Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7 into dev

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

@@ -50,7 +50,7 @@
                 <card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
               </#if>
               <#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content>
-              <#if ctrl.getViewStyle?? && ctrl.getViewStyle()?? && ctrl.getViewStyle() == 'CARDPORTAL'>
+              <#if ctrl.getViewStyle?? && ctrl.getViewStyle()?? && ctrl.getViewStyle() != 'DEFAULT'>
                 <a slot='extra'></a>
               <#else>
               <p slot='title'>
@@ -77,7 +77,7 @@
             <card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
           </#if>
             <#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content>
-            <#if ctrl.getViewStyle?? && ctrl.getViewStyle()?? && ctrl.getViewStyle() == 'CARDPORTAL'>
+            <#if ctrl.getViewStyle?? && ctrl.getViewStyle()?? && ctrl.getViewStyle() != 'DEFAULT'>
               <a slot='extra'></a>
             <#else>
               <p slot='title'>