lxm--容器标题--fix1

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

@@ -4,21 +4,12 @@
 ../@MACRO/HTML/DEFAULT.html.ftl
 </#ibizinclude>
 <#else>
-  <card class="portlet-card" :bordered="false" dis-hover :padding="0">
-    <#if ctrl.isShowTitleBar() && ctrl.getTitle()?has_content>
-    <p slot='title'>
-      ${ctrl.getTitle()}
-      <span class="line"></span>
-    </p>
-    <a slot='extra'></a>
-    </#if> 
-    <span>
-      <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>}">
+  <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>}">
   <#--  BEGIN：容器Flex布局-前  -->
   <#if ctrl.getLayoutMode?? && ctrl.getLayoutMode() == 'FLEX'>
-          <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>'>
+      <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>
+      <row>
   </#if>
   <#--  END：容器Flex布局-前  -->
   <#list ctrl.getPSPortlets() as portlet><#t>
@@ -34,32 +25,52 @@
       <#--  END：获取父的layout，自己的LayoutPos  --> 
         <#--  BEGIN：子门户部件绘制，栅格绘制  -->
         <#if (layout == 'TABLE_24COL' || layout == 'TABLE_12COL') && 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>
+        <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">
+              <card class="portlet-card" :bordered="false" dis-hover :padding="0">
+              <#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> 
+              <span>
+                <@ibizindent blank=14><#t>
+                ${P.getCtrlCode(portlet, 'CONTROL.html').code}
+                </@ibizindent>
+              </span>
+            </card>
+            </div>
+        </i-col>
         <#--  BEGIN：子门户部件绘制,Flex  -->
         <#else>
-            <div class="portlet-without-title">
-              <@ibizindent blank=18>
+        <div class="portlet-without-title">
+          <card class="portlet-card" :bordered="false" dis-hover :padding="0">
+            <#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> 
+            <span>
+              <@ibizindent blank=14><#t>
               ${P.getCtrlCode(portlet, 'CONTROL.html').code}
               </@ibizindent>
-            </div>
+            </span>
+          </card>
+        </div>
         </#if>
         <#--  END：子门户部件绘制  -->
     </#if>
   </#list>
   <#--  BEGIN：容器Flex布局-后  -->
   <#if ctrl.getLayoutMode?? && ctrl.getLayoutMode() == 'FLEX'>
-          </div>
+      </div>
   <#else>
-          </row>
+      </row>
   </#if>
   <#--  END：容器Flex布局-后  -->
-      </div>
-    </span>
-  </card>
+  </div>
 </#if>
\ No newline at end of file