Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0

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

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

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': '开始时间和结束时间不能相同'
 }