yudao
/
admin-vben
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vben.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: mixed menu layout in full content mode (#4990)

pull/56/MERGE
Netfan 2024-12-01 21:37:36 +08:00 committed by GitHub
parent 32117b73aa
commit ae3f7cb909
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/@core/ui-kit/layout-ui/src/components/layout-sidebar.vue
View File

@ -191,7 +191,10 @@ watchEffect(() => {
function calcMenuWidthStyle(isHiddenDom: boolean): CSSProperties { function calcMenuWidthStyle(isHiddenDom: boolean): CSSProperties {
const { extraWidth, fixedExtra, isSidebarMixed, show, width } = props; 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; const { collapseWidth } = props;

2
packages/@core/ui-kit/layout-ui/src/vben-layout.vue
View File

@ -192,7 +192,7 @@ const headerFixed = computed(() => {
}); });
const showSidebar = computed(() => { const showSidebar = computed(() => {
return isSideMode.value && sidebarEnable.value; return isSideMode.value && sidebarEnable.value && !props.sidebarHidden;
}); });
/** /**