This is an automated email from the ASF dual-hosted git repository.
zihaoxiang 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 6c5af9ce5b [Improvement-17957][UI] Improvement of Spark parameters
validation (#17958)
6c5af9ce5b is described below
commit 6c5af9ce5bcbbfde88eda0f899f001be6ef2a53d
Author: XpengCen <[email protected]>
AuthorDate: Tue Feb 10 09:30:39 2026 +0800
[Improvement-17957][UI] Improvement of Spark parameters validation (#17958)
---
dolphinscheduler-ui/src/locales/en_US/project.ts | 4 ++--
dolphinscheduler-ui/src/locales/zh_CN/project.ts | 4 ++--
.../projects/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 85519adf01..15073a64ae 100644
--- a/dolphinscheduler-ui/src/locales/en_US/project.ts
+++ b/dolphinscheduler-ui/src/locales/en_US/project.ts
@@ -437,7 +437,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',
@@ -462,7 +462,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 8de4df985c..880c037c96 100644
--- a/dolphinscheduler-ui/src/locales/zh_CN/project.ts
+++ b/dolphinscheduler-ui/src/locales/zh_CN/project.ts
@@ -425,7 +425,7 @@ export default {
script: '脚本',
script_tips: '请输入脚本(必填)',
master: 'Master',
- master_tips: '请输入master url(必填)',
+ master_tips: '请输入master url(选填)',
init_script: '初始化脚本',
init_script_tips: '请输入初始化脚本',
resources: '资源',
@@ -449,7 +449,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 dd0360a082..86edd21a59 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),