update

@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>
+<div nz-col <#if LayoutPos.getColXS() != -1> [nzSm]="{ span: ${LayoutPos.getColXS()}, offset: <#if LayoutPos.getColXSOffset() != -1>${LayoutPos.getColXSOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColSM() != -1> [nzMd]="{ span: ${LayoutPos.getColSM()}, offset: <#if LayoutPos.getColSMOffset() != -1>${LayoutPos.getColSMOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColMD() != -1> [nzLg]="{ span: ${LayoutPos.getColMD()}, offset: <#if LayoutPos.getColMDOffset() != -1>${LayoutPos.getColMDOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColLG() != -1> [nzXl]="{ span: ${LayoutPos.getColLG()}, offset: <#if LayoutPos.getColLGOffset() != -1>${LayoutPos.getColLGOffset()}<#else>0</#if> }"</#if>>
     ${P.getPartCode(formmenber).code}
-</Col>
+</div>
 <#elseif layout == 'FLEX'>
-<div>
+<div 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>

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

@@ -10,19 +10,17 @@
     </#if>
     </#list>
 </#assign>
-<Collapse defaultActiveKey={['${item.getName()}']} className='<#if item.getPSSysCss?? && item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>'>
-    <Panel header="${item.getCaption()}" key="${item.getName()}">
-<@ibizindent blank=8>
+<nz-card [nzBordered]="false" nzTitle="${item.getCaption()}">
+<@ibizindent blank=4>
 <#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>
+    <div nz-row>
         ${content}
-    </Row>
+    </div>
 </#if>
 </@ibizindent>
-    </Panel>
-</Collapse>
\ No newline at end of file
+</nz-card>
\ No newline at end of file

@CONTROL/表单/CONTROL.html.ftl

 <form nz-form nz-row class="app-form<#if ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>">
-    <#if ctrl.isNoTabHeader()>
-    <#list ctrl.getPSDEFormPages() as formmenber>
-        ${P.getPartCode(formmenber).code}
-    </#list>
-    <#else>
-    <nz-tabset>
-        <#list ctrl.getPSDEFormPages() as formpage>
-        <nz-tab [nzTitle]="#${formpage.name}Template">
-            <ng-template #${formpage.name}Template>
-                <#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()}
-            </ng-template>
-            ${P.getPartCode(formpage).code}
-        </nz-tab>
+    <div nz-row>
+        <#if ctrl.isNoTabHeader()>
+        <#list ctrl.getPSDEFormPages() as formmenber>
+            ${P.getPartCode(formmenber).code}
         </#list>
-    </nz-tabset>
-    </#if>
+        <#else>
+        <nz-tabset>
+            <#list ctrl.getPSDEFormPages() as formpage>
+            <nz-tab [nzTitle]="#${formpage.name}Template">
+                <ng-template #${formpage.name}Template>
+                    <#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()}
+                </ng-template>
+                ${P.getPartCode(formpage).code}
+            </nz-tab>
+            </#list>
+        </nz-tabset>
+        </#if>
+    </div>
 </form>
\ No newline at end of file