From 23ef992a7fce90d62c163f30a39c2ade9d47b91f Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 23 Feb 2022 23:30:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=9B=E5=BB=BA=E8=80=85?=
 =?UTF-8?q?=E5=92=8C=E5=8D=8F=E5=8A=A9=E4=BA=BA=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ProjectController.php    |  9 +++------
 app/Models/ProjectTask.php                        | 15 +--------------
 .../js/pages/manage/components/DialogWrapper.vue  | 13 +------------
 3 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index d1fa92ac..991ead0a 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -1083,7 +1083,7 @@ class ProjectController extends AbstractController
             return Base::retError('文件不存在或已被删除');
         }
         //
-        $task = ProjectTask::userTask($file->task_id, true, 3);
+        $task = ProjectTask::userTask($file->task_id, true, true);
         //
         $task->pushMsg('filedelete', $file);
         $file->delete();
@@ -1284,7 +1284,7 @@ class ProjectController extends AbstractController
         $task_id = intval(Request::input('task_id'));
         $name = Request::input('name');
         //
-        $task = ProjectTask::userTask($task_id, true, 3);
+        $task = ProjectTask::userTask($task_id, true, true);
         if ($task->complete_at) {
             return Base::retError('主任务已完成无法添加子任务');
         }
@@ -1336,10 +1336,7 @@ class ProjectController extends AbstractController
         parse_str(Request::getContent(), $data);
         $task_id = intval($data['task_id']);
         //
-        if (!Arr::exists($data, 'flow_item_id') && !Arr::exists($data, 'complete_at'))
-            $task = ProjectTask::userTask($task_id, true, 3);
-        else
-            $task = ProjectTask::userTask($task_id, true, 2);
+        $task = ProjectTask::userTask($task_id, true, 2);
         // 更新任务
         $updateMarking = [];
         $task->updateTask($data, $updateMarking);
diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index c8cc62da..cfe8dd0d 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -950,20 +950,6 @@ class ProjectTask extends AbstractModel
         return false;
     }
 
-    /**
-     * 是否是参与者或者创建人
-     * @return bool
-     */
-    public function isActor(): bool
-    {
-        $user = User::auth();
-        $actor = ProjectTaskUser::whereTaskId($this->id)->whereUserid($user->userid)->exists();
-        if (!$actor && $user->userid != $this->userid) {
-            return false;
-        }
-        return true;
-    }
-
     /**
      * 是否有负责人
      * @return bool
@@ -1211,6 +1197,7 @@ class ProjectTask extends AbstractModel
         if (($permission === 1 || $permission === true) && !$project->owner && !$task->permission(3)) {
             throw new ApiException('仅限项目负责人、任务负责人、协助人员或任务创建者操作');
         }
+        //
         return $task;
     }
 }
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue
index b811733d..c9825f0d 100644
--- a/resources/assets/js/pages/manage/components/DialogWrapper.vue
+++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue
@@ -249,9 +249,6 @@ export default {
             immediate: true
         }
     },
-    created() {
-        this.pasteEnter()
-    },
 
     methods: {
         sendMsg(text) {
@@ -356,15 +353,7 @@ export default {
                 this.dialogDrag = true;
             }
         },
-        pasteEnter() {
-            var that = this;
-            document.onkeydown = function (e) {
-                if (e.keyCode === 13 && that.pasteShow) {
-                    that.pasteSend();
-                    that.pasteShow = false;
-                }
-            }
-        },
+
         pasteSend() {
             this.pasteFile.some(file => {
                 this.$refs.chatUpload.upload(file)