perf: 优化任务接口数据逻辑

This commit is contained in:
kuaifan 2023-03-25 20:23:25 +08:00
parent f8cbd31f61
commit ec62d7be5a
3 changed files with 8 additions and 23 deletions

View File

@ -859,12 +859,8 @@ class ProjectController extends AbstractController
* - 第一个时间: 读取在这个时间之后更新的数据
* - 第二个时间: 读取在这个时间之后删除的数据ID第1页附加返回数据: deleted_id
*
* @apiParam {String} [complete] 完成状态
* - all所有默认
* - yes已完成
* - no未完成
* @apiParam {String} [archived] 归档状态
* - all所有
* - all所有parent_id > 0 时强制 all
* - yes已归档
* - no未归档默认
* @apiParam {String} [deleted] 是否读取已删除
@ -892,7 +888,6 @@ class ProjectController extends AbstractController
$name = Request::input('name');
$time = Request::input('time');
$timerange = TimeRange::parse(Request::input('timerange'));
$complete = Request::input('complete', 'all');
$archived = Request::input('archived', 'no');
$deleted = Request::input('deleted', 'no');
$keys = Request::input('keys');
@ -914,6 +909,7 @@ class ProjectController extends AbstractController
$isDeleted = str_replace(['all', 'yes', 'no'], [null, false, true], $deleted);
ProjectTask::userTask($parent_id, $isArchived, $isDeleted);
$scopeAll = true;
$archived = 'all';
$builder->where('project_tasks.parent_id', $parent_id);
} elseif ($parent_id === -1) {
$builder->where('project_tasks.parent_id', 0);
@ -944,12 +940,6 @@ class ProjectController extends AbstractController
$builder->where('project_tasks.updated_at', '>', $timerange->updated);
}
//
if ($complete === 'yes') {
$builder->whereNotNull('project_tasks.complete_at');
} elseif ($complete === 'no') {
$builder->whereNull('project_tasks.complete_at');
}
//
if ($archived == 'yes') {
$builder->whereNotNull('project_tasks.archived_at');
} elseif ($archived == 'no') {

View File

@ -249,10 +249,7 @@ export default {
}
//
this.loadIng++;
this.$store.dispatch("getTasks", {
time,
complete: "no"
}).finally(_ => {
this.$store.dispatch("getTasks", {time}).finally(_ => {
this.loadIng--;
})
},

View File

@ -1331,6 +1331,9 @@ export default {
*/
getTasks({state, dispatch}, requestData) {
const taskData = [];
if (requestData === null) {
requestData = {}
}
if ($A.isArray(requestData.taskData)) {
taskData.push(...requestData.taskData)
delete requestData.taskData;
@ -1453,9 +1456,7 @@ export default {
}
state.loadDashboardTasks = true;
//
dispatch("getTasks", {
complete: "no",
}).finally(_ => {
dispatch("getTasks", null).finally(_ => {
state.loadDashboardTasks = false;
})
},
@ -1482,10 +1483,7 @@ export default {
*/
getTaskForParent({state, dispatch}, parent_id) {
return new Promise(function (resolve, reject) {
dispatch("getTasks", {
parent_id,
archived: 'all'
}).then(resolve).catch(reject)
dispatch("getTasks", {parent_id}).then(resolve).catch(reject)
})
},