From 65d3d88a1bd3783e518adf4659116ea79149aeba Mon Sep 17 00:00:00 2001 From: "cenxiaopeng.cxp" Date: Thu, 5 Feb 2026 19:13:58 +0800 Subject: [PATCH] align Spark param validation and enable master for all task types --- .../src/locales/en_US/project.ts | 4 ++-- .../src/locales/zh_CN/project.ts | 4 ++-- .../task/components/node/fields/use-spark.ts | 17 ++--------------- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/dolphinscheduler-ui/src/locales/en_US/project.ts b/dolphinscheduler-ui/src/locales/en_US/project.ts index 916893b02a0c..c333936a303e 100644 --- a/dolphinscheduler-ui/src/locales/en_US/project.ts +++ b/dolphinscheduler-ui/src/locales/en_US/project.ts @@ -440,7 +440,7 @@ export default { script: 'Script', script_tips: 'Please enter script(required)', master: 'Master', - master_tips: 'Please enter master url(required)', + master_tips: 'Please enter master url(optional)', init_script: 'Initialization script', init_script_tips: 'Please enter initialization script', resources: 'Resources', @@ -465,7 +465,7 @@ export default { pre_tasks: 'Pre tasks', program_type: 'Program Type', main_class: 'Main Class Name', - main_class_tips: 'Please enter the full main class name (optional)', + main_class_tips: 'Please enter the full main class name (required)', main_class_invalid: 'Invalid main class name', main_package: 'Main Package', main_package_tips: 'Please enter main package', diff --git a/dolphinscheduler-ui/src/locales/zh_CN/project.ts b/dolphinscheduler-ui/src/locales/zh_CN/project.ts index 46fd12e348fd..a23925a1bb65 100644 --- a/dolphinscheduler-ui/src/locales/zh_CN/project.ts +++ b/dolphinscheduler-ui/src/locales/zh_CN/project.ts @@ -428,7 +428,7 @@ export default { script: '脚本', script_tips: '请输入脚本(必填)', master: 'Master', - master_tips: '请输入master url(必填)', + master_tips: '请输入master url(选填)', init_script: '初始化脚本', init_script_tips: '请输入初始化脚本', resources: '资源', @@ -452,7 +452,7 @@ export default { pre_tasks: '前置任务', program_type: '程序类型', main_class: '主类名', - main_class_tips: '请填写完整主类名(可选)', + main_class_tips: '请填写完整主类名(必填)', main_class_invalid: '主类名不合法', main_package: '主程序包', main_package_tips: '请选择主程序包', diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-spark.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-spark.ts index dd0360a0828f..86edd21a59c1 100644 --- a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-spark.ts +++ b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-spark.ts @@ -37,10 +37,6 @@ export function useSpark(model: { [field: string]: any }): IJsonItem[] { model.programType === 'PYTHON' || model.programType === 'SQL' ? 0 : 24 ) - const masterSpan = computed(() => - model.programType === 'PYTHON' || model.programType === 'SQL' ? 0 : 24 - ) - const mainArgsSpan = computed(() => (model.programType === 'SQL' ? 0 : 24)) const rawScriptSpan = computed(() => @@ -145,23 +141,14 @@ export function useSpark(model: { [field: string]: any }): IJsonItem[] { { type: 'input', field: 'master', - span: masterSpan, + span: 24, name: t('project.node.master'), props: { placeholder: t('project.node.master_tips') }, validate: { trigger: ['input', 'blur'], - required: false, - validator(validate: any, value: string) { - if ( - model.programType !== 'PYTHON' && - !value && - model.programType !== 'SQL' - ) { - return new Error(t('project.node.master_tips')) - } - } + required: false } }, useDeployMode(24, ref(true), showCluster),