diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 5444c2218..8fdf5e7e3 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -5,10 +5,11 @@
     :width="dialogWidth"
     :close-on-click-modal="false"
     :vLoading="formLoading"
+    @updateFullscreen="updateFullscreen"
   >
   
   <div 
-    style="max-height: 60vh;overflow-y: auto;">
+    style="overflow-y: auto;" :style="{'height':formHeight}">
     <Form
       ref="formRef"
       :rules="rules"
@@ -329,6 +330,10 @@ if (props.basicFormWidth) {
 } else {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }
+const formHeight = ref('60vh')
+const updateFullscreen = (isFullscreen)=>{
+  formHeight.value = isFullscreen?'auto':'60vh'
+}
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue
index 0d52642de..8ad2e6a52 100644
--- a/src/components/Dialog/src/Dialog.vue
+++ b/src/components/Dialog/src/Dialog.vue
@@ -3,6 +3,10 @@ import { propTypes } from '@/utils/propTypes'
 import { isNumber } from '@/utils/is'
 defineOptions({ name: 'Dialog' })
 
+// 传递给父类
+const emit = defineEmits([
+  'updateFullscreen'
+])
 const slots = useSlots()
 
 const props = defineProps({
@@ -32,6 +36,7 @@ const isFullscreen = ref(false)
 
 const toggleFull = () => {
   isFullscreen.value = !unref(isFullscreen)
+  emit('updateFullscreen',isFullscreen.value)
 }
 
 const dialogHeight = ref(isNumber(props.maxHeight) ? `${props.maxHeight}px` : props.maxHeight)