From 67780a1fdc6ff28289e62bd21a128a1b8c0be3a2 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 9 Mar 2023 14:44:37 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=8F=AF=E4=BB=A5=E9=80=9A=E8=BF=87ID?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/ProjectController.php     |  8 +++++--
 .../pages/manage/components/ProjectPanel.vue  | 22 ++++++++++---------
 .../pages/manage/components/TaskArchived.vue  |  4 ++--
 .../pages/manage/components/TaskDeleted.vue   |  4 ++--
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 87ef968d8..cffbba6a3 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -843,7 +843,7 @@ class ProjectController extends AbstractController
      * @apiName task__lists
      *
      * @apiParam {Object} [keys]             搜索条件
-     * - keys.name: 任务名称
+     * - keys.name: ID、任务名称
      *
      * @apiParam {Number} [project_id]       项目ID
      * @apiParam {Number} [parent_id]        主任务ID（project_id && parent_id ≤ 0 时 仅查询自己参与的任务）
@@ -897,7 +897,11 @@ class ProjectController extends AbstractController
         $sorts = is_array($sorts) ? $sorts : [];
         //
         if ($keys['name']) {
-            $builder->where("project_tasks.name", "like", "%{$keys['name']}%");
+            if (Base::isNumber($keys['name'])) {
+                $builder->where("project_tasks.id", intval($keys['name']));
+            } else {
+                $builder->where("project_tasks.name", "like", "%{$keys['name']}%");
+            }
         }
         //
         $scopeAll = false;
diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue
index 657bdaa67..b0bdc2909 100644
--- a/resources/assets/js/pages/manage/components/ProjectPanel.vue
+++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue
@@ -39,7 +39,7 @@
                     <Tooltip :always="searchText!=''" @on-popper-show="searchFocus" theme="light" :rawIndex="10">
                         <Icon class="menu-icon" type="ios-search" @click="searchFocus" />
                         <div slot="content">
-                            <Input v-model="searchText" ref="searchInput" :placeholder="$L('名称、描述...')" class="search-input" clearable/>
+                            <Input v-model="searchText" ref="searchInput" :placeholder="$L('ID、名称、描述...')" class="search-input" clearable/>
                         </div>
                     </Tooltip>
                 </li>
@@ -443,7 +443,7 @@
         <DrawerOverlay
             v-model="archivedTaskShow"
             placement="right"
-            :size="900">
+            :size="1000">
             <TaskArchived v-if="archivedTaskShow" :project-id="projectId"/>
         </DrawerOverlay>
 
@@ -451,7 +451,7 @@
         <DrawerOverlay
             v-model="deletedTaskShow"
             placement="right"
-            :size="900">
+            :size="1000">
             <TaskDeleted v-if="deletedTaskShow" :project-id="projectId"/>
         </DrawerOverlay>
     </div>
@@ -609,7 +609,9 @@ export default {
                     list = list.filter(({flow_item_id}) => flow_item_id === flowInfo.value);
                 }
                 if (searchText) {
-                    list = list.filter(({name, desc}) => $A.strExists(`${name} ${desc}`, searchText));
+                    list = list.filter(({id, name, desc}) => {
+                        return id == searchText || $A.strExists(`${name} ${desc}`, searchText)
+                    });
                 }
                 return list;
             }
@@ -727,7 +729,7 @@ export default {
                     return false;
                 }
                 if (searchText) {
-                    if (!$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
+                    if (task.id != searchText && !$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
                         return false;
                     }
                 }
@@ -758,7 +760,7 @@ export default {
                     return false;
                 }
                 if (searchText) {
-                    if (!$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
+                    if (task.id != searchText && !$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
                         return false;
                     }
                 }
@@ -1298,7 +1300,7 @@ export default {
         },
 
         taskIsHidden(task) {
-            const {name, desc, complete_at} = task;
+            const {id, name, desc, complete_at} = task;
             const {searchText} = this;
             if (!this.projectData.cacheParameter.completedTask) {
                 if (complete_at) {
@@ -1309,7 +1311,7 @@ export default {
                 return true;
             }
             if (searchText) {
-                if (!$A.strExists(`${name} ${desc}`, searchText)) {
+                if (id != searchText && !$A.strExists(`${name} ${desc}`, searchText)) {
                     return true;
                 }
             }
@@ -1405,7 +1407,7 @@ export default {
                 return false;
             }
             if (this.searchText) {
-                if (!$A.strExists(task.name, this.searchText) && !$A.strExists(task.desc, this.searchText)) {
+                if (task.id != this.searchText && !$A.strExists(task.name, this.searchText) && !$A.strExists(task.desc, this.searchText)) {
                     return false;
                 }
             }
@@ -1425,7 +1427,7 @@ export default {
                 return false;
             }
             if (this.searchText) {
-                if (!$A.strExists(task.name, this.searchText) && !$A.strExists(task.desc, this.searchText)) {
+                if (task.id != this.searchText && !$A.strExists(task.name, this.searchText) && !$A.strExists(task.desc, this.searchText)) {
                     return false;
                 }
             }
diff --git a/resources/assets/js/pages/manage/components/TaskArchived.vue b/resources/assets/js/pages/manage/components/TaskArchived.vue
index 41ea24e33..86fb86c3d 100644
--- a/resources/assets/js/pages/manage/components/TaskArchived.vue
+++ b/resources/assets/js/pages/manage/components/TaskArchived.vue
@@ -10,10 +10,10 @@
             <ul>
                 <li>
                     <div class="search-label">
-                        {{$L("任务名")}}
+                        {{$L("关键词")}}
                     </div>
                     <div class="search-content">
-                        <Input v-model="keys.name" clearable/>
+                        <Input v-model="keys.name" :placeholder="$L('ID、任务名...')" clearable/>
                     </div>
                 </li>
                 <li class="search-button">
diff --git a/resources/assets/js/pages/manage/components/TaskDeleted.vue b/resources/assets/js/pages/manage/components/TaskDeleted.vue
index 217a2eee6..f15b96163 100644
--- a/resources/assets/js/pages/manage/components/TaskDeleted.vue
+++ b/resources/assets/js/pages/manage/components/TaskDeleted.vue
@@ -10,10 +10,10 @@
             <ul>
                 <li>
                     <div class="search-label">
-                        {{$L("任务名")}}
+                        {{$L("关键词")}}
                     </div>
                     <div class="search-content">
-                        <Input v-model="keys.name" clearable/>
+                        <Input v-model="keys.name" :placeholder="$L('ID、任务名...')" clearable/>
                     </div>
                 </li>
                 <li class="search-button">