diff --git a/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java b/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java index 5a55e3280e..7ff0ccdf42 100644 --- a/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java +++ b/core/core-backend/src/main/java/io/dataease/font/manage/FontManage.java @@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ResourceLoader; +import java.awt.*; import java.io.*; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -181,9 +182,10 @@ public class FontManage { unit = "KB"; size = Double.valueOf(String.format("%.2f", (double) length / 1024)); } + Font font = Font.createFont(Font.TRUETYPE_FONT, new File(filePath)); fontDto.setSize(size); fontDto.setSizeType(unit); - + fontDto.setName(font.getFontName()); } catch (Exception e) { DEException.throwException(e); } diff --git a/core/core-frontend/src/views/system/font/UploadDetail.vue b/core/core-frontend/src/views/system/font/UploadDetail.vue index d9b8c9985f..b2ba33986c 100644 --- a/core/core-frontend/src/views/system/font/UploadDetail.vue +++ b/core/core-frontend/src/views/system/font/UploadDetail.vue @@ -20,6 +20,7 @@ const uploadExcel = () => { loading.value = true return uploadFontFile(formData) .then(res => { + ruleForm.name = res.data.name ruleForm.size = res.data.size ruleForm.sizeType = res.data.sizeType ruleForm.fileTransName = res.data.fileTransName