From 4759d47ce19ab9b7c41e5967982f2ac9ebbc875d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=81=9A=E9=98=B3?= <yinancx@live.com>
Date: Tue, 29 Sep 2020 14:22:56 +0800
Subject: [PATCH] add check interval

---
 .../_source/formModel/_source/dependentTimeout.vue | 14 ++++++++++++--
 .../src/js/module/i18n/locale/en_US.js             |  1 +
 .../src/js/module/i18n/locale/zh_CN.js             |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
index 076a536b44..235fb08412 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
@@ -49,6 +49,12 @@
           <x-input v-model="waitStartTimeout.interval" style="width: 100px;" :disabled="isDetails" maxlength="9">
             <span slot="append">{{$t('Minute')}}</span>
           </x-input>
+          <span class="text-box">
+            <span>{{$t('Check interval')}}</span>
+          </span>
+          <x-input v-model="waitStartTimeout.checkInterval" style="width: 100px;" :disabled="isDetails" maxlength="9">
+            <span slot="append">{{$t('Minute')}}</span>
+          </x-input>
           <span class="text-box">
             <span>{{$t('Timeout strategy')}}</span>
           </span>
@@ -110,7 +116,8 @@
           // Timeout strategy
           strategy: ['FAILED'],
           // Timeout period
-          interval: null
+          interval: null,
+          checkInterval: null
         },
         waitCompleteTimeout: {
           enable: false,
@@ -131,6 +138,7 @@
         // p = 0 for timeout switch; p = 1 for wait start timeout switch; p = 2 for wait complete timeout switch.
         if (p === 1 || p === 0) {
           this.waitStartTimeout.interval = is ? 30 : null
+          this.waitStartTimeout.checkInterval = is ? 1 : null
         }
         if (p === 2 || p === 0) {
           this.waitCompleteTimeout.strategy = is ? ['WARN'] : []
@@ -149,7 +157,7 @@
         const reg = /^[1-9]\d*$/
         if (this.enable 
           && (this.waitCompleteTimeout.enable && !reg.test(this.waitCompleteTimeout.interval))
-          || (this.waitStartTimeout.enable && !reg.test(this.waitStartTimeout.interval))) {
+          || (this.waitStartTimeout.enable && (!reg.test(this.waitStartTimeout.interval || !reg.test(this.waitStartTimeout.checkInterval))))) {
           this.$message.warning(`${this.$t('Timeout must be a positive integer')}`)
           return false
         }
@@ -157,6 +165,7 @@
           waitStartTimeout: {
             strategy: 'FAILED',
             interval: parseInt(this.waitStartTimeout.interval),
+            checkInterval: parseInt(this.waitStartTimeout.checkInterval),
             enable: this.waitStartTimeout.enable
           },
           waitCompleteTimeout: {
@@ -193,6 +202,7 @@
           this.waitStartTimeout.enable = o.waitStartTimeout.enable || false
           this.waitStartTimeout.strategy = ['FAILED']
           this.waitStartTimeout.interval = o.waitStartTimeout.interval || null
+          this.waitStartTimeout.checkInterval = o.waitStartTimeout.checkInterval || null
         }
       }
     },
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 2052d3e2a0..50d03ef555 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -428,6 +428,7 @@ export default {
   'Timeout period': 'Timeout period',
   'Waiting Dependent complete': 'Waiting Dependent complete',
   'Waiting Dependent start': 'Waiting Dependent start',
+  'Check interval': 'Check interval',
   'Timeout strategy must be selected': 'Timeout strategy must be selected',
   'Timeout must be a positive integer': 'Timeout must be a positive integer',
   'Add dependency': 'Add dependency',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index d46fdf551c..3f4be67b1e 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -422,6 +422,7 @@ export default {
   'Timeout period': '超时时长',
   'Waiting Dependent complete': '等待依赖完成',
   'Waiting Dependent start': '等待依赖启动',
+  'Check interval': '检查间隔',
   'Timeout strategy must be selected': '超时策略必须选一个',
   'Timeout must be a positive integer': '超时时长必须为正整数',
   'Add dependency': '添加依赖',