diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss index 5b171bb4cabce33dd4b0d75f4cad5682ccfba373..a3fcfb4f145c17f4f12d2fc665cc98ff1be8486a 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss +++ b/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; } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index 7565ebe86a17d243b2dd004715ceb517e31bc065..d12d0f7d57b8b71263b0190856275f5328c27cc8 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -538,6 +538,7 @@ eventModel.remove() } eventModel = this.$drawer({ + className: 'dagMask', render (h) { return h(mFormLineModel,{ on: { @@ -610,6 +611,7 @@ closable: false, direction: 'right', escClose: true, + className: 'dagMask', render: h => h(mFormModel, { on: { addTaskInfo ({ item, fromThis }) { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue index e3c25b4032898bb63de3a0d478a8018888cac67c..2864b3c72096c1e4a90feb941c5b1596665ff9f4 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue +++ b/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 () { diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js index e2f3f2b9dc1828f5a5eda3cf5c9835731c0d31cd..f933eaede4918909a6c871da5ce6618577b403d8 100644 --- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js +++ b/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) })