diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 943891d72..57b8ee523 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -7,7 +7,7 @@
     :vLoading="formLoading"
     @updateFullscreen="updateFullscreen"
   >
-    <div style="overflow-y: auto" :style="{ 'max-height': formHeight }">
+    <div style="overflow-y: auto" :style="formHeight">
       <Form
         ref="formRef"
         :rules="rules"
@@ -79,7 +79,6 @@
         <TableForm
           ref="tableFormRef"
           class="w-[100%]"
-          :maxHeight="490"
           :tableFields="tableAllSchemas.tableFormColumns"
           :tableData="tableData"
           :tableFormRules="tableFormRules"
@@ -351,9 +350,14 @@ if (props.basicFormWidth) {
 } else {
   dialogWidth.value = props.isBusiness ? '60%' : '40%'
 }
-const formHeight = ref('60vh')
+const formHeight = ref({
+  height:'60vh'
+})
 const updateFullscreen = (isFullscreen) => {
-  formHeight.value = isFullscreen ? 'auto' : '60vh'
+  formHeight.value.height = isFullscreen ? 'auto' : '60vh'
+  nextTick(()=>{
+    tableFormRef.value.reloadFullscreen(isFullscreen)
+  })
 }
 
 const dialogVisible = ref(false) // 弹窗的是否展示
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index c839d2937..57cabc4f5 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -1,12 +1,15 @@
 <!-- 附件组件 -->
 <template>
   <div class="table-form">
-    <el-table
+    <el-table v-clientTableForm="{
+      isShowPagination:tableData.length > 10,
+      isShowButton: isShowButton || isShowReduceButtonSelection,
+      isFullscreen:isFullscreen
+    }"
       class="multipleTableComponents"
       ref="TableBaseComponents_Ref"
       v-loading="tableLoading"
       :data="showTableData()"
-      :max-height="maxHeight"
       row-key="id"
       :border="border"
       @selection-change="tableSelectionChange"
@@ -725,11 +728,17 @@ if(headerItem?.tableForm?.valueField){
   return op.value
 }
 }
+
+const isFullscreen = ref(false)
+const reloadFullscreen = (fullscreen)=>{
+  isFullscreen.value = fullscreen
+}
 // setup 语法糖 抛出方法
 defineExpose({
   TableBaseComponents_Ref,
   validateForm,
-  keyWord
+  keyWord,
+  reloadFullscreen
 })
 </script>
 
diff --git a/src/directives/permission/clientTable.ts b/src/directives/permission/clientTable.ts
index 9c12028ce..bf41a8f2c 100644
--- a/src/directives/permission/clientTable.ts
+++ b/src/directives/permission/clientTable.ts
@@ -41,4 +41,35 @@ export function clientTable(app: App<Element>) {
       }
     })
   })
+  app.directive('clientTableForm', (el, binding) => {
+    nextTick(() => {
+      let {isShowPagination,isShowButton,isFullscreen} = binding.value
+      console.log('clientTableForm')
+      let footerHeight = 0
+      let headerHeight = 0
+      el.offsetParent.children.forEach(element => {
+        if(element.className=='el-dialog__footer'){
+          footerHeight = element.clientHeight
+        }
+        if(element.className=='el-dialog__header'){
+          headerHeight = element.clientHeight
+        }
+      });
+      console.dir(el)
+      let top = el.getBoundingClientRect().top
+      let tableFormTop = top - el.offsetParent.offsetTop
+      console.log(top)
+      console.log(el.offsetParent.offsetTop)
+      console.log(el.offsetParent.clientHeight)
+      let height = el.offsetParent.clientHeight - tableFormTop - footerHeight - 30
+      if(isShowPagination){
+        height = height- 34
+      }
+      if(isShowButton){
+        height = height- 50
+      }
+      console.log(height)
+      el.style.height = height + 'px'
+    })
+  })
 }