Browse Source

[bugFix-#3357][ui] Select the dag connection to pop up the label edit box (#3358)

* [bugFix][ui] Cannot select connection

* fix
pull/3/MERGE
break60 4 years ago committed by GitHub
parent
commit
909294d4f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 23
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js

23
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 // Monitor line click
this.JspInstance.bind('click', e => { this.JspInstance.bind('click', e => {
// Untie event // 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) { if (this.config.isClick) {
this.connectClick(e) 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 // callback onRemoveNodes event
this.options && this.options.onRemoveNodes && this.options.onRemoveNodes($id) 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 // task
_.map(_.cloneDeep(store.state.dag.tasks), v => { _.map(_.cloneDeep(store.state.dag.tasks), v => {
if (is(v.id)) { if (is(v.id)) {
const preTasks = [] let preTasks = []
const id = $(`#${v.id}`) let id = $(`#${v.id}`)
const tar = id.attr('data-targetarr') let tar = id.attr('data-targetarr')
const idDep = tar ? id.attr('data-targetarr').split(',') : [] let idDep = tar ? id.attr('data-targetarr').split(',') : []
if (idDep.length) { if (idDep.length) {
_.map(idDep, v1 => { _.map(idDep, v1 => {
preTasks.push($(`#${v1}`).find('.name-p').text()) preTasks.push($(`#${v1}`).find('.name-p').text())

Loading…
Cancel
Save