You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by zh...@apache.org on 2023/10/11 08:06:24 UTC
[dolphinscheduler] 22/40: [Bug] Dependent components cannot be justified and viewed (#14924)
This is an automated email from the ASF dual-hosted git repository.
zhongjiajie pushed a commit to branch 3.2.0-release
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit fb7fab0ecd64f99684956722c50c4f5e0c212859
Author: AmriStrong <15...@139.com>
AuthorDate: Mon Sep 18 19:17:23 2023 +0800
[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 <wa...@baseus.com>
Co-authored-by: xiangzihao <46...@qq.com>
(cherry picked from commit c438d7194ce82b12154355e836c3eb5057268bde)
---
.../views/projects/task/components/node/fields/use-dependent.ts | 4 ++--
.../src/views/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 433895f861..4b682c88ab 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
@@ -246,8 +246,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)
}
})
}