From fd40ae6b67f472bc4b00eb33a0726e063738e59f Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 13 Apr 2022 12:01:31 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E9=80=9A=E8=BF=87=E9=99=84=E4=BB=B6=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BF=9D=E5=AD=98=E5=88=B0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/DialogController.php      | 14 ++++++++------
 package.json                                       |  2 +-
 .../js/pages/manage/components/TaskDetail.vue      |  6 +++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php
index 232294771..0d29123a9 100755
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -261,10 +261,11 @@ class DialogController extends AbstractController
      * @apiGroup dialog
      * @apiName msg__sendfile
      *
-     * @apiParam {Number} dialog_id         对话ID
-     * @apiParam {String} [filename]        post-文件名称
-     * @apiParam {String} [image64]         post-base64图片（二选一）
-     * @apiParam {File} [files]             post-文件对象（二选一）
+     * @apiParam {Number} dialog_id             对话ID
+     * @apiParam {Number} [image_attachment]    图片是否也存到附件
+     * @apiParam {String} [filename]            post-文件名称
+     * @apiParam {String} [image64]             post-base64图片（二选一）
+     * @apiParam {File} [files]                 post-文件对象（二选一）
      *
      * @apiSuccess {Number} ret     返回状态码（1正确、0错误）
      * @apiSuccess {String} msg     返回信息（错误描述）
@@ -275,6 +276,7 @@ class DialogController extends AbstractController
         $user = User::auth();
         //
         $dialog_id = Base::getPostInt('dialog_id');
+        $image_attachment = Base::getPostInt('image_attachment');
         //
         $dialog = WebSocketDialog::checkDialog($dialog_id);
         //
@@ -303,8 +305,8 @@ class DialogController extends AbstractController
             $fileData['thumb'] = Base::unFillUrl($fileData['thumb']);
             $fileData['size'] *= 1024;
             //
-            if ($dialog->type === 'group' && $dialog->group_type === 'task') {  // 任务群聊保存文件
-                if (!in_array($fileData['ext'], File::localExt)) {      // 如果是图片不保存
+            if ($dialog->type === 'group' && $dialog->group_type === 'task') {                       // 任务群聊保存文件
+                if ($image_attachment || !in_array($fileData['ext'], File::imageExt)) {     // 如果是图片不保存
                     $task = ProjectTask::whereDialogId($dialog->id)->first();
                     if ($task) {
                         $file = ProjectTaskFile::createInstance([
diff --git a/package.json b/package.json
index de2cb2f98..c96b24cc0 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
         "stylus-loader": "^6.2.0",
         "tinymce": "^5.10.3",
         "tui-calendar-hi": "^1.15.1-5",
-        "view-design-hi": "^4.7.0-19",
+        "view-design-hi": "^4.7.0-20",
         "vue": "^2.6.14",
         "vue-clipboard2": "^0.3.3",
         "vue-emoji-picker": "^1.0.3",
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index 599eae1bc..b8753012c 100644
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -1123,7 +1123,11 @@ export default {
 
         sendDialogMsg() {
             if (this.msgFile.length > 0) {
-                this.$refs.dialog.sendFileMsg(this.msgFile);
+                this.$refs.dialog.sendFileMsg(this.msgFile.map(file => Object.assign(file, {
+                    ajaxExtraData: {
+                        image_attachment: 1
+                    }
+                })));
             } else if (this.msgText) {
                 this.$refs.dialog.sendMsg(this.msgText);
             }