gitee/dootask
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-01-05 19:49:47 +08:00
parent 6324e79aba
commit dde32fcaee
6 changed files with 197 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/assets/js/pages/manage/components/ProjectList.vue
View File

@ -785,7 +785,7 @@ export default {
}).catch(({msg}) => { }).catch(({msg}) => {
$A.modalError(msg); $A.modalError(msg);
this.sortDisabled = false; this.sortDisabled = false;
this.$store.dispatch("getTasks", {project_id: this.projectId}) this.$store.dispatch("getTaskForProject", this.projectId)
}); });
}, },
@ -1052,7 +1052,7 @@ export default {
this.userLoad--; this.userLoad--;
this.userShow = false; this.userShow = false;
this.$store.dispatch("getProjectOne", this.projectId); this.$store.dispatch("getProjectOne", this.projectId);
this.$store.dispatch("getTasks", {project_id: this.projectId}) this.$store.dispatch("getTaskForProject", this.projectId)
}).catch(({msg}) => { }).catch(({msg}) => {
$A.modalError(msg); $A.modalError(msg);
this.userLoad--; this.userLoad--;
@ -1072,7 +1072,7 @@ export default {
this.transferLoad--; this.transferLoad--;
this.transferShow = false; this.transferShow = false;
this.$store.dispatch("getProjectOne", this.projectId); this.$store.dispatch("getProjectOne", this.projectId);
this.$store.dispatch("getTasks", {project_id: this.projectId}) this.$store.dispatch("getTaskForProject", this.projectId)
}).catch(({msg}) => { }).catch(({msg}) => {
$A.modalError(msg); $A.modalError(msg);
this.transferLoad--; this.transferLoad--;

6
resources/assets/js/pages/manage/components/TaskRow.vue
View File

@ -228,14 +228,12 @@ export default {
} }
this.$set(this.taskLoad, task.id, true); this.$set(this.taskLoad, task.id, true);
// //
this.$store.dispatch("getTasks", { this.$store.dispatch("getTaskForParent", task.id).then(() => {
parent_id: task.id
}).then(() => {
this.$set(this.taskLoad, task.id, false); this.$set(this.taskLoad, task.id, false);
this.$set(this.taskOpen, task.id, true); this.$set(this.taskOpen, task.id, true);
}).catch(({msg}) => { }).catch(({msg}) => {
this.$set(this.taskLoad, task.id, false);
$A.modalError(msg); $A.modalError(msg);
this.$set(this.taskLoad, task.id, false);
}); });
}, },

2
resources/assets/js/pages/manage/dashboard.vue
View File

