yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: merge main userinfo error

pull/60/MERGE
xingyu4j 2024-12-18 14:06:36 +08:00
parent 5a658d6419
commit b51045cc1b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/web-antd/src/router/guard.ts
View File

@ -109,10 +109,11 @@ function setupAccessGuard(router: Router) {
accessStore.setAccessMenus(accessibleMenus); accessStore.setAccessMenus(accessibleMenus);
accessStore.setAccessRoutes(accessibleRoutes); accessStore.setAccessRoutes(accessibleRoutes);
accessStore.setIsAccessChecked(true); accessStore.setIsAccessChecked(true);
const redirectPath = (from.query.redirect ?? // const redirectPath = (from.query.redirect ??
(to.path === DEFAULT_HOME_PATH // (to.path === DEFAULT_HOME_PATH
? userInfo.homePath || DEFAULT_HOME_PATH // ? userInfo.homePath || DEFAULT_HOME_PATH
: to.fullPath)) as string; // : to.fullPath)) as string;
const redirectPath = (from.query.redirect ?? to.fullPath) as string;
return { return {
...router.resolve(decodeURIComponent(redirectPath)), ...router.resolve(decodeURIComponent(redirectPath)),