This is an automated email from the ASF dual-hosted git repository.
songjian pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new cbee25d [Fix][UI Next][V1.0.0-Alpha] Fix the pigeon node save
failure. (#9181)
cbee25d is described below
commit cbee25d4aee0bfb6ae031e5922e2c85be0084a5a
Author: Amy0104 <[email protected]>
AuthorDate: Fri Mar 25 14:39:58 2022 +0800
[Fix][UI Next][V1.0.0-Alpha] Fix the pigeon node save failure. (#9181)
---
dolphinscheduler-ui-next/src/locales/modules/en_US.ts | 2 +-
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts | 2 +-
.../src/views/projects/task/components/node/fields/use-shell.ts | 2 +-
.../projects/task/components/node/fields/use-target-task-name.ts | 5 +++++
.../src/views/projects/task/components/node/format-data.ts | 3 +++
.../src/views/projects/task/components/node/types.ts | 1 +
6 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
b/dolphinscheduler-ui-next/src/locales/modules/en_US.ts
index 2222ba1..45382f1 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 1bf49c4..947161e 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 5b853a9..9c9f171 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 0f81016..36e1adb 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 1c32175..e8c2c99 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 faf67ff..7e595b7 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
