From cf4a7eae7d13ef649c17c6fb7cbaa3a917aaa435 Mon Sep 17 00:00:00 2001
From: Hooray <304327508@qq.com>
Date: Sun, 19 Apr 2026 21:48:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20FaDrawer=20?=
 =?UTF-8?q?=E5=92=8C=20FaModal=20=E7=BB=84=E4=BB=B6=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E6=97=B6=E8=AD=A6=E5=91=8A=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/components/src/drawer/index.ts                    | 0
 packages/components/src/drawer/index.vue                   | 5 +++++
 packages/components/src/drawer/sheet/Sheet.vue             | 0
 packages/components/src/drawer/sheet/SheetClose.vue        | 0
 packages/components/src/drawer/sheet/SheetContent.vue      | 7 +++++++
 packages/components/src/drawer/sheet/SheetDescription.vue  | 0
 packages/components/src/drawer/sheet/SheetFooter.vue       | 0
 packages/components/src/drawer/sheet/SheetHeader.vue       | 0
 packages/components/src/drawer/sheet/SheetOverlay.vue      | 0
 packages/components/src/drawer/sheet/SheetTitle.vue        | 0
 packages/components/src/drawer/sheet/SheetTrigger.vue      | 0
 packages/components/src/drawer/sheet/index.ts              | 0
 packages/components/src/modal/dialog/Dialog.vue            | 0
 packages/components/src/modal/dialog/DialogClose.vue       | 0
 packages/components/src/modal/dialog/DialogContent.vue     | 0
 packages/components/src/modal/dialog/DialogDescription.vue | 0
 packages/components/src/modal/dialog/DialogFooter.vue      | 0
 packages/components/src/modal/dialog/DialogHeader.vue      | 0
 packages/components/src/modal/dialog/DialogOverlay.vue     | 0
 .../components/src/modal/dialog/DialogScrollContent.vue    | 0
 packages/components/src/modal/dialog/DialogTitle.vue       | 0
 packages/components/src/modal/dialog/DialogTrigger.vue     | 0
 packages/components/src/modal/dialog/index.ts              | 0
 packages/components/src/modal/index.ts                     | 0
 packages/components/src/modal/index.vue                    | 3 +++
 packages/components/src/modal/use-draggable.ts             | 0
 26 files changed, 15 insertions(+)
 mode change 100755 => 100644 packages/components/src/drawer/index.ts
 mode change 100755 => 100644 packages/components/src/drawer/index.vue
 mode change 100755 => 100644 packages/components/src/drawer/sheet/Sheet.vue
 mode change 100755 => 100644 packages/components/src/drawer/sheet/SheetClose.vue
 mode change 100755 => 100644 packages/components/src/drawer/sheet/SheetContent.vue
 mode change 100755 => 100644 packages/components/src/drawer/sheet/SheetDescription.vue
 mode change 100755 => 100644 packages/components/src/drawer/sheet/SheetFooter.vue
 mode change 100755 => 100644 packages/components/src/drawer/sheet/SheetHeader.vue
 mode change 100755 => 100644 packages/components/src/drawer/sheet/SheetOverlay.vue
 mode change 100755 => 100644 packages/components/src/drawer/sheet/SheetTitle.vue
 mode change 100755 => 100644 packages/components/src/drawer/sheet/SheetTrigger.vue
 mode change 100755 => 100644 packages/components/src/drawer/sheet/index.ts
 mode change 100755 => 100644 packages/components/src/modal/dialog/Dialog.vue
 mode change 100755 => 100644 packages/components/src/modal/dialog/DialogClose.vue
 mode change 100755 => 100644 packages/components/src/modal/dialog/DialogContent.vue
 mode change 100755 => 100644 packages/components/src/modal/dialog/DialogDescription.vue
 mode change 100755 => 100644 packages/components/src/modal/dialog/DialogFooter.vue
 mode change 100755 => 100644 packages/components/src/modal/dialog/DialogHeader.vue
 mode change 100755 => 100644 packages/components/src/modal/dialog/DialogOverlay.vue
 mode change 100755 => 100644 packages/components/src/modal/dialog/DialogScrollContent.vue
 mode change 100755 => 100644 packages/components/src/modal/dialog/DialogTitle.vue
 mode change 100755 => 100644 packages/components/src/modal/dialog/DialogTrigger.vue
 mode change 100755 => 100644 packages/components/src/modal/dialog/index.ts
 mode change 100755 => 100644 packages/components/src/modal/index.ts
 mode change 100755 => 100644 packages/components/src/modal/index.vue
 mode change 100755 => 100644 packages/components/src/modal/use-draggable.ts

diff --git a/packages/components/src/drawer/index.ts b/packages/components/src/drawer/index.ts
old mode 100755
new mode 100644
diff --git a/packages/components/src/drawer/index.vue b/packages/components/src/drawer/index.vue
old mode 100755
new mode 100644
index 206016ab..decb9f62
--- a/packages/components/src/drawer/index.vue
+++ b/packages/components/src/drawer/index.vue
@@ -50,6 +50,7 @@ const slots = defineSlots<{
   footer?: () => VNode
 }>()
 
