Table: fix fixed column height when empty data, fixed ElemeFE#2300

w651662199 · Jan 12, 2017 · 8498656 · 8498656
1 parent 5753b45
commit 8498656
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/packages/table/src/table-layout.js b/packages/table/src/table-layout.js
@@ -69,6 +69,7 @@ class TableLayout {
 
   updateHeight() {
     const height = this.tableHeight = this.table.$el.clientHeight;
+    const noData = !this.table.data || this.table.data.length === 0;
     const { headerWrapper } = this.table.$refs;
     if (this.showHeader && !headerWrapper) return;
     if (!this.showHeader) {
@@ -85,7 +86,7 @@ class TableLayout {
       }
       this.fixedBodyHeight = this.scrollX ? bodyHeight - this.gutterWidth : bodyHeight;
     }
-    this.viewportHeight = this.scrollX ? height - this.gutterWidth : height;
+    this.viewportHeight = this.scrollX ? height - (noData ? 0 : this.gutterWidth) : height;
   }
 
   update() {