Browse Source

[ui]Code optimization

pull/3/MERGE
break60 4 years ago
parent
commit
d0037b4668
  1. 15
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
  2. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js

15
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
*/
@ -714,19 +717,21 @@ JSP.prototype.handleEvent = function () {
}
// 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

2
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 = () => {

Loading…
Cancel
Save