From 79fc04d8cb08f00a53e4a2d042cb100fb06eb1f0 Mon Sep 17 00:00:00 2001
From: zhoumingfa <daxiongren@foxmail.com>
Date: Tue, 8 Apr 2025 19:52:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=B7=BB=E5=8A=A0=E4=B8=8B=E7=BA=A7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/constants/system/menu-const.js        |  2 +-
 .../menu/components/menu-operate-modal.vue    | 37 ++++++++++++-------
 .../system/menu/menu-list-table-columns.js    |  8 ++--
 .../src/views/system/menu/menu-list.vue       | 21 ++++++++++-
 .../src/constants/system/menu-const.ts        |  2 +-
 .../menu/components/menu-operate-modal.vue    |  5 ++-
 .../system/menu/menu-list-table-columns.ts    |  8 ++--
 .../src/views/system/menu/menu-list.vue       | 21 ++++++++++-
 8 files changed, 78 insertions(+), 26 deletions(-)

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
   >
-    <a-form ref="formRef" :labelCol="{ span: labelColSpan }" :labelWrap="true" :model="form" :rules="rules">
+    <a-form ref="formRef" :labelCol="{ span: 5 }" :labelWrap="true" :model="form" :rules="rules">
       <a-form-item label="菜单类型" name="menuType">
         <a-radio-group v-model:value="form.menuType" button-style="solid">
           <a-radio-button v-for="item in MENU_TYPE_ENUM" :key="item.value" :value="item.value">
@@ -61,11 +62,17 @@
           <a-switch v-model:checked="form.visibleFlag" checked-children="显示" un-checked-children="不显示" />
         </a-form-item>
         <a-form-item label="禁用状态" name="disabledFlag">
-          <a-switch v-model:checked="form.disabledFlag" :checkedValue="false" :unCheckedValue="true" checked-children="启用" un-checked-children="禁用" />
+          <a-switch
+            v-model:checked="form.disabledFlag"
+            :checkedValue="false"
+            :unCheckedValue="true"
+            checked-children="启用"
+            un-checked-children="禁用"
+          />
         </a-form-item>
       </template>
       <!--      目录 菜单 end   -->
-      <!--      按钮 start   -->
+      <!--      功能点 start   -->
       <template v-if="form.menuType === MENU_TYPE_ENUM.POINTS.value">
         <a-form-item label="功能点名称" name="menuName">
           <a-input v-model:value="form.menuName" placeholder="请输入功能点名称" />
@@ -74,7 +81,13 @@
           <MenuTreeSelect ref="contextMenuTreeSelect" v-model:value="form.contextMenuId" />
         </a-form-item>
         <a-form-item label="功能点状态" name="funcDisabledFlag">
-          <a-switch v-model:checked="form.disabledFlag" :checkedValue="false" :unCheckedValue="true" checked-children="启用" un-checked-children="禁用" />
+          <a-switch
+            v-model:checked="form.disabledFlag"
+            :checkedValue="false"
+            :unCheckedValue="true"
+            checked-children="启用"
+            un-checked-children="禁用"
+          />
         </a-form-item>
         <a-form-item label="权限类型" name="permsType">
           <a-radio-group v-model:value="form.permsType">
@@ -90,7 +103,7 @@
           <a-input v-model:value="form.apiPerms" placeholder="请输入后端权限" />
         </a-form-item>
       </template>
-      <!--      按钮 end   -->
+      <!--      功能点 end   -->
       <a-form-item label="排序" name="sort" help="值越小越靠前">
         <a-input-number v-model:value="form.sort" :min="0" placeholder="请输入排序" style="width: 100px" />
       </a-form-item>
@@ -105,7 +118,7 @@
 <script setup>
   import { message } from 'ant-design-vue';
   import _ from 'lodash';
-  import { computed, nextTick, reactive, ref } from 'vue';
+  import { nextTick, reactive, ref } from 'vue';
   import MenuTreeSelect from './menu-tree-select.vue';
   import { menuApi } from '/@/api/system/menu-api';
   import IconSelect from '/@/components/framework/icon-select/index.vue';
@@ -122,13 +135,6 @@
   // 是否展示抽屉
   const visible = ref(false);
 
-  const labelColSpan = computed(() => {
-    if (form.menuType === MENU_TYPE_ENUM.POINTS.value) {
-      return 6;
-    }
-    return 4;
-  });
-
   const contextMenuTreeSelect = ref();
   const parentMenuTreeSelect = ref();
 
