[incubator-dolphinscheduler] branch dev updated: Fix bug #1986. (#1987)

[eights]

This is an automated email from the ASF dual-hosted git repository.

eights pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 5f3d88e  Fix bug #1986. (#1987)
5f3d88e is described below

commit 5f3d88e4c269071bb88780ca3e318626a697d8e3
Author: zhukai <bon...@qq.com>
AuthorDate: Tue Feb 25 09:47:51 2020 +0800

    Fix bug #1986. (#1987)
    
    When in the projects define page, click the toolbar's button(task type) 
will cause the task details window switch to new one.
    
    For now, the task details window will not switch.
---
 .../src/js/conf/home/pages/dag/_source/dag.vue        |  3 ++-
 .../home/pages/dag/_source/plugIn/jsPlumbHandle.js    | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index 247f473..a21889f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -486,6 +486,7 @@
         }
 
         this.taskId = id
+        type = type || self.dagBarId
 
         eventModel = this.$drawer({
           closable: false,
@@ -522,7 +523,7 @@
             },
             props: {
               id: id,
-              taskType: type || self.dagBarId,
+              taskType: type,
               self: self
             }
           })
diff --git 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
index 454dfc7..b0a7a64 100644
--- 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+++ 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
@@ -135,15 +135,6 @@ JSP.prototype.draggable = function () {
       helper: 'clone',
       containment: $('.dag-model'),
       stop: function (e, ui) {
-        self.tasksEvent(selfId)
-
-        // Dom structure is not generated without pop-up form form
-        if ($(`#${selfId}`).html()) {
-          // dag event
-          findComponentDownward(self.dag.$root, 'dag-chart')._createNodes({
-            id: selfId
-          })
-        }
       },
       drag: function () {
         $('body').find('.tooltip.fade.top.in').remove()
@@ -178,6 +169,16 @@ JSP.prototype.draggable = function () {
           self.initNode(thisDom[thisDom.length - 1])
         })
         selfId = id
+
+        self.tasksEvent(selfId)
+
+        // Dom structure is not generated without pop-up form form
+        if ($(`#${selfId}`).html()) {
+          // dag event
+          findComponentDownward(self.dag.$root, 'dag-chart')._createNodes({
+            id: selfId
+          })
+        }
       }
     })
   }