From dfdcee9b95a49291ea6243c2b4a71ea379ea0a0f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 05 一月 2024 22:51:03 +0800
Subject: [PATCH] !79 update 富文本组件，修复两个组件上传图片位置错乱问题 Merge pull request !79 from 抓蛙师/N/A
---
src/permission.ts | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/permission.ts b/src/permission.ts
index 4543d08..ef9976a 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -15,11 +15,13 @@
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