diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts index 2222ba120e..45382f1120 100644 --- a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts +++ b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts @@ -733,7 +733,7 @@ const project = { body_not_contains: 'Content does not contain', http_parameters_position: 'Http Parameters Position', target_task_name: 'Target Task Name', - target_task_name_tips: 'Please enter the Pigeon task name', + target_task_name_tips: 'Please enter the Pigeon task name(required)', datasource_type: 'Datasource types', datasource_instances: 'Datasource instances', sql_type: 'SQL Type', diff --git a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts index 1bf49c4bd1..947161ede2 100644 --- a/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts +++ b/dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts @@ -723,7 +723,7 @@ const project = { body_not_contains: '内容不包含', http_parameters_position: '参数位置', target_task_name: '目标任务名', - target_task_name_tips: '请输入Pigeon任务名', + target_task_name_tips: '请输入Pigeon任务名(必填)', datasource_type: '数据源类型', datasource_instances: '数据源实例', sql_type: 'SQL类型', diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-shell.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-shell.ts index 5b853a90aa..9c9f171a1f 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-shell.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-shell.ts @@ -33,6 +33,6 @@ export function useShell(model: { [field: string]: any }): IJsonItem[] { } }, useResources(), - ...useCustomParams({ model, field: 'localParams', isSimple: true }) + ...useCustomParams({ model, field: 'localParams', isSimple: false }) ] } diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-target-task-name.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-target-task-name.ts index 0f81016eec..36e1adb5cd 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-target-task-name.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-target-task-name.ts @@ -27,6 +27,11 @@ export function useTargetTaskName(): IJsonItem { props: { placeholder: t('project.node.target_task_name_tips'), maxLength: 100 + }, + validate: { + trigger: ['input', 'blur'], + required: true, + message: t('project.node.target_task_name_tips') } } } diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts index 1c32175045..e8c2c99a02 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts @@ -300,6 +300,9 @@ export function formatParams(data: INodeData): { taskParams.type = data.type taskParams.jobFlowDefineJson = data.jobFlowDefineJson } + if (data.taskType === 'PIGEON') { + taskParams.targetJobName = data.targetJobName + } const params = { processDefinitionCode: data.processName ? String(data.processName) : '', diff --git a/dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts b/dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts index faf67ffd95..7e595b754e 100644 --- a/dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts +++ b/dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts @@ -286,6 +286,7 @@ interface ITaskParams { } udfs?: string connParams?: string + targetJobName?: string } interface INodeData