From 12d0d862b9c7e7fc509b3771ccaa526ca5070478 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 23 Feb 2021 16:21:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8F=9C=E5=8D=95=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtMenuMapper.java        |  4 +--
 .../common/components/MsDeleteConfirm.vue     |  4 +--
 .../business/components/settings/sys/menu.vue | 32 +++++++++++--------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtMenuMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtMenuMapper.java
index ff36fa674b..7eff7f649d 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtMenuMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtMenuMapper.java
@@ -8,8 +8,8 @@ import org.apache.ibatis.annotations.Update;
 public interface ExtMenuMapper {
 
     @Update(" update sys_menu set sub_count = sub_count+1 where menu_id = #{menuId} ")
-    int incrementalSubcount(@Param("deptId") Long menuId);
+    int incrementalSubcount(@Param("menuId") Long menuId);
 
     @Update(" update sys_menu set sub_count = sub_count-1 where menu_id = #{menuId} and sub_count > 0")
-    int decreasingSubcount(@Param("deptId") Long menuId);
+    int decreasingSubcount(@Param("menuId") Long menuId);
 }
diff --git a/frontend/src/business/components/common/components/MsDeleteConfirm.vue b/frontend/src/business/components/common/components/MsDeleteConfirm.vue
index 0c083a332a..0e72d4bdd3 100644
--- a/frontend/src/business/components/common/components/MsDeleteConfirm.vue
+++ b/frontend/src/business/components/common/components/MsDeleteConfirm.vue
@@ -7,7 +7,7 @@
     <el-row>
       <el-col>
         <span>{{$t('commons.delete_confirm')}}</span>
-        <span class="delete-tip"> DELETE-{{record.name}}</span>
+        <span class="delete-tip"> DELETE-{{record.name || record.title}}</span>
         <br/>
       </el-col>
     </el-row>
@@ -61,7 +61,7 @@
           this.record = record;
         },
         confirm() {
-          if (this.value.trim() != 'DELETE-' + this.record.name) {
+          if (this.value.trim() != 'DELETE-' + (this.record.name || this.record.title) ) {
             this.$warning(this.$t('commons.incorrect_input'));
             return;
           }
diff --git a/frontend/src/business/components/settings/sys/menu.vue b/frontend/src/business/components/settings/sys/menu.vue
index 8083138e79..c06735fcde 100644
--- a/frontend/src/business/components/settings/sys/menu.vue
+++ b/frontend/src/business/components/settings/sys/menu.vue
@@ -16,7 +16,7 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
       row-key="menuId">
             
-            <el-table-column :show-overflow-tooltip="true" label="菜单标题" width="125px" prop="title" />
+            <el-table-column :show-overflow-tooltip="true" label="菜单标题" width="150px" prop="title" />
             <el-table-column prop="icon" label="图标" align="center" width="60px">
                 <template slot-scope="scope">
                 <svg-icon :icon-class="scope.row.icon ? scope.row.icon : ''" />
@@ -43,7 +43,7 @@
                 <span v-else>是</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="createTime" label="创建日期" width="135px">
+            <el-table-column prop="createTime" label="创建日期" width="160px">
                 <template v-slot:default="scope">
                   <span>{{ scope.row.createTime | timestampFormatDate }}</span>
                 </template>
@@ -126,7 +126,7 @@
         </el-form-item>
         <el-form-item label="上级类目" prop="pid">
           <treeselect
-            v-model="form.pid"
+            v-model="form.pid"            
             :options="menus"
             :load-options="loadMenus"
             style="width: 450px;"
@@ -180,7 +180,8 @@ export default {
   },
   data() {
     return {
-      menus: null,
+      menus: [],
+      topMunu: { id: 0, label: '顶级类目', children: null },
       formType: "add",
       queryPath: '/api/menu/childNodes/',
       deletePath: '/api/menu/delete',
@@ -192,6 +193,7 @@ export default {
       tableData: [],
       maps: new Map(),
       oldPid: null,
+      defaultForm: { menuId: null, title: null, menuSort: 999, path: null, component: null, componentName: null, iframe: false, pid: 0, icon: null, cache: false, hidden: false, type: 0, permission: null },
       form: {},
       rule: {
         name: [
@@ -206,7 +208,8 @@ export default {
     }
   },
   activated() {
-    this.initTableData();
+    this.form = Object.assign({}, this.defaultForm)
+    this.initTableData()
   },
   methods: {
     create() {
@@ -219,7 +222,7 @@ export default {
     },
 
     edit(row) {
-      this.dialogOrgAddVisible = true;
+      this.dialogVisible = true;
       this.formType = "modify";
       this.oldPid = row.pid;
       this.form = Object.assign({}, row);
@@ -283,7 +286,8 @@ export default {
         if(!row){
           data.some(node => node.children = null);
           _self.tableData = data;
-          _self.menus = null;
+          _self.menus = [];
+          _self.menus.push(_self.topMunu)
 
         }else{
           this.maps.set(row.menuId, {row, treeNode, resolve})
@@ -293,11 +297,11 @@ export default {
     },
     closeFunc() {
       this.initTableData();
-      this.form = {};
+      this.form = this.defaultForm;
       this.oldPid = null;
       this.menus = null;
       removeGoBackListener(this.closeFunc);
-      this.dialogOrgAddVisible = false;
+      this.dialogVisible = false;
 
     },
 
@@ -328,7 +332,7 @@ export default {
       }
       return {
         id: node.menuId,
-        label:node.name,
+        label:node.title,
         children:node.children
       }
     },
@@ -336,7 +340,7 @@ export default {
       return {
         id: node.menuId,
         pid: node.pid,
-        label: node.name,
+        label: node.title,
         children: node.children
       }
     },
@@ -353,7 +357,7 @@ export default {
             this.initTableData();
             this.oldPid && this.reloadByPid(this.oldPid)
             this.reloadByPid(this.form['pid'])
-            this.dialogOrgAddVisible = false;
+            this.dialogVisible = false;
           });
         } else {
           return false;
@@ -370,8 +374,8 @@ export default {
         cancelButtonText: this.$t('commons.cancel'),
         type: 'warning'
       }).then(() => {
-        let requests = [{menuId: menu.menuId, pid: menu.pid}]
-        this.$post(this.deletePath, requests, () => {
+        let request = {menuId: menu.menuId, pid: menu.pid}
+        this.$post(this.deletePath, request, () => {
           this.$success(this.$t('commons.delete_success'));
           this.initTableData();
           this.reloadByPid(menu.pid)