From b7b933c89d337a76279d03d5dc4bcdd600f3497a Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 30 Mar 2023 15:07:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=B7=B2=E5=BD=92=E6=A1=A3=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/pages/manage/components/TaskArchived.vue | 1 + resources/assets/js/store/actions.js | 2 +- resources/assets/js/store/state.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/pages/manage/components/TaskArchived.vue b/resources/assets/js/pages/manage/components/TaskArchived.vue index 86fb86c3d..1391d2bb2 100644 --- a/resources/assets/js/pages/manage/components/TaskArchived.vue +++ b/resources/assets/js/pages/manage/components/TaskArchived.vue @@ -157,6 +157,7 @@ export default { }, on: { 'click': () => { + this.$store.state.taskArchiveView = params.row.id this.$store.dispatch("openTask", params.row); } }, diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 13862efe2..5bb120357 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -1288,7 +1288,7 @@ export default { forgetTask({state, dispatch}, task_id) { $A.execMainDispatch("forgetTask", task_id) // - const ids = $A.isArray(task_id) ? task_id : [task_id]; + const ids = ($A.isArray(task_id) ? task_id : [task_id]).filter(id => id != state.taskArchiveView); const parent_ids = []; const project_ids = []; ids.some(id => { diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js index a945e5842..9c7a005dc 100644 --- a/resources/assets/js/store/state.js +++ b/resources/assets/js/store/state.js @@ -112,6 +112,7 @@ export default { taskFiles: [], taskLogs: [], taskOperation: {}, + taskArchiveView: 0, // 任务等待状态 taskOneLoad: {},