Browse Source

Merge pull request #503 from hymzcn/dev-1.1.0

the start time must not be the same as the end
pull/2/head
hymzcn 5 years ago committed by GitHub
parent
commit
e1207b0d7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
  2. 3
      escheduler-ui/src/js/module/i18n/locale/en_US.js
  3. 3
      escheduler-ui/src/js/module/i18n/locale/zh_CN.js

5
escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue

@ -190,6 +190,11 @@
return false
}
if (this.scheduleTime[0] === this.scheduleTime[1]) {
this.$message.warning(`${i18n.$t('The start time must not be the same as the end')}`)
return false
}
if (!this.crontab) {
this.$message.warning(`${i18n.$t('Please enter crontab')}`)
return false

3
escheduler-ui/src/js/module/i18n/locale/en_US.js

@ -467,5 +467,6 @@ export default {
'statistics': 'statistics',
'select tenant':'select tenant',
'Process Instance Running Count': 'Process Instance Running Count',
'Please enter Principal':'Please enter Principal'
'Please enter Principal':'Please enter Principal',
'The start time must not be the same as the end': 'The start time must not be the same as the end'
}

3
escheduler-ui/src/js/module/i18n/locale/zh_CN.js

@ -467,5 +467,6 @@ export default {
'Statistics manage': '统计管理',
'statistics': '统计',
'select tenant':'选择租户',
'Please enter Principal':'请输入Principal'
'Please enter Principal':'请输入Principal',
'The start time must not be the same as the end': '开始时间和结束时间不能相同'
}

Loading…
Cancel
Save