github_mirrors/vue-vben-admin
1
0
Fork 0
mirror of https://github.com/vbenjs/vue-vben-admin.git synced 2025-08-26 00:26:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Netfan
2024-12-01 21:37:36 +08:00
committed by GitHub
parent 32117b73aa
commit ae3f7cb909
2 changed files with 5 additions and 2 deletions
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 {
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;

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

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