From 43e6b4dc2f66dd7de8461a9f65ec3fc0210ae689 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 21 Nov 2024 15:24:48 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=BB=B6=E6=9C=9F=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BF=AB=E9=80=89=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/SystemController.php |  1 -
 app/Models/Setting.php                        |  4 ++
 .../js/pages/manage/components/TaskDetail.vue | 37 ++++++++++++++++++-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index dbf9840ee..9accd920e 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -132,7 +132,6 @@ class SystemController extends AbstractController
         $setting['auto_archived'] = $setting['auto_archived'] ?: 'close';
         $setting['archived_day'] = floatval($setting['archived_day']) ?: 7;
         $setting['task_visible'] = $setting['task_visible'] ?: 'close';
-        $setting['task_default_time'] = $setting['task_default_time'] ? Base::json2array($setting['task_default_time']) : ['09:00', '18:00'];
         $setting['all_group_mute'] = $setting['all_group_mute'] ?: 'open';
         $setting['all_group_autoin'] = $setting['all_group_autoin'] ?: 'yes';
         $setting['user_private_chat_mute'] = $setting['user_private_chat_mute'] ?: 'open';
diff --git a/app/Models/Setting.php b/app/Models/Setting.php
index 1fad0529f..ae9b2e582 100644
--- a/app/Models/Setting.php
+++ b/app/Models/Setting.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Module\Base;
+use App\Module\Timer;
 
 /**
  * App\Models\Setting
@@ -46,6 +47,9 @@ class Setting extends AbstractModel
         switch ($this->name) {
             case 'system':
                 $value['system_alias'] = $value['system_alias'] ?: env('APP_NAME');
+                if (!is_array($value['task_default_time']) || count($value['task_default_time']) != 2 || !Timer::isTime($value['task_default_time'][0]) || !Timer::isTime($value['task_default_time'][1])) {
+                    $value['task_default_time'] = ['09:00', '18:00'];
+                }
                 break;
             case 'fileSetting':
                 $value['permission_pack_type'] = $value['permission_pack_type'] ?: 'all';
diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue
index ba69e5206..5b573e460 100755
--- a/resources/assets/js/pages/manage/components/TaskDetail.vue
+++ b/resources/assets/js/pages/manage/components/TaskDetail.vue
@@ -500,6 +500,13 @@
                             </Select>
                         </template>
                     </Input>
+                    <div v-if="delayTaskQuick.length > 0" class="form-tip delay-task-quick-select">
+                        <span>{{$L('快捷选择')}}:</span>
+                        <em
+                            v-for="(item, index) in delayTaskQuick"
+                            :key="index"
+                            @click="onTaskQuick(item.time, item.type)">{{$L(item.name)}}</em>
+                    </div>
                 </FormItem>
                 <FormItem :label="$L('延期备注')" prop="remark">
                     <Input type="textarea" v-model="delayTaskForm.remark" :placeholder="$L('请输入修改备注')"></Input>
@@ -527,6 +534,22 @@
     </div>
 </template>
 
+<style lang="scss">
+.delay-task-quick-select {
+    > span {
+        margin-right: 4px;
+    }
+    > em {
+        margin-right: 4px;
+        cursor: pointer;
+        color: #2b85e4;
+        font-style: normal;
+        &:hover {
+            text-decoration: underline;
+        }
+    }
+}
+</style>
 <script>
 import {mapState} from "vuex";
 import TaskPriority from "./TaskPriority";
@@ -644,9 +667,10 @@ export default {
                 time: "24",
                 remark: ""
             },
+            delayTaskQuick: [],
             delayTaskRule: {
                 time: [
-                    { required: true,  message: this.$L('请输入时长'), trigger: 'blur' },
+                    { required: true,  message: this.$L('请输入时长'), trigger: 'blur', type: 'number' },
                 ],
                 remark: [
                     { required: true, message: this.$L('请输入备注'), trigger: 'blur' },
@@ -1799,6 +1823,12 @@ export default {
         dropDeadline(command) {
             switch (command) {
                 case 1:
+                    this.delayTaskQuick = [
+                        {time: 1, type: 'day', name: '1天'},
+                        {time: 2, type: 'day', name: '2天'},
+                        {time: 3, type: 'day', name: '3天'},
+                        {time: 5, type: 'day', name: '5天'},
+                    ];
                     this.delayTaskShow = true;
                     break;
                 case 2:
@@ -1854,6 +1884,11 @@ export default {
 
         updateVisible() {
             this.updateData(['visibility', 'visibility_appointor'])
+        },
+
+        onTaskQuick(time, type) {
+            this.$set(this.delayTaskForm, 'time', time)
+            this.$set(this.delayTaskForm, 'type', type)
         }
     }
 }