From d8b50abf3ab90d5ff0979c4635117dbb73e5f2eb Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 9 Oct 2024 15:58:45 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=20=E5=88=A4=E6=96=AD=E8=B4=9F?=
 =?UTF-8?q?=E6=95=B0=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/datasource/provider/ExcelUtils.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
index e927b6dca8..f41ac59953 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java
@@ -311,7 +311,7 @@ public class ExcelUtils {
         if (StringUtils.isEmpty(value) || value.length() > 19) {
             return "TEXT";
         }
-        String regex = "^\\d+(\\.\\d+)?$";
+        String regex = "^-?\\d+(\\.\\d+)?$";
         if (!value.matches(regex)) {
             return "TEXT";
         }

From 48f9663ca693ee9ecc256664710c3da80aff5fbc Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 9 Oct 2024 15:59:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=20api=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/visualized/data/datasource/form/EditorDetail.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
index fc6f8b1566..43ca3f27e8 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
@@ -697,7 +697,7 @@ const delParams = data => {
     autofocus: false,
     showClose: false
   }).then(() => {
-    gridData.value.splice(form.value.apiConfiguration.indexOf(data), 1)
+    gridData.value.splice(gridData.value.indexOf(data), 1)
   })
 }
 const datasetTypeList = [

From 1beca69de6d7f95ee5c07a26c54bf555685e8fda Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 9 Oct 2024 15:59:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E4=B8=AD=E6=96=87=E5=90=8D=E7=A7=B0=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/chart/server/ChartDataServer.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
index 2afa50e916..50c8dec639 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java
@@ -38,6 +38,8 @@ import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -111,7 +113,7 @@ public class ChartDataServer implements ChartDataApi {
             Integer curLimit = getExportLimit();
             if (ChartConstants.VIEW_RESULT_MODE.CUSTOM.equals(viewDTO.getResultMode())) {
                 Integer limitCount = viewDTO.getResultCount();
-                viewDTO.setResultCount(Math.min(curLimit,limitCount));
+                viewDTO.setResultCount(Math.min(curLimit, limitCount));
             } else {
                 viewDTO.setResultCount(curLimit);
             }
@@ -184,7 +186,7 @@ public class ChartDataServer implements ChartDataApi {
 
                 response.setContentType("application/vnd.ms-excel");
                 //文件名称
-                response.setHeader("Content-disposition", "attachment;filename=" + request.getViewName() + ".xlsx");
+                response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(request.getViewName(), StandardCharsets.UTF_8) + ".xlsx");
                 wb.write(outputStream);
                 outputStream.flush();
                 outputStream.close();