github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-13 03:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2025-03-01 00:32:29 +08:00
parent 7234d9307e
commit 2efdfc4b1f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/assets/js/pages/manage/components/ProjectPanel.vue
View File

@ -738,7 +738,7 @@ export default {
if ($A.leftExists(flowInfo.value, "user:")) { if ($A.leftExists(flowInfo.value, "user:")) {
list = list.filter(({task_user}) => task_user.find(({userid, owner}) => userid === flowInfo.userid && owner)); list = list.filter(({task_user}) => task_user.find(({userid, owner}) => userid === flowInfo.userid && owner));
} else if ($A.leftExists(flowInfo.value, "tag:")) { } else if ($A.leftExists(flowInfo.value, "tag:")) {
list = list.filter(({task_tag}) => task_tag.find(({id}) => id === flowInfo.tag_id)); list = list.filter(({task_tag}) => task_tag.find(({name}) => name === flowInfo.tag_name));
} else if (flowInfo.value > 0) { } else if (flowInfo.value > 0) {
list = list.filter(({flow_item_id}) => flow_item_id === flowInfo.value); list = list.filter(({flow_item_id}) => flow_item_id === flowInfo.value);
} else if (flowInfo.value == -1) { } else if (flowInfo.value == -1) {
@ -921,7 +921,7 @@ export default {
const tags = []; const tags = [];
this.allTask.forEach(({task_tag}) => { this.allTask.forEach(({task_tag}) => {
task_tag.forEach(tag => { task_tag.forEach(tag => {
if (!tags.find(item => item.id === tag.id)) { if (!tags.find(item => item.name === tag.name)) {
tags.push(tag); tags.push(tag);
} }
}); });
@ -978,18 +978,18 @@ export default {
} }
// 标签 // 标签
if (this.tagList.length > 0) { if (this.tagList.length > 0) {
const tagItems = this.tagList.map(({id, name, color}) => { const tagItems = this.tagList.map(({name, color}) => {
const length = allTask.filter(({task_tag}) => { const length = allTask.filter(({task_tag}) => {
return task_tag.find(tag => tag.id === id); return task_tag.find(tag => tag.name === name);
}).length }).length
return { return {
value: `tag:${id}`, value: `tag:${name}`,
label: `${name} (${length})`, label: `${name} (${length})`,
status: 'tag-dot', status: 'tag-dot',
style: { style: {
'--bg-color': color, '--bg-color': color,
}, },
tag_id: id, tag_name: name,
length, length,
} }
}) })
@ -1656,7 +1656,7 @@ export default {
flowTask(task) { flowTask(task) {
if ($A.leftExists(this.flowInfo.value, "user:") && !task.task_user.find(({userid, owner}) => userid === this.flowInfo.userid && owner)) { if ($A.leftExists(this.flowInfo.value, "user:") && !task.task_user.find(({userid, owner}) => userid === this.flowInfo.userid && owner)) {
return true; return true;
} else if ($A.leftExists(this.flowInfo.value, "tag:") && !task.task_tag.find(({id}) => id === this.flowInfo.tag_id)) { } else if ($A.leftExists(this.flowInfo.value, "tag:") && !task.task_tag.find(({name}) => name === this.flowInfo.tag_name)) {
return true; return true;
} else if (this.flowInfo.value > 0 && task.flow_item_id !== this.flowInfo.value) { } else if (this.flowInfo.value > 0 && task.flow_item_id !== this.flowInfo.value) {
return true; return true;

2
resources/mobile

@ -1 +1 @@
Subproject commit 8373a5c5a01e5cdc011946ffcb94ecc8b1bcfe60 Subproject commit 7a1b2da5c593aa32748fcf83c898ded9a084649b