no message
This commit is contained in:
kuaifan
parent
aad621bd84
commit
7a22f4b20f
@ -76,11 +76,11 @@ export default {
|
||||
computed: {
|
||||
...mapState(['userId', 'projects', 'tasks']),
|
||||
|
||||
...mapGetters(['ownerTasks', 'transforTasks']),
|
||||
...mapGetters(['transforTasks']),
|
||||
|
||||
list() {
|
||||
const datas = this.transforTasks(this.ownerTasks.filter(({end_at}) => {
|
||||
return end_at;
|
||||
const datas = this.transforTasks(this.tasks.filter(({complete_at, owner, end_at}) => {
|
||||
return !complete_at && owner && end_at;
|
||||
}));
|
||||
return datas.map(data => {
|
||||
const isAllday = $A.rightExists(data.start_at, "00:00:00") && $A.rightExists(data.end_at, "23:59:59")
|
||||
|
||||
@ -462,7 +462,7 @@ export default {
|
||||
columnTopShow: {},
|
||||
taskLoad: {},
|
||||
|
||||
completeTask: [],
|
||||
tempShowTasks: [],
|
||||
|
||||
sortField: 'end_at',
|
||||
sortType: 'desc',
|
||||
@ -530,7 +530,7 @@ export default {
|
||||
'columns',
|
||||
]),
|
||||
|
||||
...mapGetters(['projectData', 'projectParameter', 'ownerTasks', 'transforTasks']),
|
||||
...mapGetters(['projectData', 'projectParameter', 'transforTasks']),
|
||||
|
||||
userWaitRemove() {
|
||||
const {userids, useridbak} = this.userData;
|
||||
@ -593,13 +593,13 @@ export default {
|
||||
},
|
||||
|
||||
myList() {
|
||||
const {projectId, ownerTasks, searchText, completeTask, sortField, sortType} = this;
|
||||
const array = ownerTasks.filter((task) => {
|
||||
const {projectId, tasks, searchText, tempShowTasks, sortField, sortType} = this;
|
||||
const array = tasks.filter((task) => {
|
||||
if (task.project_id != projectId) {
|
||||
return false;
|
||||
}
|
||||
if (!this.projectParameter('completedTask')) {
|
||||
if (task.complete_at && !completeTask.find(id => id == task.id)) {
|
||||
if (task.complete_at && !tempShowTasks.find(({id}) => id == task.id)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -608,7 +608,7 @@ export default {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
return task.owner;
|
||||
});
|
||||
return array.sort((a, b) => {
|
||||
if (sortType == 'asc') {
|
||||
@ -626,13 +626,13 @@ export default {
|
||||
},
|
||||
|
||||
helpList() {
|
||||
const {projectId, tasks, searchText, userId, completeTask, sortField, sortType} = this;
|
||||
const {projectId, tasks, searchText, tempShowTasks, userId, sortField, sortType} = this;
|
||||
const array = tasks.filter((task) => {
|
||||
if (task.project_id != projectId || task.parent_id > 0) {
|
||||
return false;
|
||||
}
|
||||
if (!this.projectParameter('completedTask')) {
|
||||
if (task.complete_at && !completeTask.find(id => id == task.id)) {
|
||||
if (task.complete_at && !tempShowTasks.find(({id}) => id == task.id)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@ -659,22 +659,17 @@ export default {
|
||||
},
|
||||
|
||||
unList() {
|
||||
const {projectId, tasks, searchText, completeTask, sortField, sortType} = this;
|
||||
const {projectId, tasks, searchText, sortField, sortType} = this;
|
||||
const array = tasks.filter((task) => {
|
||||
if (task.project_id != projectId || task.parent_id > 0) {
|
||||
return false;
|
||||
}
|
||||
if (!this.projectParameter('completedTask')) {
|
||||
if (task.complete_at && !completeTask.find(id => id == task.id)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if (searchText) {
|
||||
if (!$A.strExists(task.name, searchText) && !$A.strExists(task.desc, searchText)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return !task.complete_at || completeTask.find(id => id == task.id);
|
||||
return !task.complete_at;
|
||||
});
|
||||
return array.sort((a, b) => {
|
||||
if (sortType == 'asc') {
|
||||
@ -727,7 +722,7 @@ export default {
|
||||
this.sortData = this.getSort();
|
||||
},
|
||||
'$route'() {
|
||||
this.completeTask = [];
|
||||
this.tempShowTasks = [];
|
||||
}
|
||||
},
|
||||
|
||||
@ -949,19 +944,18 @@ export default {
|
||||
if (task.complete_at) return;
|
||||
this.updateTask(task, {
|
||||
complete_at: $A.formatDate("Y-m-d H:i:s")
|
||||
}).then(() => {
|
||||
this.tempShowTasks.push(task)
|
||||
})
|
||||
this.completeTask.push(task.id)
|
||||
break;
|
||||
|
||||
case 'uncomplete':
|
||||
if (!task.complete_at) return;
|
||||
this.updateTask(task, {
|
||||
complete_at: false
|
||||
}).then(() => {
|
||||
this.tempShowTasks = this.tempShowTasks.filter(({id}) => id != task.id)
|
||||
})
|
||||
let index = this.completeTask.findIndex(id => id == task.id)
|
||||
if (index > -1) {
|
||||
this.completeTask.splice(index, 1)
|
||||
}
|
||||
break;
|
||||
|
||||
case 'archived':
|
||||
@ -1255,7 +1249,7 @@ export default {
|
||||
|
||||
toggleCompleted() {
|
||||
this.$store.dispatch('toggleProjectParameter', 'completedTask');
|
||||
this.completeTask = [];
|
||||
this.tempShowTasks = [];
|
||||
},
|
||||
|
||||
formatTime(date) {
|
||||
|
||||
29
resources/assets/js/store/getters.js
vendored
29
resources/assets/js/store/getters.js
vendored
@ -58,20 +58,6 @@ export default {
|
||||
return {};
|
||||
},
|
||||
|
||||
/**
|
||||
* 我所有的任务（未完成）
|
||||
* @param state
|
||||
* @returns {unknown[]}
|
||||
*/
|
||||
ownerTasks(state) {
|
||||
return state.tasks.filter(({complete_at, owner}) => {
|
||||
if (complete_at) {
|
||||
return false;
|
||||
}
|
||||
return owner;
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 转换任务列表
|
||||
* @returns {function(*): *}
|
||||
@ -102,6 +88,7 @@ export default {
|
||||
name: task.name,
|
||||
start_at: task.start_at,
|
||||
end_at: task.end_at,
|
||||
complete_at: task.complete_at,
|
||||
|
||||
sub_top: true,
|
||||
sub_my: [],
|
||||
@ -117,6 +104,20 @@ export default {
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* 我所有的任务（未完成）
|
||||
* @param state
|
||||
* @returns {unknown[]}
|
||||
*/
|
||||
ownerTasks(state) {
|
||||
return state.tasks.filter(({complete_at, owner}) => {
|
||||
if (complete_at) {
|
||||
return false;
|
||||
}
|
||||
return owner;
|
||||
})
|
||||
},
|
||||
|
||||
/**
|
||||
* 仪表盘任务数据
|
||||
* @param state
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user