diff --git a/internal/vite-config/src/config/application.ts b/internal/vite-config/src/config/application.ts index 55e38d12..fd05f3b4 100644 --- a/internal/vite-config/src/config/application.ts +++ b/internal/vite-config/src/config/application.ts @@ -2,7 +2,7 @@ import type { UserConfig } from 'vite'; import type { DefineApplicationOptions } from '../typing'; -import { relative } from 'node:path'; +import path, { relative } from 'node:path'; import { findMonorepoRoot } from '@vben/node-utils'; @@ -101,7 +101,7 @@ function createCssOptions(injectGlobalScss = true) { additionalData: (content: string, filepath: string) => { const relativePath = relative(root, filepath); // apps下的包注入全局样式 - if (relativePath.startsWith('apps/')) { + if (relativePath.startsWith(`apps${path.sep}`)) { return `@import "@vben/styles/global";\n${content}`; } return content; diff --git a/packages/effects/layouts/src/basic/tabbar/use-tabbar.ts b/packages/effects/layouts/src/basic/tabbar/use-tabbar.ts index c27380dd..020c72dc 100644 --- a/packages/effects/layouts/src/basic/tabbar/use-tabbar.ts +++ b/packages/effects/layouts/src/basic/tabbar/use-tabbar.ts @@ -104,9 +104,10 @@ export function useTabbar() { const routes = router.getRoutes(); const currentRoute = routes.find((item) => item.path === route.path); if (currentRoute) { - tabbarStore.addTab( - currentRoute as unknown as RouteLocationNormalizedGeneric, - ); + tabbarStore.addTab({ + ...route, + meta: currentRoute.meta, + } as unknown as RouteLocationNormalizedGeneric); } }, { immediate: true }, diff --git a/packages/stores/src/modules/tabbar.ts b/packages/stores/src/modules/tabbar.ts index e51a9950..c385ae97 100644 --- a/packages/stores/src/modules/tabbar.ts +++ b/packages/stores/src/modules/tabbar.ts @@ -271,7 +271,7 @@ export const useTabbarStore = defineStore('core-tabbar', { */ async openTabInNewWindow(tab: TabDefinition) { const { hash, origin } = location; - const path = tab.fullPath; + const path = tab.fullPath || tab.path; const fullPath = path.startsWith('/') ? path : `/${path}`; const url = `${origin}${hash ? '/#' : ''}${fullPath}`; openWindow(url, { target: '_blank' });