You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ch...@apache.org on 2020/08/13 09:40:59 UTC
[incubator-dolphinscheduler] branch 1.3.2-release updated:
[fixBug-3058][ui]Fix connection abnormalities in historical workflow
instance data
This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch 1.3.2-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.2-release by this push:
new a78f5c0 [fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
new 0b2da77 Merge pull request #3484 from break60/1.3.2-release
a78f5c0 is described below
commit a78f5c0337c760adab66114fc5f0513be73403ca
Author: break60 <79...@qq.com>
AuthorDate: Thu Aug 13 17:13:28 2020 +0800
[fixBug-3058][ui]Fix connection abnormalities in historical workflow instance data
---
.../src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue | 8 +++-----
.../src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue | 8 +++-----
.../src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue | 6 ++----
.../src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue | 6 ++----
.../src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue | 8 +++-----
5 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
index 3f85f36..0fe5d0c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
@@ -375,10 +375,8 @@
resourceIdArr = isResourceId.map(item=>{
return item.id
})
- Array.prototype.diff = function(a) {
- return this.filter(function(i) {return a.indexOf(i) < 0;});
- };
- let diffSet = this.resourceList.diff(resourceIdArr);
+ let diffSet
+ diffSet = _.xorWith(this.resourceList, resourceIdArr, _.isEqual)
let optionsCmp = []
if(diffSet.length>0) {
diffSet.forEach(item=>{
@@ -477,7 +475,7 @@
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.mainClass = o.params.mainClass || ''
- if(o.params.mainJar.res) {
+ if(!o.params.mainJar.id) {
this.marjarId(o.params.mainJar.res)
} else if(o.params.mainJar.res=='') {
this.mainJar = ''
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
index d05c698..26d74bd 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
@@ -216,10 +216,8 @@
resourceIdArr = isResourceId.map(item=>{
return item.id
})
- Array.prototype.diff = function(a) {
- return this.filter(function(i) {return a.indexOf(i) < 0;});
- };
- let diffSet = this.resourceList.diff(resourceIdArr);
+ let diffSet
+ diffSet = _.xorWith(this.resourceList, resourceIdArr, _.isEqual)
let optionsCmp = []
if(diffSet.length>0) {
diffSet.forEach(item=>{
@@ -356,7 +354,7 @@
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.mainClass = o.params.mainClass || ''
- if(o.params.mainJar.res) {
+ if(!o.params.mainJar.id) {
this.marjarId(o.params.mainJar.res)
} else if(o.params.mainJar.res=='') {
this.mainJar = ''
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
index 851f8be..40b8c6a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
@@ -208,10 +208,8 @@
resourceIdArr = isResourceId.map(item=>{
return item.id
})
- Array.prototype.diff = function(a) {
- return this.filter(function(i) {return a.indexOf(i) < 0;});
- };
- let diffSet = this.resourceList.diff(resourceIdArr);
+ let diffSet
+ diffSet = _.xorWith(this.resourceList, resourceIdArr, _.isEqual)
let optionsCmp = []
if(diffSet.length>0) {
diffSet.forEach(item=>{
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
index 2f4609a..48c5322 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
@@ -246,10 +246,8 @@
resourceIdArr = isResourceId.map(item=>{
return item.id
})
- Array.prototype.diff = function(a) {
- return this.filter(function(i) {return a.indexOf(i) < 0;});
- };
- let diffSet = this.resourceList.diff(resourceIdArr);
+ let diffSet
+ diffSet = _.xorWith(this.resourceList, resourceIdArr, _.isEqual)
let optionsCmp = []
if(diffSet.length>0) {
diffSet.forEach(item=>{
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
index 4cceb3b..2c59707 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
@@ -335,10 +335,8 @@
resourceIdArr = isResourceId.map(item=>{
return item.id
})
- Array.prototype.diff = function(a) {
- return this.filter(function(i) {return a.indexOf(i) < 0;});
- };
- let diffSet = this.resourceList.diff(resourceIdArr);
+ let diffSet
+ diffSet = _.xorWith(this.resourceList, resourceIdArr, _.isEqual)
let optionsCmp = []
if(diffSet.length>0) {
diffSet.forEach(item=>{
@@ -525,7 +523,7 @@
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.mainClass = o.params.mainClass || ''
- if(o.params.mainJar.res) {
+ if(!o.params.mainJar.id) {
this.marjarId(o.params.mainJar.res)
} else if(o.params.mainJar.res=='') {
this.mainJar = ''