From dc0d46f1aafed408e4274f5205c26f975ac5a9f3 Mon Sep 17 00:00:00 2001 From: calvin Date: Tue, 13 Dec 2022 18:15:00 +0800 Subject: [PATCH] [Fix-13160][UI] Ironed out the issue with failing to save the correct settings of dependent tasks. (#13179) --- .../views/projects/task/components/node/format-data.ts | 10 +++++++--- .../src/views/projects/task/components/node/types.ts | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts index f98f147236..862ffa4624 100644 --- a/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts +++ b/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts @@ -22,7 +22,9 @@ import type { ITaskParams, ISqoopTargetParams, ISqoopSourceParams, - ILocalParam + ILocalParam, + IDependTask, + RelationType } from './types' export function formatParams(data: INodeData): { @@ -584,9 +586,11 @@ export function formatModel(data: ITaskData) { } if (data.taskParams?.dependence) { - params.dependTaskList = data.taskParams?.dependence.dependTaskList || [] - params.relation = data.taskParams?.dependence.relation + const dependence: { relation?: RelationType, dependTaskList?: IDependTask[] } = JSON.parse(JSON.stringify(data.taskParams.dependence)) + params.dependTaskList = dependence.dependTaskList || [] + params.relation = dependence.relation } + if (data.taskParams?.ruleInputParameter) { params.check_type = data.taskParams.ruleInputParameter.check_type params.comparison_execute_sql = diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts index d16e1b642e..40a90b6f1e 100644 --- a/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts +++ b/dolphinscheduler-ui/src/views/projects/task/components/node/types.ts @@ -36,9 +36,10 @@ export type { export type { IResource, ProgramType, IMainJar } from '@/store/project/types' export type { ITaskState } from '@/common/types' +export type RelationType = 'AND' | 'OR' + type SourceType = 'MYSQL' | 'HDFS' | 'HIVE' type ModelType = 'import' | 'export' -type RelationType = 'AND' | 'OR' type ITaskType = TaskType type IDateType = 'hour' | 'day' | 'week' | 'month'