From 321f21c4982c9cec198a27264d722180c79ef913 Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期二, 26 十二月 2023 18:04:35 +0800
Subject: [PATCH] !73 修复全局属性找不到的问题 * Merge remote-tracking branch 'origin/dev' into dev * fix 修复全局属性找不到的问题 * fix 修复变量问题 * fix 修复变量问题 * Merge remote-tracking branch 'origin/dev' into dev * update 依赖升级 * update 依赖升级 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/permission.ts | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/permission.ts b/src/permission.ts
index c2743eb..ef9976a 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -10,16 +10,18 @@
import usePermissionStore from '@/store/modules/permission';
NProgress.configure({ showSpinner: false });
-const whiteList = ['/login', '/register', '/social-login'];
+const whiteList = ['/login', '/register', '/social-callback'];
router.beforeEach(async (to, from, next) => {
NProgress.start();
if (getToken()) {
- to.meta.title && useSettingsStore().setTitle(to.meta.title as string);
+ to.meta.title && useSettingsStore().setTitle(to.meta.title);
/* has token*/
if (to.path === '/login') {
next({ path: '/' });
NProgress.done();
+ } else if (whiteList.indexOf(to.path as string) !== -1) {
+ next();
} else {
if (useUserStore().roles.length === 0) {
isRelogin.show = true;
@@ -38,7 +40,7 @@
router.addRoute(route); // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
}
});
- next({ ...to, replace: true }); // hack鏂规硶 纭繚addRoutes宸插畬鎴�
+ next({ path: to.path, replace: true, params: to.params, query: to.query, hash: to.hash, name: to.name as string }); // hack鏂规硶 纭繚addRoutes宸插畬鎴�
}
} else {
next();
@@ -46,7 +48,7 @@
}
} else {
// 娌℃湁token
- if (whiteList.indexOf(to.path) !== -1) {
+ if (whiteList.indexOf(to.path as string) !== -1) {
// 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
next();
} else {
--
Gitblit v1.9.3