diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index 1c8d11c9..125f1c90 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -163,8 +163,8 @@ class ProjectController extends AbstractController
*
* @apiParam {Number} project_id 项目ID
* @apiParam {Number} [column_id] 列表ID，留空取第一个
- * @apiParam {String} name 任务名称
- * @apiParam {String} [content] 任务描述
+ * @apiParam {String} name 任务描述
+ * @apiParam {String} [content] 任务详情
* @apiParam {Array} [times] 计划时间（格式：开始时间,结束时间；如：2020-01-01 00:00,2020-01-01 23:59）
* @apiParam {Number} [owner] 负责人，留空为自己
* @apiParam {Array} [subtasks] 子任务（格式：[{name,owner,times}]）
diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index d3b020f7..8008751d 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -25,6 +25,7 @@ use Carbon\Carbon;
* @property \Illuminate\Support\Carbon|null $deleted_at
* @property-read int $file_num
* @property-read int $msg_num
+ * @property-read int $sub_num
* @property-read bool $overdue
* @property-read int $percent
* @property-read bool $today
@@ -55,6 +56,7 @@ class ProjectTask extends AbstractModel
protected $appends = [
'file_num',
'msg_num',
+ 'sub_num',
'percent',
'today',
'overdue',
@@ -84,14 +86,35 @@ class ProjectTask extends AbstractModel
return $this->attributes['msg_num'];
}
+ /**
+ * 子任务数量
+ * @return int
+ */
+ public function getSubNumAttribute()
+ {
+ if ($this->parent_id > 0) {
+ return 0;
+ }
+ if (!isset($this->attributes['sub_num'])) {
+ $this->attributes['sub_num'] = self::whereParentId($this->id)->count();
+ }
+ return $this->attributes['sub_num'];
+ }
+
/**
* 进度（0-100）
* @return int
*/
public function getPercentAttribute()
{
+ if ($this->parent_id > 0) {
+ return 0;
+ }
$builder = self::whereParentId($this->id);
- $subTaskTotal = $builder->count();
+ if (!isset($this->attributes['sub_num'])) {
+ $this->attributes['sub_num'] = $builder->count();
+ }
+ $subTaskTotal = $this->attributes['sub_num'];
if ($subTaskTotal == 0) {
return $this->complete_at ? 1 : 0;
}
diff --git a/resources/assets/js/components/TEditor.vue b/resources/assets/js/components/TEditor.vue
index eba17d75..f626b0b8 100755
--- a/resources/assets/js/components/TEditor.vue
+++ b/resources/assets/js/components/TEditor.vue
@@ -49,84 +49,6 @@
-