zpc

@CONTROL/@MACRO/CONTROL/FORM_MEMBER_LAYOUT.tsx.ftl

-<#assign layout='TABLE_24COL'><#if formmenber.getPSLayoutPos()??><#if formmenber.getPSLayoutPos().getParentPSLayout()??><#assign layout='${formmenber.getPSLayoutPos().getParentPSLayout().getLayout()}'></#if></#if>
-<#assign LayoutPos = formmenber.getPSLayoutPos()>
-<#if layout == 'TABLE_24COL' && LayoutPos??>
-<Col>
-    ${P.getPartCode(formmenber).code}
-</Col>
-<#elseif layout == 'FLEX'>
-<div>
-${P.getPartCode(formmenber).code}
-</div>
-<#else>
-<div>
-    ${P.getPartCode(formmenber).code}
-</div>
-</#if>

@CONTROL/@MACRO/CONTROL/FORM_MEMBER_LAYOUT.vue.ftl

+<#assign layout='TABLE_24COL'><#if formmenber.getPSLayoutPos()??><#if formmenber.getPSLayoutPos().getParentPSLayout()??><#assign layout='${formmenber.getPSLayoutPos().getParentPSLayout().getLayout()}'></#if></#if>
+<#assign LayoutPos = formmenber.getPSLayoutPos()>
+<#if layout == 'TABLE_24COL' && LayoutPos??>
+<i-col v-show=true style="<#if (formmenber.getHeight?? && formmenber.getHeight() gt 0)>height: ${formmenber.getHeight()?c}px !important;</#if><#if (formmenber.getWidth?? && formmenber.getWidth() gt 0)>width: ${formmenber.getWidth()?c}px !important;</#if>" <#if LayoutPos.getColXS() != -1> :sm={ span: ${LayoutPos.getColXS()}, offset: <#if LayoutPos.getColXSOffset() != -1>${LayoutPos.getColXSOffset()}<#else>0</#if> }</#if><#if LayoutPos.getColSM() != -1> :md={span: ${LayoutPos.getColSM()}, offset: <#if LayoutPos.getColSMOffset() != -1>${LayoutPos.getColSMOffset()}<#else>0</#if>}</#if><#if LayoutPos.getColMD() != -1> :lg={ span: ${LayoutPos.getColMD()}, offset: <#if LayoutPos.getColMDOffset() != -1>${LayoutPos.getColMDOffset()}<#else>0</#if> }</#if><#if LayoutPos.getColLG() != -1> :xl={ span: ${LayoutPos.getColLG()}, offset: <#if LayoutPos.getColLGOffset() != -1>${LayoutPos.getColLGOffset()}<#else>0</#if> }</#if>>
+    ${P.getPartCode(formmenber).code}
+</i-col>
+<#elseif layout == 'FLEX'>
+<div  v-show=true style="<#if LayoutPos.getGrow() != -1>flex-grow: ${LayoutPos.getGrow()?c};<#if !LayoutPos.getHeight()??>height: 0;</#if></#if><#if LayoutPos.getWidth()??>width: ${LayoutPos.getWidth()?c}px;</#if><#if LayoutPos.getHeight()??>height: ${LayoutPos.getHeight()?c}px;</#if>">
+${P.getPartCode(formmenber).code}
+</div>
+<#else>
+<div v-show=true>
+    ${P.getPartCode(formmenber).code}
+</div>
+</#if>
\ No newline at end of file

@CONTROL/表单/CONTROL.vue#DETAIL_FORMPAGE.ftl

-<#if item.render??>
-${item.render.code}
+<#assign content>
+<#list item.getPSDEFormDetails() as formmenber>
+    <#if !(formmenber.isHidden?? && formmenber.isHidden())>
+    <#ibizinclude>
+    ../@MACRO/CONTROL/FORM_MEMBER_LAYOUT.vue.ftl
+    </#ibizinclude>
+    </#if>
+</#list>
+</#assign>
+
+<#if item.getPSLayout()?? &&  item.getPSLayout().getLayout() == "FLEX">
+<#assign pageLayout = item.getPSLayout()>
+<div style="height: 100%;display: flex;<#if pageLayout.getDir()!="">flex-direction: ${pageLayout.getDir()};</#if><#if pageLayout.getAlign()!="">justify-content: ${pageLayout.getAlign()};</#if><#if pageLayout.getVAlign()!="">align-items: ${pageLayout.getVAlign()};</#if>">
+    ${content}
+</div>
 <#else>
-        <a-tab-pane key="${item.getName()}"  class="app-form-page <#if item.getPSSysCss?? && item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>"  style="<#if item.getContentWidth()?? && item.getContentWidth() != 0>width:${item.getContentWidth()}px;</#if><#if item.getContentHeight()?? &&  item.getContentHeight() !=0>${item.getContentHeight()}px;</#if>">
-            <span slot="tab">
-                <#if item.getPSSysImage()??>
-                    <#assign sysimage = item.getPSSysImage()/>
-                    <#if sysimage.getImagePath() ==  "">
-                        <i class='${sysimage.getCssClass()}'></i>&nbsp;
-                    <#else>
-                        <img src='${sysimage.getImagePath()}'/>&nbsp;
-                    </#if>
-                </#if>
-                ${item.getCaption()}
-            </span>
-        <#list item.getPSDEFormDetails() as formmenber>
-            ${P.getPartCode(formmenber).code}
-        </#list>
-        </a-tab-pane>
+    ${content}
 </#if>
\ No newline at end of file

@CONTROL/表单/CONTROL.vue#DETAIL_GROUPPANEL.ftl

