Browse Source

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 <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
pull/2/head
break60 5 years ago committed by GitHub
parent
commit
3740b2410e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 26
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  2. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

26
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

@ -611,25 +611,27 @@
this.failedBranch = o.conditionResult.failedNode[0] this.failedBranch = o.conditionResult.failedNode[0]
} }
// If the workergroup has been deleted, set the default workergroup // If the workergroup has been deleted, set the default workergroup
var hasMatch = false; var hasMatch = false;
for (let i = 0; i < this.store.state.security.workerGroupsListAll.length; i++) { for (let i = 0; i < this.store.state.security.workerGroupsListAll.length; i++) {
var workerGroup = this.store.state.security.workerGroupsListAll[i].id var workerGroup = this.store.state.security.workerGroupsListAll[i].id
if (o.workerGroup == workerGroup) { if (o.workerGroup == workerGroup) {
hasMatch = true; hasMatch = true;
break; break;
}
} }
}
if(!hasMatch){ if(!hasMatch){
this.workerGroup = 'default' this.workerGroup = 'default'
}else{ } else {
this.workerGroup = o.workerGroup this.workerGroup = o.workerGroup
} }
this.params = o.params || {} this.params = o.params || {}
this.dependence = o.dependence || {} this.dependence = o.dependence || {}
this.cacheDependence = o.dependence || {} this.cacheDependence = o.dependence || {}
} else {
this.workerGroup = this.store.state.security.workerGroupsListAll[0].id
} }
this.isContentBox = true this.isContentBox = true
}, },

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

@ -311,9 +311,9 @@
name: 'list', name: 'list',
data () { data () {
return { return {
// // data
list: [], list: [],
// // btn type
buttonType: '', buttonType: '',
strDelete: '', strDelete: '',
checkAll: false checkAll: false

Loading…
Cancel
Save