From 2efdfc4b1f0194e2605604fdf9dfcc76c846a517 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Sat, 1 Mar 2025 00:32:29 +0800 Subject: [PATCH] no message --- .../js/pages/manage/components/ProjectPanel.vue | 14 +++++++------- resources/mobile | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue index e571fb255..e3177bf74 100644 --- a/resources/assets/js/pages/manage/components/ProjectPanel.vue +++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue @@ -738,7 +738,7 @@ export default { if ($A.leftExists(flowInfo.value, "user:")) { list = list.filter(({task_user}) => task_user.find(({userid, owner}) => userid === flowInfo.userid && owner)); } 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) { list = list.filter(({flow_item_id}) => flow_item_id === flowInfo.value); } else if (flowInfo.value == -1) { @@ -921,7 +921,7 @@ export default { const tags = []; this.allTask.forEach(({task_tag}) => { task_tag.forEach(tag => { - if (!tags.find(item => item.id === tag.id)) { + if (!tags.find(item => item.name === tag.name)) { tags.push(tag); } }); @@ -978,18 +978,18 @@ export default { } // 标签 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}) => { - return task_tag.find(tag => tag.id === id); + return task_tag.find(tag => tag.name === name); }).length return { - value: `tag:${id}`, + value: `tag:${name}`, label: `${name} (${length})`, status: 'tag-dot', style: { '--bg-color': color, }, - tag_id: id, + tag_name: name, length, } }) @@ -1656,7 +1656,7 @@ export default { flowTask(task) { if ($A.leftExists(this.flowInfo.value, "user:") && !task.task_user.find(({userid, owner}) => userid === this.flowInfo.userid && owner)) { 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; } else if (this.flowInfo.value > 0 && task.flow_item_id !== this.flowInfo.value) { return true; diff --git a/resources/mobile b/resources/mobile index 8373a5c5a..7a1b2da5c 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit 8373a5c5a01e5cdc011946ffcb94ecc8b1bcfe60 +Subproject commit 7a1b2da5c593aa32748fcf83c898ded9a084649b