[incubator-dolphinscheduler] branch dev updated: Modify worker parameters (#2479)

[journey]

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

journey 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 3740b24  Modify worker parameters (#2479)
3740b24 is described below

commit 3740b2410e62dcb57a878c8620a88e7c8db63072
Author: break60 <790061...@qq.com>
AuthorDate: Tue Apr 21 10:48:32 2020 +0800

    Modify worker parameters (#2479)
    
    * Fix the problem of data echo in script edit box
    
    * Optimize resource tree
    
    * Change the name of the shell node and modify the parameter transmission 
method of spark, mr, python, and flink nodes
    
    * Repair naming
    
    * Modify list style
    
    * Online editing is prohibited
    
    * Change the background color of the disabled state of the radio button 
when the workflow goes online
    
    * Modify worker parameters
    
    Co-authored-by: dailidong <dailidon...@gmail.com>
    Co-authored-by: qiaozhanwei <qiaozhan...@outlook.com>
---
 .../home/pages/dag/_source/formModel/formModel.vue | 26 ++++++++++++----------
 .../pages/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 a2b3ad9..459f9a8 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 641c7aa..9019e69 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