table 组件高度未设置或者设置的高度大于实际表格高度时，表格高度自适应

Author: 黄书伟

packages/v-table/src/frozen-columns-mixin.js

@@ -2,10 +2,9 @@
  * 固定列
  *
  * */
-import utils from '../../src/utils/utils.js'
 
 export default {
-    computed:{
+    computed: {
         // 冻结的列集合
         frozenCols(){
             return this.internalColumns.filter(x => x.isFrozen === true);
@@ -65,29 +64,5 @@ export default {
         },
 
 
-    },
-
-    methods:{
-
-        // 获取滚动条高度（当没有设置高度或者设置的高度大于所有列高度之和时）
-        setInternalHeightByFrozen(totalColumnsHeight){
-
-            // 包含固定列
-            if (this.$el && this.hasFrozenColumn) {
-
-                this.$nextTick(x => {
-
-                    if (this.hasBodyHorizontalScrollBar()) {
-
-                        totalColumnsHeight += utils.getScrollbarWidth();
-
-                    }
-                    this.internalHeight = totalColumnsHeight;
-                })
-            }else{
-
-                this.internalHeight = totalColumnsHeight;
-            }
-        }
     }
 }

packages/v-table/src/scroll-bar-control-mixin.js

@@ -14,12 +14,15 @@ export default {
         // 判断右侧区域是否有横向滚动条
         hasBodyHorizontalScrollBar(){
 
-            return this.rightViewWidth < this.totalNoFrozenColumnsWidth;
+            if (this.$el){
 
-           /* var rightViewBody = this.$el.querySelector('.v-table-rightview .v-table-body'),
-                rightViewContent = this.$el.querySelector('.v-table-rightview .v-table-body .v-table-btable');
+                let rightViewBody = this.$el.querySelector('.v-table-rightview .v-table-body'),
+                    rightColumnsWidth = Math.round(this.totalNoFrozenColumnsWidth);
 
-            return rightViewBody.clientWidth + 2 < rightViewContent.clientWidth;*/
+                return rightViewBody.clientWidth + 2 < rightColumnsWidth;
+            }
+
+            return false;
         }
     }
 

packages/v-table/src/table-resize-mixin.js

@@ -37,6 +37,34 @@ export  default {
             this.getResizeColumns();
         },
 
+        adjustHeight(){
+
+            setTimeout(x => {
+
+                if (!this.$el || this.isVerticalResize) {
+                    return false;
+                }
+
+                var totalColumnsHeight = this.getTotalColumnsHeight(),
+                    scrollbarWidth = utils.getScrollbarWidth(),
+                    hasScrollBar = this.hasBodyHorizontalScrollBar();
+
+                // 当没有设置高度时计算总高度 || 设置的高度大于所有列高度之和时
+                if (!(this.height && this.height > 0) || this.height > totalColumnsHeight) {
+
+                    if (hasScrollBar && this.internalHeight + 2 < totalColumnsHeight + scrollbarWidth) {
+
+                        this.internalHeight += scrollbarWidth;
+
+                    } else if (!hasScrollBar) {
+
+                        this.internalHeight = totalColumnsHeight;
+                    }
+                }
+            })
+
+        },
+
         // 随着窗口改变表格自适应
         tableResize(){
 
@@ -120,6 +148,8 @@ export  default {
                 }
             }
 
+            this.adjustHeight();
+
             if (currentWidth >= initResizeWidths || differ > 0) {
 
                 var average = differ / this.resizeColumns.length;

packages/v-table/src/table.vue

@@ -780,26 +780,25 @@
             // 当没设置宽度和高度时动态计算
             initView(){
 
-                var self = this;
                 // 当没有设置宽度计算总宽度
-                if (!(self.internalWidth && self.internalWidth > 0)) {
+                if (!(this.internalWidth && this.internalWidth > 0)) {
 
-                    if (self.columns && self.columns.length > 0) {
-                        self.internalWidth = self.columns.reduce((total, curr) => total + curr.width, 0);
+                    if (this.columns && this.columns.length > 0) {
+                        this.internalWidth = this.columns.reduce((total, curr) => total + curr.width, 0);
 
                     }
                 }
 
-                var totalColumnsHeight = self.getTotalColumnsHeight();
+                var totalColumnsHeight = this.getTotalColumnsHeight();
 
                 // 当没有设置高度时计算总高度 || 设置的高度大于所有列高度之和时
-                if (!(self.height && self.height > 0) || self.height > totalColumnsHeight) {
+                if (!(this.height && this.height > 0) || this.height > totalColumnsHeight) {
 
-                    this.setInternalHeightByFrozen(totalColumnsHeight);
+                    this.internalHeight = totalColumnsHeight;
 
-                } else if (self.height <= totalColumnsHeight) {
+                } else if (this.height <= totalColumnsHeight) {
 
-                    self.internalHeight = self.height;
+                    this.internalHeight = this.height;
                 }
             },
 
@@ -846,6 +845,8 @@
         },
         mounted(){
 
+            this.adjustHeight();
+
             this.tableEmpty();
 
             if (Array.isArray(this.tableData) && this.tableData.length > 0) {
@@ -898,6 +899,8 @@
                     }
 
                     this.resize();
+
+                    this.adjustHeight();
                 },
                 deep: true
             }