From 952d060e2fa25446f3102e5ca09452206470783a Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Sat, 7 Dec 2024 11:55:02 +0800
Subject: [PATCH] no message

---
 app/Models/Setting.php                        |  4 +--
 resources/assets/sass/pages/components/_.scss |  2 +-
 ...css => project-task-template-and-tag.scss} | 34 +++++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)
 rename resources/assets/sass/pages/components/{project-task-template.scss => project-task-template-and-tag.scss} (76%)

diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index f40087e90..f1919b703 100644
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -11,7 +11,7 @@ use App\Module\Timer;
  * @property int $id
  * @property string|null $name
  * @property string|null $desc 参数描述、备注
- * @property string|null $setting
+ * @property array $setting
  * @property \Illuminate\Support\Carbon|null $created_at
  * @property \Illuminate\Support\Carbon|null $updated_at
  * @method static \Illuminate\Database\Eloquent\Builder|AbstractModel cancelAppend()
@@ -36,7 +36,7 @@ class Setting extends AbstractModel
     /**
      * 格式化设置参数
      * @param $value
-     * @return array|mixed
+     * @return array
      */
     public function getSettingAttribute($value)
     {
diff --git a/resources/assets/sass/pages/components/_.scss b/resources/assets/sass/pages/components/_.scss
index a502c5fb2..fcbae7fa2 100755
--- a/resources/assets/sass/pages/components/_.scss
+++ b/resources/assets/sass/pages/components/_.scss
@@ -15,7 +15,7 @@
 @import "project-panel";
 @import "project-workflow";
 @import "project-permission";
-@import "project-task-template";
+@import "project-task-template-and-tag";
 @import "task-add";
 @import "task-add-simple";
 @import "task-archived";
diff --git a/resources/assets/sass/pages/components/project-task-template.scss b/resources/assets/sass/pages/components/project-task-template-and-tag.scss
similarity index 76%
rename from resources/assets/sass/pages/components/project-task-template.scss
rename to resources/assets/sass/pages/components/project-task-template-and-tag.scss
index 6a703031f..dc1bd85fe 100644
--- a/resources/assets/sass/pages/components/project-task-template.scss
+++ b/resources/assets/sass/pages/components/project-task-template-and-tag.scss
@@ -97,6 +97,40 @@
                     padding: 0 12px;
                     font-size: 13px;
 
+                    > i {
+                        margin: 0 -2px;
+                    }
+                }
+            }
+        }
+        .tag-item {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            margin-bottom: 16px;
+            padding: 16px;
+            border: 1px solid #F4F4F5;
+            border-radius: 4px;
+            .tag-contents {
+                .tag-title {
+                    height: 22px;
+                    display: flex;
+                    align-items: center;
+                    color: $primary-title-color;
+                }
+                .tag-desc {
+                    margin-top: 4px;
+                    color: $primary-text-color;
+                    font-size: 13px;
+                }
+            }
+            .tag-actions {
+                > button {
+                    margin: 8px 0 8px 8px;
+                    height: 28px;
+                    padding: 0 12px;
+                    font-size: 13px;
+
                     > i {
                         margin: 0 -2px;
                     }