diff --git a/smart-admin-web-javascript/src/constants/system/menu-const.js b/smart-admin-web-javascript/src/constants/system/menu-const.js index 948e3e2a..6adf4b10 100644 --- a/smart-admin-web-javascript/src/constants/system/menu-const.js +++ b/smart-admin-web-javascript/src/constants/system/menu-const.js @@ -18,7 +18,7 @@ export const MENU_TYPE_ENUM = { }, POINTS: { value: 3, - desc: '按钮', + desc: '功能点', }, }; diff --git a/smart-admin-web-javascript/src/views/system/menu/components/menu-operate-modal.vue b/smart-admin-web-javascript/src/views/system/menu/components/menu-operate-modal.vue index 042d162d..d87d3383 100644 --- a/smart-admin-web-javascript/src/views/system/menu/components/menu-operate-modal.vue +++ b/smart-admin-web-javascript/src/views/system/menu/components/menu-operate-modal.vue @@ -15,8 +15,9 @@ :open="visible" :width="600" @close="onClose" + destroyOnClose > - + @@ -61,11 +62,17 @@ - + - + - + @@ -105,7 +118,7 @@ diff --git a/smart-admin-web-typescript/src/constants/system/menu-const.ts b/smart-admin-web-typescript/src/constants/system/menu-const.ts index 2d769fae..8109cfa5 100644 --- a/smart-admin-web-typescript/src/constants/system/menu-const.ts +++ b/smart-admin-web-typescript/src/constants/system/menu-const.ts @@ -21,7 +21,7 @@ export const MENU_TYPE_ENUM: SmartEnum = { }, POINTS: { value: 3, - desc: '按钮', + desc: '功能点', }, }; diff --git a/smart-admin-web-typescript/src/views/system/menu/components/menu-operate-modal.vue b/smart-admin-web-typescript/src/views/system/menu/components/menu-operate-modal.vue index d681f145..300bed69 100644 --- a/smart-admin-web-typescript/src/views/system/menu/components/menu-operate-modal.vue +++ b/smart-admin-web-typescript/src/views/system/menu/components/menu-operate-modal.vue @@ -15,6 +15,7 @@ :open="visible" :width="600" @close="onClose" + destroyOnClose > @@ -65,7 +66,7 @@ - + - + diff --git a/smart-admin-web-typescript/src/views/system/menu/menu-list-table-columns.ts b/smart-admin-web-typescript/src/views/system/menu/menu-list-table-columns.ts index dabb6616..effc5ad0 100644 --- a/smart-admin-web-typescript/src/views/system/menu/menu-list-table-columns.ts +++ b/smart-admin-web-typescript/src/views/system/menu/menu-list-table-columns.ts @@ -13,12 +13,13 @@ export const columns = ref([ title: '名称', dataIndex: 'menuName', key: 'ID', - width: 200, + width: 220, }, { title: '类型', dataIndex: 'menuType', - width: 80, + width: 100, + align: "center" }, { title: '图标', @@ -53,6 +54,7 @@ export const columns = ref([ { title: '操作', dataIndex: 'operate', - width: 100, + width: 170, + align: "center" }, ]); diff --git a/smart-admin-web-typescript/src/views/system/menu/menu-list.vue b/smart-admin-web-typescript/src/views/system/menu/menu-list.vue index bbbe14b3..dffb7888 100644 --- a/smart-admin-web-typescript/src/views/system/menu/menu-list.vue +++ b/smart-admin-web-typescript/src/views/system/menu/menu-list.vue @@ -88,7 +88,7 @@
+ + 添加下级 + 编辑 删除
@@ -157,6 +166,7 @@ import { smartSentry } from '/@/lib/smart-sentry'; import TableOperator from '/@/components/support/table-operator/index.vue'; import { TABLE_ID_CONST } from '/@/constants/support/table-id-const'; + import { MENU_TYPE_ENUM } from '/@/constants/system/menu-const'; // ------------------------ 表格渲染 ------------------------ const menuTypeColorArray = ['red', 'blue', 'orange', 'green']; @@ -256,4 +266,13 @@ function showDrawer(rowData) { menuOperateModal.value.showDrawer(rowData); } + + function showAddSub(rowData) { + const subData = { + parentId: rowData.menuId, + menuType: rowData.menuType === MENU_TYPE_ENUM.CATALOG.value ? MENU_TYPE_ENUM.MENU.value : MENU_TYPE_ENUM.POINTS.value, + contextMenuId: rowData.menuType === MENU_TYPE_ENUM.MENU.value ? rowData.menuId : undefined, + }; + menuOperateModal.value.showDrawer(subData); + }