Browse Source
fix(router): resolve menu loading failure when permission is in "role mode" (#3660)
closed #3655
pull/3669/head
Zhong
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
3 additions and
8 deletions
-
src/router/helper/menuHelper.ts
-
src/router/menus/index.ts
-
src/router/types.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]; |
|
|
|
|
|
|
|
@ -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[] = []; |
|
|
|
|
|
|
|
|
|
|
|
@ -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; |
|
|
|
|