fix: 修复非超级管理员 静态路由下添加错误

Author: Ohh-889

src/features/router/routerHooks.ts

@@ -26,8 +26,9 @@ export function initAuthRoutes(addRoutes: (parent: string | null, route: RouteOb
     } else {
       // 非超级管理员
       const filteredRoutes = filterAuthRoutesByRoles(reactAuthRoutes, roles);
-      filteredRoutes.forEach((route, index) => {
-        addRoutes(reactAuthRoutes[index].parent, route);
+
+      filteredRoutes.forEach(({ parent, route }) => {
+        addRoutes(parent, route);
       });
     }
   } else {

src/features/router/shared.ts

@@ -54,7 +54,12 @@ export function mergeValuesByParent(data: Router.SingleAuthRoute[]) {
  */
 export function filterAuthRoutesByRoles(routes: { parent: string | null; route: RouteObject[] }[], roles: string[]) {
   return routes.flatMap(route => {
-    const filteredRoutes = route.route.map(item => filterAuthRouteByRoles(item, roles));
+    const filteredRoutes = route.route.map(item => {
+      return {
+        parent: route.parent,
+        route: filterAuthRouteByRoles(item, roles)
+      };
+    });
 
     return filteredRoutes;
   });

src/features/tab/tabHooks.ts

@@ -233,6 +233,19 @@ export function useTabController() {
   };
 }
 
+export function initTab(cache: boolean, updateTabs: (tabs: App.Global.Tab[]) => void) {
+  const storageTabs = localStg.get('globalTabs');
+
+  if (cache && storageTabs) {
+    // const tabs = extractTabsByAllRoutes(router.getAllRouteNames(), storageTabs);
+    // dispatch(setTabs(tabs));
+    updateTabs(storageTabs);
+    return storageTabs;
+  }
+
+  return [];
+}
+
 export function useTabManager() {
   const isInit = useRef(false);
 
@@ -246,19 +259,6 @@ export function useTabManager() {
 
   const updateTabs = useUpdateTabs();
 
-  function _initTabs() {
-    const storageTabs = localStg.get('globalTabs');
-
-    if (themeSettings.tab.cache && storageTabs) {
-      // const tabs = extractTabsByAllRoutes(router.getAllRouteNames(), storageTabs);
-      // dispatch(setTabs(tabs));
-      updateTabs(storageTabs);
-      return storageTabs;
-    }
-
-    return [];
-  }
-
   function _cacheTabs() {
     if (!themeSettings.tab.cache) return;
 
@@ -271,7 +271,7 @@ export function useTabManager() {
     if (!isInit.current) {
       isInit.current = true;
 
-      const initTabs = _initTabs();
+      const initTabs = initTab(themeSettings.tab.cache, updateTabs);
 
       if (!initTabs || initTabs.length === 0 || (initTabs.length > 0 && !isTabInTabs(tab.id, initTabs))) {
         dispatch(addTab(tab));