From bc7c528501abb1a263354196a5a412d3e501930e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 17 Dec 2024 15:12:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8A=E4=BC=A0=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E8=AF=BB?=
 =?UTF-8?q?=E5=8F=96=E5=AD=97=E4=BD=93=E5=90=8D=E4=BD=9C=E4=B8=BA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/font/manage/FontManage.java     | 4 +++-
 core/core-frontend/src/views/system/font/UploadDetail.vue     | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

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