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

fix(layout): fix layout scale error

Browse Source
This commit is contained in:
vben
2021-01-04 21:31:13 +08:00
parent 7a07b703d1
commit da76f3c77b
11 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/layouts/default/header/MultipleHeader.vue
View File

@@ -34,6 +34,7 @@
getShowInsetHeaderRef,
getShowFullHeaderRef,
getHeaderTheme,
getShowHeader,
} = useHeaderSetting();
const { getFullContent } = useFullContent();
@@ -68,7 +69,7 @@
const getPlaceholderDomStyle = computed(
(): CSSProperties => {
let height = 0;
if (unref(getShowFullHeaderRef) || !unref(getSplit)) {
if ((unref(getShowFullHeaderRef) || !unref(getSplit)) && unref(getShowHeader)) {
height += HEADER_HEIGHT;
}
if (unref(getShowMultipleTab)) {

1
src/layouts/default/tabs/useTabDropdown.ts
View File

@@ -129,6 +129,7 @@ export function useTabDropdown(tabContentProps: TabContentProps) {
const isScale = !unref(getShowMenu) && !unref(getShowHeader);
setMenuSetting({
show: isScale,
hidden: !isScale,
});
setHeaderSetting({
show: isScale,