[incubator-dolphinscheduler] branch 1.3.2-release updated: [bugFix-#3357][ui] Select the dag connection to pop up the label edit box (#3358)

[journey]

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

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


The following commit(s) were added to refs/heads/1.3.2-release by this push:
     new 909294d  [bugFix-#3357][ui] Select the dag connection to pop up the 
label edit box (#3358)
909294d is described below

commit 909294d4f588ffb055cafa4120f2c13895ab908e
Author: break60 <790061...@qq.com>
AuthorDate: Thu Jul 30 15:03:44 2020 +0800

    [bugFix-#3357][ui] Select the dag connection to pop up the label edit box 
(#3358)
    
    * [bugFix][ui] Cannot select connection
    
    * fix
---
 .../home/pages/dag/_source/plugIn/jsPlumbHandle.js | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

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 b1121c8..5212484 100755
--- 
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
@@ -84,11 +84,10 @@ JSP.prototype.init = function ({ dag, instance, options }) {
   // Monitor line click
   this.JspInstance.bind('click', e => {
     // Untie event
-  if (this.config.isDblclick) {
-    findComponentDownward(this.dag.$root, 'dag-chart')._createLineLabel({id: 
e._jsPlumb.overlays.label.canvas.id, sourceId: e.sourceId, targetId: 
e.targetId})
-    }
     if (this.config.isClick) {
       this.connectClick(e)
+    } else {
+      findComponentDownward(this.dag.$root, 'dag-chart')._createLineLabel({id: 
e._jsPlumb.overlays.label.canvas.id, sourceId: e.sourceId, targetId: 
e.targetId})
     }
   })
 
@@ -496,6 +495,16 @@ JSP.prototype.removeNodes = function ($id) {
 
   // callback onRemoveNodes event
   this.options && this.options.onRemoveNodes && this.options.onRemoveNodes($id)
+  let connects = []
+  _.map(this.JspInstance.getConnections(), v => {
+    connects.push({
+      endPointSourceId: v.sourceId,
+      endPointTargetId: v.targetId,
+      label: v._jsPlumb.overlays.label.canvas.innerText
+    })
+  })
+  // Storage line dependence
+  store.commit('dag/setConnects', connects)
 }
 
 /**
@@ -623,10 +632,10 @@ JSP.prototype.saveStore = function () {
     // task
     _.map(_.cloneDeep(store.state.dag.tasks), v => {
       if (is(v.id)) {
-        const preTasks = []
-        const id = $(`#${v.id}`)
-        const tar = id.attr('data-targetarr')
-        const idDep = tar ? id.attr('data-targetarr').split(',') : []
+        let preTasks = []
+        let id = $(`#${v.id}`)
+        let tar = id.attr('data-targetarr')
+        let idDep = tar ? id.attr('data-targetarr').split(',') : []
         if (idDep.length) {
           _.map(idDep, v1 => {
             preTasks.push($(`#${v1}`).find('.name-p').text())
@@ -819,4 +828,4 @@ JSP.prototype.jspBackfill = function ({ connects, 
locations, largeJson }) {
   this.draggable()
 }
 
-export default new JSP()
+export default new JSP()
\ No newline at end of file