Browse Source

Merge pull request #3763 from break60/1.3.3-release

[fix-3553][ui]cherry pick repair click workflow connection, select the entire path
pull/3/MERGE
xingchun-chen 4 years ago committed by GitHub
parent
commit
973cbf8d86
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. 18
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js

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

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

18
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js

@ -101,13 +101,27 @@ const setSvgColor = (e, color) => {
// Traverse clear all colors
$('.jtk-connector').each((i, o) => {
_.map($(o)[0].childNodes, v => {
$(v).attr('fill', '#2d8cf0').attr('stroke', '#2d8cf0').attr('stroke-width', 2)
if($(v).attr('fill') ==='#ccc') {
$(v).attr('fill', '#2d8cf0')
}
if($(v).attr('fill') ==='#4caf50') {
$(v).attr('fill','#4caf50').attr('stroke', '#4caf50').attr('stroke-width', 2)
$(v).prev().attr('stroke', '#4caf50').attr('stroke-width', 2)
} else if($(v).attr('fill') ==='#252d39') {
$(v).attr('stroke', '#252d39').attr('stroke-width', 2)
$(v).prev().attr('stroke', '#252d39').attr('stroke-width', 2)
} else {
$(v).attr('stroke', '#2d8cf0').attr('stroke-width', 2)
}
})
})
// Add color to the selection
_.map($(e.canvas)[0].childNodes, (v, i) => {
$(v).attr('fill', color).attr('stroke', color)
if($(v).attr('fill') ==='#2d8cf0') {
$(v).attr('fill', '#ccc')
}
$(v).attr('stroke', '#ccc')
if ($(v).attr('class')) {
$(v).attr('stroke-width', 2)
}

Loading…
Cancel
Save