fix(router): resolve menu loading failure when permission is in "role…

… mode" (#3660) closed #3655
vbenjs · Mar 7, 2024 · c7631fe · c7631fe
1 parent a4cc1d5
commit c7631fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/src/router/helper/menuHelper.ts b/src/router/helper/menuHelper.ts
@@ -33,9 +33,7 @@ function joinParentPath(menus: Menu[], parentPath = '') {
 
 // Parsing the menu module
 export function transformMenuModule(menuModule: MenuModule): Menu {
-  const { menu } = menuModule;
-
-  const menuList = [menu];
+  const menuList = [menuModule];
 
   joinParentPath(menuList);
   return menuList[0];

diff --git a/src/router/menus/index.ts b/src/router/menus/index.ts
@@ -10,7 +10,7 @@ import { router } from '@/router';
 import { PermissionModeEnum } from '@/enums/appEnum';
 import { pathToRegexp } from 'path-to-regexp';
 
-const modules = import.meta.glob('./modules/**/*.ts', { eager: true });
+const modules = import.meta.glob('../routes/modules/**/*.ts', { eager: true });
 
 const menuModules: MenuModule[] = [];
 

diff --git a/src/router/types.ts b/src/router/types.ts
@@ -51,10 +51,7 @@ export interface Menu {
   hideMenu?: boolean;
 }
 
-export interface MenuModule {
-  orderNo?: number;
-  menu: Menu;
-}
+export type MenuModule = Menu;
 
 // export type AppRouteModule = RouteModule | AppRouteRecordRaw;
 export type AppRouteModule = AppRouteRecordRaw;