From 1595cb282aab5399862fac6406b5de550863e3b6 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 03 四月 2023 00:05:09 +0800 Subject: [PATCH] update 调整代码格式 --- src/permission.ts | 84 +++++++++++++++++++++--------------------- 1 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/permission.ts b/src/permission.ts index 3c76965..4713383 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -13,49 +13,49 @@ const whiteList = ['/login', '/register']; router.beforeEach(async (to, from, next) => { - NProgress.start(); - if (getToken()) { - to.meta.title && useSettingsStore().setTitle(to.meta.title as string); - /* has token*/ - if (to.path === '/login') { - next({ path: '/' }); - NProgress.done(); - } else { - if (useUserStore().roles.length === 0) { - isRelogin.show = true; - // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅 - const [err] = await tos(useUserStore().getInfo()); - if (err) { - await useUserStore().logout(); - ElMessage.error(err); - next({ path: '/' }); - } else { - isRelogin.show = false; - const accessRoutes = await usePermissionStore().generateRoutes(); - // 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛� - accessRoutes.forEach((route) => { - if (!isHttp(route.path)) { - router.addRoute(route); // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛� - } - }); - next({ ...to, replace: true }); // hack鏂规硶 纭繚addRoutes宸插畬鎴� - } - } else { - next(); - } - } - } else { - // 娌℃湁token - if (whiteList.indexOf(to.path) !== -1) { - // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆 - next(); - } else { - next(`/login?redirect=${to.fullPath}`); // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤� - NProgress.done(); - } - } + NProgress.start(); + if (getToken()) { + to.meta.title && useSettingsStore().setTitle(to.meta.title as string); + /* has token*/ + if (to.path === '/login') { + next({ path: '/' }); + NProgress.done(); + } else { + if (useUserStore().roles.length === 0) { + isRelogin.show = true; + // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅 + const [err] = await tos(useUserStore().getInfo()); + if (err) { + await useUserStore().logout(); + ElMessage.error(err); + next({ path: '/' }); + } else { + isRelogin.show = false; + const accessRoutes = await usePermissionStore().generateRoutes(); + // 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛� + accessRoutes.forEach((route) => { + if (!isHttp(route.path)) { + router.addRoute(route); // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛� + } + }); + next({ ...to, replace: true }); // hack鏂规硶 纭繚addRoutes宸插畬鎴� + } + } else { + next(); + } + } + } else { + // 娌℃湁token + if (whiteList.indexOf(to.path) !== -1) { + // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆 + next(); + } else { + next(`/login?redirect=${to.fullPath}`); // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤� + NProgress.done(); + } + } }); router.afterEach(() => { - NProgress.done(); + NProgress.done(); }); -- Gitblit v1.9.3