From a358b58ef8ce3d1feec5cd898cf9d3cb22932552 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Tue, 21 Apr 2020 09:40:15 +0800
Subject: [PATCH] Modify worker parameters

---
 .../pages/dag/_source/formModel/formModel.vue | 26 ++++++++++---------
 .../instance/pages/list/_source/list.vue      |  4 +--
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
index a2b3ad9ba..459f9a860 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
@@ -611,25 +611,27 @@
           this.failedBranch = o.conditionResult.failedNode[0]
         }
           // If the workergroup has been deleted, set the default workergroup
-          var hasMatch = false;
-          for (let i = 0; i < this.store.state.security.workerGroupsListAll.length; i++) {
-            var workerGroup = this.store.state.security.workerGroupsListAll[i].id
-            if (o.workerGroup == workerGroup) {
-              hasMatch = true;
-              break;
-            }
+        var hasMatch = false;
+        for (let i = 0; i < this.store.state.security.workerGroupsListAll.length; i++) {
+          var workerGroup = this.store.state.security.workerGroupsListAll[i].id
+          if (o.workerGroup == workerGroup) {
+            hasMatch = true;
+            break;
           }
+        }
 
-          if(!hasMatch){
-            this.workerGroup = 'default'
-          }else{
-            this.workerGroup = o.workerGroup
-          }
+        if(!hasMatch){
+          this.workerGroup = 'default'
+        } else {
+          this.workerGroup = o.workerGroup
+        }
 
         this.params = o.params || {}
         this.dependence = o.dependence || {}
         this.cacheDependence = o.dependence || {}
 
+      } else {
+        this.workerGroup = this.store.state.security.workerGroupsListAll[0].id
       }
       this.isContentBox = true
     },
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index 641c7aaa6..9019e697d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -311,9 +311,9 @@
     name: 'list',
     data () {
       return {
-        // 数据
+        // data
         list: [],
-        // 按钮类型
+        // btn type
         buttonType: '',
         strDelete: '',
         checkAll: false
-- 
GitLab