From 5cf1e2df9d6c0de317e698dae79ebf89c39ee62e Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Sat, 22 Aug 2020 09:21:20 +0800 Subject: [PATCH 1/4] [fix-3553][ui]Repair click workflow connection, select the entire path --- .../src/js/conf/home/pages/dag/_source/dag.vue | 2 -- .../src/js/conf/home/pages/dag/_source/plugIn/util.js | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index d12d0f7d57..e8e709f1d9 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -196,7 +196,6 @@ ], Connector: 'Bezier', PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style - HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3}, ConnectionOverlays: [ [ 'Arrow', @@ -685,7 +684,6 @@ ], Connector: 'Bezier', PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style - HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3}, ConnectionOverlays: [ [ 'Arrow', diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js index 0b472b6c10..bc5321f8b1 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js @@ -100,13 +100,13 @@ 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) + $(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) + $(v).attr('stroke', '#ccc') if ($(v).attr('class')) { $(v).attr('stroke-width', 2) } From e708729245fb5e520cdc358b836c4a0b2c1f11b7 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Mon, 24 Aug 2020 10:27:52 +0800 Subject: [PATCH 2/4] fix --- .../src/js/conf/home/pages/dag/_source/plugIn/util.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js index bc5321f8b1..dc2360d896 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js @@ -106,6 +106,9 @@ const setSvgColor = (e, color) => { // Add color to the selection _.map($(e.canvas)[0].childNodes, (v, i) => { + if($(v).attr('fill') ==='#2d8cf0') { + $(v).attr('fill', '#ccc') + } $(v).attr('stroke', '#ccc') if ($(v).attr('class')) { $(v).attr('stroke-width', 2) From cab72aeac0f7a0ac034a31f7ea6e4fbfea46cd6f Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Mon, 24 Aug 2020 16:36:48 +0800 Subject: [PATCH 3/4] fix --- .../js/conf/home/pages/dag/_source/plugIn/util.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js index dc2360d896..f5aacf294f 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js @@ -100,7 +100,18 @@ const setSvgColor = (e, color) => { // Traverse clear all colors $('.jtk-connector').each((i, o) => { _.map($(o)[0].childNodes, v => { - $(v).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) + } }) }) From 2d15275ec4bb53cea3a03f0f3bf0deedd65b9eec Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Tue, 25 Aug 2020 11:30:18 +0800 Subject: [PATCH 4/4] fix --- dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index 466bfd4fef..6546739421 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -208,7 +208,6 @@ ], Connector: 'Bezier', PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style - HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3}, ConnectionOverlays: [ [ 'Arrow', @@ -832,7 +831,6 @@ ], Connector: 'Bezier', PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style - HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3}, ConnectionOverlays: [ [ 'Arrow',