lxm--门户部件--fix4

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

@@ -6,7 +6,7 @@
     <row v-if="!isHasCustomized">
 <#--  BEGIN：看板Flex布局-前  -->
 <#if ctrl.getLayoutMode?? && ctrl.getLayoutMode() == '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> '>
+    <div style = '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>
 <#--  END：看板Flex布局-前  -->
 <#list ctrl.getPSPortlets() as portlet><#t>

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

@@ -5,10 +5,11 @@
 </#ibizinclude>
 <#else>
   <div class='portlet-container ${srffilepath2(ctrl.getCodeName())} <#if ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>' :style="{<#if (ctrl.getHeight?? && ctrl.getHeight() gt 0)>'height': isAdaptiveSize ? '100%' : <#if ctrl.getHeight() == 0>'auto'<#else>'${ctrl.getHeight()?c}px'</#if>,</#if><#if (ctrl.getWidth?? && ctrl.getWidth() gt 0)>'width': isAdaptiveSize ? '100%' : '${ctrl.getWidth()?c}px '</#if>}">
-    <row>
   <#--  BEGIN：容器Flex布局-前  -->
   <#if ctrl.getLayoutMode?? && ctrl.getLayoutMode() == '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> '>
+      <div style = '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>'>
+  <#else>
+      <row>
   </#if>
   <#--  END：容器Flex布局-前  -->
   <#list ctrl.getPSPortlets() as portlet><#t>
@@ -45,8 +46,9 @@
   <#--  BEGIN：容器Flex布局-后  -->
   <#if ctrl.getLayoutMode?? && ctrl.getLayoutMode() == 'FLEX'>
       </div>
+  <#else>
+      </row>
   </#if>
-    </row>
   <#--  END：容器Flex布局-后  -->
   </div>
 </#if>
\ No newline at end of file