From c57592f3a69a9709e860ae0ea4b9415b7676f9bd 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 16:56:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(@vben-core/shadcn-ui):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DVbenPinInput=E7=BB=84=E4=BB=B6=E5=9C=A8=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E8=8E=B7=E5=8F=96=E9=AA=8C=E8=AF=81=E7=A0=81=E5=92=8C?=
 =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E5=90=8C=E6=97=B6=E8=BF=9B=E8=A1=8C=E6=97=B6?=
 =?UTF-8?q?=E4=BC=9A=E9=87=8D=E5=A4=8D=E8=A7=A6=E5=8F=91=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E9=97=AE=E9=A2=98=20(#6705)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue b/packages/@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue
index 941198d1..9bbd456f 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/pin-input/input.vue
@@ -59,9 +59,9 @@ function handleComplete(e: string[]) {
 async function handleSend(e: Event) {
   try {
     e?.preventDefault();
-    await handleSendCode();
     countdown.value = maxTime;
     startCountdown();
+    await handleSendCode();
   } catch (error) {
     console.error('Failed to send code:', error);
     // Consider emitting an error event or showing a notification

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 2/2] 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<HTMLDivElement>('footerRef');
 const contentStyle = computed<StyleValue>(() => {
   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(() => {
 </script>
 
 <template>
-  <div class="relative">
+  <div class="relative flex min-h-full flex-col">
     <div
       v-if="
         description ||
@@ -89,16 +89,10 @@ onMounted(() => {
     <div :class="cn('h-full p-4', contentClass)" :style="contentStyle">
       <slot></slot>
     </div>
-
     <div
       v-if="$slots.footer"
       ref="footerRef"
-      :class="
-        cn(
-          'bg-card align-center absolute bottom-0 left-0 right-0 flex px-6 py-4',
-          footerClass,
-        )
-      "
+      :class="cn('bg-card align-center flex px-6 py-4', footerClass)"
     >
       <slot name="footer"></slot>
     </div>