lxm--门户部件

@CONTROL/门户部件/CONTROL-BASE.vue.ftl

-<#if ctrl.getPortletType() == 'CONTAINER'>
-  <#assign portletClass = "portlet-container">
-  <#assign portletHeight = "100%">
-  <#assign portletWidth = "100%">
-<#else>
+<#if ctrl.getPortletType() != 'CONTAINER'>
   <#assign portletHeight = "calc(100% - 16px)">
   <#assign portletWidth = "calc(100% - 16px)">
   <#assign portletClass = "portlet">
-</#if>
 <template>
     <div class='${portletClass} ${srffilepath2(ctrl.getCodeName())} <#if ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>' :style="{<#if (ctrl.getHeight?? && ctrl.getHeight() gt 0)>'height': isAdaptiveSize ? '${portletHeight}' : <#if ctrl.getHeight() == 0>'auto'<#else>'${ctrl.getHeight()?c}px'</#if>,</#if><#if (ctrl.getWidth?? && ctrl.getWidth() gt 0)>'width': isAdaptiveSize ? '${portletWidth}' : '${ctrl.getWidth()?c}px '</#if>}">
     <#if ctrl.getPortletType?? && ctrl.getPortletType()??><#t>
@@ -77,35 +72,6 @@
         <div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
         <iframe src="<#if ctrl.getPageUrl()??>${ctrl.getPageUrl()}</#if>" style="height: <#if ctrl.getHeight() gt 0>${ctrl.getHeight()?c}<#else>400</#if>px;width: 100%;border-width: 1px;"></iframe>
         </div>         
-        <#--  容器  -->
-        <#elseif  ctrl.getPortletType() == 'CONTAINER'><#t>
-        <#list ctrl.getPSPortlets() as portlet><#t>
-            <#if portlet.getPortletType?? && portlet.getPortletType()??><#t>
-            <#assign layout='TABLE_24COL'><#if portlet.getPSLayoutPos()??><#if portlet.getPSLayoutPos().getParentPSLayout()??><#assign layout='${portlet.getPSLayoutPos().getParentPSLayout().getLayout()}'></#if></#if><#t>
-            <#assign LayoutPos = portlet.getPSLayoutPos()><#t>
-            <#if layout == 'FLEX' >
-            <div style = '<#if layout == 'FLEX' > display : flex; <#if ctrl.getFlexAlign()??> justify-content :${ctrl.getFlexAlign()};</#if> <#if ctrl.getFlexDir()??> flex-direction:${ctrl.getFlexDir()};</#if> <#if ctrl.getFlexVAlign()??>align-items:${ctrl.getFlexVAlign()};</#if></#if> '>
-            </#if>
-            <#if layout == 'TABLE_24COL' && LayoutPos??><#t>
-            <i-col<#if LayoutPos.getColXS() != -1> :xs="{ span: ${LayoutPos.getColXS()}, offset: <#if LayoutPos.getColXSOffset() != -1>${LayoutPos.getColXSOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColSM() != -1> :sm="{ span: ${LayoutPos.getColSM()}, offset: <#if LayoutPos.getColSMOffset() != -1>${LayoutPos.getColSMOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColMD() != -1> :md="{ span: ${LayoutPos.getColMD()}, offset: <#if LayoutPos.getColMDOffset() != -1>${LayoutPos.getColMDOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColLG() != -1> :lg="{ span: ${LayoutPos.getColLG()}, offset: <#if LayoutPos.getColLGOffset() != -1>${LayoutPos.getColLGOffset()}<#else>0</#if> }"</#if>>
-                <div class="portlet-without-title">
-                <@ibizindent blank=18>
-                ${P.getCtrlCode(portlet, 'CONTROL.html').code}
-                </@ibizindent>
-                </div>
-            </i-col>
-            <#else>
-            <div class="portlet-without-title">
-            <@ibizindent blank=18>
-            ${P.getCtrlCode(portlet, 'CONTROL.html').code}
-            </@ibizindent>
-            </div>
-            </#if>
-            <#if layout == 'FLEX' >
-            </div>
-            </#if>
-            </#if>
-        </#list>
         <#--  其他部件  -->
         <#elseif ctrl.getContentPSControl()??><#t>
         <#if ctrl.isShowTitleBar() && ctrl.getTitle()??>
@@ -263,4 +229,6 @@
 
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL-BASE.style.ftl
-</#ibizinclude>
\ No newline at end of file
+</#ibizinclude>
+
+</#if>
\ No newline at end of file

@CONTROL/门户部件/CONTROL.html.ftl

+<#--    -->
+<#if ctrl.getPortletType() != 'CONTAINER'>
 <#ibizinclude>
 ../@MACRO/HTML/DEFAULT.html.ftl
-</#ibizinclude>
\ No newline at end of file
+</#ibizinclude>
+<#else>
+  <#assign portletClass = "portlet-container">
+  <#assign portletHeight = "100%">
+  <#assign portletWidth = "100%">
+  <div class='${portletClass} ${srffilepath2(ctrl.getCodeName())} <#if ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>' :style="{<#if (ctrl.getHeight?? && ctrl.getHeight() gt 0)>'height': isAdaptiveSize ? '${portletHeight}' : <#if ctrl.getHeight() == 0>'auto'<#else>'${ctrl.getHeight()?c}px'</#if>,</#if><#if (ctrl.getWidth?? && ctrl.getWidth() gt 0)>'width': isAdaptiveSize ? '${portletWidth}' : '${ctrl.getWidth()?c}px '</#if>}">
+  </div>
+</#if>
\ No newline at end of file

@CONTROL/门户部件/CONTROL.less.ftl

+<#if ctrl.getPortletType() != 'CONTAINER'>
 <#ibizinclude>
 ../@MACRO/CSS/DEFAULT.less.ftl
 </#ibizinclude>
@@ -51,4 +52,5 @@
       }
     }
   }
-}
\ No newline at end of file
+}
+</#if>
\ No newline at end of file

@CONTROL/门户部件/CONTROL.vue.ftl

+<#if ctrl.getPortletType() != 'CONTAINER'>
 <#assign import_block>
 <#if ctrl.getPSPortlets?? && ctrl.getPSPortlets()??>
 <#list ctrl.getPSPortlets() as subctrl>
@@ -62,4 +63,5 @@ import layout_${panel.getName()} from '@widgets/${srffilepath2(panel.getPSAppDat
 export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.getPSAppDataEntity().getCodeName()}')}</#if>${srfclassname('${ctrl.codeName}')} extends <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.getPSAppDataEntity().getCodeName()}')}</#if>${srfclassname('${ctrl.codeName}')}Base {
 
 }
-</script>
\ No newline at end of file
+</script>
+</#if>
\ No newline at end of file

@CONTROL/门户部件/MODEL.ts.ftl

+<#if ctrl.getPortletType() != 'CONTAINER'>
 <#ibizinclude>
 ../@MACRO/MODEL/DEFAULT.ts.ftl
-</#ibizinclude>
\ No newline at end of file
+</#ibizinclude>
+</#if>
\ No newline at end of file

@CONTROL/门户部件/SERVICE.ts.ftl

+<#if ctrl.getPortletType() != 'CONTAINER'>
 <#ibizinclude>
 ../@MACRO/SERVICE/DEFAULT.ts.ftl
-</#ibizinclude>
\ No newline at end of file
+</#ibizinclude>
+</#if>
\ No newline at end of file