From 8badd48a699aabd8fe510052d098fa6848ff5cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=B4=A2=E5=AF=8C?= <1501583478@qq.com> Date: Fri, 15 Dec 2023 15:59:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=20=E4=BF=AE=E5=A4=8DcutMenu=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E5=92=8Ctop=E5=B8=83=E5=B1=80=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/AppView.vue | 4 ++-- src/layout/components/useRenderLayout.tsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/layout/components/AppView.vue b/src/layout/components/AppView.vue index c48694680..c1d091a1f 100644 --- a/src/layout/components/AppView.vue +++ b/src/layout/components/AppView.vue @@ -44,10 +44,10 @@ const tagsView = computed(() => appStore.getTagsView) // '!min-h-[calc(100%-var(--app-content-padding)-var(--app-content-padding)-var(--app-footer-height)-var(--tags-view-height)-var(--top-tool-height))]': // !fixedHeader && layout === 'top' && footer, - '!min-h-[calc(100%-var(--top-tool-height)-var(--app-content-padding)-var(--app-content-padding))]': + '!min-h-[calc(100%-var(--app-footer-height)-var(--app-content-padding)-var(--app-content-padding))]': fixedHeader && layout === 'cutMenu' && footer, - '!min-h-[calc(100%-var(--top-tool-height)-var(--app-content-padding)-var(--app-content-padding)-var(--tags-view-height))]': + '!min-h-[calc(100%-var(--app-footer-height)-var(--app-content-padding)-var(--app-content-padding)-var(--tags-view-height))]': !fixedHeader && layout === 'cutMenu' && footer } ]" diff --git a/src/layout/components/useRenderLayout.tsx b/src/layout/components/useRenderLayout.tsx index 8e74a70df..9f4b3a722 100644 --- a/src/layout/components/useRenderLayout.tsx +++ b/src/layout/components/useRenderLayout.tsx @@ -195,8 +195,8 @@ export const useRenderLayout = () => { `${prefixCls}-content`, 'w-full', { - 'h-[calc(100%-var(--app-footer-height))]': !fixedHeader.value, - 'h-[calc(100%-var(--tags-view-height)-var(--app-footer-height))]': fixedHeader.value + 'h-[calc(100%-var(--top-tool-height))]': !fixedHeader.value, + 'h-[calc(100%-var(--tags-view-height)-var(--top-tool-height))]': fixedHeader.value } ]} >