Merge pull request #3484 from break60/1.3.2-release

[fixBug-3058][ui]Fix connection abnormalities in historical workflow …

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) {
+          let diffSet
-            return this.filter(function(i) {return a.indexOf(i) < 0;});
+          diffSet = _.xorWith(this.resourceList, resourceIdArr, _.isEqual)
-          };
-          let diffSet = this.resourceList.diff(resourceIdArr);
           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 = ''

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) {
+          let diffSet
-            return this.filter(function(i) {return a.indexOf(i) < 0;});
+          diffSet = _.xorWith(this.resourceList, resourceIdArr, _.isEqual)
-          };
-          let diffSet = this.resourceList.diff(resourceIdArr);
           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 = ''

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) {
+          let diffSet
-            return this.filter(function(i) {return a.indexOf(i) < 0;});
+          diffSet = _.xorWith(this.resourceList, resourceIdArr, _.isEqual)
-          };
-          let diffSet = this.resourceList.diff(resourceIdArr);
           let optionsCmp = []
           if(diffSet.length>0) {
             diffSet.forEach(item=>{

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) {
+          let diffSet
-            return this.filter(function(i) {return a.indexOf(i) < 0;});
+          diffSet = _.xorWith(this.resourceList, resourceIdArr, _.isEqual)
-          };
-          let diffSet = this.resourceList.diff(resourceIdArr);
           let optionsCmp = []
           if(diffSet.length>0) {
             diffSet.forEach(item=>{

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) {
+          let diffSet
-            return this.filter(function(i) {return a.indexOf(i) < 0;});
+          diffSet = _.xorWith(this.resourceList, resourceIdArr, _.isEqual)
-          };
-          let diffSet = this.resourceList.diff(resourceIdArr);
           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 = ''