Merge branch 'dev' --- fix1

@CONTROL/表格/CONTROL-BASE.vue.ftl

@@ -17,6 +17,7 @@
         :show-summary="true && items.length > 0"
         :summary-method="getSummaries"
         </#if>
+        :height="isEnablePagingBar && items.length > 0 ? 'calc(100% - 50px)' : '100%'" 
         <#-- 表格聚合end -->  
         :highlight-current-row ="isSingleSelect"
         :row-class-name="getRowClassName"