Browse Source
fix: header logo may not be collapsed in `header-sidebar-nav` layout (#5274)
pull/5275/head
Netfan
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
13 additions and
1 deletions
-
packages/@core/preferences/src/use-preferences.ts
-
packages/effects/layouts/src/basic/layout.vue
|
|
@ -82,10 +82,20 @@ function usePreferences() { |
|
|
() => appPreferences.value.layout === 'header-nav', |
|
|
() => appPreferences.value.layout === 'header-nav', |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* @zh_CN 是否为头部混合导航模式 |
|
|
|
|
|
*/ |
|
|
const isHeaderMixedNav = computed( |
|
|
const isHeaderMixedNav = computed( |
|
|
() => appPreferences.value.layout === 'header-mixed-nav', |
|
|
() => appPreferences.value.layout === 'header-mixed-nav', |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* @zh_CN 是否为顶部通栏+侧边导航模式 |
|
|
|
|
|
*/ |
|
|
|
|
|
const isHeaderSidebarNav = computed( |
|
|
|
|
|
() => appPreferences.value.layout === 'header-sidebar-nav', |
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* @zh_CN 是否为混合导航模式 |
|
|
* @zh_CN 是否为混合导航模式 |
|
|
*/ |
|
|
*/ |
|
|
@ -225,6 +235,7 @@ function usePreferences() { |
|
|
isFullContent, |
|
|
isFullContent, |
|
|
isHeaderMixedNav, |
|
|
isHeaderMixedNav, |
|
|
isHeaderNav, |
|
|
isHeaderNav, |
|
|
|
|
|
isHeaderSidebarNav, |
|
|
isMixedNav, |
|
|
isMixedNav, |
|
|
isMobile, |
|
|
isMobile, |
|
|
isSideMixedNav, |
|
|
isSideMixedNav, |
|
|
|
|
|
@ -40,6 +40,7 @@ const { |
|
|
isMobile, |
|
|
isMobile, |
|
|
isSideMixedNav, |
|
|
isSideMixedNav, |
|
|
isHeaderMixedNav, |
|
|
isHeaderMixedNav, |
|
|
|
|
|
isHeaderSidebarNav, |
|
|
layout, |
|
|
layout, |
|
|
preferencesButtonPosition, |
|
|
preferencesButtonPosition, |
|
|
sidebarCollapsed, |
|
|
sidebarCollapsed, |
|
|
@ -81,7 +82,7 @@ const logoCollapsed = computed(() => { |
|
|
if (isMobile.value && sidebarCollapsed.value) { |
|
|
if (isMobile.value && sidebarCollapsed.value) { |
|
|
return true; |
|
|
return true; |
|
|
} |
|
|
} |
|
|
if (isHeaderNav.value || isMixedNav.value) { |
|
|
if (isHeaderNav.value || isMixedNav.value || isHeaderSidebarNav.value) { |
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
return ( |
|
|
return ( |
|
|
|