From 1a902d94c97f36dd7c667c221fc307c633b347ba Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Wed, 16 Nov 2022 18:18:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96vue3=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue3/components/${entityName}Form.vuei         |  2 +-
 .../vue3Native/components/${entityName}Form.vuei   |  2 +-
 .../vue3/components/${entityName}Form.vuei         |  2 +-
 .../vue3Native/components/${entityName}Form.vuei   |  2 +-
 .../vue3/components/${entityName}Form.vuei         |  8 ++++++--
 .../vue3/components/${entityName}Form.vuei         |  8 ++++++--
 .../vue3Native/${entityName}List.vuei              |  1 +
 .../vue3Native/components/${entityName}Form.vuei   |  7 +++++--
 .../vue3/components/${entityName}Form.vuei         | 14 +++++++++++---
 .../vue3/components/${entityName}Modal.vuei        |  5 ++++-
 10 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
index 61fade23..848e61e2 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
@@ -1,6 +1,6 @@
 <#include "/common/utils.ftl">
 <template>
-    <div style="height: 400px">
+    <div style="min-height: 400px">
         <BasicForm @register="registerForm"></BasicForm>
         <div style="width: 100%;text-align: center" v-if="!formDisabled">
             <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index 30964461..eaf31a40 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -222,7 +222,7 @@
 
 <style lang="less" scoped>
   .antd-modal-form {
-    height: 500px !important;
+    min-height: 500px !important;
     overflow-y: auto;
     padding: 24px 24px 24px 24px;
   }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
index 8d8e68be..c95f2655 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
@@ -1,6 +1,6 @@
 <#include "/common/utils.ftl">
 <template>
-    <div style="height: 400px">
+    <div style="min-height: 400px">
         <BasicForm @register="registerForm"></BasicForm>
         <div style="width: 100%;text-align: center" v-if="!formDisabled">
             <a-button @click="submitForm" pre-icon="ant-design:check" type="primary">提 交</a-button>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index f37b1685..bd5bf071 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -273,7 +273,7 @@
 
 <style lang="less" scoped>
   .antd-modal-form {
-    height: 500px !important;
+    min-height: 500px !important;
     overflow-y: auto;
     padding: 24px 24px 24px 24px;
   }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
index e32c84b9..6d583260 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
@@ -14,6 +14,7 @@
   <#else>
       <a-tab-pane tab="${sub.ftlDescription}" key="${refKey}" :forceRender="true">
         <JVxeTable
+          v-if="${sub.entityName?uncap_first}Table.show"      
           keep-source
           resizable
           ref="${refKey}"
@@ -72,7 +73,8 @@
     const ${sub.entityName?uncap_first}Table = reactive({
           loading: false,
           dataSource: [],
-          columns:${sub.entityName?uncap_first}JVxeColumns
+          columns:${sub.entityName?uncap_first}JVxeColumns,
+          show: false
     })
     </#if>
    </#list>
@@ -128,7 +130,9 @@
         </#list>
         <#list subTables as sub><#rt/>
         <#if sub.foreignRelationType =='0'>
-        requestSubTableData(query${sub.entityName}, {id: data.id}, ${sub.entityName?uncap_first}Table)
+        requestSubTableData(query${sub.entityName}, {id: data.id}, ${sub.entityName?uncap_first}Table, ()=>{
+          ${sub.entityName?uncap_first}Table.show = true;
+        });
         </#if>
         </#list>
         // 隐藏底部时禁用整个表单
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
index b3a1e40c..3ad37a8c 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
@@ -17,6 +17,7 @@
               keep-source
               resizable
               ref="${refKey}"
+              v-if="${sub.entityName?uncap_first}Table.show"
               :loading="${sub.entityName?uncap_first}Table.loading"
               :columns="${sub.entityName?uncap_first}Table.columns"
               :dataSource="${sub.entityName?uncap_first}Table.dataSource"
@@ -102,7 +103,8 @@
       const ${sub.entityName?uncap_first}Table = reactive({
         loading: false,
         dataSource: [],
-        columns:${sub.entityName?uncap_first}Columns
+        columns:${sub.entityName?uncap_first}Columns,
+        show: false
       })
       </#if>
       </#list>
@@ -161,7 +163,9 @@
         await setFieldsValue({...data});
         <#list subTables as sub>
         <#if sub.foreignRelationType =='0'>
