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 @@ {{$t('commons.delete_confirm')}} - DELETE-{{record.name}} + DELETE-{{record.name || record.title}}
@@ -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"> - + - + @@ -126,7 +126,7 @@ 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)