From 42234be5cf089f8412aabb381ba1dc4fed5f0b2d Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sun, 8 Dec 2024 17:25:23 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=87=E7=AD=BE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/ProjectController.php     |  5 +++--
 .../js/pages/manage/components/ProjectLog.vue      | 14 +++++++++++++-
 .../assets/sass/pages/components/project-log.scss  | 13 +++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index a91589393..7289c1571 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -2864,7 +2864,7 @@ class ProjectController extends AbstractController
     /**
      * @api {post} api/project/tag/save          51. 保存标签
      *
-     * @apiDescription 需要token身份（限：项目负责人）
+     * @apiDescription 需要token身份（修改：项目负责人；添加：项目所有成员）
      * @apiVersion 1.0.0
      * @apiGroup project
      * @apiName tag__save
@@ -2887,7 +2887,6 @@ class ProjectController extends AbstractController
         if (!$projectId) {
             return Base::retError('参数错误');
         }
-        Project::userProject($projectId, true, true);
         //
         $id = intval(Request::input('id', 0));
         $name = trim(Request::input('name', ''));
@@ -2906,6 +2905,7 @@ class ProjectController extends AbstractController
             'color' => $color,
             'userid' => $user->userid
         ];
+        $project = Project::userProject($projectId, true, $id > 0 ? true : null);
         if ($id > 0) {
             $tag = ProjectTag::where('id', $id)
                 ->where('project_id', $projectId)
@@ -2920,6 +2920,7 @@ class ProjectController extends AbstractController
                 return Base::retError('每个项目最多添加20个标签');
             }
             $tag = ProjectTag::create($data);
+            $project->addLog("添加标签【" . $tag->name . "】");
         }
         return Base::retSuccess('保存成功', $tag);
     }
diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue
index eb356f157..f889a3f55 100644
--- a/resources/assets/js/pages/manage/components/ProjectLog.vue
+++ b/resources/assets/js/pages/manage/components/ProjectLog.vue
@@ -43,10 +43,11 @@
 
 <script>
 import ProjectLogDetail from "./ProjectLogDetail";
+import TaskTag from "./ProjectTaskTag/tags.vue";
 
 export default {
     name: "ProjectLog",
-    components: {ProjectLogDetail},
+    components: {ProjectLogDetail, TaskTag},
     props: {
         projectId: {
             type: Number,
@@ -193,6 +194,17 @@ export default {
                         vNode.push(h('span', {class:'change-value'}, now || '-'))
                     }
                 }
+                if ($A.isArray(record.tags)) {
+                    vNode.push(h('span', {
+                        class: 'change-tags'
+                    }, [
+                        h('TaskTag', {
+                            props: {
+                                tags: record.tags
+                            }
+                        })
+                    ]))
+                }
                 if ($A.isJson(record.link)) {
                     const {title, url} = record.link
                     vNode.push(h('span', ': '))
diff --git a/resources/assets/sass/pages/components/project-log.scss b/resources/assets/sass/pages/components/project-log.scss
index ecc44e0f7..e985f7c3e 100644
--- a/resources/assets/sass/pages/components/project-log.scss
+++ b/resources/assets/sass/pages/components/project-log.scss
@@ -143,6 +143,19 @@
                             }
                         }
                     }
+
+                    .change-tags {
+                        display: inline-block;
+                        margin-left: 6px;
+                        .tags-box {
+                            gap: 6px;
+                            > li {
+                                height: 20px;
+                                padding: 0 8px;
+                                font-size: 12px;
+                            }
+                        }
+                    }
                 }
 
                 .log-operation {