@@ -178,7 +184,7 @@
     apiPerms: undefined,
     sort: undefined,
     visibleFlag: true,
-    cacheFlag: true,
+    cacheFlag: false,
     component: undefined,
     contextMenuId: undefined,
     disabledFlag: false,
@@ -196,6 +202,9 @@
     formRef.value.resetFields();
     form.menuType = menuType;
     form.parentId = parentId;
+    if (form.menuType === MENU_TYPE_ENUM.POINTS.value) {
+      form.contextMenuId = parentId;
+    }
     // 移除最后一个：后面的内容
     if (webPerms && webPerms.lastIndexOf(':')) {
       form.webPerms = webPerms.substring(0, webPerms.lastIndexOf(':') + 1);
diff --git a/smart-admin-web-javascript/src/views/system/menu/menu-list-table-columns.js b/smart-admin-web-javascript/src/views/system/menu/menu-list-table-columns.js
index dabb6616..effc5ad0 100644
--- a/smart-admin-web-javascript/src/views/system/menu/menu-list-table-columns.js
+++ b/smart-admin-web-javascript/src/views/system/menu/menu-list-table-columns.js
@@ -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-javascript/src/views/system/menu/menu-list.vue b/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
index 9fc15cd7..e1aca08d 100644
--- a/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
+++ b/smart-admin-web-javascript/src/views/system/menu/menu-list.vue
@@ -88,7 +88,7 @@
       <a-table
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         size="small"
-        :scroll="{ x: 1000 }"
+        :scroll="{ y: 800 }"
         :defaultExpandAllRows="true"
         :dataSource="tableData"
         bordered
@@ -132,6 +132,15 @@
 
           <template v-if="column.dataIndex === 'operate'">
             <div class="smart-table-operate">
+              <a-button
+                v-if="record.menuType !== MENU_TYPE_ENUM.POINTS.value"
+                v-privilege="'system:menu:update'"
+                type="link"
+                size="small"
+                @click="showAddSub(record)"
+              >
+                添加下级
+              </a-button>
               <a-button v-privilege="'system:menu:update'" type="link" size="small" @click="showDrawer(record)">编辑</a-button>
               <a-button v-privilege="'system:menu:batchDelete'" danger type="link" @click="singleDelete(record)">删除</a-button>
             </div>
@@ -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);
+  }
 </script>
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<number> = {
   },
   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
   >
     <a-form ref="formRef" :labelCol="{ span: labelColSpan }" :labelWrap="true" :model="form" :rules="rules">
       <a-form-item label="菜单类型" name="menuType">
@@ -65,7 +66,7 @@
         </a-form-item>
       </template>
       <!--      目录 菜单 end   -->
-      <!--      按钮 start   -->
+      <!--      功能点 start   -->
       <template v-if="form.menuType === MENU_TYPE_ENUM.POINTS.value">
         <a-form-item label="功能点名称" name="menuName">
           <a-input v-model:value="form.menuName" placeholder="请输入功能点名称" />
@@ -90,7 +91,7 @@
           <a-input v-model:value="form.apiPerms" placeholder="请输入后端权限" />
         </a-form-item>
       </template>
-      <!--      按钮 end   -->
+      <!--      功能点 end   -->
       <a-form-item label="排序" name="sort" help="值越小越靠前">
         <a-input-number v-model:value="form.sort" :min="0" placeholder="请输入排序" style="width: 100px" />
       </a-form-item>
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 @@
       <a-table
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         size="small"
-        :scroll="{ x: 1000 }"
+        :scroll="{ y: 800 }"
         :defaultExpandAllRows="true"
         :dataSource="tableData"
         bordered
@@ -132,6 +132,15 @@
 
           <template v-if="column.dataIndex === 'operate'">
             <div class="smart-table-operate">
+              <a-button
+                v-if="record.menuType !== MENU_TYPE_ENUM.POINTS.value"
+                v-privilege="'system:menu:update'"
+                type="link"
+                size="small"
+                @click="showAddSub(record)"
+              >
+                添加下级
+              </a-button>
               <a-button v-privilege="'system:menu:update'" type="link" size="small" @click="showDrawer(record)">编辑</a-button>
               <a-button v-privilege="'system:menu:batchDelete'" danger type="link" @click="singleDelete(record)">删除</a-button>
             </div>
@@ -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);
+  }
 </script>