From 824399bbf187787c62e7178f3a8d0b52c4e8c7d5 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 4 Jul 2022 16:13:57 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E7=AD=9B=E9=80=89=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/ProjectController.php     | 11 +++++++
 .../manage/components/ProjectManagement.vue   | 33 +++++++++++++++----
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 2e711360f..9986622ed 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -44,6 +44,10 @@ class ProjectController extends AbstractController
      * @apiName lists
      *
      * @apiParam {String} [all]              是否查看所有项目（限制管理员）
+     * @apiParam {String} [type]             项目类型
+     * - all：全部（默认）
+     * - team：团队项目
+     * - personal：个人项目
      * @apiParam {String} [archived]         归档状态
      * - all：全部
      * - no：未归档（默认）
@@ -96,6 +100,7 @@ class ProjectController extends AbstractController
         $user = User::auth();
         //
         $all = Request::input('all');
+        $type = Request::input('type', 'all');
         $archived = Request::input('archived', 'no');
         $getcolumn = Request::input('getcolumn', 'no');
         //
@@ -110,6 +115,12 @@ class ProjectController extends AbstractController
             $builder->with(['projectColumn']);
         }
         //
+        if ($type === 'team') {
+            $builder->where('projects.personal', 0);
+        } elseif ($type === 'personal') {
+            $builder->where('projects.personal', 1);
+        }
+        //
         if ($archived == 'yes') {
             $builder->whereNotNull('projects.archived_at');
         } elseif ($archived == 'no') {
diff --git a/resources/assets/js/pages/manage/components/ProjectManagement.vue b/resources/assets/js/pages/manage/components/ProjectManagement.vue
index f4f131cdc..88d90a80c 100644
--- a/resources/assets/js/pages/manage/components/ProjectManagement.vue
+++ b/resources/assets/js/pages/manage/components/ProjectManagement.vue
@@ -16,15 +16,27 @@
                         <Input v-model="keys.name" clearable/>
                     </div>
                 </li>
+                <li>
+                    <div class="search-label">
+                        {{$L("项目类型")}}
+                    </div>
+                    <div class="search-content">
+                        <Select v-model="keys.type" :placeholder="$L('团队项目')">
+                            <Option value="">{{$L('团队项目')}}</Option>
+                            <Option value="personal">{{$L('个人项目')}}</Option>
+                            <Option value="all">{{$L('全部项目')}}</Option>
+                        </Select>
+                    </div>
+                </li>
                 <li>
                     <div class="search-label">
                         {{$L("项目状态")}}
                     </div>
                     <div class="search-content">
-                        <Select v-model="keys.status" :placeholder="$L('全部')">
-                            <Option value="">{{$L('全部')}}</Option>
-                            <Option value="unarchived">{{$L('未归档')}}</Option>
+                        <Select v-model="keys.status" :placeholder="$L('未归档')">
+                            <Option value="">{{$L('未归档')}}</Option>
                             <Option value="archived">{{$L('已归档')}}</Option>
+                            <Option value="all">{{$L('全部')}}</Option>
                         </Select>
                     </div>
                 </li>
@@ -192,11 +204,17 @@ export default {
         },
 
         getLists() {
-            let archived = 'all';
-            if (this.keys.status == 'archived') {
+            let type = 'team';
+            if (this.keys.type == 'all') {
+                type = 'all';
+            } else if (this.keys.type == 'personal') {
+                type = 'personal';
+            }
+            let archived = 'no';
+            if (this.keys.status == 'all') {
+                archived = 'all';
+            } else if (this.keys.status == 'archived') {
                 archived = 'yes';
-            } else if (this.keys.status == 'unarchived') {
-                archived = 'no';
             }
             this.loadIng++;
             this.keyIs = $A.objImplode(this.keys) != "";
@@ -206,6 +224,7 @@ export default {
                     keys: this.keys,
                     all: 1,
                     archived,
+                    type,
                     page: Math.max(this.page, 1),
                     pagesize: Math.max($A.runNum(this.pageSize), 10),
                 },