Browse Source

[bugFix][ui]cherry pick commit from dev for Fix the problem that the label of DAG creation task is not displayed, the workflow cannot be formatted after saving, and the drawer style is global (#3284)

* Click Cancel, the node data is restored to the original data

* Delete the pid of the master and worker processes

* When modifying the dag, if the DAG is not saved, it cannot be formatted

* Fix the problem that the label of DAG creation task is not displayed, the workflow cannot be formatted after saving, and the drawer style is global
pull/3/MERGE
break60 4 years ago committed by GitHub
parent
commit
a5cc686f49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
  2. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  3. 14
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue
  4. 1
      dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js

6
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss

@ -560,9 +560,9 @@ svg path:hover {
}
}
.ans-drawer.ans-drawer-right {
width: 628px;
left: auto;
.ans-modal-box.ans-drawer.ans-drawer-right.dagMask.mask {
width: 628px;
left: auto;
}

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

@ -519,6 +519,7 @@
eventModel.remove()
}
eventModel = this.$drawer({
className: 'dagMask',
render (h) {
return h(mFormLineModel,{
on: {
@ -591,6 +592,7 @@
closable: false,
direction: 'right',
escClose: true,
className: 'dagMask',
render: h => h(mFormModel, {
on: {
addTaskInfo ({ item, fromThis }) {

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

@ -77,6 +77,9 @@
})
},
ok() {
if($(`#${this.id}`).prev().attr('class')==='jtk-overlay') {
$(`#${this.id}`).prev().empty()
}
$(`#${this.id}`).text(this.labelName)
this.$emit('addLineInfo', {
item: {
@ -92,12 +95,11 @@
},
created () {
let connects = this.store.state.dag.connects
connects.filter( item => {
if(item.endPointSourceId===this.sourceId && item.endPointTargetId===this.targetId) {
this.labelName = item.label
}
});
if($(`#${this.id}`).prev().attr('class').indexOf('jtk-overlay')!==-1) {
this.labelName = $(`#${this.id}`).prev().text()
} else {
this.labelName = $(`#${this.id}`).text()
}
},
mounted () {

1
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js

@ -255,6 +255,7 @@ export default {
syncDefine: state.syncDefine
}, res => {
resolve(res)
state.isEditDag = false
}).catch(e => {
reject(e)
})

Loading…
Cancel
Save