From fd71b63841c46802fee8731e148a4a0e65035c59 Mon Sep 17 00:00:00 2001
From: taojinlong <tjlygdx@163.com>
Date: Tue, 11 Mar 2025 23:34:35 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8Bexcel=E6=95=B0=E6=8D=AE=E6=BA=90=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E9=97=AE=E9=A2=98=20(#15294)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: taojinlong <jinlong@fit2cloud.com>
---
 .../dataease/datasource/server/DatasourceServer.java | 10 +---------
 .../visualized/data/datasource/BaseInfoItem.vue      |  2 +-
 .../data/datasource/form/ApiHttpRequestDraw.vue      | 12 +++++++++++-
 .../data/datasource/form/ExcelRemoteDetail.vue       |  4 ++++
 .../views/visualized/data/datasource/form/index.vue  |  8 ++++++++
 .../main/java/io/dataease/utils/HttpClientUtil.java  |  2 ++
 6 files changed, 27 insertions(+), 11 deletions(-)

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 e0a2cc2011..e405075380 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
@@ -927,21 +927,13 @@ public class DatasourceServer implements DatasourceApi {
             DatasourceRequest datasourceRequest = new DatasourceRequest();
             datasourceRequest.setDatasource(transDTO(coreDatasource));
             List<DatasetTableDTO> datasetTableDTOS = ExcelUtils.getTables(datasourceRequest);
-            List<ExcelSheetData> excelSheetDataList = new ArrayList<>();
             for (ExcelSheetData sheet : excelFileData.getSheets()) {
                 for (DatasetTableDTO datasetTableDTO : datasetTableDTOS) {
                     if (excelDataTableName(datasetTableDTO.getTableName()).equals(sheet.getTableName())) {
-                        List<TableField> newTableFields = sheet.getFields();
-                        datasourceRequest.setTable(datasetTableDTO.getTableName());
-                        List<TableField> oldTableFields = ExcelUtils.getTableFields(datasourceRequest);
-                        if (isEqual(newTableFields, oldTableFields)) {
-                            sheet.setDeTableName(datasetTableDTO.getTableName());
-                            excelSheetDataList.add(sheet);
-                        }
+                        sheet.setDeTableName(datasetTableDTO.getTableName());
                     }
                 }
             }
-            excelFileData.setSheets(excelSheetDataList);
         }
         for (ExcelSheetData sheet : excelFileData.getSheets()) {
             for (int i = 0; i < sheet.getFields().size() - 1; i++) {
diff --git a/core/core-frontend/src/views/visualized/data/datasource/BaseInfoItem.vue b/core/core-frontend/src/views/visualized/data/datasource/BaseInfoItem.vue
index 4cf4191840..9678a3da05 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/BaseInfoItem.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/BaseInfoItem.vue
@@ -8,7 +8,7 @@ defineProps({
 <template>
   <div class="base-info-item">
     <p class="label">{{ label }}</p>
-    <p class="value">
+    <p class="value ellipsis">
       <slot></slot>
     </p>
   </div>
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 b17f202a57..fdf94abd23 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
@@ -190,7 +190,17 @@ const initApiItem = (
 ) => {
   pluginDs.value = pluginDsList
   pluginIndex.value = indexPlugin
-  isPlugin.value = isPluginDs
+  if (!isPluginDs) {
+    const arr = pluginDs.value.filter(ele => {
+      return ele.type === from.type
+    })
+    if (arr && arr.length > 0) {
+      isPlugin.value = true
+    }
+  } else {
+    isPlugin.value = isPluginDs
+  }
+
   copyItem.value = val.copy
   copyDs.value = from.copy
   dsType.value = from.type
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelRemoteDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelRemoteDetail.vue
index 3f69f53cbb..59b8170501 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelRemoteDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelRemoteDetail.vue
@@ -252,6 +252,10 @@ const validateExcel = () => {
 }
 
 const clearForm = () => {
+  state.excelData = []
+  activeTab.value = ''
+  tabList.value = []
+  Object.assign(sheetObj, cloneDeep(defaultSheetObj))
   return remoteExcelForm.value.clearValidate()
 }
 
diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
index 0c8754a9ff..704f513503 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
@@ -711,6 +711,7 @@ const init = (nodeInfo: Form | Param, id?: string, res?: object, supportSetKey:
       }
       nextTick(() => {
         detail?.value?.clearForm()
+        excelRemote?.value?.clearForm()
         xpack?.value?.invokeMethod({
           methodName: 'clearForm',
           args: []
@@ -725,6 +726,13 @@ const drawTitle = computed(() => {
   if (creator && id && currentDsType.value == 'Excel') {
     return editType === 1 ? t('data_source.append_data') : t('data_source.replace_data')
   }
+  if (currentDsType.value == 'ExcelRemote') {
+    return editDs.value
+      ? !form2.id
+        ? t('data_source.copy_data_source')
+        : t('datasource.modify')
+      : t('data_source.create_data_source')
+  }
   return editDs.value
     ? !form.id
       ? t('data_source.copy_data_source')
diff --git a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java b/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java
index 15be895534..50e12e3011 100755
--- a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java
+++ b/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java
@@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.security.cert.X509Certificate;
 import java.util.*;
@@ -403,6 +404,7 @@ public class HttpClientUtil {
     }
 
     private static String extractFileName(HttpResponse response, String url) {
+        url = URLDecoder.decode(url);
         String fileName = "";
         String disposition = response.getHeaders("Content-Disposition").toString();
         if (disposition != null) {