-<#--  <#if item.getPSLayout()?? &&  item.getPSLayout().getLayout() == "FLEX">
-<#assign pageLayout = item.getPSLayout()>  -->
+<#assign content>
+    <#list item.getPSDEFormDetails() as formmenber>
+    <#if !(formmenber.isHidden?? && formmenber.isHidden())>
+    <#ibizinclude>
+    ../@MACRO/CONTROL/FORM_MEMBER_LAYOUT.tsx.ftl
+    </#ibizinclude>
+    </#if>
+    </#list>
+</#assign>
 <div class="app-form-group<#if item.getPSSysCss?? && item.getPSSysCss()??>  ${item.getPSSysCss().getCssName()}</#if><#if item.isInfoGroupMode()?? &&  item.isInfoGroupMode() == true>  app-info-form-group</#if>"  style="<#if item.getContentHeight()?? && item.getContentHeight() !=0 >height:${item.getContentHeight()}px;</#if><#if item.getContentWidth()?? && item.getContentWidth() !=0>width:${item.getContentWidth()}px;</#if>">
 <#if item.render??>
 ${item.render.code}
@@ -19,19 +26,32 @@ ${item.render.code}
             ${item.getCaption()}
             </template>
         <p class="app-form-group-content">
-        <#list item.getPSDEFormDetails() as formmenber>
-            ${P.getPartCode(formmenber).code}
-        </#list>
+            <#if item.getPSLayout()?? &&  item.getPSLayout().getLayout() == "FLEX">
+            <#assign pageLayout = item.getPSLayout()>
+                <div style="height: 100%;display: flex;<#if pageLayout.getDir()!="">flex-direction: ${pageLayout.getDir()};</#if><#if pageLayout.getAlign()!="">justify-content: ${pageLayout.getAlign()};</#if><#if pageLayout.getVAlign()!="">align-items: ${pageLayout.getVAlign()};</#if>">
+                    ${content}
+                </div>
+            <#else>
+                <row>
+                    ${content}
+                </row>
+            </#if>
         </p>
       </a-collapse-panel>
     </a-collapse>
   <#else>
       <p class="app-form-group-content">
-        <#list item.getPSDEFormDetails() as formmenber>
-            ${P.getPartCode(formmenber).code}
-        </#list>
+        <#if item.getPSLayout()?? &&  item.getPSLayout().getLayout() == "FLEX">
+        <#assign pageLayout = item.getPSLayout()>
+            <div style="height: 100%;display: flex;<#if pageLayout.getDir()!="">flex-direction: ${pageLayout.getDir()};</#if><#if pageLayout.getAlign()!="">justify-content: ${pageLayout.getAlign()};</#if><#if pageLayout.getVAlign()!="">align-items: ${pageLayout.getVAlign()};</#if>">
+                ${content}
+            </div>
+        <#else>
+            <row>
+                ${content}
+            </row>
+        </#if>
       </p>
   </#if>
 </#if>
-</div>
-<#--  </#if>  -->
\ No newline at end of file
+</div>
\ No newline at end of file

@CONTROL/表单/CONTROL.vue#FORM.ftl

@@ -3,6 +3,7 @@ ${ctrl.render.code}
 <#else>
 <div>
   <a-form class="app-form<#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()>  ${singleCss.getCssName()}</#if><#if ctrl.isInfoFormMode()?? && ctrl.isInfoFormMode() == true>  app-info-form</#if>"  style="<#if ctrl.getFormWidth()?? && ctrl.getFormWidth() != 0>width:${ctrl.getFormWidth()}px;</#if><#if ctrl.getHeight()?? && ctrl.getHeight() != 0>height:${ctrl.getHeight()}px;</#if>">
+        <a-row>
 <#if ctrl.isNoTabHeader()>
     <#list ctrl.getPSDEFormPages() as formmenber>
         ${P.getPartCode(formmenber).code}
@@ -10,10 +11,28 @@ ${ctrl.render.code}
 <#else>
         <a-tabs <#list ctrl.getPSDEFormPages() as formPage><#if formPage_index == 0>defaultActiveKey="${formPage.getName()}"</#if></#list> @change="formPageSelected">
 <#list ctrl.getPSDEFormPages() as formPage>
-            ${P.getPartCode(formPage).code}
+        <#if formPage.render??>
+        ${formPage.render.code}
+        <#else>
+            <a-tab-pane key="${formPage.getName()}"  class="app-form-page <#if formPage.getPSSysCss?? && formPage.getPSSysCss()??>${formPage.getPSSysCss().getCssName()}</#if>"  style="<#if formPage.getContentWidth()?? && formPage.getContentWidth() != 0>width:${formPage.getContentWidth()}px;</#if><#if formPage.getContentHeight()?? &&  formPage.getContentHeight() !=0>${formPage.getContentHeight()}px;</#if>">
+                <span slot="tab">
+                    <#if formPage.getPSSysImage()??>
+                        <#assign sysimage = formPage.getPSSysImage()/>
+                        <#if sysimage.getImagePath() ==  "">
+                            <i class='${sysimage.getCssClass()}'></i>&nbsp;
+                        <#else>
+                            <img src='${sysimage.getImagePath()}'/>&nbsp;
+                        </#if>
+                    </#if>
+                    ${formPage.getCaption()}
+                </span>
+                ${P.getPartCode(formpage).code}
+            </a-tab-pane>
+        </#if>
 </#list>
         </a-tabs>
 </#if>
+        </a-row>
     </a-form>
 </div>
 </#if>
\ No newline at end of file