hrsass-components 1.7.71 → 1.7.72

package/lib/hrsass-components.js

@@ -65,7 +65,7 @@ var contentStyle = _interopDefault(require('!!raw-loader!tinymce/skins/content/d
 var SvgPanZoom = _interopDefault(require('svg-pan-zoom'));
 var saveSvgAsPng = require('save-svg-as-png');
 
-var version = "1.7.71";
+var version = "1.7.72";
 
 /**
  * 版本号
@@ -7586,13 +7586,18 @@ var HrTableBase = {
       var headHeight = 48,
         toolbarHeight = 32,
         searchHeight = 120,
-        layoutPadding = 38,
+        layoutPadding = 60,
         tableHeaderHeight = 68,
-        // 根据条件判断是否显示分页组件，如果显示则高度为60，否则为0
-        paginationHeight = this.$props.pagination ? 60 : 0;
+        // 根据条件判断是否显示分页组件，如果显示则高度为56.5 ，否则为0
+        paginationHeight = this.$props.pagination ? 56.5 : 0,
+        tableRowHeight = 47.5;
+      this.$refs.tableToolbar && (searchHeight = this.$refs.tableToolbar.$el.clientHeight + 24);
+
+      // 默认高度为窗口高度减去以上所有高度
       var defaultHeight = parseInt(window.innerHeight - headHeight - toolbarHeight - searchHeight - layoutPadding - tableHeaderHeight - paginationHeight);
-      if (this.dataList.length > 0 && this.$parent.$parent.$el.clientHeight - tableHeaderHeight - paginationHeight > defaultHeight) {
-        return defaultHeight;
+      if (this.dataList.length > 0) {
+        var tableHeight = this.$parent.$parent.$el.clientHeight + tableRowHeight * this.dataList.length - searchHeight - tableHeaderHeight - paginationHeight;
+        return tableHeight - defaultHeight > 0 ? defaultHeight : tableHeight;
       }
       return height;
     },
@@ -7636,6 +7641,7 @@ var HrTableBase = {
       var hasReset = title && (_conditions.length > 0 || typeof $listeners.reset === "function");
       var titleSolt = title && $scopedSlots.title ? this.normalizeTitleSlot($scopedSlots.title()) : null;
       var toolbar = title ? h(Toolbar, [h(TableToolbar, {
+        ref: "tableToolbar",
         attrs: {
           data: _conditions,
           locale: locale,