From 6a85b3ab8416092376ffbb4eef0e76a72fd09857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A6=E5=85=83=E5=90=89?= <87116441+qianYuanJ@users.noreply.github.com> Date: Tue, 2 Sep 2025 17:02:11 +0800 Subject: [PATCH] fix(@vben/common-ui): resolve #6698 (#6700) * fix(@vben/common-ui): resolve #6698 * fix(@vben/common-ui): resolve #6698 * fix(@vben/common-ui): resolve conversation * fix(@vben/common-ui): resolve #6698 --- .../effects/common-ui/src/components/page/page.vue | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/effects/common-ui/src/components/page/page.vue b/packages/effects/common-ui/src/components/page/page.vue index c95a3b45..4a0ea54a 100644 --- a/packages/effects/common-ui/src/components/page/page.vue +++ b/packages/effects/common-ui/src/components/page/page.vue @@ -25,7 +25,7 @@ const footerRef = useTemplateRef('footerRef'); const contentStyle = computed(() => { if (autoContentHeight) { return { - height: `calc(var(${CSS_VARIABLE_LAYOUT_CONTENT_HEIGHT}) - ${headerHeight.value}px - ${typeof heightOffset === 'number' ? `${heightOffset}px` : heightOffset})`, + height: `calc(var(${CSS_VARIABLE_LAYOUT_CONTENT_HEIGHT}) - ${headerHeight.value}px - ${footerHeight.value}px - ${typeof heightOffset === 'number' ? `${heightOffset}px` : heightOffset})`, overflowY: shouldAutoHeight.value ? 'auto' : 'unset', }; } @@ -50,7 +50,7 @@ onMounted(() => {