Преглед изворни кода

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

Amy0104 пре 3 година
родитељ
комит
cbee25d4ae

+ 1 - 1
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',

+ 1 - 1
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类型',

+ 1 - 1
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 })
   ]
 }

+ 5 - 0
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')
     }
   }
 }

+ 3 - 0
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) : '',

+ 1 - 0
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