From 0c353d69e29a0b562ebb6938d345fc1b4589b781 Mon Sep 17 00:00:00 2001
From: songjianet <1778651752@qq.com>
Date: Fri, 14 Jan 2022 18:34:21 +0800
Subject: [PATCH] [Fix][Dag] Timeout alert. (#8049)

---
 .../_source/formModel/_source/dependentTimeout.vue   |  2 +-
 .../home/pages/dag/_source/formModel/formModel.vue   | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 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 d4cd8efd2f..a87b666331 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
@@ -29,7 +29,7 @@
       </div>
     </div>
 
-    <div class="clearfix list" v-if="enable">
+    <div class="clearfix list" v-if="false">
       <div class="text-box">
         <span>{{$t('Waiting Dependent start')}}</span>
       </div>
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 e92e006edd..fb1b18d591 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
@@ -648,6 +648,13 @@
           '/docs/latest/user_doc/guide/task/' + tasktype.toLowerCase() + '.html'
       },
       taskToBackfillItem (task) {
+        let strategy = ''
+        if (this.nodeData.taskType === 'DEPENDENT') {
+          strategy = task.timeoutNotifyStrategy === 'WARNFAILED' ? 'WARN,FAILED' : task.timeoutNotifyStrategy
+        } else {
+          strategy = task.timeoutNotifyStrategy
+        }
+
         return {
           code: task.code,
           conditionResult: task.taskParams.conditionResult,
@@ -669,7 +676,7 @@
           taskInstancePriority: task.taskPriority,
           timeout: {
             interval: task.timeout,
-            strategy: task.timeoutNotifyStrategy,
+            strategy,
             enable: task.timeoutFlag === 'OPEN'
           },
           type: task.taskType,
@@ -888,6 +895,7 @@
 
         this.successBranch && (this.conditionResult.successNode[0] = this.successBranch)
         this.failedBranch && (this.conditionResult.failedNode[0] = this.failedBranch)
+
         this.$emit('addTaskInfo', {
           item: {
             code: this.nodeData.id,
@@ -907,7 +915,7 @@
             failRetryTimes: this.maxRetryTimes,
             failRetryInterval: this.retryInterval,
             timeoutFlag: this.timeout.enable ? 'OPEN' : 'CLOSE',
-            timeoutNotifyStrategy: this.timeout.strategy,
+            timeoutNotifyStrategy: this.timeout.strategy.indexOf(',') > 0 ? 'WARNFAILED' : this.timeout.strategy,
             timeout: this.timeout.interval || 0,
             delayTime: this.delayTime,
             environmentCode: this.environmentCode || -1,