kingecg
/
gohttpdUi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复cutMenu布局和top布局内容高度计算错误问题

This commit is contained in:
陈财富 2023-12-15 15:59:28 +08:00
parent 649fb17d00
commit 8badd48a69
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/layout/components/AppView.vue
View File

@ -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))]': // '!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, // !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, 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 !fixedHeader && layout === 'cutMenu' && footer
} }
]" ]"

4
src/layout/components/useRenderLayout.tsx
View File

@ -195,8 +195,8 @@ export const useRenderLayout = () => {
`${prefixCls}-content`, `${prefixCls}-content`,
'w-full', 'w-full',
{ {
'h-[calc(100%-var(--app-footer-height))]': !fixedHeader.value, 'h-[calc(100%-var(--top-tool-height))]': !fixedHeader.value,
'h-[calc(100%-var(--tags-view-height)-var(--app-footer-height))]': fixedHeader.value 'h-[calc(100%-var(--tags-view-height)-var(--top-tool-height))]': fixedHeader.value
} }
]} ]}
> >