From 0123c37de29229b49177df0c67d376a87ec1be11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=81=95=E7=91=9E=E7=8E=9B=E7=9A=84=E7=9A=87=E5=B8=9D?= <2075125282@qq.com> Date: Fri, 1 Mar 2024 11:35:25 +0800 Subject: [PATCH 1/2] fix(projects): Fix the logic of root route redirection to home --- src/router/routes/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/routes/index.ts b/src/router/routes/index.ts index a2b9f4b7..d9a0d0f1 100644 --- a/src/router/routes/index.ts +++ b/src/router/routes/index.ts @@ -1,12 +1,12 @@ import type { CustomRoute, ElegantConstRoute, ElegantRoute } from '@elegant-router/types'; import { generatedRoutes } from '../elegant/routes'; import { layouts, views } from '../elegant/imports'; -import { transformElegantRoutesToVueRoutes } from '../elegant/transform'; +import { getRoutePath, transformElegantRoutesToVueRoutes } from '../elegant/transform'; export const ROOT_ROUTE: CustomRoute = { name: 'root', path: '/', - redirect: '/home', + redirect: getRoutePath(import.meta.env.VITE_ROUTE_HOME) || '/home', meta: { title: 'root', constant: true From 9cf2a513f7968c1456558b6a82908860334ddef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=81=95=E7=91=9E=E7=8E=9B=E7=9A=84=E7=9A=87=E5=B8=9D?= <2075125282@qq.com> Date: Fri, 1 Mar 2024 13:12:28 +0800 Subject: [PATCH 2/2] fix(projects): Fix homepage mount error under dynamic routing --- src/store/modules/tab/index.ts | 4 +++- src/store/modules/tab/shared.ts | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/store/modules/tab/index.ts b/src/store/modules/tab/index.ts index a4399a31..6394b6e8 100644 --- a/src/store/modules/tab/index.ts +++ b/src/store/modules/tab/index.ts @@ -6,6 +6,7 @@ import type { RouteKey } from '@elegant-router/types'; import { SetupStoreId } from '@/enum'; import { useRouterPush } from '@/hooks/common/router'; import { localStg } from '@/utils/storage'; +import { useRouteStore } from '@/store/modules/route'; import { useThemeStore } from '../theme'; import { filterTabsByAllRoutes, @@ -23,6 +24,7 @@ import { export const useTabStore = defineStore(SetupStoreId.Tab, () => { const router = useRouter(); + const routeStore = useRouteStore(); const themeStore = useThemeStore(); const { routerPush } = useRouterPush(false); @@ -34,7 +36,7 @@ export const useTabStore = defineStore(SetupStoreId.Tab, () => { /** Init home tab */ function initHomeTab() { - homeTab.value = getDefaultHomeTab(router); + homeTab.value = getDefaultHomeTab(router, routeStore.routeHome); } /** Get all tabs */ diff --git a/src/store/modules/tab/shared.ts b/src/store/modules/tab/shared.ts index 9513ab7c..31a4449a 100644 --- a/src/store/modules/tab/shared.ts +++ b/src/store/modules/tab/shared.ts @@ -100,9 +100,9 @@ export function getRouteIcons(route: App.Global.TabRoute) { * Get default home tab * * @param router + * @param homeRouteName routeHome in useRouteStore */ -export function getDefaultHomeTab(router: Router) { - const homeRouteName = import.meta.env.VITE_ROUTE_HOME; +export function getDefaultHomeTab(router: Router, homeRouteName: LastLevelRouteKey) { const homeRoutePath = getRoutePath(homeRouteName); const i18nLabel = $t(`route.${homeRouteName}`);