From c5b74961cf344ea88e636be6ec839a0d359ed0a9 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 3 Dec 2024 16:11:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E3=80=91-=E6=96=B0=E5=BB=BAExcel=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E7=BD=AE=E4=B8=BB=E9=94=AE=E6=97=B6=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=AE=BE=E7=BD=AE=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=97=B6=E6=8A=A5=E9=94=99=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9=E5=90=8E=E5=86=8D?=
 =?UTF-8?q?=E6=AC=A1=E6=8F=90=E4=BA=A4=E4=BF=9D=E5=AD=98=EF=BC=8C=E7=A1=AE?=
 =?UTF-8?q?=E5=AE=9A=E6=8C=89=E9=92=AE=E6=97=A0=E5=93=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/visualized/data/datasource/form/ExcelDetail.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
index 6e81b749d5..6f97d10b92 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
@@ -220,6 +220,7 @@ const saveExcelDs = (params, successCb, finallyCb) => {
           message: selectNode[i].excelLabel + t('datasource.api_field_not_empty'),
           type: 'error'
         })
+        finallyCb?.()
         return
       }
       for (let j = 0; j < selectNode[i].fields.length; j++) {
@@ -237,6 +238,7 @@ const saveExcelDs = (params, successCb, finallyCb) => {
               selectNode[i].fields[j].name,
             type: 'error'
           })
+          finallyCb?.()
           return
         }
       }
@@ -249,9 +251,11 @@ const saveExcelDs = (params, successCb, finallyCb) => {
       message: t('dataset.ple_select_excel'),
       type: 'error'
     })
+    finallyCb?.()
     return
   }
   if (!validate) {
+    finallyCb?.()
     return
   }
 

From e5457757b98b02cd91e0e1be78b039fe93078c26 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 3 Dec 2024 16:28:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=90=8E=E7=BC=80=EF=BC=9A?=
 =?UTF-8?q?.ttf=20=E6=88=96=20.TTF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/font/manage/FontManage.java       | 2 +-
 1 file changed, 1 insertion(+), 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 ec488fbfca..5a55e3280e 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
@@ -155,7 +155,7 @@ public class FontManage {
         FontDto fontDto = new FontDto();
         try {
             String filename = file.getOriginalFilename();
-            if (StringUtils.isEmpty(filename) || !filename.endsWith(".ttf")) {
+            if (StringUtils.isEmpty(filename) || !filename.toLowerCase().endsWith(".ttf")) {
                 DEException.throwException("非法格式的文件！");
             }
             String suffix = filename.substring(filename.lastIndexOf(".") + 1);