- {{$t('Main jar package')}}
+ {{$t('Main Jar Package')}}
{{ node.raw.fullName }}
@@ -137,7 +137,7 @@
- {{$t('Command-line parameters')}}
+ {{$t('Main Arguments')}}
+ :placeholder="$t('Please enter main arguments')">
- {{$t('Other parameters')}}
+ {{$t('Option Parameters')}}
+ :placeholder="$t('Please enter option parameters')">
@@ -213,19 +213,19 @@
cacheResourceList: [],
// Custom function
localParams: [],
- // Driver Number of cores
+ // Slot number
slot: 1,
- // Driver Number of memory
+ // TaskManager mumber
taskManager: '2',
- // jobManager Memory
+ // JobManager memory
jobManagerMemory: '1G',
- // taskManager Memory
+ // TaskManager memory
taskManagerMemory: '2G',
- // Flink Job Name
+ // Flink app name
appName: '',
- // Command line argument
+ // Main arguments
mainArgs: '',
- // Other parameters
+ // Option parameters
others: '',
// Program type
programType: 'SCALA',
@@ -310,11 +310,21 @@
return false
}
- if (!_.isNumber(parseInt(this.taskManagerMemory))) {
+ if (!Number.isInteger(parseInt(this.taskManagerMemory))) {
this.$message.warning(`${i18n.$t('Memory should be a positive integer')}`)
return false
}
+ if (!Number.isInteger(parseInt(this.slot))) {
+ this.$message.warning(`${i18n.$t('Please enter Slot number')}`)
+ return false
+ }
+
+ if (this.flinkVersion === '<1.10' && !Number.isInteger(parseInt(this.taskManager))) {
+ this.$message.warning(`${i18n.$t('Please enter TaskManager number')}`)
+ return false
+ }
+
// noRes
if (this.noRes.length > 0) {
this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
index 356eefd65a..adef5989e0 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
@@ -30,7 +30,7 @@