diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js b/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js index 5fb2cd51fd..72404897c2 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js @@ -668,26 +668,21 @@ JSP.prototype.saveStore = function () { /** * Event processing */ + JSP.prototype.handleEvent = function () { this.JspInstance.bind('beforeDrop', function (info) { let sourceId = info['sourceId']// 出 let targetId = info['targetId']// 入 - /** * Recursive search for nodes */ let recursiveVal const recursiveTargetarr = (arr, targetId) => { - for (var i in arr) { + for (let i in arr) { if (arr[i] === targetId) { recursiveVal = targetId } else { - let recTargetarrArr = rtTargetarrArr(arr[i]) - if (recTargetarrArr.length) { - recursiveTargetarr(recTargetarrArr, targetId) - } else { - return recursiveTargetarr(targetId) - } + recursiveTargetarr(rtTargetarrArr(arr[i]), targetId) } } return recursiveVal @@ -700,7 +695,6 @@ JSP.prototype.handleEvent = function () { // Recursive form to find if the target Targetarr has a sourceId if (recursiveTargetarr(rtTargetarrArr(sourceId), targetId)) { - // setRecursiveVal(null) return false } diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js b/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js index cda59ba1e7..ff0f578ae5 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js @@ -24,8 +24,8 @@ import store from '@/conf/home/store' * Node, to array */ const rtTargetarrArr = (id) => { - let a = $(`#${id}`).attr('data-targetarr') - return a ? a.split(',') : [] + let ids = $(`#${id}`).attr('data-targetarr') + return ids ? ids.split(',') : [] } /** diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue index 81f9da5325..8d26ce78c0 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue @@ -4,7 +4,16 @@
{{$t('Global parameters')}}
- {{item.prop}} = {{item.value}} +
@@ -15,10 +24,19 @@
Task({{$index}}):{{key}}
-
-