From e44aa1394e4276ceb1f799b9e94ba5ffefb4d4d7 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Wed, 12 Aug 2020 11:50:27 +0800
Subject: [PATCH] [fix-3058][ui]Move rtTargetArr to jsPlumbHandle.js

---
 .../pages/dag/_source/plugIn/jsPlumbHandle.js   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 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 2feb5e587d..34f78b03b8 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
@@ -688,12 +688,15 @@ JSP.prototype.saveStore = function () {
 JSP.prototype.handleEvent = function () {
   this.JspInstance.bind('beforeDrop', function (info) {
     console.log(info)
+    const rtTargetArr = (id) => {
+      let ids = $(`#${id}`).attr('data-targetarr')
+      return ids ? ids.split(',') : []
+    }
     let sourceId = info['sourceId']// 出
     let targetId = info['targetId']// 入
     console.log(sourceId,targetId)
-    let rtTargetarr = rtTargetarrArr(targetId)
-    let rtSoucearr = rtTargetarrArr(sourceId)
-    console.log(rtTargetarr,rtSoucearr)
+    let rtTargetArrs = rtTargetArr(targetId)
+    let rtSouceArrs = rtTargetArr(sourceId)
     /**
     * When connecting, connection is prohibited when the sourceId and target nodes are empty
     */
@@ -710,7 +713,7 @@ JSP.prototype.handleEvent = function () {
           if (arr[i] === targetId) {
             recursiveVal = targetId
           } else {
-            let targetArr = rtTargetarrArr(arr[i])
+            let targetArr = rtTargetArr(arr[i])
             recursiveTargetarr(targetArr, targetId)
           }
         }
@@ -718,13 +721,13 @@ JSP.prototype.handleEvent = function () {
     }
     
     // Connection to connected nodes is not allowed
-    if (_.findIndex(rtTargetarr, v => v === sourceId) !== -1) {
-      console.log(rtTargetarr,'not allowed')
+    if (_.findIndex(rtTargetArrs, v => v === sourceId) !== -1) {
+      console.log(rtTargetArrs,'not allowed')
       return false
     }
     
     // Recursive form to find if the target Targetarr has a sourceId
-    if (recursiveTargetarr(rtSoucearr, targetId)) {
+    if (recursiveTargetarr(rtSouceArrs, targetId)) {
       console.log('has a sourceId')
       return false
     }