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

packages/effects/common-ui/package.json

@@ -41,7 +41,7 @@
     "vue": "^3.5.4",
     "vue-codemirror6": "^1.3.4",
     "vue-json-pretty": "^2.4.0",
-    "vue-router": "^4.4.4"
+    "vue-router": "^4.4.5"
   },
   "devDependencies": {
     "@types/qrcode": "^1.5.5"

packages/effects/hooks/package.json

@@ -26,7 +26,7 @@
     "@vben/types": "workspace:*",
     "@vben/utils": "workspace:*",
     "vue": "^3.5.4",
-    "vue-router": "^4.4.4",
+    "vue-router": "^4.4.5",
     "watermark-js-plus": "^1.5.6"
   }
 }

packages/effects/layouts/package.json

@@ -37,6 +37,6 @@
     "@vben/utils": "workspace:*",
     "@vueuse/core": "^11.0.3",
     "vue": "^3.5.4",
-    "vue-router": "^4.4.4"
+    "vue-router": "^4.4.5"
   }
 }

packages/effects/layouts/src/basic/tabbar/tabbar.vue

@@ -22,7 +22,7 @@ defineProps<{ showIcon?: boolean; theme?: string }>();
 
 const route = useRoute();
 const tabbarStore = useTabbarStore();
-const { toggleMaximize } = useContentMaximize();
+const { contentIsMaximize, toggleMaximize } = useContentMaximize();
 const { refreshTab, unpinTab } = useTabs();
 
 const {
@@ -73,7 +73,7 @@ if (!preferences.tabbar.persist) {
     <TabsToolMore v-if="preferences.tabbar.showMore" :menus="menus" />
     <TabsToolScreen
       v-if="preferences.tabbar.showMaximize"
-      :screen="preferences.sidebar.hidden"
+      :screen="contentIsMaximize"
       @change="toggleMaximize"
       @update:screen="toggleMaximize"
     />