调整面板内容

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

@@ -7,7 +7,7 @@
   <#if item.render??>
   ${item.render.code}
   <#else>
-    <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>">
+    <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>">
       <@ibizindent blank=8>
       <#if item.getPSPanelItems()??>
       <#list item.getPSPanelItems() as panelItem>
@@ -23,7 +23,7 @@
   <#if item.render??>
   ${item.render.code}
   <#else>
-    <row style="height:100%;<#if item.getPSSysCss()??>${item.getPSSysCss().getRawCssStyle()}</#if>">
+    <row style="height:100%;">
       <@ibizindent blank=8>
       <#if item.getPSPanelItems()??>
       <#list item.getPSPanelItems() as panelItem>

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

@@ -3,11 +3,11 @@
 ./@MACRO/PLAYOUT.vue.ftl
 </#ibizinclude>
 <#if layout.getLayout()=='FLEX'>
-<div v-show="detailsModel.${item.name}.visible" class="app-layoutpanel-tabpage<#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>">
+<el-tab-pane label="<#if item.getCaption()??>${item.getCaption()}<#else>分页</#if>" name="${item.getName()}" v-show="detailsModel.${item.name}.visible" class="app-layoutpanel-tabpage<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>">
   <#if item.render??>
   ${item.render.code}
   <#else>
-    <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>">
+    <div style="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.getWidth() gt 0>width: ${item.getWidth()?c}px;</#if><#if item.getHeight() gt 0>height: ${item.getHeight()?c}px;<#else>height:100%;</#if>">
       <@ibizindent blank=8>
       <#if item.getPSPanelItems()??>
       <#list item.getPSPanelItems() as panelItem>
@@ -17,13 +17,13 @@
       </@ibizindent>
     </div>
   </#if>
-</div>
+</el-tab-pane>
 <#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-tabpage<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>">
+<el-tab-pane label="<#if item.getCaption()??>${item.getCaption()}<#else>分页</#if>" name="${item.getName()}" v-show="detailsModel.${item.name}.visible" class="app-layoutpanel-tabpage<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>">
   <#if item.render??>
   ${item.render.code}
   <#else>
-    <row style="height:100%;<#if item.getPSSysCss()??>${item.getPSSysCss().getRawCssStyle()}</#if>">
+    <row style="<#if item.getWidth() gt 0>width: ${item.getWidth()?c}px;</#if><#if item.getHeight() gt 0>height: ${item.getHeight()?c}px;<#else>height:100%;</#if>">
       <@ibizindent blank=8>
       <#if item.getPSPanelItems()??>
       <#list item.getPSPanelItems() as panelItem>
@@ -33,5 +33,5 @@
       </@ibizindent>
     </row>
   </#if>
-</i-col>
+</el-tab-pane>
 </#if>
\ No newline at end of file

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

@@ -6,11 +6,13 @@
   ${item.render.code}
   <#else>
   <@ibizindent blank=8>
+  <el-tabs>
   <#if item.getPSPanelTabPages?? && item.getPSPanelTabPages()??>
   <#list item.getPSPanelTabPages() as tabPage>
   ${P.getPartCode(tabPage).code}
   </#list>
   </#if>
+  </el-tabs>
   </@ibizindent>
   </#if>
 </div>
\ No newline at end of file