fix: If the url is /login/register, the system is redirected to /logi…

…n/pwd-login by default .close #22
soybeanjs · Dec 10, 2024 · 9ddae85 · 9ddae85
1 parent b2f071c
commit 9ddae85
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/packages/simple-router/src/router.ts b/packages/simple-router/src/router.ts
@@ -216,7 +216,8 @@ export function createRouter({ getReactRoutes, init, initRoutes, mode, opt }: Ro
           if (!res) {
             reactRouter.initialize();
           } else {
-            reactRouter.initialize().navigate(resolve(res).fullPath);
+            const targetPath = typeof res === 'string' ? res : resolve(res).fullPath;
+            reactRouter.initialize().navigate(targetPath);
           }
           resolved(true);
         })

diff --git a/packages/simple-router/src/types/router.ts b/packages/simple-router/src/types/router.ts
@@ -143,4 +143,4 @@ type PatchRoutesParams = Parameters<RemixRouter['patchRoutes']>;
 export type Init = (
   currentFullPath: string,
   patchRoutes?: (parentId: PatchRoutesParams[0], routes: PatchRoutesParams[1]) => void
-) => Promise<RouteLocationNamedRaw | null>;
+) => Promise<RouteLocationNamedRaw | null | string>;
diff --git a/src/router/guard/index.ts b/src/router/guard/index.ts
@@ -22,6 +22,10 @@ export const init: Init = async currentFullPath => {
   const isLogin = Boolean(localStg.get('token'));
 
   if (!isLogin) {
+    if (currentFullPath.includes('login')) {
+      return currentFullPath;
+    }
+
     const loginRoute: RouteKey = 'login';
     const routeHome = getRouteHome(store.getState());