From c438d7194ce82b12154355e836c3eb5057268bde Mon Sep 17 00:00:00 2001 From: AmriStrong <15770757077@139.com> Date: Mon, 18 Sep 2023 19:17:23 +0800 Subject: [PATCH] [Bug] Dependent components cannot be justified and viewed (#14924) * Dependent components cannot be justified and viewed (dependent components cannot be edited and viewed) #14865 * Dependent components cannot be justified and viewed (dependent components cannot be edited and viewed) #14865 Improve stability --------- Co-authored-by: AmriStrong Co-authored-by: xiangzihao <460888207@qq.com> --- .../projects/task/components/node/fields/use-dependent.ts | 4 ++-- .../projects/workflow/components/dag/use-node-status.ts | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dependent.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dependent.ts index fc9911800b..10a6fcedfd 100644 --- a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dependent.ts +++ b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dependent.ts @@ -258,8 +258,8 @@ export function useDependent(model: { [field: string]: any }): IJsonItem[] { return null const key = `${item.definitionCode}-${item.depTaskCode}-${item.cycle}-${item.dateValue}` const state: ITaskState = dependentResult[key] - return h(NIcon, { size: 24, color: TasksStateConfig[state].color }, () => - h(TasksStateConfig[state].icon) + return h(NIcon, { size: 24, color: TasksStateConfig[state]?.color }, () => + h(TasksStateConfig[state]?.icon) ) } diff --git a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-node-status.ts b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-node-status.ts index 058fa770d9..985bf9a494 100644 --- a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-node-status.ts +++ b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-node-status.ts @@ -77,15 +77,14 @@ export function useNodeStatus(options: Options) { window.$message.success(t('project.workflow.refresh_status_succeeded')) taskList.value = res.taskList if (taskList.value) { + const allDependentResult = {} taskList.value.forEach((taskInstance: any) => { setNodeStatus(taskInstance.taskCode, taskInstance.state, taskInstance) - if (taskInstance.dependentResult) { - nodeStore.updateDependentResult( - JSON.parse(taskInstance.dependentResult) - ) + Object.assign(allDependentResult, JSON.parse(taskInstance.dependentResult)) } }) + nodeStore.updateDependentResult(allDependentResult) } }) }