diff --git a/src/router/helper/menuHelper.ts b/src/router/helper/menuHelper.ts index 6ecbccb8024..4af1bad4bbf 100644 --- 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 index 58c537434a1..f9e6b4f0a23 100644 --- 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 index 85a2d36f740..0302212b8fa 100644 --- 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;