GTsoft/ruoyi-plus-soybean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(projects): fix login redirect to routeHome when routeHome of dynamic route is not same as static route. fixed #511

Browse Source
This commit is contained in:
Soybean 2024-06-20 19:49:59 +08:00
parent 425c69acc2
commit 49f60b2d50
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/router/guard/route.ts
View File

@ -6,6 +6,7 @@ import type {
Router Router
} from 'vue-router'; } from 'vue-router';
import type { RouteKey, RoutePath } from '@elegant-router/types'; import type { RouteKey, RoutePath } from '@elegant-router/types';
import { getRouteName } from '@/router/elegant/transform';
import { useAuthStore } from '@/store/modules/auth'; import { useAuthStore } from '@/store/modules/auth';
import { useRouteStore } from '@/store/modules/route'; import { useRouteStore } from '@/store/modules/route';
import { localStg } from '@/utils/storage'; import { localStg } from '@/utils/storage';
@ -150,8 +151,16 @@ async function initRoute(to: RouteLocationNormalized): Promise<RouteLocationRaw
if (!isLogin) { if (!isLogin) {
const loginRoute: RouteKey = 'login'; const loginRoute: RouteKey = 'login';
const redirect = to.fullPath; const redirect = to.fullPath;
const [redirectPath, redirectQuery] = redirect.split('?');
const redirectName = getRouteName(redirectPath as RoutePath);
const query: LocationQueryRaw = to.name !== loginRoute ? { redirect } : {}; const isRedirectHome = routeStore.routeHome === redirectName || import.meta.env.VITE_ROUTE_HOME === redirectName;
const query: LocationQueryRaw = to.name !== loginRoute && !isRedirectHome ? { redirect } : {};
if (isRedirectHome && redirectQuery) {
query.redirect = `/?${redirectQuery}`;
}
const location: RouteLocationRaw = { const location: RouteLocationRaw = {
name: loginRoute, name: loginRoute,