-        requestSubTableData(${sub.entityName?uncap_first}List, {id: data.id}, ${sub.entityName?uncap_first}Table, ()=>{});
+        requestSubTableData(${sub.entityName?uncap_first}List, {id: data.id}, ${sub.entityName?uncap_first}Table, ()=>{
+          ${sub.entityName?uncap_first}Table.show = true;
+        });
         </#if>
         <#if sub.foreignRelationType =='1'>
         ${sub.entityName?uncap_first}Form.value.initFormData(${sub.entityName?uncap_first}List, data.id);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
index 1d53a63b..f7621642 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
@@ -1,3 +1,4 @@
+<#include "/common/utils.ftl">
 <template>
   <div>
     <#assign query_field_no=0>
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
index ec24a8fa..b82ccd80 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
@@ -55,10 +55,11 @@
         <j-vxe-table
           :keep-source="true"
           ref="${sub.entityName?uncap_first}TableRef"
+          v-if="${sub.entityName?uncap_first}Table.show"
           :loading="${sub.entityName?uncap_first}Table.loading"
           :columns="${sub.entityName?uncap_first}Table.columns"
           :dataSource="${sub.entityName?uncap_first}Table.dataSource"
-          :maxHeight="300"
+          :height="340"
           :disabled="disabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -139,7 +140,8 @@
       const ${sub.entityName?uncap_first}Table = reactive<Record<string, any>>({
         loading: false,
         columns: ${sub.entityName?uncap_first}Columns,
-        dataSource: []
+        dataSource: [],
+        show: false
       });
       </#if>
       </#list>
@@ -201,6 +203,7 @@
           <#else>
           const ${sub.entityName?uncap_first}DataList = await query${sub.entityName}ListByMainId(row['${subMainFieldMap[sub.entityName]}']);
           ${sub.entityName?uncap_first}Table.dataSource = [...${sub.entityName?uncap_first}DataList];
+          ${sub.entityName?uncap_first}Table.show = true;
           </#if>
           </#list>
         }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
index c510e12c..4c64baf2 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei
@@ -21,6 +21,7 @@
           keep-source
           resizable
           ref="${refKey}"
+          v-if="${sub.entityName?uncap_first}Table.show"
           :loading="${sub.entityName?uncap_first}Table.loading"
           :columns="${sub.entityName?uncap_first}Table.columns"
           :dataSource="${sub.entityName?uncap_first}Table.dataSource"
@@ -75,7 +76,8 @@
     const ${sub.entityName?uncap_first}Table = reactive({
           loading: false,
           dataSource: [],
-          columns:${sub.entityName?uncap_first}Columns
+          columns:${sub.entityName?uncap_first}Columns,
+          show: false
     })
     </#if>
    </#list>
@@ -131,7 +133,9 @@
         </#list>
         <#list subTables as sub><#rt/>
         <#if sub.foreignRelationType =='0'>
-        requestSubTableData(${sub.entityName?uncap_first}List, {id: data.id}, ${sub.entityName?uncap_first}Table)
+        requestSubTableData(${sub.entityName?uncap_first}List, {id: data.id}, ${sub.entityName?uncap_first}Table, ()=>{
+          ${sub.entityName?uncap_first}Table.show = true;
+        })
         </#if>
         </#list>
         // 隐藏底部时禁用整个表单
@@ -147,7 +151,11 @@
       let minHeight = '100px'
       let maxHeight: Nullable<string> = '500px'
       // 弹窗wrapper
-      return {height, minHeight, maxHeight}
+      
+      <#-- update-begin-author:taoyan date:2022-11-14 for:VUEN-2674 【代码生成】对接流程表单 附加单据显示问题 5.多tab生成代码后，新增 没有滚动条，只能填写部分字段 --> 
+      let overflow = 'auto';
+      return {height, minHeight, maxHeight, overflow};
+      <#-- update-end-author:taoyan date:2022-11-14 for:VUEN-2674 【代码生成】对接流程表单 附加单据显示问题 5.多tab生成代码后，新增 没有滚动条，只能填写部分字段 -->
     })
 
     async function reset(){
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
index da09e131..42322c2d 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei
@@ -128,7 +128,10 @@
           maxHeight = null
         }
       }
-      return {height, minHeight, maxHeight}
+      <#-- update-begin-author:taoyan date:2022-11-14 for:VUEN-2674 【代码生成】对接流程表单 附加单据显示问题 5.多tab生成代码后，新增 没有滚动条，只能填写部分字段 -->
+      let overflow = 'auto';
+      return {height, minHeight, maxHeight, overflow};
+      <#-- update-end-author:taoyan date:2022-11-14 for:VUEN-2674 【代码生成】对接流程表单 附加单据显示问题 5.多tab生成代码后，新增 没有滚动条，只能填写部分字段 -->
     })
 
     async function reset(){