feat: 完成动态路由的添加

Author: Ohh-889

src/features/auth/initAuth.ts

@@ -1,23 +1,19 @@
 import { useLoading } from '@sa/hooks';
 
-import { useInitAuthRoutes, useRouter } from '@/features/router';
+import { useRouter } from '@/features/router';
 
 import { login } from './authStore';
 
-const { VITE_AUTH_ROUTE_MODE, VITE_STATIC_SUPER_ROLE } = import.meta.env;
-
 export function useInitAuth() {
   const { endLoading, loading, startLoading } = useLoading();
 
   const [searchParams] = useSearchParams();
 
   const { t } = useTranslation();
 
-  const initAuthRoutes = useInitAuthRoutes();
-
   const dispatch = useAppDispatch();
 
-  const { addRoutes, navigate } = useRouter();
+  const { navigate } = useRouter();
 
   const redirectUrl = searchParams.get('redirect');
 
@@ -28,10 +24,6 @@ export function useInitAuth() {
     const info = res.payload as Api.Auth.Info;
 
     if (info.token) {
-      const isStaticSuper = VITE_AUTH_ROUTE_MODE === 'static' && info.userInfo.roles.includes(VITE_STATIC_SUPER_ROLE);
-
-      initAuthRoutes(isStaticSuper, info.userInfo.roles, addRoutes);
-
       if (redirectUrl && redirect) {
         await navigate(redirectUrl);
       } else {

src/features/router/router.ts

@@ -1,14 +1,14 @@
-import { emitter } from '@sa/hooks';
-import type { RouteObject, RouterNavigateOptions, To } from 'react-router-dom';
+import type { RouterNavigateOptions, To } from 'react-router-dom';
 import { createBrowserRouter, matchRoutes } from 'react-router-dom';
 
-import { authRoutes, routes } from '@/router';
+import { routes } from '@/router';
+import { store } from '@/store';
 
-import { filterRoutesToMenus } from '../menu/MenuUtil';
+import { getIsLogin } from '../auth/authStore';
 
-import { mergeValuesByParent } from './shared';
+import { initAuthRoutes } from './routerHooks';
 
-export function navigator() {
+function initRouter() {
   const authRouteMode = import.meta.env.VITE_AUTH_ROUTE_MODE;
 
   const isStaticSuper = true;
@@ -23,35 +23,39 @@ export function navigator() {
     if (!matchRoute) return true;
 
     if (matchRoute) {
-      return matchRoute[0].route.path === '*';
+      return matchRoute[1].route.path === '*';
     }
+
     return false;
   }
 
-  const reactAuthRoutes = mergeValuesByParent(authRoutes).reverse();
-
   const reactRouter = createBrowserRouter(routes, {
     basename: import.meta.env.VITE_BASE_URL,
     patchRoutesOnNavigation: ({ patch, path }) => {
       if (getIsNeedPatch(path)) {
         if (authRouteMode === 'static') {
           // 超级管理员
           if (isStaticSuper) {
-            reactAuthRoutes.forEach(route => {
-              if (route.parent?.includes('base')) {
-                emitter.emit('ADD_MENUS', filterRoutesToMenus(route.route));
-              }
-
-              patch(route.parent, route.route);
-            });
+            initAuthRoutes(patch);
           }
         }
-
         isAlreadyPatch = true;
       }
     }
   });
 
+  if (getIsLogin(store.getState())) {
+    initAuthRoutes(reactRouter.patchRoutes);
+
+    isAlreadyPatch = true;
+  }
+
+  return reactRouter;
+}
+
+export function navigator() {
+  const reactRouter = initRouter();
+
   async function navigate(path: To | null, options?: RouterNavigateOptions) {
     reactRouter.navigate(path, options);
   }
@@ -84,12 +88,7 @@ export function navigator() {
     reactRouter.navigate('/');
   }
 
-  function addRoutes(newRoutes: RouteObject[], parent: string | null = null) {
-    reactRouter.patchRoutes(parent, newRoutes);
-  }
-
   return {
-    addRoutes,
     back,
     forward,
     go,