From ebe6f306c6c9b38ba5994a986a258f79cc7a7729 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 8 Jun 2021 12:16:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/dataset/DataSetTableRequest.java  |  3 +--
 .../service/dataset/DataSetTableService.java  | 25 ++++++++++++++-----
 frontend/src/views/dataset/group/Group.vue    |  1 +
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java b/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java
index 2341b12407..ac4119d714 100644
--- a/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java
+++ b/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java
@@ -16,8 +16,7 @@ public class DataSetTableRequest extends DatasetTable {
     private String sort;
     private List<String> tableNames;
     private String row = "1000";
-
     private String userId;
-
     private Integer editType;
+    private Boolean isRename;
 }
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 353fd7dea6..2dbad5b7ff 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -114,12 +114,25 @@ public class DataSetTableService {
             }
         } else {
             int update = datasetTableMapper.updateByPrimaryKeySelective(datasetTable);
-            // sql 更新
-            if (update == 1) {
-                if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql") || StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) {
-                    // 删除所有字段，重新抽象
-                    dataSetTableFieldsService.deleteByTableId(datasetTable.getId());
-                    saveTableField(datasetTable);
+            if (datasetTable.getIsRename() == null || !datasetTable.getIsRename()) {
+                // 更新数据和字段
+                if (update == 1) {
+                    if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql") || StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) {
+                        // 删除所有字段，重新抽象
+                        dataSetTableFieldsService.deleteByTableId(datasetTable.getId());
+                        saveTableField(datasetTable);
+                    }
+                    if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) {
+                        if (datasetTable.getEditType() == 0) {
+                            commonThreadPool.addTask(() -> {
+                                extractDataService.extractData(datasetTable.getId(), null, "all_scope", null);
+                            });
+                        } else if (datasetTable.getEditType() == 1) {
+                            commonThreadPool.addTask(() -> {
+                                extractDataService.extractData(datasetTable.getId(), null, "add_scope", null);
+                            });
+                        }
+                    }
                 }
             }
         }
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index d6a232d744..ec9f694d7e 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -395,6 +395,7 @@ export default {
       table.mode = parseInt(table.mode)
       this.$refs['tableForm'].validate((valid) => {
         if (valid) {
+          table.isRename = true
           addTable(table).then(response => {
             this.closeTable()
             this.$message({