image/tdesign-vue-next-starter
1
0
Fork 1
mirror of https://github.com/Tencent/tdesign-vue-next-starter.git synced 2024-09-19 02:04:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: 路由守卫获取菜单异常，跳转登录页并弹窗提示 (#502)

Browse Source
This commit is contained in:
liweijie0812 2023-05-11 22:10:32 +08:00 committed by GitHub
parent 4bcf7d22aa
commit c89f434ce8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/permission.ts
View File

@ -25,38 +25,37 @@ router.beforeEach(async (to, from, next) => {
}
try {
await userStore.getUserInfo();
const { asyncRoutes } = permissionStore;
if (asyncRoutes && asyncRoutes.length === 0) {
const routeList = await permissionStore.buildAsyncRoutes();
routeList.forEach((item: RouteRecordRaw) => {
router.addRoute(item);
});
if (to.name === PAGE_NOT_FOUND_ROUTE.name) {
// 动态添加路由后，此处应当重定向到fullPath，否则会加载404页面内容
next({ path: to.fullPath, replace: true, query: to.query });
} else {
const redirect = decodeURIComponent((from.query.redirect || to.path) as string);
next(to.path === redirect ? { ...to, replace: true } : { path: redirect });
return;
}
}
if (router.hasRoute(to.name)) {
next();
} else {
next(`/`);
}
} catch (error) {
MessagePlugin.error(error);
MessagePlugin.error(error.message);
next({
path: '/login',
query: { redirect: encodeURIComponent(to.fullPath) },
});
NProgress.done();
}
const { asyncRoutes } = permissionStore;
if (asyncRoutes && asyncRoutes.length === 0) {
const routeList = await permissionStore.buildAsyncRoutes();
routeList.forEach((item: RouteRecordRaw) => {
router.addRoute(item);
});
if (to.name === PAGE_NOT_FOUND_ROUTE.name) {
// 动态添加路由后，此处应当重定向到fullPath，否则会加载404页面内容
next({ path: to.fullPath, replace: true, query: to.query });
} else {
const redirect = decodeURIComponent((from.query.redirect || to.path) as string);
next(to.path === redirect ? { ...to, replace: true } : { path: redirect });
return;
}
}
if (router.hasRoute(to.name)) {
next();
} else {
next(`/`);
}
} else {
/* white list router */
if (whiteListRouters.indexOf(to.path) !== -1) {