From 339d4940232eb4e3bb8d4580f1592a629e2fd522 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Wed, 22 Jul 2020 13:37:10 +0800 Subject: [PATCH] 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 --- .../src/js/conf/home/pages/dag/_source/dag.scss | 6 +++--- .../src/js/conf/home/pages/dag/_source/dag.vue | 2 ++ .../pages/dag/_source/formModel/formLineModel.vue | 14 ++++++++------ .../src/js/conf/home/store/dag/actions.js | 1 + 4 files changed, 14 insertions(+), 9 deletions(-) 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 5b171bb4ca..a3fcfb4f14 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 7565ebe86a..d12d0f7d57 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 e3c25b4032..2864b3c720 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 e2f3f2b9dc..f933eaede4 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) })