@ -135,7 +135,7 @@ export default {
}, },
activated() { activated() {
this.$store.dispatch("getDashboardTasks"); this.$store.dispatch("getTaskForDashboard");
}, },
computed: { computed: {

2
resources/assets/js/pages/manage/project.vue
View File

@ -35,7 +35,7 @@ export default {
this.$store.state.projectId = $A.runNum(id); this.$store.state.projectId = $A.runNum(id);
this.$store.dispatch("getProjectOne", id).then(() => { this.$store.dispatch("getProjectOne", id).then(() => {
this.$store.dispatch("getColumns", id); this.$store.dispatch("getColumns", id);
this.$store.dispatch("getTasks", {project_id: id}); this.$store.dispatch("getTaskForProject", id);
}).catch(({msg}) => { }).catch(({msg}) => {
$A.modalWarning({ $A.modalWarning({
content: msg, content: msg,

2
resources/assets/js/pages/single/task.vue
View File

@ -70,7 +70,7 @@ export default {
this.taskInfo = data; this.taskInfo = data;
this.$store.dispatch("getTaskContent", task_id); this.$store.dispatch("getTaskContent", task_id);
this.$store.dispatch("getTaskFiles", task_id); this.$store.dispatch("getTaskFiles", task_id);
this.$store.dispatch("getTasks", {parent_id: task_id}); this.$store.dispatch("getTaskForParent", task_id);
}).catch(({msg}) => { }).catch(({msg}) => {
this.loadIng--; this.loadIng--;
$A.modalError({ $A.modalError({

289
resources/assets/js/store/actions.js vendored
View File

@ -202,7 +202,7 @@ export default {
state.method.setStorage("userInfo", state.userInfo); state.method.setStorage("userInfo", state.userInfo);
dispatch("getProjects"); dispatch("getProjects");
dispatch("getDialogs"); dispatch("getDialogs");
dispatch("getDashboardTasks"); dispatch("getTaskForDashboard");
dispatch("websocketConnection"); dispatch("websocketConnection");
resolve() resolve()
}); });
@ -433,12 +433,15 @@ export default {
forgetFile({state, dispatch}, file_id) { forgetFile({state, dispatch}, file_id) {
$A.execMainDispatch("forgetFile", file_id) $A.execMainDispatch("forgetFile", file_id)
// //
state.files = state.files.filter((file) => file.id != file_id); let ids = $A.isArray(file_id) ? file_id : [file_id];
state.files.forEach((file) => { ids.some(id => {
if (file.pid == file_id) { state.files = state.files.filter(file => file.id != id);
dispatch("forgetFile", file.id); state.files.some(file => {
} if (file.pid == id) {
}); dispatch("forgetFile", file.id);
}
});
})
}, },
/** /**
@ -458,6 +461,7 @@ export default {
}).then((result) => { }).then((result) => {
const ids = result.data.map(({id}) => id) const ids = result.data.map(({id}) => id)
state.files = state.files.filter((item) => item.pid != pid || ids.includes(item.id)); state.files = state.files.filter((item) => item.pid != pid || ids.includes(item.id));
//
dispatch("saveFile", result.data); dispatch("saveFile", result.data);
resolve(result) resolve(result)
}).catch(e => { }).catch(e => {
@ -533,11 +537,14 @@ export default {
forgetProject({state}, project_id) { forgetProject({state}, project_id) {
$A.execMainDispatch("forgetProject", project_id) $A.execMainDispatch("forgetProject", project_id)
// //
let index = state.projects.findIndex(({id}) => id == project_id); let ids = $A.isArray(project_id) ? project_id : [project_id];
if (index > -1) { ids.some(id => {
state.projects.splice(index, 1); let index = state.projects.findIndex(project => project.id == id);
} if (index > -1) {
if (state.projectId == project_id) { state.projects.splice(index, 1);
}
})
if (ids.includes(state.projectId)) {
const project = state.projects.find(({id}) => id && id != project_id); const project = state.projects.find(({id}) => id && id != project_id);
if (project) { if (project) {
$A.goForward({path: '/manage/project/' + project.id}); $A.goForward({path: '/manage/project/' + project.id});
@ -735,11 +742,18 @@ export default {
forgetColumn({state, dispatch}, column_id) { forgetColumn({state, dispatch}, column_id) {
$A.execMainDispatch("forgetColumn", column_id) $A.execMainDispatch("forgetColumn", column_id)
// //
let index = state.columns.findIndex(({id}) => id == column_id); let ids = $A.isArray(column_id) ? column_id : [column_id];
if (index > -1) { let project_ids = [];
dispatch('getProjectOne', state.columns[index].project_id) ids.some(id => {
state.columns.splice(index, 1); let index = state.columns.findIndex(column => column.id == id);
} if (index > -1) {
project_ids.push(state.columns[index].project_id)
dispatch('getProjectOne', state.columns[index].project_id)
state.columns.splice(index, 1);
}
})
Array.from(new Set(project_ids)).some(id => dispatch("getProjectOne", id))
//
setTimeout(() => { setTimeout(() => {
state.method.setStorage("cacheColumns", state.cacheColumns = state.columns); state.method.setStorage("cacheColumns", state.cacheColumns = state.columns);
}) })
@ -770,11 +784,12 @@ export default {
} }
}).then(({data}) => { }).then(({data}) => {
state.projectLoad--; state.projectLoad--;
//
const ids = data.data.map(({id}) => id) const ids = data.data.map(({id}) => id)
if (ids.length > 0) { state.columns = state.columns.filter((item) => item.project_id != project_id || ids.includes(item.id));
state.columns = state.columns.filter((item) => item.project_id != project_id || ids.includes(item.id)); //
}
dispatch("saveColumn", data.data); dispatch("saveColumn", data.data);
resolve(data.data)
// 判断只有1列的时候默认版面为表格模式 // 判断只有1列的时候默认版面为表格模式
if (state.columns.filter(item => item.project_id == project_id).length === 1) { if (state.columns.filter(item => item.project_id == project_id).length === 1) {
const cache = state.cacheProjectParameter.find(item => item.project_id == project_id) || {}; const cache = state.cacheProjectParameter.find(item => item.project_id == project_id) || {};
@ -788,7 +803,6 @@ export default {
}); });
} }
} }
resolve(data.data)
}).catch(e => { }).catch(e => {
console.error(e); console.error(e);
state.projectLoad--; state.projectLoad--;
@ -842,6 +856,7 @@ export default {
dispatch("saveTask", task) dispatch("saveTask", task)
}); });
} else if (state.method.isJson(data)) { } else if (state.method.isJson(data)) {
data._time = $A.Time();
let index = state.tasks.findIndex(({id}) => id == data.id); let index = state.tasks.findIndex(({id}) => id == data.id);
if (index > -1) { if (index > -1) {
state.tasks.splice(index, 1, Object.assign({}, state.tasks[index], data)); state.tasks.splice(index, 1, Object.assign({}, state.tasks[index], data));
@ -862,7 +877,7 @@ export default {
} }
if (data.is_update_subtask) { if (data.is_update_subtask) {
data.is_update_subtask = false; data.is_update_subtask = false;
dispatch("getTasks", {parent_id: data.id}); dispatch("getTaskForParent", data.id);
} }
// //
setTimeout(() => { setTimeout(() => {
@ -880,15 +895,23 @@ export default {
forgetTask({state, dispatch}, task_id) { forgetTask({state, dispatch}, task_id) {
$A.execMainDispatch("forgetTask", task_id) $A.execMainDispatch("forgetTask", task_id)
// //
let index = state.tasks.findIndex(({id}) => id == task_id); let ids = $A.isArray(task_id) ? task_id : [task_id];
if (index > -1) { let parent_ids = [];
if (state.tasks[index].parent_id) { let project_ids = [];
dispatch("getTaskOne", state.tasks[index].parent_id) ids.some(id => {
let index = state.tasks.findIndex(task => task.id == id);
if (index > -1) {
if (state.tasks[index].parent_id) {
parent_ids.push(state.tasks[index].parent_id)
}
project_ids.push(state.tasks[index].project_id)
state.tasks.splice(index, 1);
} }
dispatch('getProjectOne', state.tasks[index].project_id) })
state.tasks.splice(index, 1); Array.from(new Set(parent_ids)).some(id => dispatch("getTaskOne", id))
} Array.from(new Set(project_ids)).some(id => dispatch("getProjectOne", id))
if (state.taskId == task_id) { //
if (ids.includes(state.taskId)) {
state.taskId = 0; state.taskId = 0;
} }
setTimeout(() => { setTimeout(() => {
@ -904,7 +927,7 @@ export default {
increaseTaskMsgNum({state}, dialog_id) { increaseTaskMsgNum({state}, dialog_id) {
$A.execMainDispatch("increaseTaskMsgNum", dialog_id) $A.execMainDispatch("increaseTaskMsgNum", dialog_id)
// //
const task = state.tasks.find((task) => task.dialog_id === dialog_id); const task = state.tasks.find(task => task.dialog_id === dialog_id);
if (task) task.msg_num++; if (task) task.msg_num++;
}, },
@ -913,56 +936,60 @@ export default {
* @param state * @param state
* @param dispatch * @param dispatch
* @param data * @param data
* @returns {Promise<unknown>}
*/ */
getTasks({state, dispatch}, data) { getTasks({state, dispatch}, data) {
if (state.userId === 0) { return new Promise(function (resolve, reject) {
state.tasks = []; if (state.userId === 0) {
return; state.tasks = [];
} reject({msg: 'Parameter error'});
if (state.tasks.length == 0 && state.cacheTasks.length > 0) { return;
state.tasks = state.cacheTasks; }
} if (state.tasks.length == 0 && state.cacheTasks.length > 0) {
if (data.project_id) { state.tasks = state.cacheTasks;
state.projectLoad++; }
}
dispatch("call", {
url: 'project/task/lists',
data: data
}).then(result => {
if (data.project_id) { if (data.project_id) {
state.projectLoad--; state.projectLoad++;
} }
// //
const resData = result.data; dispatch("call", {
if (data.project_id && resData.current_page == 1) { url: 'project/task/lists',
const ids = resData.data.map(({id}) => id) data: data
if (ids.length > 0) { }).then(result => {
state.tasks = state.tasks.filter((item) => item.project_id != data.project_id || ids.includes(item.id)); if (data.project_id) {
state.projectLoad--;
} }
} //
// const resData = result.data;
if (resData.next_page_url) { dispatch("saveTask", resData.data);
const nextData = Object.assign(data, { //
page: resData.current_page + 1, if (resData.next_page_url) {
}); const nextData = Object.assign(data, {
if (resData.current_page % 5 === 0) { page: resData.current_page + 1,
$A.modalWarning({
content: "数据已超过" + resData.to + "条，是否继续加载？",
onOk: () => {
dispatch("getTasks", nextData)
}
}); });
if (resData.current_page % 5 === 0) {
$A.modalWarning({
content: "数据已超过" + resData.to + "条，是否继续加载？",
onOk: () => {
dispatch("getTasks", nextData).then(resolve).catch(reject)
},
onCancel: () => {
resolve()
}
});
} else {
dispatch("getTasks", nextData).then(resolve).catch(reject)
}
} else { } else {
dispatch("getTasks", nextData) resolve()
} }
} }).catch(e => {
// console.error(e);
dispatch("saveTask", resData.data); reject(e)
}).catch(e => { if (data.project_id) {
console.error(e); state.projectLoad--;
if (data.project_id) { }
state.projectLoad--; });
}
}); });
}, },
@ -998,46 +1025,103 @@ export default {
* 获取Dashboard相关任务 * 获取Dashboard相关任务
* @param state * @param state
* @param dispatch * @param dispatch
* @param getters
*/ */
getDashboardTasks({state, dispatch}) { getTaskForDashboard({state, dispatch, getters}) {
if (state.cacheLoading["loadDashboardTasks"] === true) { if (state.cacheLoading["loadDashboardTasks"] === true) {
return; return;
} }
state.cacheLoading["loadDashboardTasks"] = true; state.cacheLoading["loadDashboardTasks"] = true;
// //
const time = $A.Time()
const {today, overdue} = getters.dashboardTask;
const currentIds = today.map(({id}) => id)
currentIds.push(...overdue.map(({id}) => id))
//
let loadIng = 2; let loadIng = 2;
let call = () => { let call = () => {
if (loadIng <= 0) { if (loadIng <= 0) {
state.cacheLoading["loadDashboardTasks"] = false; state.cacheLoading["loadDashboardTasks"] = false;
//
const {today, overdue} = getters.dashboardTask;
const newIds = today.filter(task => task._time >= time).map(({id}) => id)
newIds.push(...overdue.filter(task => task._time >= time).map(({id}) => id))
dispatch("forgetTask", currentIds.filter(v => newIds.indexOf(v) == -1))
return; return;
} }
loadIng--; loadIng--;
if (loadIng == 1) { if (loadIng == 1) {
// 获取今日任务
dispatch("getTasks", { dispatch("getTasks", {
complete: "no", complete: "no",
time: [ time: [
$A.formatDate("Y-m-d 00:00:00"), $A.formatDate("Y-m-d 00:00:00"),
$A.formatDate("Y-m-d 23:59:59") $A.formatDate("Y-m-d 23:59:59")
] ],
}).then(() => { }).then(call).catch(call)
setTimeout(call);
}).catch(() => {
setTimeout(call);
})
} else if (loadIng == 0) { } else if (loadIng == 0) {
// 获取过期任务
dispatch("getTasks", { dispatch("getTasks", {
complete: "no", complete: "no",
time_before: $A.formatDate("Y-m-d H:i:s") time_before: $A.formatDate("Y-m-d H:i:s"),
}).then(() => { }).then(call).catch(call)
setTimeout(call);
}).catch(() => {
setTimeout(call);
})
} }
} }
call(); call();
}, },
/**
* 获取项目任务
* @param state
* @param dispatch
* @param project_id
* @returns {Promise<unknown>}
*/
getTaskForProject({state, dispatch}, project_id) {
return new Promise(function (resolve, reject) {
const time = $A.Time()
const currentIds = state.tasks.filter(task => task.project_id == project_id).map(({id}) => id)
//
let call = () => {
const newIds = state.tasks.filter(task => task.project_id == project_id && task._time >= time).map(({id}) => id)
dispatch("forgetTask", currentIds.filter(v => newIds.indexOf(v) == -1))
}
dispatch("getTasks", {project_id}).then(() => {
call()
resolve()
}).catch(() => {
call()
reject()
})
})
},
/**
* 获取子任务
* @param state
* @param dispatch
* @param parent_id
* @returns {Promise<unknown>}
*/
getTaskForParent({state, dispatch}, parent_id) {
return new Promise(function (resolve, reject) {
const time = $A.Time()
const currentIds = state.tasks.filter(task => task.parent_id == parent_id).map(({id}) => id)
//
let call = () => {
const newIds = state.tasks.filter(task => task.parent_id == parent_id && task._time >= time).map(({id}) => id)
dispatch("forgetTask", currentIds.filter(v => newIds.indexOf(v) == -1))
}
dispatch("getTasks", {parent_id}).then(() => {
call()
resolve()
}).catch(() => {
call()
reject()
})
})
},
/** /**
* 删除任务 * 删除任务
* @param state * @param state
@ -1175,10 +1259,13 @@ export default {
* @param file_id * @param file_id
*/ */
forgetTaskFile({state, dispatch}, file_id) { forgetTaskFile({state, dispatch}, file_id) {
let index = state.taskFiles.findIndex(({id}) => id == file_id) let ids = $A.isArray(file_id) ? file_id : [file_id];
if (index > -1) { ids.some(id => {
state.taskFiles.splice(index, 1) let index = state.taskFiles.findIndex(file => file.id == id)
} if (index > -1) {
state.taskFiles.splice(index, 1)
}
})
}, },
/** /**
@ -1201,7 +1288,7 @@ export default {
dispatch("getTaskOne", task_id).then(() => { dispatch("getTaskOne", task_id).then(() => {
dispatch("getTaskContent", task_id); dispatch("getTaskContent", task_id);
dispatch("getTaskFiles", task_id); dispatch("getTaskFiles", task_id);
dispatch("getTasks", {parent_id: task_id}); dispatch("getTaskForParent", task_id);
}).catch(({msg}) => { }).catch(({msg}) => {
$A.modalWarning({ $A.modalWarning({
content: msg, content: msg,
@ -1475,13 +1562,17 @@ export default {
forgetDialog({state}, dialog_id) { forgetDialog({state}, dialog_id) {
$A.execMainDispatch("forgetDialog", dialog_id) $A.execMainDispatch("forgetDialog", dialog_id)
// //
let index = state.dialogs.findIndex(({id}) => id == dialog_id); let ids = $A.isArray(dialog_id) ? dialog_id : [dialog_id];
if (index > -1) { ids.some(id => {
state.dialogs.splice(index, 1); let index = state.dialogs.findIndex(dialog => dialog.id == id);
} if (index > -1) {
if (dialog_id == state.method.getStorageInt("messenger::dialogId")) { state.dialogs.splice(index, 1);
}
})
if (ids.includes(state.method.getStorageInt("messenger::dialogId"))) {
state.method.setStorage("messenger::dialogId", 0) state.method.setStorage("messenger::dialogId", 0)
} }
//
setTimeout(() => { setTimeout(() => {
state.method.setStorage("cacheDialogs", state.cacheDialogs = state.dialogs); state.method.setStorage("cacheDialogs", state.cacheDialogs = state.dialogs);
}) })
@ -1548,9 +1639,7 @@ export default {
dispatch("saveDialog", dialog); dispatch("saveDialog", dialog);
// //
const ids = result.data.data.map(({id}) => id) const ids = result.data.data.map(({id}) => id)
if (ids.length > 0) { state.dialogMsgs = state.dialogMsgs.filter((item) => item.dialog_id != dialog_id || ids.includes(item.id));
state.dialogMsgs = state.dialogMsgs.filter((item) => item.dialog_id != dialog_id || ids.includes(item.id));
}
// //
dispatch("saveDialog", result.data.dialog); dispatch("saveDialog", result.data.dialog);
dispatch("saveDialogMsg", result.data.data); dispatch("saveDialogMsg", result.data.data);
@ -1752,14 +1841,14 @@ export default {
break; break;
case 'detail': case 'detail':
dispatch("getProjectOne", data.id); dispatch("getProjectOne", data.id);
dispatch("getTasks", {project_id: data.id}) dispatch("getTaskForProject", data.id)
break; break;
case 'archived': case 'archived':
case 'delete': case 'delete':
dispatch("forgetProject", data.id); dispatch("forgetProject", data.id);
break; break;
case 'sort': case 'sort':
dispatch("getTasks", {project_id: data.id}) dispatch("getTaskForProject", data.id)
break; break;
} }
})(msgDetail); })(msgDetail);