You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ca...@apache.org on 2022/01/14 07:46:04 UTC
[dolphinscheduler] branch dev updated: [Fix-7513] Fix identical numbers and add positive integer judgment (#8032)
This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new e45e78d [Fix-7513] Fix identical numbers and add positive integer judgment (#8032)
e45e78d is described below
commit e45e78d8031e64b8f408d712251c2c6c94c52f93
Author: xiangzihao <46...@qq.com>
AuthorDate: Fri Jan 14 15:45:53 2022 +0800
[Fix-7513] Fix identical numbers and add positive integer judgment (#8032)
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* fix bug_7513
* test
* test
* test
* test
* test
* chinese change
---
.../home/pages/dag/_source/formModel/_source/selectInput.vue | 10 ++++++++--
.../src/js/conf/home/pages/dag/_source/formModel/formModel.vue | 6 +++---
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue
index ae8d18e..0af6729 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue
@@ -71,8 +71,14 @@
},
methods: {
_onChange (o) {
- this.$emit('valueEvent', +o)
- this._setIconState(+o)
+ // positive integer judgment
+ const r = /^\+?[1-9][0-9]*$/
+ if (!r.test(o)) {
+ this.$message.warning(`${i18n.$t('Please enter a positive integer')}`)
+ } else {
+ this.$emit('valueEvent', +o)
+ this._setIconState(+o)
+ }
},
_setIconState (value) {
// Whether there is a list
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
index 4b7ea18..e92e006 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
@@ -208,13 +208,13 @@
<div slot="content">
<m-select-input
v-model="maxRetryTimes"
- :list="[0, 1, 2, 3, 4]"
+ :list="[]"
></m-select-input>
<span>({{ $t("Times") }})</span>
<span class="text-b">{{ $t("Failed retry interval") }}</span>
<m-select-input
v-model="retryInterval"
- :list="[1, 10, 30, 60, 120]"
+ :list="[]"
></m-select-input>
<span>({{ $t("Minute") }})</span>
</div>
@@ -233,7 +233,7 @@
<div slot="content">
<m-select-input
v-model="delayTime"
- :list="[0, 1, 5, 10]"
+ :list="[]"
></m-select-input>
<span>({{ $t("Minute") }})</span>
</div>