Netfan
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
5 additions and
2 deletions
-
packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
-
packages/@core/ui-kit/layout-ui/src/vben-layout.vue
|
|
|
@ -191,7 +191,10 @@ watchEffect(() => { |
|
|
|
function calcMenuWidthStyle(isHiddenDom: boolean): CSSProperties { |
|
|
|
const { extraWidth, fixedExtra, isSidebarMixed, show, width } = props; |
|
|
|
|
|
|
|
let widthValue = `${width + (isSidebarMixed && fixedExtra && extraVisible.value ? extraWidth : 0)}px`; |
|
|
|
let widthValue = |
|
|
|
width === 0 |
|
|
|
? '0px' |
|
|
|
: `${width + (isSidebarMixed && fixedExtra && extraVisible.value ? extraWidth : 0)}px`; |
|
|
|
|
|
|
|
const { collapseWidth } = props; |
|
|
|
|
|
|
|
|
|
|
|
@ -192,7 +192,7 @@ const headerFixed = computed(() => { |
|
|
|
}); |
|
|
|
|
|
|
|
const showSidebar = computed(() => { |
|
|
|
return isSideMode.value && sidebarEnable.value; |
|
|
|
return isSideMode.value && sidebarEnable.value && !props.sidebarHidden; |
|
|
|
}); |
|
|
|
|
|
|
|
/** |
|
|
|
|