+const sheetContentRef = useTemplateRef('sheetContentRef')
 const drawerId = shallowRef(props.id ?? useId())
 const isOpen = ref(props.modelValue)
 
@@ -140,6 +141,9 @@ function handleOpenAutoFocus(e: Event) {
   if (!props.openAutoFocus) {
     e.preventDefault()
     e.stopPropagation()
+    nextTick(() => {
+      sheetContentRef.value?.el?.$el?.focus()
+    })
   }
 }
 
@@ -176,6 +180,7 @@ function handleAnimationEnd() {
 <template>
   <Sheet :open="isOpen" @update:open="updateOpen">
     <SheetContent
+      ref="sheetContentRef"
       :drawer-id="drawerId"
       :open="isOpen"
       :z-index="props.zIndex"
diff --git a/packages/components/src/drawer/sheet/Sheet.vue b/packages/components/src/drawer/sheet/Sheet.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/drawer/sheet/SheetClose.vue b/packages/components/src/drawer/sheet/SheetClose.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/drawer/sheet/SheetContent.vue b/packages/components/src/drawer/sheet/SheetContent.vue
old mode 100755
new mode 100644
index cdb9fc71..863f991f
--- a/packages/components/src/drawer/sheet/SheetContent.vue
+++ b/packages/components/src/drawer/sheet/SheetContent.vue
@@ -38,6 +38,12 @@ const delegatedProps = reactiveOmit(props, 'class', 'side')
 
 const forwarded = useForwardPropsEmits(delegatedProps, emits)
 
+const sheetContentRef = useTemplateRef<ComponentPublicInstance<typeof DialogContent>>('sheetContentRef')
+
+defineExpose({
+  el: sheetContentRef,
+})
+
 const showOverlay = computed(() => props.open && props.overlay)
 </script>
 
@@ -67,6 +73,7 @@ const showOverlay = computed(() => props.open && props.overlay)
     </Transition>
     <SheetOverlay class="hidden" />
     <DialogContent
+      ref="sheetContentRef"
       data-slot="sheet-content"
       :class="cn(
         'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500',
diff --git a/packages/components/src/drawer/sheet/SheetDescription.vue b/packages/components/src/drawer/sheet/SheetDescription.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/drawer/sheet/SheetFooter.vue b/packages/components/src/drawer/sheet/SheetFooter.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/drawer/sheet/SheetHeader.vue b/packages/components/src/drawer/sheet/SheetHeader.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/drawer/sheet/SheetOverlay.vue b/packages/components/src/drawer/sheet/SheetOverlay.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/drawer/sheet/SheetTitle.vue b/packages/components/src/drawer/sheet/SheetTitle.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/drawer/sheet/SheetTrigger.vue b/packages/components/src/drawer/sheet/SheetTrigger.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/drawer/sheet/index.ts b/packages/components/src/drawer/sheet/index.ts
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/dialog/Dialog.vue b/packages/components/src/modal/dialog/Dialog.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/dialog/DialogClose.vue b/packages/components/src/modal/dialog/DialogClose.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/dialog/DialogContent.vue b/packages/components/src/modal/dialog/DialogContent.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/dialog/DialogDescription.vue b/packages/components/src/modal/dialog/DialogDescription.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/dialog/DialogFooter.vue b/packages/components/src/modal/dialog/DialogFooter.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/dialog/DialogHeader.vue b/packages/components/src/modal/dialog/DialogHeader.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/dialog/DialogOverlay.vue b/packages/components/src/modal/dialog/DialogOverlay.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/dialog/DialogScrollContent.vue b/packages/components/src/modal/dialog/DialogScrollContent.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/dialog/DialogTitle.vue b/packages/components/src/modal/dialog/DialogTitle.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/dialog/DialogTrigger.vue b/packages/components/src/modal/dialog/DialogTrigger.vue
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/dialog/index.ts b/packages/components/src/modal/dialog/index.ts
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/index.ts b/packages/components/src/modal/index.ts
old mode 100755
new mode 100644
diff --git a/packages/components/src/modal/index.vue b/packages/components/src/modal/index.vue
old mode 100755
new mode 100644
index 4f39417b..40aaec34
--- a/packages/components/src/modal/index.vue
+++ b/packages/components/src/modal/index.vue
@@ -174,6 +174,9 @@ function handleOpenAutoFocus(e: Event) {
   if (!props.openAutoFocus) {
     e.preventDefault()
     e.stopPropagation()
+    nextTick(() => {
+      dialogContentRef.value?.el?.$el?.focus()
+    })
   }
 }
 
diff --git a/packages/components/src/modal/use-draggable.ts b/packages/components/src/modal/use-draggable.ts
old mode 100755
new mode 100644