From d0037b46684c201ac690cd9e73cdfbee713e8c45 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 11 Aug 2020 18:15:56 +0800
Subject: [PATCH 1/3] [ui]Code optimization

---
 .../pages/dag/_source/plugIn/jsPlumbHandle.js | 31 +++++++++++--------
 .../home/pages/dag/_source/plugIn/util.js     |  2 +-
 2 files changed, 19 insertions(+), 14 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 c662339b8e..c39802d091 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
@@ -691,6 +691,9 @@ JSP.prototype.handleEvent = function () {
     let sourceId = info['sourceId']// 出
     let targetId = info['targetId']// 入
     console.log(sourceId,targetId)
+    let rtTargetarr = rtTargetarrArr(targetId)
+    let rtSoucearr = rtTargetarrArr(sourceId)
+    console.log(rtTargetarr,rtSoucearr)
     /**
     * When connecting, connection is prohibited when the sourceId and target nodes are empty
     */
@@ -703,30 +706,32 @@ JSP.prototype.handleEvent = function () {
      */
     let recursiveVal
     const recursiveTargetarr = (arr, targetId) => {
-      for (let i in arr) {
-        if (arr[i] === targetId) {
-          recursiveVal = targetId
-        } else {
-          recursiveTargetarr(rtTargetarrArr(arr[i]), targetId)
+        for (let i in arr) {
+          if (arr[i] === targetId) {
+            recursiveVal = targetId
+          } else {
+            recursiveTargetarr(rtTargetarrArr(arr[i]), targetId)
+          }
         }
-      }
       return recursiveVal
     }
-
+    
     // Connection to connected nodes is not allowed
-    if (_.findIndex(rtTargetarrArr(targetId), v => v === sourceId) !== -1) {
+    if (_.findIndex(rtTargetarr, v => v == sourceId) !== -1) {
+      console.log(rtTargetarr,'not allowed')
       return false
     }
-
+    
     // Recursive form to find if the target Targetarr has a sourceId
-    if (recursiveTargetarr(rtTargetarrArr(sourceId), targetId)) {
+    if (recursiveTargetarr(rtSoucearr, targetId)) {
+      console.log('has a sourceId')
       return false
     }
-
-    if ($(`#${sourceId}`).attr('data-tasks-type') === 'CONDITIONS' && $(`#${sourceId}`).attr('data-nodenumber') === 2) {
+    if ($(`#${sourceId}`).attr('data-tasks-type') === 'CONDITIONS' && parseInt($(`#${sourceId}`).attr('data-nodenumber')) === 2) {
       return false
     } else {
-      $(`#${sourceId}`).attr('data-nodenumber', Number($(`#${sourceId}`).attr('data-nodenumber')) + 1)
+      console.log('data-nodenumber')
+      $(`#${sourceId}`).attr('data-nodenumber', parseInt($(`#${sourceId}`).attr('data-nodenumber')) + 1)
     }
 
     // Storage node dependency information
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
index 65c345921d..c0037dca7f 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
@@ -34,7 +34,7 @@ const saveTargetarr = (valId, domId) => {
   let $target = $(`#${domId}`)
   let targetStr = $target.attr('data-targetarr') ? $target.attr('data-targetarr') + `,${valId}` : `${valId}`;
   $target.attr('data-targetarr', targetStr)
-  console.log(targetStr)
+  console.log('Store node id to targetarr',targetStr)
 }
 
 const rtBantpl = () => {

From cafa2ae0c621ccc617d0427dc8a05b063b0f0ddb Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 11 Aug 2020 18:32:29 +0800
Subject: [PATCH 2/3] fix

---
 .../src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 c39802d091..0b4146e490 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
@@ -710,7 +710,8 @@ JSP.prototype.handleEvent = function () {
           if (arr[i] === targetId) {
             recursiveVal = targetId
           } else {
-            recursiveTargetarr(rtTargetarrArr(arr[i]), targetId)
+            let targetArr = rtTargetarrArr(arr[i])
+            recursiveTargetarr(targetArr, targetId)
           }
         }
       return recursiveVal

From b6186bf31847bdaf02712c3fc14cf7fe8c3fa191 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 11 Aug 2020 18:39:42 +0800
Subject: [PATCH 3/3] fix

---
 .../src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 0b4146e490..2feb5e587d 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
@@ -718,7 +718,7 @@ JSP.prototype.handleEvent = function () {
     }
     
     // Connection to connected nodes is not allowed
-    if (_.findIndex(rtTargetarr, v => v == sourceId) !== -1) {
+    if (_.findIndex(rtTargetarr, v => v === sourceId) !== -1) {
       console.log(rtTargetarr,'not allowed')
       return false
     }