调整面板和面板容器内容

@CONTROL/面板/CONTROL-BASE.vue#ITEM_CONTAINER.ftl

@@ -3,17 +3,10 @@
 ./@MACRO/PLAYOUT.vue.ftl
 </#ibizinclude>
 <#if layout.getLayout()=='FLEX'>
-<div v-show="detailsModel.${item.name}.visible" class="app-layoutpanel-container<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>" style="${flexAttr}<#if item.getWidth() gt 0>width: ${item.getWidth()?c}px;</#if><#if item.getHeight() gt 0>height: ${item.getHeight()?c}px;</#if>">
+<i-col v-show="detailsModel.${item.name}.visible" ${tableAttr} class="app-layoutpanel-container<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>" style="${flexAttr}<#if item.getWidth() gt 0>width: ${item.getWidth()?c}px;</#if><#if item.getHeight() gt 0>height: ${item.getHeight()?c}px;</#if>">
   <#if item.render??>
   ${item.render.code}
   <#else>
-    <#--  <#if item.isShowCaption()>
-    <#if item.getLabelPSSysCss()??>
-    <div class="${item.getLabelPSSysCss().getCssName()}" style="height: 50px;${item.getLabelPSSysCss().getRawCssStyle()}">${item.getCaption()}</div>
-    <#else>
-    <div style="height: 50px;">${item.getCaption()}</div>
-    </#if>
-    </#if>  -->
     <div style="height:100%;display: flex;<#if layout.getDir()!="">flex-direction: ${layout.getDir()};</#if><#if layout.getAlign()!="">justify-content: ${layout.getAlign()};</#if><#if layout.getVAlign()!="">align-items: ${layout.getVAlign()};</#if><#if item.getPSSysCss()??>${item.getPSSysCss().getRawCssStyle()}</#if>">
       <@ibizindent blank=8>
       <#if item.getPSPanelItems()??>
@@ -24,19 +17,12 @@
       </@ibizindent>
     </div>
   </#if>
-</div>
+</i-col>
 <#else>
-<i-col v-show="detailsModel.${item.name}.visible" ${tableAttr} style="${flexAttr}<#if item.getWidth() gt 0>width: ${item.getWidth()?c}px;</#if><#if item.getHeight() gt 0>height: ${item.getHeight()?c}px;</#if>" class="app-layoutpanel-container<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>">
+<i-col v-show="detailsModel.${item.name}.visible" ${tableAttr}  class="app-layoutpanel-container<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>" style="${flexAttr}<#if item.getWidth() gt 0>width: ${item.getWidth()?c}px;</#if><#if item.getHeight() gt 0>height: ${item.getHeight()?c}px;</#if>">
   <#if item.render??>
   ${item.render.code}
   <#else>
-    <#--  <#if item.isShowCaption()>
-    <#if item.getLabelPSSysCss()??>
-    <div class="${item.getLabelPSSysCss().getCssName()}" style="height: 50px;${item.getLabelPSSysCss().getRawCssStyle()}">${item.getCaption()}</div>
-    <#else>
-    <div style="height: 50px;">${item.getCaption()}</div>
-    </#if>
-    </#if>  -->
     <row style="height:100%;<#if item.getPSSysCss()??>${item.getPSSysCss().getRawCssStyle()}</#if>">
       <@ibizindent blank=8>
       <#if item.getPSPanelItems()??>

@CONTROL/面板/CONTROL-BASE.vue#PANEL.ftl

 <#if ctrl.render??>
 ${ctrl.render.code}
 <#else>
-<div class='panel-container<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>' style="<#if ctrl.getWidth() gt 0>width: ${ctrl.getWidth()?c}px;</#if><#if ctrl.getHeight() gt 0>height: ${ctrl.getHeight()?c}px;</#if>">
 <#if ctrl.getLayoutMode()=='FLEX'>
-    <div class="app-layoutpanel" style="height:100%;display: flex;">
+    <row class="app-layoutpanel <#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" style="<#if ctrl.getWidth() gt 0>width: ${ctrl.getWidth()?c}px;</#if><#if ctrl.getHeight() gt 0>height: ${ctrl.getHeight()?c}px;<#else>height:100%;</#if>display: flex;">
 <@ibizindent blank=8>
 <#if ctrl.getRootPSPanelItems()??>
 <#list ctrl.getRootPSPanelItems() as item>
@@ -11,9 +10,9 @@ ${P.getPartCode(item).code}
 </#list>
 </#if>
 </@ibizindent>
-    </div>
+    </row>
 <#else>
-    <row class="app-layoutpanel" style="height:100%;">
+    <row class="app-layoutpanel <#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" style="<#if ctrl.getWidth() gt 0>width: ${ctrl.getWidth()?c}px;</#if><#if ctrl.getHeight() gt 0>height: ${ctrl.getHeight()?c}px;<#else>height:100%;</#if>">
 <@ibizindent blank=8>
 <#if ctrl.getRootPSPanelItems()??>
 <#list ctrl.getRootPSPanelItems() as item>
@@ -23,5 +22,4 @@ ${P.getPartCode(item).code}
 </@ibizindent>
     </row>
 </#if>
-</div>
 </#if>
\ No newline at end of file