From 23068a7c05a4f56688c8ddbe0d418efd3607df5d Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 29 Nov 2024 12:13:47 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=20fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0excel=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/datasource/provider/ExcelUtils.java  | 1 +
 .../io/dataease/datasource/server/DatasourceServer.java   | 8 --------
 .../data/datasource/form/ApiHttpRequestDraw.vue           | 6 +++++-
 .../views/visualized/data/datasource/form/ExcelDetail.vue | 8 +++++---
 4 files changed, 11 insertions(+), 12 deletions(-)

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 3ae742deb7..31c18fc1b4 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
@@ -486,6 +486,7 @@ public class ExcelUtils {
                 tableFiled.setName(filedName);
                 tableFiled.setOriginName(filedName);
                 tableFiled.setFieldType(null);
+                tableFiled.setChecked(true);
                 fields.add(tableFiled);
             }
 
diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
index 5370af6d50..848a67b145 100644
--- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
+++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java
@@ -810,19 +810,11 @@ public class DatasourceServer implements DatasourceApi {
                 datasourceRequest.setDatasource(transDTO(coreDatasource));
                 List<DatasetTableDTO> datasetTableDTOS = ExcelUtils.getTables(datasourceRequest);
                 for (ExcelSheetData sheet : excelFileData.getSheets()) {
-                    boolean find = false;
                     for (DatasetTableDTO datasetTableDTO : datasetTableDTOS) {
                         if (excelDataTableName(datasetTableDTO.getTableName()).equals(sheet.getTableName()) || isCsv(file.getOriginalFilename())) {
-                            find = true;
                             sheet.setDeTableName(datasetTableDTO.getTableName());
-                            datasourceRequest.setTable(datasetTableDTO.getTableName());
-                            List<TableField> oldTableFields = ExcelUtils.getTableFields(datasourceRequest);
-                            mergeFields(oldTableFields, sheet.getFields());
                         }
                     }
-                    if (!find) {
-                        sheet.setNewSheet(true);
-                    }
                 }
             }
         }
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
index 7dc1fba8c2..c6f2c62281 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
@@ -289,7 +289,11 @@ const saveItem = () => {
     }
   } else {
     for (let i = 0; i < apiItem.fields.length; i++) {
-      if (apiItem.fields[i].primaryKey && !apiItem.fields[i].length) {
+      if (
+        apiItem.fields[i].primaryKey &&
+        !apiItem.fields[i].length &&
+        apiItem.fields[i].deExtractType === 0
+      ) {
         ElMessage.error(t('datasource.primary_key_length') + apiItem.fields[i].name)
         return
       }
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 5c79d1feed..8363eebf92 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
@@ -207,6 +207,7 @@ const saveExcelDs = (params, successCb, finallyCb) => {
   let effectExtField = false
   let changeFiled = false
   let selectNode = state.excelData[0]?.sheets
+  console.log(1)
   for (let i = 0; i < selectNode.length; i++) {
     if (selectNode[i].sheet) {
       if (selectNode[i].effectExtField) {
@@ -243,6 +244,7 @@ const saveExcelDs = (params, successCb, finallyCb) => {
       sheetFileMd5.push(selectNode[i].fieldsMd5)
     }
   }
+  console.log(2)
   if (!selectedSheet.length) {
     ElMessage({
       message: t('dataset.ple_select_excel'),
@@ -644,7 +646,7 @@ defineExpose({
         ></SheetTabs>
 
         <div class="table-select_mode">
-          <div class="btn-select" v-if="param.id === '0' || sheetObj.newSheet">
+          <div class="btn-select" v-if="param.editType === 0">
             <el-button
               @click="changeCurrentMode('preview')"
               :class="[currentMode === 'preview' && 'is-active']"
@@ -705,7 +707,7 @@ defineExpose({
             <el-table-column
               prop="length"
               :label="t('datasource.length')"
-              v-if="param.id === '0' || sheetObj.newSheet"
+              v-if="param.editType === 0"
             >
               <template #default="scope">
                 <el-input-number
@@ -728,7 +730,7 @@ defineExpose({
               class-name="checkbox-table"
               :label="t('datasource.set_key')"
               width="100"
-              v-if="param.id === '0' || sheetObj.newSheet"
+              v-if="param.editType === 0"
             >
               <template #default="scope">
                 <el-checkbox

From 435b27a132b91042a830fa6ce65e57671a5dbc0e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 29 Nov 2024 12:21:44 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=20fix:=E3=80=90=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E3=80=91=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=AD=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E7=9B=98excel=E5=AF=BC=E5=87=BA=E5=A4=B1=E8=B4=A5=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/charts/impl/numeric/NumericalChartHandler.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/NumericalChartHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/NumericalChartHandler.java
index 7ffe2b9345..62530e0fbf 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/NumericalChartHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/NumericalChartHandler.java
@@ -60,6 +60,9 @@ public class NumericalChartHandler extends DefaultChartHandler {
         String maxType = (String) target.get(type);
         if (StringUtils.equalsIgnoreCase("dynamic", maxType)) {
             Map<String, Object> maxField = (Map<String, Object>) target.get(field);
+            if (maxField.get("id") == null || StringUtils.isEmpty(maxField.get("id").toString())) {
+                DEException.throwException(Translator.get("i18n_gauge_field_delete"));
+            }
             Long id = Long.valueOf((String) maxField.get("id"));
             String summary = (String) maxField.get("summary");
             DatasetTableFieldDTO datasetTableField = datasetTableFieldManage.selectById(id);

From 822de6f2b82d026d81b6cafef7fc48625c0ef836 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 2 Dec 2024 12:56:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=20fix:=E3=80=90=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E3=80=91MySQL=20=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=90=AB?=
 =?UTF-8?q?=E6=9C=89=E6=8D=A2=E8=A1=8C=E7=AC=A6=E6=97=B6=EF=BC=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BB=84=E4=BB=B6=E4=BC=9A=E6=9F=A5=E4=B8=8D=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extensions/view/dto/ChartExtFilterDTO.java    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java
index 9af98e72d2..0d61784fd7 100644
--- a/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java
+++ b/sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartExtFilterDTO.java
@@ -1,10 +1,13 @@
 package io.dataease.extensions.view.dto;
 
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.dataease.extensions.datasource.dto.DatasetTableFieldDTO;
 import lombok.Data;
 
+
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
@@ -23,4 +26,16 @@ public class ChartExtFilterDTO {
     @JsonIgnore
     private List<String> originValue;
     private int filterType;// 0-过滤组件，1-下钻，2-联动，外部参数
+
+
+    public List<String> getValue() {
+        if (CollectionUtils.isNotEmpty(value)) {
+            List<String> values = new ArrayList<>();
+            value.forEach(v -> {
+                values.add(v.replace("\n", "\\n"));
+            });
+            return values;
+        }
+        return value;
+    }
 }

From 847fd4a1fb8d80fb89c1925734627aeb687d5ec9 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 2 Dec 2024 15:29:17 +0800
Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/visualized/data/datasource/form/ExcelDetail.vue   | 2 --
 1 file changed, 2 deletions(-)

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 8363eebf92..7c9f7e2d49 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
@@ -207,7 +207,6 @@ const saveExcelDs = (params, successCb, finallyCb) => {
   let effectExtField = false
   let changeFiled = false
   let selectNode = state.excelData[0]?.sheets
-  console.log(1)
   for (let i = 0; i < selectNode.length; i++) {
     if (selectNode[i].sheet) {
       if (selectNode[i].effectExtField) {
@@ -244,7 +243,6 @@ const saveExcelDs = (params, successCb, finallyCb) => {
       sheetFileMd5.push(selectNode[i].fieldsMd5)
     }
   }
-  console.log(2)
   if (!selectedSheet.length) {
     ElMessage({
       message: t('dataset.ple_select_excel'),