From 5f98cc93c7b92f0ca4c1ad372ecf381b05f7bc97 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 21 Jun 2022 17:30:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/js/pages/manage/components/DialogItem.vue | 8 ++++---- .../assets/js/pages/manage/components/DialogView.vue | 8 ++++---- .../js/pages/manage/components/DialogWrapper.vue | 11 +++++++---- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/resources/assets/js/pages/manage/components/DialogItem.vue b/resources/assets/js/pages/manage/components/DialogItem.vue index 14e799a10..d4db47fe5 100644 --- a/resources/assets/js/pages/manage/components/DialogItem.vue +++ b/resources/assets/js/pages/manage/components/DialogItem.vue @@ -79,12 +79,12 @@ export default { this.dispatch("on-view-reply", data) }, - onViewText(e) { - this.dispatch("on-view-text", e) + onViewText(el) { + this.dispatch("on-view-text", el) }, - onViewFile(e) { - this.dispatch("on-view-file", e) + onViewFile(data) { + this.dispatch("on-view-file", data) }, onEmoji(data) { diff --git a/resources/assets/js/pages/manage/components/DialogView.vue b/resources/assets/js/pages/manage/components/DialogView.vue index c5faa5bc7..ebcd2242e 100644 --- a/resources/assets/js/pages/manage/components/DialogView.vue +++ b/resources/assets/js/pages/manage/components/DialogView.vue @@ -378,12 +378,12 @@ export default { }) }, - viewText(e) { - this.$emit("on-view-text", e) + viewText(el) { + this.$emit("on-view-text", el) }, - viewFile(e) { - this.$emit("on-view-file", e) + viewFile() { + this.$emit("on-view-file", this.msgData) }, onEmoji(symbol) { diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 3319b206b..93679eb07 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -1201,19 +1201,22 @@ export default { } }, - onViewFile() { + onViewFile(data) { if (this.operateVisible) { return } - const {msg} = this.operateItem; + if (!$A.isJson(data)) { + data = this.operateItem + } + const {msg} = data; if (['jpg', 'jpeg', 'gif', 'png'].includes(msg.ext)) { this.onViewPicture(msg.path); return } - const path = `/single/file/msg/${this.operateItem.id}`; + const path = `/single/file/msg/${data.id}`; if (this.$Electron) { this.$Electron.sendMessage('windowRouter', { - name: `file-msg-${this.operateItem.id}`, + name: `file-msg-${data.id}`, path: path, userAgent: "/hideenOfficeTitle/", force: false,