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

2024-09-21 19:12:42 +08:00
parent d2b512ff91 81a9accafd
commit d1efb4278b
9 changed files with 171 additions and 11 deletions
--- a/packages/effects/layouts/src/basic/layout.vue
+++ b/packages/effects/layouts/src/basic/layout.vue
@@ -143,6 +143,19 @@ watch(
  },
 );

+watch(
+  () => preferences.app.layout,
+  async (val) => {
+    if (val === 'sidebar-mixed-nav' && preferences.sidebar.hidden) {
+      updatePreferences({
+        sidebar: {
+          hidden: false,
+        },
+      });
+    }
+  },
+);
+
 const slots = useSlots();
 const headerSlots = computed(() => {
  return Object.keys(slots).filter((key) => key.startsWith('header-'));