From 654bf90c0dae9a12f5313730066600aa921c759d Mon Sep 17 00:00:00 2001
From: falcon-jin <48880836+falcon-jin@users.noreply.github.com>
Date: Sun, 11 Aug 2024 15:49:17 +0800
Subject: [PATCH] fix: missing route data in guard of web-ele and web-naive,
 fixed: #4108 (#4115) (#4117)

---
 apps/web-ele/src/router/guard.ts   | 4 ++--
 apps/web-naive/src/router/guard.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/web-ele/src/router/guard.ts b/apps/web-ele/src/router/guard.ts
index 1581d015..f6b79f06 100644
--- a/apps/web-ele/src/router/guard.ts
+++ b/apps/web-ele/src/router/guard.ts
@@ -115,10 +115,10 @@ function setupAccessGuard(router: Router) {
     // 保存菜单信息和路由信息
     accessStore.setAccessMenus(accessibleMenus);
     accessStore.setAccessRoutes(accessibleRoutes);
-    const redirectPath = (from.query.redirect ?? to.path) as string;
+    const redirectPath = (from.query.redirect ?? to.fullPath) as string;
 
     return {
-      path: decodeURIComponent(redirectPath),
+      ...router.resolve(decodeURIComponent(redirectPath)),
       replace: true,
     };
   });
diff --git a/apps/web-naive/src/router/guard.ts b/apps/web-naive/src/router/guard.ts
index 1581d015..f6b79f06 100644
--- a/apps/web-naive/src/router/guard.ts
+++ b/apps/web-naive/src/router/guard.ts
@@ -115,10 +115,10 @@ function setupAccessGuard(router: Router) {
     // 保存菜单信息和路由信息
     accessStore.setAccessMenus(accessibleMenus);
     accessStore.setAccessRoutes(accessibleRoutes);
-    const redirectPath = (from.query.redirect ?? to.path) as string;
+    const redirectPath = (from.query.redirect ?? to.fullPath) as string;
 
     return {
-      path: decodeURIComponent(redirectPath),
+      ...router.resolve(decodeURIComponent(redirectPath)),
       replace: true,
     };
   });