From b2e00892773d3af32634d4e8ff4f5d59b599c02e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 30 Aug 2021 15:47:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/dataset/DataSetTableController.java  |  6 ++++++
 .../service/dataset/DataSetTableService.java        |  8 ++++++++
 frontend/src/api/dataset/dataset.js                 |  9 +++++++++
 frontend/src/views/dataset/group/Group.vue          | 13 ++-----------
 4 files changed, 25 insertions(+), 11 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 ab6c300345..4fa8d70494 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -46,6 +46,12 @@ public class DataSetTableController {
         }
     }
 
+    @ApiOperation("重命名")
+    @PostMapping("rename")
+    public void rename(@RequestBody DataSetTableRequest request) throws Exception {
+        dataSetTableService.rename(request);
+    }
+    
     @ApiOperation("删除")
     @PostMapping("delete/{id}")
     public void delete(@PathVariable String id) throws Exception {
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 d3cb79db85..94b1f45169 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -251,6 +251,14 @@ public class DataSetTableService {
         return datasetTable;
     }
 
+    public void rename(DataSetTableRequest request)throws Exception {
+        checkName(request);
+        DatasetTable datasetTable = new DatasetTable();
+        datasetTable.setId(request.getId());
+        datasetTable.setName(request.getName());
+        datasetTableMapper.updateByPrimaryKeySelective(datasetTable);
+    }
+
     public void delete(String id) throws Exception {
         DatasetTable table = datasetTableMapper.selectByPrimaryKey(id);
         datasetTableMapper.deleteByPrimaryKey(id);
diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index 5813b7611c..0efcf06d48 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -43,6 +43,15 @@ export function addTable(data) {
   })
 }
 
+export function rename(data) {
+  return request({
+    url: '/dataset/table/rename',
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+
 export function delTable(tableId) {
   return request({
     url: '/dataset/table/delete/' + tableId,
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 2163d42f21..a78d2973e8 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -341,7 +341,7 @@
 </template>
 
 <script>
-import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post, isKettleRunning} from '@/api/dataset/dataset'
+import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post, isKettleRunning, rename} from '@/api/dataset/dataset'
 import GroupMoveSelector from './GroupMoveSelector'
 import DsMoveSelector from './DsMoveSelector'
 
@@ -551,30 +551,21 @@ export default {
     },
 
     saveTable(table) {
-      //   console.log(table)
       table.mode = parseInt(table.mode)
       this.$refs['tableForm'].validate((valid) => {
         if (valid) {
           table.isRename = true
-          addTable(table).then(response => {
+          rename(table).then(response => {
             this.closeTable()
             this.$message({
               message: this.$t('dataset.save_success'),
               type: 'success',
               showClose: true
             })
-            // this.tableTree()
             this.refreshNodeBy(table.sceneId)
-            // this.$router.push('/dataset/home')
-            // this.$emit('switchComponent', { name: 'ViewTable', param: table.id })
             this.$store.dispatch('dataset/setTable', new Date().getTime())
           })
         } else {
-          // this.$message({
-          //   message: this.$t('commons.input_content'),
-          //   type: 'error',
-          //   showClose: true
-          // })
           return false
         }
       })