lxm--门户部件flex布局修复

@CONTROL/数据看板/CONTROL-BASE.vue.ftl

@@ -4,10 +4,18 @@
       <app-build @handleClick="handleClick"></app-build>
     </row>
     <row v-if="!isHasCustomized">
-      <#list ctrl.getPSPortlets() as portlet><#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>
+    <#--  BEGIN：处理参数layout，LayoutPos  -->
+    <#assign layout='TABLE_24COL'>
+    <#if portlet.getPSLayoutPos()??>
+      <#if portlet.getPSLayoutPos().getParentPSLayout()??>
+        <#assign layout='${portlet.getPSLayoutPos().getParentPSLayout().getLayout()}'>
+      </#if>
+    </#if>
     <#assign LayoutPos = portlet.getPSLayoutPos()><#t>
+    <#--  END：处理参数layout，LayoutPos  -->
+    <#--  BEGIN：第一个门户部件前  -->
     <#if portlet_index == 0 >
       <#list ctrl.getPSPortlets() as container><#t>
         <#if container.getPortletType() == 'CONTAINER' && layout == 'FLEX'>
@@ -16,6 +24,8 @@
       </#list>
           <div style = '<#if layout == 'FLEX' > display : flex; justify-content : ${flexLayout.getAlign()}; flex-direction:${flexLayout.getDir()} ;align-items:${flexLayout.getVAlign()};flex-wrap: wrap;</#if>'>
     </#if>
+    <#--  END：第一个门户部件前  -->
+    <#--  BEGIN：门户部件绘制，栅格布局  -->
     <#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>>
         <card class="portlet-card" :bordered="false" dis-hover :padding="0">
@@ -27,28 +37,14 @@
           <a slot='extra'></a>
           </#if> 
           <span>
-<@ibizindent blank=10><#t>
-${P.getCtrlCode(portlet, 'CONTROL.html').code}
-</@ibizindent>
-          </span>
-        </card>
-      </i-col>
-        <#else>
-      <card class="portlet-card" :bordered="false" dis-hover :padding="0">
-        <#if portlet.isShowTitleBar() && portlet.getTitle()?has_content><#t>
-        <p slot='title'>
-          ${portlet.getTitle()}
-        </p>
-        <a slot='extra'></a>
-        </#if> 
-        <span>
             <@ibizindent blank=10><#t>
             ${P.getCtrlCode(portlet, 'CONTROL.html').code}
             </@ibizindent>
           </span>
         </card>
-        </#if>
-        <#if layout == 'FLEX'>
+      </i-col>
+    <#--  ELSE：门户部件布局，Flex  -->
+    <#else>
       <card class="portlet-card" :bordered="false" dis-hover :padding="0">
         <#if portlet.isShowTitleBar() && portlet.getTitle()?has_content><#t>
         <p slot='title'>
@@ -63,11 +59,14 @@ ${P.getCtrlCode(portlet, 'CONTROL.html').code}
         </span>
       </card>
     </#if>
+    <#--  END：门户部件布局  -->
+    <#--  BEGIN：最后一个门户部件后  -->
     <#if !portlet_has_next>
       </div>
     </#if>
+    <#--  END：最后一个门户部件后  -->
   </#if>
-      </#list>
+</#list>
     </row>
     <row v-if="isHasCustomized" style="width: 100%;min-height: calc(100% - 40px);">
       <div class="portlet-container" style="position: relative;width:100%;">