Merge branch 'main' into example

2025-11-15 05:03:44 +08:00 · 2024-08-01 16:06:59 +08:00
parent d825b6e260 e6aa25e9f8
commit 48e005bcaf
15 changed files with 666 additions and 1828 deletions
--- a/src/layouts/modules/global-menu/modules/horizontal-mix-menu.vue
+++ b/src/layouts/modules/global-menu/modules/horizontal-mix-menu.vue
@@ -56,9 +56,7 @@ function handleSelectMixMenu(menu: App.Global.Menu) {
      :theme-color="themeStore.themeColor"
      @select="handleSelectMixMenu"
      @toggle-sider-collapse="appStore.toggleSiderCollapse"
-    >
-      <slot></slot>
-    </FirstLevelMenu>
+    />
  </Teleport>
 </template>

--- a/src/layouts/modules/global-menu/modules/vertical-mix-menu.vue
+++ b/src/layouts/modules/global-menu/modules/vertical-mix-menu.vue
@@ -49,8 +49,11 @@ function handleSelectMixMenu(menu: App.Global.Menu) {
 }

 function handleResetActiveMenu() {
-  getActiveFirstLevelMenuKey();
  setDrawerVisible(false);
+
+  if (!appStore.mixSiderFixed) {
+    getActiveFirstLevelMenuKey();
+  }
 }

 const selectedKey = computed(() => {