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 1cd5162 fix bug_7512 (#7716)
1cd5162 is described below
commit 1cd5162e4e9ba1ab5a3c3b254f8bc89bb9da94b9
Author: xiangzihao <[email protected]>
AuthorDate: Thu Dec 30 10:34:10 2021 +0800
fix bug_7512 (#7716)
---
.../_source/formModel/_source/dependentTimeout.vue | 83 +++++++++++++++-------
1 file changed, 57 insertions(+), 26 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 8d8f13c..d4cd8ef 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
@@ -28,6 +28,7 @@
</label>
</div>
</div>
+
<div class="clearfix list" v-if="enable">
<div class="text-box">
<span>{{$t('Waiting Dependent start')}}</span>
@@ -40,25 +41,44 @@
</label>
</div>
</div>
+
+ <div class="clearfix list" v-if="enable && waitStartTimeout.enable">
+ <div class="text-box">
+ <span>{{$t('Timeout period')}}</span>
+ </div>
+ <div class="cont-box">
+ <label class="label-box">
+ <div style="padding-top: 2px;">
+ <el-input v-model="waitStartTimeout.interval" size="small"
style="width: 100px;" :disabled="isDetails" maxlength="9">
+ <span slot="append">{{$t('Minute')}}</span>
+ </el-input>
+ </div>
+ </label>
+ </div>
+ </div>
+
+ <div class="clearfix list" v-if="enable && waitStartTimeout.enable">
+ <div class="text-box">
+ <span>{{$t('Check interval')}}</span>
+ </div>
+ <div class="cont-box">
+ <label class="label-box">
+ <div style="padding-top: 2px;">
+ <el-input v-model="waitStartTimeout.checkInterval" size="small"
style="width: 100px;" :disabled="isDetails" maxlength="9">
+ <span slot="append">{{$t('Minute')}}</span>
+ </el-input>
+ </div>
+ </label>
+ </div>
+ </div>
+
<div class="clearfix list" v-if="enable && waitStartTimeout.enable">
+ <div class="text-box">
+ <span>{{$t('Timeout strategy')}}</span>
+ </div>
<div class="cont-box">
<label class="label-box">
- <span class="text-box">
- <span>{{$t('Timeout period')}}</span>
- </span>
- <el-input v-model="waitStartTimeout.interval" size="small"
style="width: 100px;" :disabled="isDetails" maxlength="9">
- <span slot="append">{{$t('Minute')}}</span>
- </el-input>
- <span class="text-box">
- <span>{{$t('Check interval')}}</span>
- </span>
- <el-input v-model="waitStartTimeout.checkInterval" size="small"
style="width: 100px;" :disabled="isDetails" maxlength="9">
- <span slot="append">{{$t('Minute')}}</span>
- </el-input>
- <span class="text-box">
- <span>{{$t('Timeout strategy')}}</span>
- </span>
- <div style="padding-top: 6px;">
+ <div style="padding-top: 5px;">
<el-checkbox-group size="small"
v-model="waitStartTimeout.strategy">
<el-checkbox label="FAILED" :disabled="true">{{$t('Timeout
failure')}}</el-checkbox>
</el-checkbox-group>
@@ -66,6 +86,7 @@
</label>
</div>
</div>
+
<div class="clearfix list" v-if="enable">
<div class="text-box">
<span>{{$t('Waiting Dependent complete')}}</span>
@@ -78,19 +99,29 @@
</label>
</div>
</div>
+
+ <div class="clearfix list" v-if="enable && waitCompleteTimeout.enable">
+ <div class="text-box">
+ <span>{{$t('Timeout period')}}</span>
+ </div>
+ <div class="cont-box">
+ <label class="label-box">
+ <div style="padding-top: 2px;">
+ <el-input v-model="waitCompleteTimeout.interval" size="small"
style="width: 100px;" :disabled="isDetails" maxlength="9">
+ <span slot="append">{{$t('Minute')}}</span>
+ </el-input>
+ </div>
+ </label>
+ </div>
+ </div>
+
<div class="clearfix list" v-if="enable && waitCompleteTimeout.enable">
+ <div class="text-box">
+ <span>{{$t('Timeout strategy')}}</span>
+ </div>
<div class="cont-box">
<label class="label-box">
- <span class="text-box">
- <span>{{$t('Timeout period')}}</span>
- </span>
- <el-input v-model="waitCompleteTimeout.interval" size="small"
style="width: 100px;" :disabled="isDetails" maxlength="9">
- <span slot="append">{{$t('Minute')}}</span>
- </el-input>
- <span class="text-box">
- <span>{{$t('Timeout strategy')}}</span>
- </span>
- <div style="padding-top: 6px;">
+ <div style="padding-top: 5px;">
<el-checkbox-group size="small"
v-model="waitCompleteTimeout.strategy">
<el-checkbox label="WARN" :disabled="isDetails">{{$t('Timeout
alarm')}}</el-checkbox>
<el-checkbox label="FAILED" :disabled="isDetails">{{$t('Timeout
failure')}}</el-checkbox>
