From 6c117b41302520491f1eeea93904d369f2460fed Mon Sep 17 00:00:00 2001
From: zmcode <48686959+zmcode@users.noreply.github.com>
Date: Sat, 10 Aug 2024 16:26:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dvben/styles/global?=
 =?UTF-8?q?=20=E5=85=A8=E5=B1=80=E6=B3=A8=E5=85=A5=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#4106)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://doc.vben.pro/guide/essentials/styles.html#bem-%E8%A7%84%E8%8C%83

在widow下无法注册成功
---
 internal/vite-config/src/config/application.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;

From 4d4327cb252e518b580c8a13bee8780804bfb8cd Mon Sep 17 00:00:00 2001
From: P2K0 <39264625+P2K0@users.noreply.github.com>
Date: Sat, 10 Aug 2024 16:31:09 +0800
Subject: [PATCH 2/3] fix: TabsToolMore cannot be opened in a new window
 (#4107) (#4109)

---
 packages/stores/src/modules/tabbar.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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' });

From ec49a0415157bca4ab31962683e8894a7af7ac02 Mon Sep 17 00:00:00 2001
From: Netfan <netfan@foxmail.com>
Date: Sat, 10 Aug 2024 16:33:38 +0800
Subject: [PATCH 3/3] fix: use correct route data in tabbar, fixed: #4107
 (#4110)

---
 packages/effects/layouts/src/basic/tabbar/use-tabbar.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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 },