twh_eastasia/pure-admin-thin
1
0
Fork 0
mirror of https://github.com/pure-admin/pure-admin-thin.git synced 2025-04-25 16:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pure-admin:main' into main

Browse Source
This commit is contained in:
Composure 2023-04-08 22:13:38 +08:00 committed by GitHub
commit c4cdade6e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/router/index.ts
View File

@ -137,7 +137,7 @@ router.beforeEach((to: toRouteType, _from, next) => {
if ( if (
usePermissionStoreHook().wholeMenus.length === 0 && usePermissionStoreHook().wholeMenus.length === 0 &&
to.path !== "/login" to.path !== "/login"
) ) {
initRouter().then((router: Router) => { initRouter().then((router: Router) => {
if (!useMultiTagsStoreHook().getMultiTagsCache) { if (!useMultiTagsStoreHook().getMultiTagsCache) {
const { path } = to; const { path } = to;
@ -156,6 +156,7 @@ router.beforeEach((to: toRouteType, _from, next) => {
} }
router.push(to.fullPath); router.push(to.fullPath);
}); });
}
toCorrectRoute(); toCorrectRoute();
} }
} else { } else {

1
src/router/utils.ts
View File

@ -367,6 +367,7 @@ export {
ascending, ascending,
filterTree, filterTree,
initRouter, initRouter,
addPathMatch,
isOneOfArray, isOneOfArray,
getHistoryMode, getHistoryMode,
addAsyncRoutes, addAsyncRoutes,