瀏覽代碼

Table: Fix wrong height when switch prop height. (#2979)

Cyril Su 8 年之前
父節點
當前提交
f1913d991d
共有 1 個文件被更改,包括 20 次插入1 次删除
  1. 20 1
      packages/table/src/table.vue

+ 20 - 1
packages/table/src/table.vue

@@ -8,7 +8,8 @@
       'el-table--enable-row-hover': !store.states.isComplex,
       'el-table--enable-row-transition': true || (store.states.data || []).length !== 0 && (store.states.data || []).length < 100
     }"
-    @mouseleave="handleMouseLeave($event)">
+    @mouseleave="handleMouseLeave($event)"
+    :style="[tableHeight]">
     <div class="hidden-columns" ref="hiddenColumns"><slot></slot></div>
     <div class="el-table__header-wrapper" ref="headerWrapper" v-if="showHeader">
       <table-header
@@ -294,6 +295,24 @@
         return style;
       },
 
+      tableHeight() {
+        let style = {};
+
+        const height = this.layout.tableHeight ? this.layout.tableHeight + 'px' : '';
+
+        if (this.height) {
+          style = {
+            height
+          };
+        } else if (this.maxHeight) {
+          style = {
+            'max-height': height
+          };
+        }
+
+        return style;
+      },
+
       bodyWidth() {
         const { bodyWidth, scrollY, gutterWidth } = this.layout;
         return bodyWidth ? bodyWidth - (scrollY ? gutterWidth : 0) + 'px' : '';