fix: 修复 ETooltip 组件 disabled 取消后错位的问题

This commit is contained in:
kuaifan 2022-04-26 10:27:50 +08:00
parent 41e60ee990
commit b1395377a1
3 changed files with 22 additions and 4 deletions

View File

@ -21,7 +21,7 @@
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"css-loader": "^6.5.1", "css-loader": "^6.5.1",
"echarts": "^5.2.2", "echarts": "^5.2.2",
"element-ui": "^2.15.6", "element-ui": "^2.15.8",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",
"inquirer": "^8.2.0", "inquirer": "^8.2.0",
"internal-ip": "^6.2.0", "internal-ip": "^6.2.0",

View File

@ -8,7 +8,7 @@
v-model="showEmoji" v-model="showEmoji"
:visibleArrow="false" :visibleArrow="false"
popperClass="chat-input-emoji-popover"> 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> <i class="taskfont" @click="onToolbar('emoji')">&#xe7ad;</i>
</ETooltip> </ETooltip>
<ChatEmoji @on-select="onSelectEmoji"/> <ChatEmoji @on-select="onSelectEmoji"/>
@ -25,7 +25,7 @@
v-model="showMore" v-model="showMore"
:visibleArrow="false" :visibleArrow="false"
popperClass="chat-input-more-popover"> 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> <i class="taskfont">&#xe790;</i>
</ETooltip> </ETooltip>
<div class="chat-input-popover-item" @click="onToolbar('image')"> <div class="chat-input-popover-item" @click="onToolbar('image')">
@ -156,6 +156,18 @@ export default {
this.userList = null; this.userList = null;
this.taskList = 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: { methods: {
init() { init() {

View File

@ -63,7 +63,7 @@
<div class="file-content-history"> <div class="file-content-history">
<FileHistory :value="historyShow" :file="file" @on-restore="onRestoreHistory"/> <FileHistory :value="historyShow" :file="file" @on-restore="onRestoreHistory"/>
</div> </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> <div class="header-icon"><i class="taskfont">&#xe71d;</i></div>
</ETooltip> </ETooltip>
</EPopover> </EPopover>
@ -208,6 +208,12 @@ export default {
immediate: true, immediate: true,
}, },
historyShow(val) {
if (!val && this.$refs.historyTip) {
this.$refs.historyTip.updatePopper()
}
},
wsMsg: { wsMsg: {
handler(info) { handler(info) {
const {type, action, data} = info; const {type, action, data} = info;