From 74e6dac47c7055ada6a60e0f2e6be6cff1658330 Mon Sep 17 00:00:00 2001
From: "cinwell.li" <cinwell.li@gmail.com>
Date: Sun, 30 Oct 2016 11:32:06 +0800
Subject: [PATCH] Table: fix show tooltip, fixed #714 (#717)

---
 examples/docs/zh-cn/table.md         | 1 +
 examples/docs/zh-cn/tooltip.md       | 5 +++--
 packages/table/src/table-body.js     | 5 -----
 packages/theme-default/src/table.css | 8 ++++++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/examples/docs/zh-cn/table.md b/examples/docs/zh-cn/table.md
index 1bf173f93..ce7c85779 100644
--- a/examples/docs/zh-cn/table.md
+++ b/examples/docs/zh-cn/table.md
@@ -675,6 +675,7 @@
 <template>
   <el-table
     :data="tableData3"
+    border
     style="width: 100%"
     @selection-change="handleSelectionChange">
     <el-table-column
diff --git a/examples/docs/zh-cn/tooltip.md b/examples/docs/zh-cn/tooltip.md
index beb3037a3..aa1bcd450 100644
--- a/examples/docs/zh-cn/tooltip.md
+++ b/examples/docs/zh-cn/tooltip.md
@@ -7,7 +7,8 @@
     }
   };
 </script>
-## Tooltips 文字提示
+
+## Tooltip 文字提示
 
 常用于展示鼠标 hover 时的提示信息。
 
@@ -118,7 +119,7 @@ Tooltip 组件提供了两个不同的主题：`dark`和`light`。
 ```
 :::
 
-### 更多Content
+### 更多 Content
 
 展示多行文本或者是设置文本内容的格式
 
diff --git a/packages/table/src/table-body.js b/packages/table/src/table-body.js
index 36e5919c2..92bf4e8db 100644
--- a/packages/table/src/table-body.js
+++ b/packages/table/src/table-body.js
@@ -36,7 +36,6 @@ export default {
                 {
                   this._l(this.columns, (column, cellIndex) =>
                     <td
-                      style={ this.getColumnWhiteSpaceStyle(column) }
                       class={ [column.id, column.align, this.isCellHidden(cellIndex) ? 'hidden' : '' ] }
                       on-mouseenter={ ($event) => this.handleCellMouseEnter($event, row) }
                       on-mouseleave={ this.handleCellMouseLeave }>
@@ -118,10 +117,6 @@ export default {
       return classes.join(' ');
     },
 
-    getColumnWhiteSpaceStyle(column) {
-      return column.showTooltipWhenOverflow ? { 'white-space': 'nowrap' } : {};
-    },
-
     handleCellMouseEnter(event, row) {
       const table = this.$parent;
       const cell = getCell(event);
diff --git a/packages/theme-default/src/table.css b/packages/theme-default/src/table.css
index ba995d47e..9cc183127 100644
--- a/packages/theme-default/src/table.css
+++ b/packages/theme-default/src/table.css
@@ -39,8 +39,16 @@
       z-index: 1;
     }
 
+    .el-tooltip {
+      display: block;
+    }
+
     .el-tooltip__rel {
       display: block;
+
+      .cell > * {
+         white-space: nowrap;
+      }
     }
 
     @e empty-block {