lxm--门户部件--fix3

6d5de021 · WodahsOrez · 69ce061e · 6d5de021 · 6d5de021 · 6d5de021
--- a/@CONTROL/数据看板/CONTROL-BASE.vue.ftl
+++ b/@CONTROL/数据看板/CONTROL-BASE.vue.ftl
@@ -4,32 +4,27 @@
      <app-build @handleClick="handleClick"></app-build>
    </row>
    <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> '>
+</#if>
+<#--  END：看板Flex布局-前  -->
 <#list ctrl.getPSPortlets() as portlet><#t>
  <#if portlet.getPortletType?? && portlet.getPortletType()??><#t>
-    <#--  BEGIN：处理参数layout，LayoutPos  -->
+    <#--  BEGIN：获取父的layout，自己的LayoutPos  -->
    <#assign layout='TABLE_24COL'>
-    <#if portlet.getPSLayoutPos()??>
+    <#if portlet.getPSLayoutPos?? && 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'>
-          <#assign flexLayout = container.getPSLayout()><#t>
-        </#if>
-      </#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：第一个门户部件前  -->
+    <#--  END：获取父的layout，自己的LayoutPos  -->
    <#--  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">
-          <#if portlet.isShowTitleBar() && portlet.getTitle()?has_content>
+          <#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content>
          <p slot='title'>
            ${portlet.getTitle()}
            <span class="line"></span>
@@ -43,12 +38,13 @@
          </span>
        </card>
      </i-col>
-    <#--  ELSE：门户部件布局，Flex  -->
+    <#--  ELSE：门户部件绘制，Flex  -->
    <#else>
      <card class="portlet-card" :bordered="false" dis-hover :padding="0">
-        <#if portlet.isShowTitleBar() && portlet.getTitle()?has_content><#t>
+        <#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content>
        <p slot='title'>
          ${portlet.getTitle()}
+          <span class="line"></span>
        </p>
        <a slot='extra'></a>
        </#if> 
@@ -59,14 +55,14 @@
        </span>
      </card>
    </#if>
-    <#--  END：门户部件布局  -->
+    <#--  END：门户部件绘制  -->
-    <#--  BEGIN：最后一个门户部件后  -->
-    <#if !portlet_has_next>
-      </div>
-    </#if>
-    <#--  END：最后一个门户部件后  -->
  </#if>
 </#list>
+    <#--  BEGIN：看板Flex布局-后  -->
+    <#if ctrl.getLayoutMode?? && ctrl.getLayoutMode() == 'FLEX'>
+    </div>
+    </#if>
+    <#--  END：看板Flex布局-后  -->
    </row>
    <row v-if="isHasCustomized" style="width: 100%;min-height: calc(100% - 40px);">
      <div class="portlet-container" style="position: relative;width:100%;">

--- a/@CONTROL/门户部件/CONTROL-BASE.vue.ftl
+++ b/@CONTROL/门户部件/CONTROL-BASE.vue.ftl
 <#if ctrl.getPortletType() != 'CONTAINER'>
-  <#assign portletHeight = "calc(100% - 16px)">
-  <#assign portletWidth = "calc(100% - 16px)">
-  <#assign portletClass = "portlet">
 <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>}">
+    <div class='portlet ${srffilepath2(ctrl.getCodeName())} <#if ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>' :style="{<#if (ctrl.getHeight?? && ctrl.getHeight() gt 0)>'height': isAdaptiveSize ? 'calc(100% - 16px)' : <#if ctrl.getHeight() == 0>'auto'<#else>'${ctrl.getHeight()?c}px'</#if>,</#if><#if (ctrl.getWidth?? && ctrl.getWidth() gt 0)>'width': isAdaptiveSize ? 'calc(100% - 16px)' : '${ctrl.getWidth()?c}px '</#if>}">
    <#if ctrl.getPortletType?? && ctrl.getPortletType()??><#t>
        <#--  视图  -->
        <#if ctrl.getPortletType() == 'VIEW' && ctrl.getPortletPSAppView?? && ctrl.getPortletPSAppView()??><#t>

--- a/@CONTROL/门户部件/CONTROL.html.ftl
+++ b/@CONTROL/门户部件/CONTROL.html.ftl
@@ -4,17 +4,25 @@
 ../@MACRO/HTML/DEFAULT.html.ftl
 </#ibizinclude>
 <#else>
-  <#assign portletClass = "portlet-container">
+  <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>}">
-  <#assign portletHeight = "100%">
+    <row>
-  <#assign portletWidth = "100%">
+  <#--  BEGIN：容器Flex布局-前  -->
-  <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.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> '>
+  </#if>
+  <#--  END：容器Flex布局-前  -->
  <#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?? && portlet.getPSLayoutPos()??>
+        <#if portlet.getPSLayoutPos().getParentPSLayout()??>
+          <#assign layout='${portlet.getPSLayoutPos().getParentPSLayout().getLayout()}'>
+        </#if>
        <#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>
+      <#--  END：获取父的layout，自己的LayoutPos  --> 
+        <#--  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>>
            <div class="portlet-without-title">
@@ -23,6 +31,7 @@
              </@ibizindent>
            </div>
        </i-col>
+        <#--  BEGIN：子门户部件绘制,Flex  -->
        <#else>
        <div class="portlet-without-title">
          <@ibizindent blank=18>
@@ -30,10 +39,14 @@
          </@ibizindent>
        </div>
        </#if>
-        <#if layout == 'FLEX' >
+        <#--  END：子门户部件绘制  -->
-        </div>
-        </#if>
    </#if>
  </#list>
+  <#--  BEGIN：容器Flex布局-后  -->
+  <#if ctrl.getLayoutMode?? && ctrl.getLayoutMode() == 'FLEX'>
+      </div>
+  </#if>
+    </row>
+  <#--  END：容器Flex布局-后  -->
  </div>
 </#if>
\ No newline at end of file