Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[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

Merged
merged 7 commits into from
Jul 23, 2020
Merged

[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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
20bcf0a
Click Cancel, the node data is restored to the original data
break60 Jul 21, 2020
e5569f9
Merge branch '1.3.2-release' of https://github.com/apache/incubator-d…
break60 Jul 23, 2020
92adde2
Delete the pid of the master and worker processes
break60 Jul 21, 2020
7d47b33
Merge branch '1.3.2-release' of https://github.com/apache/incubator-d…
break60 Jul 23, 2020
996188d
When modifying the dag, if the DAG is not saved, it cannot be formatted
break60 Jul 21, 2020
4755081
Merge branch '1.3.2-release' of https://github.com/apache/incubator-d…
break60 Jul 23, 2020
808b0b3
Fix the problem that the label of DAG creation task is not displayed,…
break60 Jul 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 0 deletions dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
eventModel.remove()
}
eventModel = this.$drawer({
className: 'dagMask',
render (h) {
return h(mFormLineModel,{
on: {
Expand Down Expand Up @@ -591,6 +592,7 @@
closable: false,
direction: 'right',
escClose: true,
className: 'dagMask',
render: h => h(mFormModel, {
on: {
addTaskInfo ({ item, fromThis }) {
Expand Down
14 changes: 8 additions & 6 deletions dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -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 () {

Expand Down
1 change: 1 addition & 0 deletions dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ export default {
syncDefine: state.syncDefine
}, res => {
resolve(res)
state.isEditDag = false
}).catch(e => {
reject(e)
})
Expand Down