From 9c07c7d7ed3bf9387b2e9986a56be560595018a1 Mon Sep 17 00:00:00 2001
From: Jiajie Zhong <zhongjiajie955@hotmail.com>
Date: Thu, 30 Sep 2021 18:23:42 +0800
Subject: [PATCH] Move waterdrop to the end of task list (#6425)

closes: #6424
---
 .../js/conf/home/pages/dag/_source/config.js   |  8 ++++----
 .../pages/dag/_source/formModel/formModel.vue  | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
index e2b6436d8..96479f846 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
@@ -257,10 +257,6 @@ const tasksType = {
     desc: 'SHELL',
     color: '#646464'
   },
-  WATERDROP: {
-    desc: 'WATERDROP',
-    color: '#646465'
-  },
   SUB_PROCESS: {
     desc: 'SUB_PROCESS',
     color: '#0097e0'
@@ -316,6 +312,10 @@ const tasksType = {
   SWITCH: {
     desc: 'SWITCH',
     color: '#E46F13'
+  },
+  WATERDROP: {
+    desc: 'WATERDROP',
+    color: '#646465'
   }
 }
 
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 f4692c642..e58d66584 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
@@ -264,15 +264,6 @@
             :backfill-item="backfillItem"
           >
           </m-shell>
-          <!-- waterdrop node -->
-          <m-waterdrop
-            v-if="nodeData.taskType === 'WATERDROP'"
-            @on-params="_onParams"
-            @on-cache-params="_onCacheParams"
-            ref="WATERDROP"
-            :backfill-item="backfillItem"
-          >
-          </m-waterdrop>
           <!-- sub_process node -->
           <m-sub-process
             v-if="nodeData.taskType === 'SUB_PROCESS'"
@@ -393,6 +384,15 @@
             :backfill-item="backfillItem"
             :nodeData="nodeData"
           ></m-switch>
+          <!-- waterdrop node -->
+          <m-waterdrop
+            v-if="nodeData.taskType === 'WATERDROP'"
+            @on-params="_onParams"
+            @on-cache-params="_onCacheParams"
+            ref="WATERDROP"
+            :backfill-item="backfillItem"
+          >
+          </m-waterdrop>
         </div>
         <!-- Pre-tasks in workflow -->
         <m-pre-tasks
-- 
GitLab