[incubator-dolphinscheduler] branch dev updated: Default assignment of delete condition judgment node

[chenxingchun]

This is an automated email from the ASF dual-hosted git repository.

chenxingchun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 338f334  Default assignment of delete condition judgment node
     new 1814e22  Merge pull request #3272 from break60/dev
338f334 is described below

commit 338f33413ee8bd7a3ca9416d54b4a50f007aa4f8
Author: break60 <790061...@qq.com>
AuthorDate: Wed Jul 22 14:38:14 2020 +0800

    Default assignment of delete condition judgment node
---
 .../src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
index 08682a4..03c3d2d 100755
--- 
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+++ 
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
@@ -799,7 +799,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({
@@ -808,7 +808,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({