From c839b3cba4fdb12cee0e0c6dc817156192a25f58 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 8 Jun 2021 11:30:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91excel=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/DataSetTableController.java       |  4 +--
 .../request/dataset/DataSetTableRequest.java  |  2 ++
 .../service/dataset/DataSetTableService.java  |  6 ++--
 frontend/src/views/dataset/add/AddExcel.vue   | 33 +++++++++++++------
 frontend/src/views/dataset/data/ViewTable.vue |  4 +--
 5 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
index 7f1a4fe577..b40d009e66 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -25,12 +25,12 @@ public class DataSetTableController {
     private DataSetTableService dataSetTableService;
 
     @PostMapping("batchAdd")
-    public void batchAdd(@RequestBody List<DatasetTable> datasetTable) throws Exception {
+    public void batchAdd(@RequestBody List<DataSetTableRequest> datasetTable) throws Exception {
         dataSetTableService.batchInsert(datasetTable);
     }
 
     @PostMapping("update")
-    public DatasetTable save(@RequestBody DatasetTable datasetTable) throws Exception {
+    public DatasetTable save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
         return dataSetTableService.save(datasetTable);
     }
 
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 9eea8a6819..2341b12407 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
@@ -18,4 +18,6 @@ public class DataSetTableRequest extends DatasetTable {
     private String row = "1000";
 
     private String userId;
+
+    private Integer editType;
 }
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 9c88a595c2..353fd7dea6 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -84,13 +84,13 @@ public class DataSetTableService {
     @Value("${upload.file.path}")
     private String path;
 
-    public void batchInsert(List<DatasetTable> datasetTable) throws Exception {
-        for (DatasetTable table : datasetTable) {
+    public void batchInsert(List<DataSetTableRequest> datasetTable) throws Exception {
+        for (DataSetTableRequest table : datasetTable) {
             save(table);
         }
     }
 
-    public DatasetTable save(DatasetTable datasetTable) throws Exception {
+    public DatasetTable save(DataSetTableRequest datasetTable) throws Exception {
         checkName(datasetTable);
         if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql")) {
             DataSetTableRequest dataSetTableRequest = new DataSetTableRequest();
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index a93aad123d..e5de317cb3 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -20,7 +20,7 @@
           <el-col style="width: 500px;">
             <el-form :inline="true" size="mini" class="row-style">
               <el-form-item class="form-item">
-                <el-input v-model="name" :disabled="!!param.tableId" :placeholder="$t('commons.name')" />
+                <el-input v-show="!param.tableId" v-model="name" :placeholder="$t('commons.name')" />
               </el-form-item>
               <el-form-item class="form-item">
                 <el-upload
@@ -176,15 +176,28 @@ export default {
         })
         return
       }
-      const table = {
-        id: this.param.tableId,
-        name: this.name,
-        sceneId: this.param.id,
-        dataSourceId: null,
-        type: 'excel',
-        mode: parseInt(this.mode),
-        info: '{"data":"' + this.path + '"}',
-        editType: this.param.editType ? this.param.editType : 0
+      let table = {}
+      if (!this.param.tableId) {
+        table = {
+          id: this.param.tableId,
+          name: this.name,
+          sceneId: this.param.id,
+          dataSourceId: null,
+          type: 'excel',
+          mode: parseInt(this.mode),
+          info: '{"data":"' + this.path + '"}'
+        }
+      } else {
+        table = {
+          id: this.param.tableId,
+          name: this.param.table.name,
+          sceneId: this.param.id,
+          dataSourceId: null,
+          type: 'excel',
+          mode: parseInt(this.mode),
+          info: '{"data":"' + this.path + '"}',
+          editType: this.param.editType ? this.param.editType : 0
+        }
       }
       post('/dataset/table/update', table).then(response => {
         this.$store.dispatch('dataset/setSceneData', new Date().getTime())
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 4326fb470a..a331c94b1b 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -166,10 +166,10 @@ export default {
       // console.log(param);
       switch (param.type) {
         case '0':
-          this.$emit('switchComponent', { name: 'AddExcel', param: { id: this.table.sceneId, tableId: this.table.id, editType: 0 }})
+          this.$emit('switchComponent', { name: 'AddExcel', param: { id: this.table.sceneId, tableId: this.table.id, editType: 0, table: this.table }})
           break
         case '1':
-          this.$emit('switchComponent', { name: 'AddExcel', param: { id: this.table.sceneId, tableId: this.table.id, editType: 1 }})
+          this.$emit('switchComponent', { name: 'AddExcel', param: { id: this.table.sceneId, tableId: this.table.id, editType: 1, table: this.table }})
           break
       }
     },