github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-02-02 18:28:40 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: missing route data in guard of web-ele and web-naive, fixed: #4108 (#4115) (#4117)

Browse Source
This commit is contained in:
falcon-jin 2024-08-11 15:49:17 +08:00 committed by GitHub
parent 9d6cc22dfa
commit 654bf90c0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web-ele/src/router/guard.ts
View File

@ -115,10 +115,10 @@ function setupAccessGuard(router: Router) {
// 保存菜单信息和路由信息 // 保存菜单信息和路由信息
accessStore.setAccessMenus(accessibleMenus); accessStore.setAccessMenus(accessibleMenus);
accessStore.setAccessRoutes(accessibleRoutes); accessStore.setAccessRoutes(accessibleRoutes);
const redirectPath = (from.query.redirect ?? to.path) as string; const redirectPath = (from.query.redirect ?? to.fullPath) as string;
return { return {
path: decodeURIComponent(redirectPath), ...router.resolve(decodeURIComponent(redirectPath)),
replace: true, replace: true,
}; };
}); });

4
apps/web-naive/src/router/guard.ts
View File

@ -115,10 +115,10 @@ function setupAccessGuard(router: Router) {
// 保存菜单信息和路由信息 // 保存菜单信息和路由信息
accessStore.setAccessMenus(accessibleMenus); accessStore.setAccessMenus(accessibleMenus);
accessStore.setAccessRoutes(accessibleRoutes); accessStore.setAccessRoutes(accessibleRoutes);
const redirectPath = (from.query.redirect ?? to.path) as string; const redirectPath = (from.query.redirect ?? to.fullPath) as string;
return { return {
path: decodeURIComponent(redirectPath), ...router.resolve(decodeURIComponent(redirectPath)),
replace: true, replace: true,
}; };
}); });