mirror of
				https://github.com/soybeanjs/soybean-admin.git
				synced 2025-11-04 15:53:43 +08:00 
			
		
		
		
	Merge pull request #337 from Azir-11/main
Fix home mount issue for static and dynamic routes
This commit is contained in:
		@@ -1,12 +1,12 @@
 | 
				
			|||||||
import type { CustomRoute, ElegantConstRoute, ElegantRoute } from '@elegant-router/types';
 | 
					import type { CustomRoute, ElegantConstRoute, ElegantRoute } from '@elegant-router/types';
 | 
				
			||||||
import { generatedRoutes } from '../elegant/routes';
 | 
					import { generatedRoutes } from '../elegant/routes';
 | 
				
			||||||
import { layouts, views } from '../elegant/imports';
 | 
					import { layouts, views } from '../elegant/imports';
 | 
				
			||||||
import { transformElegantRoutesToVueRoutes } from '../elegant/transform';
 | 
					import { getRoutePath, transformElegantRoutesToVueRoutes } from '../elegant/transform';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export const ROOT_ROUTE: CustomRoute = {
 | 
					export const ROOT_ROUTE: CustomRoute = {
 | 
				
			||||||
  name: 'root',
 | 
					  name: 'root',
 | 
				
			||||||
  path: '/',
 | 
					  path: '/',
 | 
				
			||||||
  redirect: '/home',
 | 
					  redirect: getRoutePath(import.meta.env.VITE_ROUTE_HOME) || '/home',
 | 
				
			||||||
  meta: {
 | 
					  meta: {
 | 
				
			||||||
    title: 'root',
 | 
					    title: 'root',
 | 
				
			||||||
    constant: true
 | 
					    constant: true
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,6 +6,7 @@ import type { RouteKey } from '@elegant-router/types';
 | 
				
			|||||||
import { SetupStoreId } from '@/enum';
 | 
					import { SetupStoreId } from '@/enum';
 | 
				
			||||||
import { useRouterPush } from '@/hooks/common/router';
 | 
					import { useRouterPush } from '@/hooks/common/router';
 | 
				
			||||||
import { localStg } from '@/utils/storage';
 | 
					import { localStg } from '@/utils/storage';
 | 
				
			||||||
 | 
					import { useRouteStore } from '@/store/modules/route';
 | 
				
			||||||
import { useThemeStore } from '../theme';
 | 
					import { useThemeStore } from '../theme';
 | 
				
			||||||
import {
 | 
					import {
 | 
				
			||||||
  filterTabsByAllRoutes,
 | 
					  filterTabsByAllRoutes,
 | 
				
			||||||
@@ -23,6 +24,7 @@ import {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
export const useTabStore = defineStore(SetupStoreId.Tab, () => {
 | 
					export const useTabStore = defineStore(SetupStoreId.Tab, () => {
 | 
				
			||||||
  const router = useRouter();
 | 
					  const router = useRouter();
 | 
				
			||||||
 | 
					  const routeStore = useRouteStore();
 | 
				
			||||||
  const themeStore = useThemeStore();
 | 
					  const themeStore = useThemeStore();
 | 
				
			||||||
  const { routerPush } = useRouterPush(false);
 | 
					  const { routerPush } = useRouterPush(false);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -34,7 +36,7 @@ export const useTabStore = defineStore(SetupStoreId.Tab, () => {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  /** Init home tab */
 | 
					  /** Init home tab */
 | 
				
			||||||
  function initHomeTab() {
 | 
					  function initHomeTab() {
 | 
				
			||||||
    homeTab.value = getDefaultHomeTab(router);
 | 
					    homeTab.value = getDefaultHomeTab(router, routeStore.routeHome);
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  /** Get all tabs */
 | 
					  /** Get all tabs */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -100,9 +100,9 @@ export function getRouteIcons(route: App.Global.TabRoute) {
 | 
				
			|||||||
 * Get default home tab
 | 
					 * Get default home tab
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * @param router
 | 
					 * @param router
 | 
				
			||||||
 | 
					 * @param homeRouteName routeHome in useRouteStore
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
export function getDefaultHomeTab(router: Router) {
 | 
					export function getDefaultHomeTab(router: Router, homeRouteName: LastLevelRouteKey) {
 | 
				
			||||||
  const homeRouteName = import.meta.env.VITE_ROUTE_HOME;
 | 
					 | 
				
			||||||
  const homeRoutePath = getRoutePath(homeRouteName);
 | 
					  const homeRoutePath = getRoutePath(homeRouteName);
 | 
				
			||||||
  const i18nLabel = $t(`route.${homeRouteName}`);
 | 
					  const i18nLabel = $t(`route.${homeRouteName}`);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user