Unverified Commit ae902e23 authored by BoYiZhang's avatar BoYiZhang Committed by GitHub
Browse files

fix flink web ui bug (#3079) 



* fix bug

Delete invalid field: executorcores

Modify verification prompt

* fix bug

Delete invalid field: executorcores

Modify verification prompt

* fix bug

Delete invalid field: executorcores

Modify verification prompt

* dag  add close button

* reset last version

* reset last version

* Update dag.vue

Co-authored-by: default avatardailidong <dailidong66@gmail.com>
parent bf3cc0d0

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

+9 −28
Original line number Diff line number Diff line
@@ -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>
@@ -110,7 +110,7 @@ 
                  :disabled="isDetails"

                  type="input"

                  v-model="slot"

                  :placeholder="$t('Please enter driver core number')"

                  :placeholder="$t('Please enter solt number')"

                  style="width: 200px;"

                  autocomplete="off">

        </x-input>
@@ -122,7 +122,7 @@ 
                  :disabled="isDetails"

                  type="input"

                  v-model="taskManager"

                  :placeholder="$t('Please enter driver memory use')"

                  :placeholder="$t('Please enter taskManager number')"

                  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')}`)

          return false

        }



        if (!this.taskManagerMemory) {

          this.$message.warning(`${i18n.$t('Please enter the Executor memory')}`)

          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')}`)

          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

+4 −0
Original line number Diff line number Diff line
@@ -113,6 +113,10 @@ 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': 'Please enter jobManager memory',

  'Please enter the taskManager memory': 'Please enter the taskManager memory',

  'Please enter solt number': 'Please enter solt number',

  'Please enter taskManager number': 'Please enter taskManager number',

  'SQL Type': 'SQL Type',

  Title: 'Title',

  'Please enter the title of email': 'Please enter the title of email',

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

+4 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ 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内存数',

  'Please enter solt number': '请输入solt数量',

  'Please enter taskManager number': '请输入taskManager数量',

  'SQL Type': 'sql类型',

  Title: '主题',

  'Please enter the title of email': '请输入邮件主题',