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 34bd1d4369 [Improvement-17065][UI][TASK] Improvement custom parameters
read-only mode show (#17068)
34bd1d4369 is described below
commit 34bd1d4369f4e3462725301e3f6342a04a64facd
Author: 小可耐 <[email protected]>
AuthorDate: Tue Mar 25 11:49:34 2025 +0800
[Improvement-17065][UI][TASK] Improvement custom parameters read-only mode
show (#17068)
---
.../task/components/node/fields/use-aliyun-serverless-spark.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-datasync.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-dinky.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-dms.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-hive-cli.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-java.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-jupyter.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-k8s.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-kubeflow.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-openmldb.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-procedure.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-pytorch.ts | 6 +++++-
.../views/projects/task/components/node/fields/use-remote-shell.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-sagemaker.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-shell.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-spark.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-sql.ts | 6 +++++-
.../src/views/projects/task/components/node/fields/use-zeppelin.ts | 6 +++++-
18 files changed, 90 insertions(+), 18 deletions(-)
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-aliyun-serverless-spark.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-aliyun-serverless-spark.ts
index 56f73912c7..650f488271 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-aliyun-serverless-spark.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-aliyun-serverless-spark.ts
@@ -168,6 +168,10 @@ export function useAliyunServerlessSpark(model: {
span: 12
},
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-datasync.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-datasync.ts
index 23ccd24d95..ead9ed3f07 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-datasync.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-datasync.ts
@@ -80,6 +80,10 @@ export function useDatasync(model: { [field: string]: any
}): IJsonItem[] {
name: 'cloudWatchLogGroupArn',
span: cloudWatchLogGroupArnSpan
},
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dinky.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dinky.ts
index d043b2209d..5a4af540c8 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dinky.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dinky.ts
@@ -61,6 +61,10 @@ export function useDinky(model: { [field: string]: any }):
IJsonItem[] {
field: 'online',
name: t('project.node.dinky_online')
},
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dms.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dms.ts
index 7c566141b6..d935fff3c2 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dms.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-dms.ts
@@ -121,7 +121,11 @@ export function useDms(model: { [field: string]: any }):
IJsonItem[] {
span: replicationTaskArnSpan
},
useResources(),
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-hive-cli.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-hive-cli.ts
index b285cc2353..eb422e86ad 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-hive-cli.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-hive-cli.ts
@@ -82,6 +82,10 @@ export function useHiveCli(model: { [field: string]: any }):
IJsonItem[] {
}
},
useResources(24, resourcesRequired, resourcesLimit),
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-java.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-java.ts
index e45a9344f8..92f1518ad2 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-java.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-java.ts
@@ -58,7 +58,11 @@ export function useJava(model: { [field: string]: any }):
IJsonItem[] {
useJavaTaskMainJar(model),
...useJavaTaskNormalJar(model),
useResources(),
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-jupyter.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-jupyter.ts
index 582b308d6c..507a5d86d0 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-jupyter.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-jupyter.ts
@@ -122,6 +122,10 @@ export function useJupyter(model: { [field: string]: any
}): IJsonItem[] {
}
},
useResources(),
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-k8s.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-k8s.ts
index 8d2a702464..f67d1a407e 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-k8s.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-k8s.ts
@@ -107,7 +107,11 @@ export function useK8s(model: { [field: string]: any }):
IJsonItem[] {
field: 'nodeSelectors',
name: 'node_selectors'
}),
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-kubeflow.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-kubeflow.ts
index e03e524cf3..04c789d3e6 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-kubeflow.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-kubeflow.ts
@@ -33,6 +33,10 @@ export function useKubeflow(model: { [field: string]: any
}): IJsonItem[] {
message: 'requestJson'
}
},
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-openmldb.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-openmldb.ts
index 742d404900..766748b7d3 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-openmldb.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-openmldb.ts
@@ -82,6 +82,10 @@ export function useOpenmldb(model: { [field: string]: any
}): IJsonItem[] {
}
},
useResources(),
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-procedure.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-procedure.ts
index 1c0b4f99a3..109c7e545e 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-procedure.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-procedure.ts
@@ -36,6 +36,10 @@ export function useProcedure(model: { [field: string]: any
}): IJsonItem[] {
message: t('project.node.procedure_method_tips')
}
},
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-pytorch.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-pytorch.ts
index c0fda45a27..339e1ba381 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-pytorch.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-pytorch.ts
@@ -123,7 +123,11 @@ export function usePytorch(model: { [field: string]: any
}): IJsonItem[] {
}
},
useResources(),
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-remote-shell.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-remote-shell.ts
index a3a6f55e46..a7a8a666f3 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-remote-shell.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-remote-shell.ts
@@ -32,6 +32,10 @@ export function useRemoteShell(model: { [field: string]: any
}): IJsonItem[] {
message: t('project.node.script_tips')
}
},
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sagemaker.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sagemaker.ts
index ad78353727..0cf64fd7ee 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sagemaker.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sagemaker.ts
@@ -32,6 +32,10 @@ export function useSagemaker(model: { [field: string]: any
}): IJsonItem[] {
message: 'requestJson'
}
},
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-shell.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-shell.ts
index 9c9f171a1f..014b8d447f 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-shell.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-shell.ts
@@ -33,6 +33,10 @@ export function useShell(model: { [field: string]: any }):
IJsonItem[] {
}
},
useResources(),
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
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 ab89e69e6d..dd0360a082 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
@@ -200,7 +200,11 @@ export function useSpark(model: { [field: string]: any }):
IJsonItem[] {
}
},
useResources(24, resourcesRequired, resourcesLimit),
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sql.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sql.ts
index 2299d4569b..0044fa9cf8 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sql.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-sql.ts
@@ -47,7 +47,11 @@ export function useSql(model: { [field: string]: any }):
IJsonItem[] {
language: 'sql'
}
},
- ...useCustomParams({ model, field: 'localParams', isSimple: false }),
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ }),
{
type: 'multi-input',
field: 'preStatements',
diff --git
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-zeppelin.ts
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-zeppelin.ts
index eff4777215..a3e2f83813 100644
---
a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-zeppelin.ts
+++
b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-zeppelin.ts
@@ -63,6 +63,10 @@ export function useZeppelin(model: { [field: string]: any
}): IJsonItem[] {
placeholder: t('project.node.zeppelin_parameters_tips')
}
},
- ...useCustomParams({ model, field: 'localParams', isSimple: false })
+ ...useCustomParams({
+ model,
+ field: 'localParams',
+ isSimple: model.readonly
+ })
]
}
