diff --git a/src/router/guard/permissionGuard.ts b/src/router/guard/permissionGuard.ts index b4c1767..ec272ac 100644 --- a/src/router/guard/permissionGuard.ts +++ b/src/router/guard/permissionGuard.ts @@ -18,11 +18,13 @@ const OAUTH2_LOGIN_PAGE_PATH = PageEnum.OAUTH2_LOGIN_PAGE_PATH; //分享免登录路由 const SYS_FILES_PATH = PageEnum.SYS_FILES_PATH; +// const BASE_SITE_HOME = PageEnum.BASE_SITE_HOME; + const ROOT_PATH = RootRoute.path; //update-begin---author:wangshuai ---date:20220629 for:[issues/I5BG1I]vue3不支持auth2登录------------ //update-begin---author:wangshuai ---date:20221111 for: [VUEN-2472]分享免登录------------ -const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH,SYS_FILES_PATH]; +const whitePathList: PageEnum[] = [LOGIN_PATH, OAUTH2_LOGIN_PAGE_PATH, SYS_FILES_PATH]; //update-end---author:wangshuai ---date:20221111 for: [VUEN-2472]分享免登录------------ //update-end---author:wangshuai ---date:20220629 for:[issues/I5BG1I]vue3不支持auth2登录------------ diff --git a/src/router/types.ts b/src/router/types.ts index 5be6ce6..8b4e9d0 100644 --- a/src/router/types.ts +++ b/src/router/types.ts @@ -45,9 +45,8 @@ export interface Menu { tag?: MenuTag; hideMenu?: boolean; - + alwaysShow?: boolean; - } export interface MenuModule { diff --git a/src/utils/types.ts b/src/utils/types.ts index 4453ec4..a2f1881 100644 --- a/src/utils/types.ts +++ b/src/utils/types.ts @@ -12,8 +12,7 @@ type MonoArgEmitter = (evt: K, arg?: T[ type BiArgEmitter = (evt: K, arg: T[K]) => void; -export type EventEmitter> = MonoArgEmitter> & - BiArgEmitter>; +export type EventEmitter> = MonoArgEmitter> & BiArgEmitter>; export type AnyFunction = (...args: any[]) => T;