fix bug

Delete invalid field: executorcores

Modify verification prompt

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue

@@ -86,7 +86,7 @@
             :disabled="isDetails"
             type="input"
             v-model="jobManagerMemory"
-            :placeholder="$t('Please enter the number of Executor')"
+            :placeholder="$t('Please enter jobManager memory')"
             style="width: 200px;"
             autocomplete="off">
         </x-input>
@@ -97,7 +97,7 @@
             :disabled="isDetails"
             type="input"
             v-model="taskManagerMemory"
-            :placeholder="$t('Please enter the Executor memory')"
+            :placeholder="$t('Please enter the taskManager memory')"
             style="width: 186px;"
             autocomplete="off">
         </x-input>
@@ -210,12 +210,10 @@
         slot: 1,
         // Driver Number of memory
         taskManager: '2',
-        // Executor Number
+        // jobManager Memory
         jobManagerMemory: '1G',
-        // Executor Number of memory
+        // taskManager Memory
         taskManagerMemory: '2G',
-        // Executor Number of cores
-        executorCores: 2,
         // Command line argument
         mainArgs: '',
         // Other parameters
@@ -290,22 +288,17 @@
         }
 
         if (!this.jobManagerMemory) {
-          this.$message.warning(`${i18n.$t('Please enter the number of Executor')}`)
+          this.$message.warning(`${i18n.$t('Please enter jobManager memory')}`)
           return false
         }
 
         if (!Number.isInteger(parseInt(this.jobManagerMemory))) {
-          this.$message.warning(`${i18n.$t('The number of Executors should be a positive integer')}`)
+          this.$message.warning(`${i18n.$t('Memory should be a positive integer')}`)
-          return false
-        }
-
-        if (!this.taskManagerMemory) {
-          this.$message.warning(`${i18n.$t('Please enter the Executor memory')}`)
           return false
         }
 
         if (!this.taskManagerMemory) {
-          this.$message.warning(`${i18n.$t('Please enter the Executor memory')}`)
+          this.$message.warning(`${i18n.$t('Please enter the taskManager memory')}`)
           return false
         }
 
@@ -314,16 +307,6 @@
           return false
         }
 
-        if (!this.executorCores) {
-          this.$message.warning(`${i18n.$t('Please enter ExecutorPlease enter Executor core number')}`)
-          return false
-        }
-
-        if (!Number.isInteger(parseInt(this.executorCores))) {
-          this.$message.warning(`${i18n.$t('Core number should be positive integer')}`)
-          return false
-        }
-
         // noRes
         if (this.noRes.length>0) {
           this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
@@ -351,7 +334,6 @@
           taskManager: this.taskManager,
           jobManagerMemory: this.jobManagerMemory,
           taskManagerMemory: this.taskManagerMemory,
-          executorCores: this.executorCores,
           mainArgs: this.mainArgs,
           others: this.others,
           programType: this.programType
@@ -482,7 +464,6 @@
           taskManager: this.taskManager,
           jobManagerMemory: this.jobManagerMemory,
           taskManagerMemory: this.taskManagerMemory,
-          executorCores: this.executorCores,
           mainArgs: this.mainArgs,
           others: this.others,
           programType: this.programType

dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

@@ -98,7 +98,7 @@ export default {
   Script: 'Script',
   'Please enter script(required)': 'Please enter script(required)',
   'Deploy Mode': 'Deploy Mode',
-  'Flink Version':'Flink Version',
+  'Flink Version': 'Flink Version',
   'Driver core number': 'Driver core number',
   'Please enter driver core number': 'Please enter driver core number',
   'Driver memory use': 'Driver memory use',
@@ -113,6 +113,8 @@ export default {
   'Memory should be a positive integer': 'Memory should be a positive integer',
   'Please enter ExecutorPlease enter Executor core number': 'Please enter ExecutorPlease enter Executor core number',
   'Core number should be positive integer': 'Core number should be positive integer',
+  'Please enter jobManager memory': '请输入JobManager内存数',
+  'Please enter the taskManager memory': '请输入TaskManager内存数',
   'SQL Type': 'SQL Type',
   Title: 'Title',
   'Please enter the title of email': 'Please enter the title of email',
@@ -181,7 +183,7 @@ export default {
   Tenant: 'Tenant',
   Email: 'Email',
   Phone: 'Phone',
-  'User Type':'User Type',
+  'User Type': 'User Type',
   'Please enter phone number': 'Please enter phone number',
   'Please enter main class': 'Please enter main class',
   'Please enter email': 'Please enter email',
@@ -600,12 +602,12 @@ export default {
   'Successful branch flow and failed branch flow are required': 'Successful branch flow and failed branch flow are required',
   'Unauthorized or deleted resources': 'Unauthorized or deleted resources',
   'Please delete all non-existent resources': 'Please delete all non-existent resources',
-  'Enable': 'Enable',
+  Enable: 'Enable',
-  'Disable': 'Disable',
+  Disable: 'Disable',
   'Timeout Settings': 'Timeout Settings',
-  'Connect Timeout':'Connect Timeout',
+  'Connect Timeout': 'Connect Timeout',
-  'Socket Timeout':'Socket Timeout',
+  'Socket Timeout': 'Socket Timeout',
   'Connect timeout be a positive integer': 'Connect timeout be a positive integer',
   'Socket Timeout be a positive integer': 'Socket Timeout be a positive integer',
-  'ms':'ms'
+  ms: 'ms'
 }

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

@@ -114,6 +114,8 @@ export default {
   'Memory should be a positive integer': '内存数为数字',
   'Please enter ExecutorPlease enter Executor core number': '请填写Executor内核数',
   'Core number should be positive integer': '内核数为正整数',
+  'Please enter jobManager memory': '请输入JobManager内存数',
+  'Please enter the taskManager memory': '请输入TaskManager内存数',
   'SQL Type': 'sql类型',
   Title: '主题',
   'Please enter the title of email': '请输入邮件主题',
@@ -184,7 +186,7 @@ export default {
   Tenant: '租户',
   Email: '邮件',
   Phone: '手机',
-  'User Type':'用户类型',
+  'User Type': '用户类型',
   'Please enter phone number': '请输入手机',
   'Please enter email': '请输入邮箱',
   'Please enter the correct email format': '请输入正确的邮箱格式',
@@ -600,12 +602,12 @@ export default {
   'Successful branch flow and failed branch flow are required': '成功分支流转和失败分支流转必填',
   'Unauthorized or deleted resources': '未授权或已删除资源',
   'Please delete all non-existent resources': '请删除所有未授权或已删除资源',
-  'Enable': '启用',
+  Enable: '启用',
-  'Disable': '停用',
+  Disable: '停用',
   'Timeout Settings': '超时设置',
-  'Connect Timeout':'连接超时',
+  'Connect Timeout': '连接超时',
-  'Socket Timeout':'Socket超时',
+  'Socket Timeout': 'Socket超时',
   'Connect timeout be a positive integer': '连接超时必须为数字',
   'Socket Timeout be a positive integer': 'Socket超时必须为数字',
-  'ms':'毫秒'
+  ms: '毫秒'
 }