Browse Source

[Fix][UI Next][V1.0.0-Alpha] Fix the pigeon node save failure. (#9181)

3.0.0/version-upgrade
Amy0104 3 years ago committed by GitHub
parent
commit
cbee25d4ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-ui-next/src/locales/modules/en_US.ts
  2. 2
      dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts
  3. 2
      dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-shell.ts
  4. 5
      dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-target-task-name.ts
  5. 3
      dolphinscheduler-ui-next/src/views/projects/task/components/node/format-data.ts
  6. 1
      dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts

2
dolphinscheduler-ui-next/src/locales/modules/en_US.ts

@ -733,7 +733,7 @@ const project = {
body_not_contains: 'Content does not contain', body_not_contains: 'Content does not contain',
http_parameters_position: 'Http Parameters Position', http_parameters_position: 'Http Parameters Position',
target_task_name: 'Target Task Name', 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_type: 'Datasource types',
datasource_instances: 'Datasource instances', datasource_instances: 'Datasource instances',
sql_type: 'SQL Type', sql_type: 'SQL Type',

2
dolphinscheduler-ui-next/src/locales/modules/zh_CN.ts

@ -723,7 +723,7 @@ const project = {
body_not_contains: '内容不包含', body_not_contains: '内容不包含',
http_parameters_position: '参数位置', http_parameters_position: '参数位置',
target_task_name: '目标任务名', target_task_name: '目标任务名',
target_task_name_tips: '请输入Pigeon任务名', target_task_name_tips: '请输入Pigeon任务名(必填)',
datasource_type: '数据源类型', datasource_type: '数据源类型',
datasource_instances: '数据源实例', datasource_instances: '数据源实例',
sql_type: 'SQL类型', sql_type: 'SQL类型',

2
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(), useResources(),
...useCustomParams({ model, field: 'localParams', isSimple: true }) ...useCustomParams({ model, field: 'localParams', isSimple: false })
] ]
} }

5
dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-target-task-name.ts

@ -27,6 +27,11 @@ export function useTargetTaskName(): IJsonItem {
props: { props: {
placeholder: t('project.node.target_task_name_tips'), placeholder: t('project.node.target_task_name_tips'),
maxLength: 100 maxLength: 100
},
validate: {
trigger: ['input', 'blur'],
required: true,
message: t('project.node.target_task_name_tips')
} }
} }
} }

3
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.type = data.type
taskParams.jobFlowDefineJson = data.jobFlowDefineJson taskParams.jobFlowDefineJson = data.jobFlowDefineJson
} }
if (data.taskType === 'PIGEON') {
taskParams.targetJobName = data.targetJobName
}
const params = { const params = {
processDefinitionCode: data.processName ? String(data.processName) : '', processDefinitionCode: data.processName ? String(data.processName) : '',

1
dolphinscheduler-ui-next/src/views/projects/task/components/node/types.ts

@ -286,6 +286,7 @@ interface ITaskParams {
} }
udfs?: string udfs?: string
connParams?: string connParams?: string
targetJobName?: string
} }
interface INodeData interface INodeData

Loading…
Cancel
Save