This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new de41ac5 timeoutAlarm model interval bug,You can now set negative
integers (#3171)
de41ac5 is described below
commit de41ac5083c16e14555e848fcf4d30f680d34617
Author: zhuangchong <[email protected]>
AuthorDate: Mon Jul 13 16:22:20 2020 +0800
timeoutAlarm model interval bug,You can now set negative integers (#3171)
Co-authored-by: qiaozhanwei <[email protected]>
---
.../js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
index b6710e5..0dcab3e 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
@@ -91,7 +91,8 @@
return false
}
// Verify timeout duration Non 0 positive integer
- if (this.enable && !parseInt(this.interval) &&
!_.isInteger(this.interval)) {
+ const reg = /^[1-9]\d*$/
+ if (this.enable && !reg.test(this.interval)) {
this.$message.warning(`${this.$t('Timeout must be a positive
integer')}`)
return false
}
