From 49f60b2d508f8803e5cb4a01d83bc5cf1c4cf063 Mon Sep 17 00:00:00 2001
From: Soybean <soybeanjs@outlook.com>
Date: Thu, 20 Jun 2024 19:49:59 +0800
Subject: [PATCH] fix(projects): fix login redirect to routeHome when routeHome
 of dynamic route is not same as static route. fixed #511

---
 src/router/guard/route.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/router/guard/route.ts b/src/router/guard/route.ts
index 7bb238d5f..b0699c637 100644
--- a/src/router/guard/route.ts
+++ b/src/router/guard/route.ts
@@ -6,6 +6,7 @@ import type {
   Router
 } from 'vue-router';
 import type { RouteKey, RoutePath } from '@elegant-router/types';
+import { getRouteName } from '@/router/elegant/transform';
 import { useAuthStore } from '@/store/modules/auth';
 import { useRouteStore } from '@/store/modules/route';
 import { localStg } from '@/utils/storage';
@@ -150,8 +151,16 @@ async function initRoute(to: RouteLocationNormalized): Promise<RouteLocationRaw
   if (!isLogin) {
     const loginRoute: RouteKey = 'login';
     const redirect = to.fullPath;
+    const [redirectPath, redirectQuery] = redirect.split('?');
+    const redirectName = getRouteName(redirectPath as RoutePath);
 
-    const query: LocationQueryRaw = to.name !== loginRoute ? { redirect } : {};
+    const isRedirectHome = routeStore.routeHome === redirectName || import.meta.env.VITE_ROUTE_HOME === redirectName;
+
+    const query: LocationQueryRaw = to.name !== loginRoute && !isRedirectHome ? { redirect } : {};
+
+    if (isRedirectHome && redirectQuery) {
+      query.redirect = `/?${redirectQuery}`;
+    }
 
     const location: RouteLocationRaw = {
       name: loginRoute,