Browse Source

Merge pull request #2721 from break60/dev-1.3.0

Conditional judgment adds text
pull/3/MERGE
xingchun-chen 5 years ago committed by GitHub
parent
commit
c08fa12f50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  2. 11
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

@ -180,6 +180,7 @@
], ],
Connector: 'Bezier', Connector: 'Bezier',
PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style
HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
ConnectionOverlays: [ ConnectionOverlays: [
[ [
'Arrow', 'Arrow',
@ -617,6 +618,7 @@
], ],
Connector: 'Bezier', Connector: 'Bezier',
PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style
HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
ConnectionOverlays: [ ConnectionOverlays: [
[ [
'Arrow', 'Arrow',

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

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

Loading…
Cancel
Save