fix: fix the original page after login expired

vben
1 parent 7675a9f6
Showing 3 changed files with 14 additions and 11 deletions
CHANGELOG.zh_CN.md
src/router/guard/permissionGuard.ts
yarn.lock
@@ -3,6 +3,8 @@
 ### 🐛 Bug Fixes
  
 - 修复多个富文本编辑器只显示一个
+- 修复登录过期后重新登录未跳转原来页面的
+- 修复 window 系统动态引入错误
  
 ## 2.0.0-rc.9 (2020-11-9)
  
@@ -40,8 +40,17 @@ export function createPermissionGuard(router: Router) {
         return;
       }
       // redirect login page
-      const redirectPath = to.path ? `${LOGIN_PATH}?redirect=${to.path}` : LOGIN_PATH;
-      next(redirectPath);
+      const redirectData: { path: string; replace: boolean; query?: { [key: string]: string } } = {
+        path: LOGIN_PATH,
+        replace: true,
+      };
+      if (to.path) {
+        redirectData.query = {
+          ...redirectData.query,
+          redirect: to.path,
+        };
+      }
+      next(redirectData);
       return;
     }
     if (permissionStore.getIsDynamicAddedRouteState) {
@@ -6944,7 +6944,7 @@ rollup@^1.31.1:
     "@types/node" "*"
     acorn "^7.1.0"
  
-rollup@^2.32.1, rollup@^2.33.1:
+rollup@^2.32.1:
   version "2.33.1"
   resolved "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz#802795164164ee63cd47769d8879c33ec8ae0c40"
   integrity sha512-uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==
@@ -8162,14 +8162,6 @@ vfile@^4.0.0:
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
  
-vite-plugin-cdn@^1.0.0-beta.3:
-  version "1.0.0-beta.3"
-  resolved "https://registry.npmjs.org/vite-plugin-cdn/-/vite-plugin-cdn-1.0.0-beta.3.tgz#5846e80debba5e3968169931f5cba86aea5701cd"
-  integrity sha512-1oepxSSr8rROFhyP93EWVasKHAAbGfp3QyUrUmJW/zU80CvFPyHATckk8vy08pMiulErSqATjfofTJ+TxP4wkw==
-  dependencies:
-    lodash "^4.17.20"
-    rollup "^2.33.1"
-
 vite-plugin-html@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.npmjs.org/vite-plugin-html/-/vite-plugin-html-1.0.0-beta.2.tgz#f30cdba4ca70469e62b770e32c407ce5d7f9b544"