From 3e44c14286d62c0594d8c0f6ed11d41a8eb48cad Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: 星期五, 05 四月 2024 14:09:53 +0800
Subject: [PATCH] Merge branch 'dev' of https://gitee.com/JavaLionLi/plus-ui into dev
---
src/permission.ts | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/permission.ts b/src/permission.ts
index 402fdec..ef9976a 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -8,7 +8,6 @@
import useUserStore from '@/store/modules/user';
import useSettingsStore from '@/store/modules/settings';
import usePermissionStore from '@/store/modules/permission';
-import { RouteRecordRaw } from 'vue-router';
NProgress.configure({ showSpinner: false });
const whiteList = ['/login', '/register', '/social-callback'];
@@ -16,13 +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) !== -1) {
- next()
+ } else if (whiteList.indexOf(to.path as string) !== -1) {
+ next();
} else {
if (useUserStore().roles.length === 0) {
isRelogin.show = true;
@@ -36,12 +35,12 @@
isRelogin.show = false;
const accessRoutes = await usePermissionStore().generateRoutes();
// 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
- accessRoutes.forEach((route: RouteRecordRaw) => {
+ accessRoutes.forEach((route) => {
if (!isHttp(route.path)) {
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();
--
Gitblit v1.9.3