Browse Source

[bugFix][ui]cherry pick commit from dev for Default assignment of delete condition judgment node (#3286)

* Click Cancel, the node data is restored to the original data

* Delete the pid of the master and worker processes

* When modifying the dag, if the DAG is not saved, it cannot be formatted

* Fix the problem that the label of DAG creation task is not displayed, the workflow cannot be formatted after saving, and the drawer style is global

* Default assignment of delete condition judgment node
pull/3/MERGE
break60 4 years ago committed by GitHub
parent
commit
71259db56b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js

4
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js

@ -786,7 +786,7 @@ JSP.prototype.jspBackfill = function ({ connects, locations, largeJson }) {
type: 'basic',
paintStyle: { strokeWidth: 2, stroke: '#4caf50' },
HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
overlays:[["Label", { label: i18n.$t('success'), location:0.5, id:"label"} ]]
overlays:[["Label", { label: labels} ]]
})
} else if($(`#${sourceId}`).attr('data-tasks-type') === 'CONDITIONS' && $(`#${sourceId}`).attr('data-failednode') === $(`#${targetId}`).find('.name-p').text()) {
this.JspInstance.connect({
@ -795,7 +795,7 @@ JSP.prototype.jspBackfill = function ({ connects, locations, largeJson }) {
type: 'basic',
paintStyle: { strokeWidth: 2, stroke: '#252d39' },
HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
overlays:[["Label", { label: i18n.$t('failed'), location:0.5, id:"label"} ]]
overlays:[["Label", { label: labels} ]]
})
} else {
this.JspInstance.connect({

Loading…
Cancel
Save