Merge branch 'dev'

@CONTROL/视图布局面板/实体数据看板视图 (卡片)/VIEW.less.ftl

@@ -11,6 +11,9 @@
     >.ivu-card-head{
         display: none;
     }
+    >.ivu-card-body {
+      height: 100%;
+    }
   }
   .portlet-card {
     background-color: #f0f2f5;
@@ -26,4 +29,4 @@
   }
 
 }
-  </#if>
\ No newline at end of file
+</#if>
\ No newline at end of file

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

@@ -42,7 +42,7 @@
   </#if>
   > .portlet-with-title{
     width:100%;
-    height:calc(100% - 52px);
+    height:calc(100% - 58px);
     overflow:auto;
     padding:0px 12px;
   }