From 69707cdde16ac3e0a4aa4e775c3c7b2b30f6ef93 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Tue, 1 Mar 2022 09:28:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(menus):=20=E5=88=87=E6=8D=A2=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=BE=E5=AE=9A=E7=9A=84=E8=B5=B7=E5=A7=8B=E9=A1=B5?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/vue/src/api/sys/model/menuModel.ts | 1 + apps/vue/src/store/modules/permission.ts | 7 +++++++ apps/vue/src/store/modules/user.ts | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/vue/src/api/sys/model/menuModel.ts b/apps/vue/src/api/sys/model/menuModel.ts index 4ffa6146e..72ac1d796 100644 --- a/apps/vue/src/api/sys/model/menuModel.ts +++ b/apps/vue/src/api/sys/model/menuModel.ts @@ -11,6 +11,7 @@ export interface RouteItem { children?: RouteItem[]; fullPath?: string; props?: any; + startup: boolean; } /** diff --git a/apps/vue/src/store/modules/permission.ts b/apps/vue/src/store/modules/permission.ts index f9b7e49a5..4adf84c68 100644 --- a/apps/vue/src/store/modules/permission.ts +++ b/apps/vue/src/store/modules/permission.ts @@ -256,6 +256,13 @@ export const usePermissionStore = defineStore({ if (menu.children) { r.children = this.filterDynamicRoutes(menu.children); } + // 修改用户首页 + if (menu.startup) { + const userStore = useUserStore(); + const userInfo = userStore.getUserInfo; + userInfo.homePath = menu.path; + userStore.setUserInfo(userInfo); + } routeList.push(r); }); diff --git a/apps/vue/src/store/modules/user.ts b/apps/vue/src/store/modules/user.ts index 2271e2bb0..47515223a 100644 --- a/apps/vue/src/store/modules/user.ts +++ b/apps/vue/src/store/modules/user.ts @@ -140,7 +140,7 @@ export const useUserStore = defineStore({ async afterLoginAction(goHome?: boolean): Promise { if (!this.getToken) return null; // get user info - const userInfo = await this.getUserInfoAction(); + await this.getUserInfoAction(); const sessionTimeout = this.sessionTimeout; if (sessionTimeout) { @@ -155,9 +155,9 @@ export const useUserStore = defineStore({ router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw); permissionStore.setDynamicAddedRoute(true); } - goHome && (await router.replace(userInfo?.homePath || PageEnum.BASE_HOME)); + goHome && (await router.replace(this.userInfo?.homePath || PageEnum.BASE_HOME)); } - return userInfo; + return this.userInfo; }, async getUserInfoAction(): Promise { const abpStore = useAbpStoreWithOut();