From b1395377a1eeaffe0b8d907bcafcbd71aebdb69c Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Tue, 26 Apr 2022 10:27:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20ETooltip=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20disabled=20=E5=8F=96=E6=B6=88=E5=90=8E?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                     |  2 +-
 .../pages/manage/components/ChatInput/index.vue  | 16 ++++++++++++++--
 .../js/pages/manage/components/FileContent.vue   |  8 +++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 7d8be75f0..c0bb2e2f7 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
         "cross-env": "^7.0.3",
         "css-loader": "^6.5.1",
         "echarts": "^5.2.2",
-        "element-ui": "^2.15.6",
+        "element-ui": "^2.15.8",
         "file-loader": "^6.2.0",
         "inquirer": "^8.2.0",
         "internal-ip": "^6.2.0",
diff --git a/resources/assets/js/pages/manage/components/ChatInput/index.vue b/resources/assets/js/pages/manage/components/ChatInput/index.vue
index 091f1a204..c93e9e602 100755
--- a/resources/assets/js/pages/manage/components/ChatInput/index.vue
+++ b/resources/assets/js/pages/manage/components/ChatInput/index.vue
@@ -8,7 +8,7 @@
                 v-model="showEmoji"
                 :visibleArrow="false"
                 popperClass="chat-input-emoji-popover">
-                <ETooltip slot="reference" :disabled="showEmoji" placement="top" :content="$L('表情')">
+                <ETooltip slot="reference" ref="emojiTip" :disabled="showEmoji" placement="top" :content="$L('表情')">
                     <i class="taskfont" @click="onToolbar('emoji')">&#xe7ad;</i>
                 </ETooltip>
                 <ChatEmoji @on-select="onSelectEmoji"/>
@@ -25,7 +25,7 @@
                 v-model="showMore"
                 :visibleArrow="false"
                 popperClass="chat-input-more-popover">
-                <ETooltip slot="reference" :disabled="showMore" placement="top" :content="$L('展开')">
+                <ETooltip slot="reference" ref="moreTip" :disabled="showMore" placement="top" :content="$L('展开')">
                     <i class="taskfont">&#xe790;</i>
                 </ETooltip>
                 <div class="chat-input-popover-item" @click="onToolbar('image')">
@@ -156,6 +156,18 @@ export default {
             this.userList = null;
             this.taskList = null;
         },
+
+        showEmoji(val) {
+            if (!val && this.$refs.emojiTip) {
+                this.$refs.emojiTip.updatePopper()
+            }
+        },
+
+        showMore(val) {
+            if (!val && this.$refs.moreTip) {
+                this.$refs.moreTip.updatePopper()
+            }
+        }
     },
     methods: {
         init() {
diff --git a/resources/assets/js/pages/manage/components/FileContent.vue b/resources/assets/js/pages/manage/components/FileContent.vue
index db98c3e43..4ea835926 100644
--- a/resources/assets/js/pages/manage/components/FileContent.vue
+++ b/resources/assets/js/pages/manage/components/FileContent.vue
@@ -63,7 +63,7 @@
                             <div class="file-content-history">
                                 <FileHistory :value="historyShow" :file="file" @on-restore="onRestoreHistory"/>
                             </div>
-                            <ETooltip slot="reference" :disabled="historyShow" :content="$L('历史版本')">
+                            <ETooltip slot="reference" ref="historyTip" :disabled="historyShow" :content="$L('历史版本')">
                                 <div class="header-icon"><i class="taskfont">&#xe71d;</i></div>
                             </ETooltip>
                         </EPopover>
@@ -208,6 +208,12 @@ export default {
             immediate: true,
         },
 
+        historyShow(val) {
+            if (!val && this.$refs.historyTip) {
+                this.$refs.historyTip.updatePopper()
+            }
+        },
+
         wsMsg: {
             handler(info) {
                 const {type, action, data} = info;