Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin

packages/stores/package.json

@@ -22,7 +22,7 @@
   "dependencies": {
     "@vben-core/shared": "workspace:*",
     "@vben-core/typings": "workspace:*",
-    "pinia": "2.2.1",
+    "pinia": "2.2.2",
     "pinia-plugin-persistedstate": "^3.2.1",
     "vue": "^3.4.37",
     "vue-router": "^4.4.3"

packages/stores/src/modules/tabbar.test.ts

@@ -55,7 +55,7 @@ describe('useAccessStore', () => {
     const updatedTab = { ...initialTab, query: { id: '1' } };
     store.addTab(updatedTab);
     expect(store.tabs.length).toBe(1);
-    expect(store.tabs[0].query).toEqual({ id: '1' });
+    expect(store.tabs[0]?.query).toEqual({ id: '1' });
   });
 
   it('closes all tabs', async () => {
@@ -67,7 +67,7 @@ describe('useAccessStore', () => {
 
     await store.closeAllTabs(router);
 
-    expect(store.tabs.length).toBe(0); // 假设没有固定的标签页
+    expect(store.tabs.length).toBe(1); // 假设没有固定的标签页
     // expect(router.replace).toHaveBeenCalled();
   });
 

packages/stores/src/modules/tabbar.ts

@@ -124,10 +124,21 @@ export const useTabbarStore = defineStore('core-tabbar', {
       } else {
         // 页面已经存在，不重复添加选项卡，只更新选项卡参数
         const currentTab = toRaw(this.tabs)[tabIndex];
-        const mergedTab = { ...currentTab, ...tab };
-        if (currentTab && Reflect.has(currentTab.meta, 'affixTab')) {
-          mergedTab.meta.affixTab = currentTab.meta.affixTab;
+        const mergedTab = {
+          ...currentTab,
+          ...tab,
+          meta: { ...currentTab?.meta, ...tab.meta },
+        };
+        if (currentTab) {
+          const curMeta = currentTab.meta;
+          if (Reflect.has(curMeta, 'affixTab')) {
+            mergedTab.meta.affixTab = curMeta.affixTab;
+          }
+          if (Reflect.has(curMeta, 'newTabTitle')) {
+            mergedTab.meta.newTabTitle = curMeta.newTabTitle;
+          }
         }
+
         this.tabs.splice(tabIndex, 1, mergedTab);
       }
       this.updateCacheTab();
@@ -136,7 +147,8 @@ export const useTabbarStore = defineStore('core-tabbar', {
      * @zh_CN 关闭所有标签页
      */
     async closeAllTabs(router: Router) {
-      this.tabs = this.tabs.filter((tab) => isAffixTab(tab));
+      const newTabs = this.tabs.filter((tab) => isAffixTab(tab));
+      this.tabs = newTabs.length > 0 ? newTabs : [...this.tabs].splice(0, 1);
       await this._goToDefaultTab(router);
       this.updateCacheTab();
     },