From c31f19a4e89d51149e458665250ee4abb9a957e5 Mon Sep 17 00:00:00 2001
From: Cyril Su <god@liril.net>
Date: Sat, 18 Mar 2017 08:40:01 +0800
Subject: [PATCH] Table: Fixed wrong height. (#3539)

---
 packages/table/src/table-layout.js |  3 +++
 packages/table/src/table.vue       | 21 +--------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/packages/table/src/table-layout.js b/packages/table/src/table-layout.js
index d4509721b..b53e32780 100644
--- a/packages/table/src/table-layout.js
+++ b/packages/table/src/table-layout.js
@@ -59,6 +59,9 @@ class TableLayout {
 
       this.updateHeight();
     } else if (typeof value === 'string') {
+      if (value === '') {
+        el.style[prop] = '';
+      }
       this.updateHeight();
     }
   }
diff --git a/packages/table/src/table.vue b/packages/table/src/table.vue
index 0d4f538e9..a4eea3982 100644
--- a/packages/table/src/table.vue
+++ b/packages/table/src/table.vue
@@ -8,8 +8,7 @@
       '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)"
-    :style="[tableHeight]">
+    @mouseleave="handleMouseLeave($event)">
     <div class="hidden-columns" ref="hiddenColumns"><slot></slot></div>
     <div class="el-table__header-wrapper" ref="headerWrapper" v-if="showHeader">
       <table-header
@@ -295,24 +294,6 @@
         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' : '';