fixed: 进入404页面不会触发获取菜单.

orion-ops-ui/src/views/system/menu/components/menu-form-modal.vue

@@ -114,8 +114,9 @@
   import { MenuTypeEnum, MenuVisibleEnum, MenuCacheEnum } from '../types/enum.types';
   import { toOptions } from '@/utils/enum';
   import IconPicker from '@sanqi377/arco-vue-icon-picker';
-  import MenuTreeSelector from '@/views/system/menu/components/menu-tree-selector.vue';
+  import MenuTreeSelector from './menu-tree-selector.vue';
   import { createMenu, updateMenu } from '@/api/system/menu';
+  import { Message } from '@arco-design/web-vue';
 
   const { visible, setVisible } = useVisible();
   const { loading, setLoading } = useLoading();
@@ -155,7 +156,11 @@
   const openAdd = (record: any) => {
     title.value = '添加菜单';
     isAddHandle.value = true;
-    renderForm({ ...defaultForm(), ...record });
+    renderForm({ ...defaultForm(), parentId: record.parentId });
+    // 如果是父菜单默认选中子菜单 如果是子菜单默认选中功能
+    if (record.type === 1 || record.type === 2) {
+      formModel.type = record.type + 1;
+    }
     setVisible(true);
   };
 
@@ -185,13 +190,20 @@
       if (error) {
         return false;
       }
+      if (formModel.parentId === 0
+        && (formModel.type === MenuTypeEnum.SUB_MENU.value || formModel.type === MenuTypeEnum.FUNCTION.value)) {
+        Message.error('创建子目录或功能时 父菜单不能为根目录');
+        return false;
+      }
       if (isAddHandle.value) {
         // 新增
         await createMenu(formModel as any);
+        Message.success('创建成功');
         emits('added');
       } else {
         // 修改
         await updateMenu(formModel as any);
+        Message.success('修改成功');
         emits('updated');
       }
       // 清空

orion-ops-ui/src/views/system/menu/components/menu-table.vue

@@ -122,7 +122,7 @@
                     size="mini"
                     v-if="record.type !== MenuTypeEnum.FUNCTION.value"
                     v-permission="['infra:system-menu:create']"
-                    @click="emits('openAdd', { parentId: record.id })">
+                    @click="emits('openAdd', { parentId: record.id, type: record.type })">
             新增
           </a-button>
           <!-- 修改 -->
@@ -276,7 +276,7 @@
     await loadMenuData();
   };
 
-  // 卸载时清除 store
+  // 卸载时清除 menu cache
   onUnmounted(() => {
     cacheStore.resetMenu();
   });

orion-ops-ui/src/views/system/menu/components/menu-tree-selector.vue

@@ -4,7 +4,7 @@
                  :disabled="disabled"
                  :allow-search="true"
                  :filter-tree-node="filterTreeNode"
-                 placeholder="请选择上级菜单" />
+                 placeholder="请选择菜单" />
 </template>
 
 <script lang="ts">
@@ -20,7 +20,7 @@
 
   const props = defineProps({
     modelValue: Number,
-    disabled: Boolean
+    disabled: Boolean,
   });
 
   const emits = defineEmits(['update:modelValue']);

orion-ops-ui/src/views/system/menu/index.vue

@@ -4,7 +4,7 @@
     <menu-table ref="table"
                 @openAdd="(e) => modal.openAdd(e)"
                 @openUpdate="(e) => modal.openUpdate(e)" />
-    <!-- 添加修改框 -->
+    <!-- 添加修改模态框 -->
     <menu-form-modal ref="modal"
                      @added="() => table.addedCallback()"
                      @updated="() => table.updatedCallback()" />