From d303ae90fe5890e7d1dfe09ab5a1647c731f8ff0 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 30 Aug 2021 16:18:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/DataSetTableController.java       |  8 +++---
 .../service/dataset/DataSetTableService.java  |  7 ++---
 frontend/src/api/dataset/dataset.js           |  4 +--
 frontend/src/views/dataset/group/Group.vue    | 28 ++-----------------
 4 files changed, 11 insertions(+), 36 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 4fa8d70494..76c2288b81 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -46,10 +46,10 @@ public class DataSetTableController {
         }
     }
 
-    @ApiOperation("重命名")
-    @PostMapping("rename")
-    public void rename(@RequestBody DataSetTableRequest request) throws Exception {
-        dataSetTableService.rename(request);
+    @ApiOperation("修改")
+    @PostMapping("alter")
+    public void alter(@RequestBody DataSetTableRequest request) throws Exception {
+        dataSetTableService.alter(request);
     }
     
     @ApiOperation("删除")
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 94b1f45169..93e1158b4a 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -251,12 +251,9 @@ public class DataSetTableService {
         return datasetTable;
     }
 
-    public void rename(DataSetTableRequest request)throws Exception {
+    public void alter(DataSetTableRequest request)throws Exception {
         checkName(request);
-        DatasetTable datasetTable = new DatasetTable();
-        datasetTable.setId(request.getId());
-        datasetTable.setName(request.getName());
-        datasetTableMapper.updateByPrimaryKeySelective(datasetTable);
+        datasetTableMapper.updateByPrimaryKeySelective(request);
     }
 
     public void delete(String id) throws Exception {
diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index 0efcf06d48..be73f0862d 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -43,9 +43,9 @@ export function addTable(data) {
   })
 }
 
-export function rename(data) {
+export function alter(data) {
   return request({
-    url: '/dataset/table/rename',
+    url: '/dataset/table/alter',
     method: 'post',
     loading: true,
     data
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index a78d2973e8..1d86c4b06b 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, rename} from '@/api/dataset/dataset'
+import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post, isKettleRunning, alter} from '@/api/dataset/dataset'
 import GroupMoveSelector from './GroupMoveSelector'
 import DsMoveSelector from './DsMoveSelector'
 
@@ -419,23 +419,12 @@ export default {
     }
   },
   computed: {
-    // sceneData: function() {
-    //   // this.tableTree()
-    //   // console.log(this.$store.state.dataset.sceneData)
-    //   this.refreshNodeBy(this.currGroup.id)
-    //   return this.$store.state.dataset.sceneData
-    // }
   },
   created() {
     this.kettleState()
   },
   watch: {
     search(val) {
-      // if (val && val !== '') {
-      //   this.tableData = JSON.parse(JSON.stringify(this.tables.filter(ele => { return ele.name.includes(val) })))
-      // } else {
-      //   this.tableData = JSON.parse(JSON.stringify(this.tables))
-      // }
       this.$emit('switchComponent', { name: '' })
       this.tData = []
       this.expandedArray = []
@@ -526,7 +515,6 @@ export default {
     },
 
     saveGroup(group) {
-      // console.log(group);
       this.$refs['groupForm'].validate((valid) => {
         if (valid) {
           addGroup(group).then(res => {
@@ -536,15 +524,9 @@ export default {
               type: 'success',
               showClose: true
             })
-            // this.tree(this.groupForm)
             this.refreshNodeBy(group.pid)
           })
         } else {
-          // this.$message({
-          //   message: this.$t('commons.input_error'),
-          //   type: 'error',
-          //   showClose: true
-          // })
           return false
         }
       })
@@ -555,7 +537,7 @@ export default {
       this.$refs['tableForm'].validate((valid) => {
         if (valid) {
           table.isRename = true
-          rename(table).then(response => {
+          alter(table).then(response => {
             this.closeTable()
             this.$message({
               message: this.$t('dataset.save_success'),
@@ -787,14 +769,10 @@ export default {
       }
     },
     saveMoveDs() {
-      // if (this.tDs && this.tDs.type === 'group') {
-      //   return
-      // }
       this.dsForm.sceneId = this.tDs.id
       this.dsForm.isRename = true
-      addTable(this.dsForm).then(res => {
+      alter(this.dsForm).then(res => {
         this.closeMoveDs()
-        // this.tableTree()
         this.refreshNodeBy(this.dsForm.sceneId)
       })
     },