fix: fix homePage affix error

修复当没有通过接口为用户指定首页时，如果默认的首页是一个带有重定向的路由，则可能出现双首页Tab的问题
vbenjs · Jul 15, 2021 · c117802 · c117802
1 parent db7254a
commit c117802
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/router/routes/modules/about.ts b/src/router/routes/modules/about.ts
@@ -22,7 +22,7 @@ const dashboard: AppRouteModule = {
       meta: {
         title: t('routes.dashboard.about'),
         icon: 'simple-icons:about-dot-me',
-        // hideMenu: true,
+        hideMenu: true,
       },
     },
   ],

diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
@@ -123,15 +123,19 @@ export const usePermissionStore = defineStore({
        * */
       const patchHomeAffix = (routes: AppRouteRecordRaw[]) => {
         if (!routes || routes.length === 0) return;
-        const homePath = userStore.getUserInfo.homePath || PageEnum.BASE_HOME;
+        let homePath: string = userStore.getUserInfo.homePath || PageEnum.BASE_HOME;
         function patcher(routes: AppRouteRecordRaw[], parentPath = '') {
           if (parentPath) parentPath = parentPath + '/';
           routes.forEach((route: AppRouteRecordRaw) => {
-            const { path, children } = route;
+            const { path, children, redirect } = route;
             const currentPath = path.startsWith('/') ? path : parentPath + path;
             if (currentPath === homePath) {
-              route.meta = Object.assign({}, route.meta, { affix: true });
-              throw new Error('end');
+              if (redirect) {
+                homePath = route.redirect! as string;
+              } else {
+                route.meta = Object.assign({}, route.meta, { affix: true });
+                throw new Error('end');
+              }
             }
             children && children.length > 0 && patcher(children, currentPath);
           });