fix: header logo may not be collapsed in header-sidebar-nav layout (#…

…5274)
vbenjs · Dec 31, 2024 · 3af22f7 · 3af22f7
1 parent 2135cb8
commit 3af22f7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/packages/@core/preferences/src/use-preferences.ts b/packages/@core/preferences/src/use-preferences.ts
@@ -82,10 +82,20 @@ function usePreferences() {
     () => appPreferences.value.layout === 'header-nav',
   );
 
+  /**
+   * @zh_CN 是否为头部混合导航模式
+   */
   const isHeaderMixedNav = computed(
     () => appPreferences.value.layout === 'header-mixed-nav',
   );
 
+  /**
+   * @zh_CN 是否为顶部通栏+侧边导航模式
+   */
+  const isHeaderSidebarNav = computed(
+    () => appPreferences.value.layout === 'header-sidebar-nav',
+  );
+
   /**
    * @zh_CN 是否为混合导航模式
    */
@@ -225,6 +235,7 @@ function usePreferences() {
     isFullContent,
     isHeaderMixedNav,
     isHeaderNav,
+    isHeaderSidebarNav,
     isMixedNav,
     isMobile,
     isSideMixedNav,

diff --git a/packages/effects/layouts/src/basic/layout.vue b/packages/effects/layouts/src/basic/layout.vue
@@ -40,6 +40,7 @@ const {
   isMobile,
   isSideMixedNav,
   isHeaderMixedNav,
+  isHeaderSidebarNav,
   layout,
   preferencesButtonPosition,
   sidebarCollapsed,
@@ -81,7 +82,7 @@ const logoCollapsed = computed(() => {
   if (isMobile.value && sidebarCollapsed.value) {
     return true;
   }
-  if (isHeaderNav.value || isMixedNav.value) {
+  if (isHeaderNav.value || isMixedNav.value || isHeaderSidebarNav.value) {
     return false;
   }
   return (