From a9950a43656af1db3b4b323f57c6bcba79bbed08 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Fri, 1 Jul 2022 16:17:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=96=87=E4=BB=B6=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/pages/manage/components/DialogItem.vue       |  5 +++++
 .../js/pages/manage/components/DialogView.vue       |  6 +++++-
 .../js/pages/manage/components/DialogWrapper.vue    | 13 ++++++++++---
 .../sass/pages/components/dialog-wrapper.scss       |  1 +
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/pages/manage/components/DialogItem.vue b/resources/assets/js/pages/manage/components/DialogItem.vue
index cbef233b3..aaf57627b 100644
--- a/resources/assets/js/pages/manage/components/DialogItem.vue
+++ b/resources/assets/js/pages/manage/components/DialogItem.vue
@@ -23,6 +23,7 @@
                 @on-view-reply="onViewReply"
                 @on-view-text="onViewText"
                 @on-view-file="onViewFile"
+                @on-down-file="onDownFile"
                 @on-reply-list="onReplyList"
                 @on-emoji="onEmoji"/>
         </template>
@@ -114,6 +115,10 @@ export default {
             this.dispatch("on-view-file", data)
         },
 
+        onDownFile(data) {
+            this.dispatch("on-down-file", data)
+        },
+
         onReplyList(data) {
             this.dispatch("on-reply-list", data)
         },
diff --git a/resources/assets/js/pages/manage/components/DialogView.vue b/resources/assets/js/pages/manage/components/DialogView.vue
index fa4ae9fc2..3b7674e5b 100644
--- a/resources/assets/js/pages/manage/components/DialogView.vue
+++ b/resources/assets/js/pages/manage/components/DialogView.vue
@@ -24,7 +24,7 @@
                 <div v-else-if="msgData.type === 'file'" :class="`content-file ${msgData.msg.type}`">
                     <div class="dialog-file">
                         <img v-if="msgData.msg.type === 'img'" class="file-img" :style="imageStyle(msgData.msg)" :src="msgData.msg.thumb" @click="viewFile"/>
-                        <div v-else class="file-box">
+                        <div v-else class="file-box" @click="downFile">
                             <img class="file-thumb" :src="msgData.msg.thumb"/>
                             <div class="file-info">
                                 <div class="file-name">{{msgData.msg.name}}</div>
@@ -392,6 +392,10 @@ export default {
             this.$emit("on-view-file", this.msgData)
         },
 
+        downFile() {
+            this.$emit("on-down-file", this.msgData)
+        },
+
         replyList() {
             this.$emit("on-reply-list", {
                 msg_id: this.msgData.id,
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index 264b1a7a9..4db8fc6e0 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -105,6 +105,7 @@
             @on-view-reply="onViewReply"
             @on-view-text="onViewText"
             @on-view-file="onViewFile"
+            @on-down-file="onDownFile"
             @on-reply-list="onReplyList"
             @on-emoji="onEmoji">
             <template slot="header">
@@ -1434,13 +1435,19 @@ export default {
             }
         },
 
-        onDownFile() {
+        onDownFile(data) {
+            if (this.operateVisible) {
+                return
+            }
+            if (!$A.isJson(data)) {
+                data = this.operateItem
+            }
             $A.modalConfirm({
                 title: '下载文件',
-                content: `${this.operateItem.msg.name} (${$A.bytesToSize(this.operateItem.msg.size)})`,
+                content: `${data.msg.name} (${$A.bytesToSize(data.msg.size)})`,
                 okText: '立即下载',
                 onOk: () => {
-                    this.$store.dispatch('downUrl', $A.apiUrl(`dialog/msg/download?msg_id=${this.operateItem.id}`))
+                    this.$store.dispatch('downUrl', $A.apiUrl(`dialog/msg/download?msg_id=${data.id}`))
                 }
             });
         },
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 2c0581838..7568e2944 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -577,6 +577,7 @@
                                     padding: 10px 14px;
                                     border-radius: 3px;
                                     width: 220px;
+                                    cursor: pointer;
 
                                     .file-thumb {
                                         width: 36px;