From ec62d7be5a75a696e5aeb5eb78f1e61f67c1a296 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sat, 25 Mar 2023 20:23:25 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ProjectController.php | 14 ++------------
 resources/assets/js/pages/manage/calendar.vue  |  5 +----
 resources/assets/js/store/actions.js           | 12 +++++-------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 71f93217b..cd2934b85 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -859,12 +859,8 @@ class ProjectController extends AbstractController
      * - 第一个时间: 读取在这个时间之后更新的数据
      * - 第二个时间: 读取在这个时间之后删除的数据ID（第1页附加返回数据: deleted_id）
      *
-     * @apiParam {String} [complete]         完成状态
-     * - all：所有（默认）
-     * - yes：已完成
-     * - no：未完成
      * @apiParam {String} [archived]         归档状态
-     * - all：所有
+     * - all：所有（parent_id > 0 时强制 all）
      * - yes：已归档
      * - no：未归档（默认）
      * @apiParam {String} [deleted]          是否读取已删除
@@ -892,7 +888,6 @@ class ProjectController extends AbstractController
         $name = Request::input('name');
         $time = Request::input('time');
         $timerange = TimeRange::parse(Request::input('timerange'));
-        $complete = Request::input('complete', 'all');
         $archived = Request::input('archived', 'no');
         $deleted = Request::input('deleted', 'no');
         $keys = Request::input('keys');
@@ -914,6 +909,7 @@ class ProjectController extends AbstractController
             $isDeleted = str_replace(['all', 'yes', 'no'], [null, false, true], $deleted);
             ProjectTask::userTask($parent_id, $isArchived, $isDeleted);
             $scopeAll = true;
+            $archived = 'all';
             $builder->where('project_tasks.parent_id', $parent_id);
         } elseif ($parent_id === -1) {
             $builder->where('project_tasks.parent_id', 0);
@@ -944,12 +940,6 @@ class ProjectController extends AbstractController
             $builder->where('project_tasks.updated_at', '>', $timerange->updated);
         }
         //
-        if ($complete === 'yes') {
-            $builder->whereNotNull('project_tasks.complete_at');
-        } elseif ($complete === 'no') {
-            $builder->whereNull('project_tasks.complete_at');
-        }
-        //
         if ($archived == 'yes') {
             $builder->whereNotNull('project_tasks.archived_at');
         } elseif ($archived == 'no') {
diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue
index 590f7005d..d79ac6a52 100644
--- a/resources/assets/js/pages/manage/calendar.vue
+++ b/resources/assets/js/pages/manage/calendar.vue
@@ -249,10 +249,7 @@ export default {
             }
             //
             this.loadIng++;
-            this.$store.dispatch("getTasks", {
-                time,
-                complete: "no"
-            }).finally(_ => {
+            this.$store.dispatch("getTasks", {time}).finally(_ => {
                 this.loadIng--;
             })
         },
diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js
index 2bc709af7..d23bcef0f 100644
--- a/resources/assets/js/store/actions.js
+++ b/resources/assets/js/store/actions.js
@@ -1331,6 +1331,9 @@ export default {
      */
     getTasks({state, dispatch}, requestData) {
         const taskData = [];
+        if (requestData === null) {
+            requestData = {}
+        }
         if ($A.isArray(requestData.taskData)) {
             taskData.push(...requestData.taskData)
             delete requestData.taskData;
@@ -1453,9 +1456,7 @@ export default {
         }
         state.loadDashboardTasks = true;
         //
-        dispatch("getTasks", {
-            complete: "no",
-        }).finally(_ => {
+        dispatch("getTasks", null).finally(_ => {
             state.loadDashboardTasks = false;
         })
     },
@@ -1482,10 +1483,7 @@ export default {
      */
     getTaskForParent({state, dispatch}, parent_id) {
         return new Promise(function (resolve, reject) {
-            dispatch("getTasks", {
-                parent_id,
-                archived: 'all'
-            }).then(resolve).catch(reject)
+            dispatch("getTasks", {parent_id}).then(resolve).catch(reject)
         })
     },