From d50cdabe656bd2f1168981349ab181245ea07764 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 23 May 2025 09:50:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/prod' into prod
---
src/permission.js | 56 ++++++++++++++++++++++++++++----------------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 6414b01..821f3dc 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -7,39 +7,39 @@
* @Description:
* Copyright (c) 2024 by GuLiMmo, All Rights Reserved.
*/
-import router from './router/';
-import store from './store';
-import { getToken } from '@/utils/auth';
+import router from './router/'
+import store from './store'
+import { getToken } from '@/utils/auth'
import { getUrlParams } from './utils/validate'
-import NProgress from 'nprogress'; // progress bar
-import 'nprogress/nprogress.css'; // progress bar style
-NProgress.configure({ showSpinner: false });
-const lockPage = '/lock'; //锁屏页
+import NProgress from 'nprogress' // progress bar
+import 'nprogress/nprogress.css' // progress bar style
+NProgress.configure({ showSpinner: false })
+const lockPage = '/lock' //锁屏页
const urlParams = getUrlParams(window.location.href)
router.beforeEach((to, from, next) => {
- const meta = to.meta || {};
- const isMenu = meta.menu === undefined ? to.query.menu : meta.menu;
- store.commit('SET_IS_MENU', isMenu === undefined);
+ const meta = to.meta || {}
+ const isMenu = meta.menu === undefined ? to.query.menu : meta.menu
+ store.commit('SET_IS_MENU', isMenu === undefined)
if (getToken()) {
if (store.getters.isLock && to.path !== lockPage) {
//如果系统激活锁屏，全部跳转到锁屏页
- next({ path: lockPage });
+ next({ path: lockPage })
} else if (to.path === '/login') {
//如果登录成功访问登录页跳转到主页
- next({ path: '/' });
+ next({ path: '/' })
} else {
const systemToken = store.getters.token || urlParams?.token
if (systemToken === 0) {
store.dispatch('FedLogOut').then(() => {
- next({ path: '/login' });
- });
+ next({ path: '/login' })
+ })
} else {
- const meta = to.meta || {};
- const query = to.query || {};
+ const meta = to.meta || {}
+ const query = to.query || {}
if (meta.target) {
- window.open(query.url.replace(/#/g, '&'));
- return;
+ window.open(query.url.replace(/#/g, '&'))
+ return
} else if (meta.isTab !== false) {
store.commit('ADD_TAG', {
name: query.name || to.name,
@@ -48,24 +48,24 @@
params: to.params,
query: to.query,
meta: meta,
- });
+ })
}
- next();
+ next()
}
}
} else {
//判断是否需要认证，没有登录访问去登录页
if (meta.isAuth === false) {
- next();
+ next()
} else {
- next('/login');
+ next('/login')
}
}
-});
+})
router.afterEach(to => {
- NProgress.done();
- let title = router.$avueRouter.generateTitle(to, { label: 'name' });
- router.$avueRouter.setTitle(title);
- store.commit('SET_IS_SEARCH', false);
-});
+ NProgress.done()
+ let title = router.$avueRouter.generateTitle(to, { label: 'name' })
+ router.$avueRouter.setTitle(title)
+ store.commit('SET_IS_SEARCH', false)
+})
--
Gitblit v1.9.3