From b91f6536e1ffcf47917c65d7a9c17d8e0ba7ab56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 25 Jan 2021 11:55:13 +0800
Subject: [PATCH] fix Table column tooltip bug,and Table/column add
 tooltipMaxWidth prop

---
 src/components/table/cell.vue  | 23 +++++++++--------------
 src/components/table/table.vue |  5 +++++
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/components/table/cell.vue b/src/components/table/cell.vue
index 3eff914b..79142c70 100644
--- a/src/components/table/cell.vue
+++ b/src/components/table/cell.vue
@@ -14,8 +14,8 @@
         <template v-if="renderType === 'html'"><span v-html="row[column.key]"></span></template>
         <template v-if="renderType === 'normal'">
             <template v-if="column.tooltip">
-                <Tooltip transfer :content="row[column.key]" :theme="tableRoot.tooltipTheme" :disabled="!showTooltip && !tooltipShow" :max-width="300" class="ivu-table-cell-tooltip" @on-popper-show="handleTooltipShow" @on-popper-hide="handleTooltipHide">
-                    <span ref="content" @mouseenter="handleTooltipIn" @mouseleave="handleTooltipOut" class="ivu-table-cell-tooltip-content">{{ row[column.key] }}</span>
+                <Tooltip transfer :content="row[column.key]" :theme="column.tooltipTheme ? column.tooltipTheme : tableRoot.tooltipTheme" :disabled="!showTooltip" :max-width="column.tooltipMaxWidth ? column.tooltipMaxWidth : tableRoot.tooltipMaxWidth" class="ivu-table-cell-tooltip">
+                    <span ref="content" @mouseenter="handleTooltipIn" class="ivu-table-cell-tooltip-content">{{ row[column.key] }}</span>
                 </Tooltip>
             </template>
             <span v-else>{{row[column.key]}}</span>
@@ -75,8 +75,7 @@
                 renderType: '',
                 uid: -1,
                 context: this.$parent.$parent.$parent.currentContext,
-                showTooltip: false,  // 鼠标滑过overflow文本时，再检查是否需要显示
-                tooltipShow: false
+                showTooltip: false  // 鼠标滑过overflow文本时，再检查是否需要显示
             };
         },
         computed: {
@@ -153,16 +152,12 @@
             },
             handleTooltipIn () {
                 const $content = this.$refs.content;
-                this.showTooltip = $content.scrollWidth > $content.offsetWidth;
-            },
-            handleTooltipOut () {
-                this.showTooltip = false;
-            },
-            handleTooltipShow () {
-                this.tooltipShow = true;
-            },
-            handleTooltipHide () {
-                this.tooltipShow = false;
+                let range = document.createRange();
+                range.setStart($content, 0);
+                range.setEnd($content, $content.childNodes.length);
+                const rangeWidth = range.getBoundingClientRect().width;
+                this.showTooltip = rangeWidth > $content.offsetWidth;
+                range = null;
             },
             handleToggleTree () {
                 this.$parent.$parent.$parent.toggleTree(this.row._rowKey);
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index 99d172d5..ef6ccf71 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -244,6 +244,11 @@
                 },
                 default: 'dark'
             },
+            // 4.5.0
+            tooltipMaxWidth: {
+                type: Number,
+                default: 300
+            },
             // #5380 开启后，:key 强制更新，否则使用 index
             // 4.1 开始支持 String，指定具体字段
             rowKey: {