From 331a7440da5df70edf4204965b99ba6fa1c8bcaa Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 19 Aug 2024 15:09:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=BA=A6=E9=97=AE=E9=A2=98=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue | 39 +++++++++++-----------
 src/components/TableForm/src/TableForm.vue |  6 ++--
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 4881ff3df..d2136a0be 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -407,21 +407,22 @@ const sureDisabled = ref(false)
 const tabSheet = ref('TableForm')
 routeName.value = route.name
 const formHeight = ref({
-  height:'60vh'
+  'max-height': '60vh' 
 })
+
 const tabChange = (item) => {
   tabSheet.value = item.prop
 }
 
-if(!props.tableAllSchemas||formType.value!='create'){
-  formHeight.value = {
-    height:'auto'
-  }
-}else{
-  formHeight.value = {
-    height:'60vh'
-  }
-}
+// if(!props.tableAllSchemas||formType.value!='create'){
+//   formHeight.value = {
+//     height:'auto'
+//   }
+// }else{
+//   formHeight.value = {
+//     height:'60vh'
+//   }
+// }
 // 列表-按钮
 // const buttondata = [
 //   defaultButtons.mainListEditBtn(null), // 编辑
@@ -668,15 +669,15 @@ const open = async (
     dialogTitle.value = t('action.' + type)
   }
   formType.value = type
-  if(!props.tableAllSchemas||formType.value!='create'){
-    formHeight.value = {
-      height:'auto'
-    }
-  }else{
-    formHeight.value = {
-      height:'60vh'
-    }
-  }
+  // if(!props.tableAllSchemas||formType.value!='create'){
+  //   formHeight.value = {
+  //     height:'auto'
+  //   }
+  // }else{
+  //   formHeight.value = {
+  //     height:'60vh'
+  //   }
+  // }
   resetForm()
   count.value = 0
   // 修改时，设置数据
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 1da966ea4..57dd2ceae 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -1,11 +1,13 @@
 <!-- 附件组件 -->
 <template>
   <div class="table-form">
-    <el-table v-clientTableForm="{
+    <!-- v-clientTableForm="{
+      showTab:showTab,
       isShowPagination:tableData.length > 10,
       isShowButton: isShowButton || isShowReduceButtonSelection,
       isFullscreen:isFullscreen
-    }"
+    }" -->
+    <el-table 
       class="multipleTableComponents"
       ref="TableBaseComponents_Ref"
       v-loading="tableLoading"