diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php index 987ad0936..1d1f1518b 100644 --- a/app/Models/ProjectTask.php +++ b/app/Models/ProjectTask.php @@ -879,41 +879,42 @@ class ProjectTask extends AbstractModel */ public function refreshLoop($save = false) { - if (!$this->start_at) { - return false; - } - // $success = true; - $start = Carbon::parse($this->start_at); - if ($start->lt(Carbon::today())) { - // 如果任务开始时间小于今天则重复周期开始时间为今天 - $start = Carbon::parse(date("Y-m-d {$start->toTimeString()}")); + if ($this->start_at) { + $base = Carbon::parse($this->start_at); + if ($base->lt(Carbon::today())) { + // 如果任务开始时间小于今天则基数时间为今天 + $base = Carbon::parse(date("Y-m-d {$base->toTimeString()}")); + } + } else { + // 未设置任务时间时基数时间为今天 + $base = Carbon::today(); } switch ($this->loop) { case "day": - $this->loop_at = $start->addDay(); + $this->loop_at = $base->addDay(); break; case "weekdays": - $this->loop_at = $start->addWeekday(); + $this->loop_at = $base->addWeekday(); break; case "week": - $this->loop_at = $start->addWeek(); + $this->loop_at = $base->addWeek(); break; case "twoweeks": - $this->loop_at = $start->addWeeks(2); + $this->loop_at = $base->addWeeks(2); break; case "month": - $this->loop_at = $start->addMonth(); + $this->loop_at = $base->addMonth(); break; case "year": - $this->loop_at = $start->addYear(); + $this->loop_at = $base->addYear(); break; case "never": $this->loop_at = null; break; default: if (Base::isNumber($this->loop)) { - $this->loop_at = $start->addDays($this->loop); + $this->loop_at = $base->addDays($this->loop); } else { $success = false; } diff --git a/public/css/fonts/taskfont.ttf b/public/css/fonts/taskfont.ttf index c29b5f9cc..31f323783 100644 Binary files a/public/css/fonts/taskfont.ttf and b/public/css/fonts/taskfont.ttf differ diff --git a/public/css/fonts/taskfont.woff b/public/css/fonts/taskfont.woff index 8719ce888..8032f7de3 100644 Binary files a/public/css/fonts/taskfont.woff and b/public/css/fonts/taskfont.woff differ diff --git a/public/css/fonts/taskfont.woff2 b/public/css/fonts/taskfont.woff2 index 7c2672fb9..20f1a2941 100644 Binary files a/public/css/fonts/taskfont.woff2 and b/public/css/fonts/taskfont.woff2 differ diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index 6cacfbb2f..b868369b7 100644 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -277,7 +277,7 @@
- {{$L('重复周期')}} + {{$L('重复周期')}}