Unverified Commit aefb60a7 authored by xingchun-chen's avatar xingchun-chen Committed by GitHub
Browse files

Merge pull request #3269 from break60/dev 

[bugFix][ui]Fix the problem that the label of DAG creation task is not displayed,…
parents 0f6f138d 339d4940

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

+3 −3
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ svg path:hover { 
  }

}



.ans-drawer.ans-drawer-right {

.ans-modal-box.ans-drawer.ans-drawer-right.dagMask.mask {

    width: 628px;

    left: auto;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -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 }) {

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

+8 −6
Original line number Diff line number Diff line
@@ -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 () {

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

+1 −0
Original line number Diff line number Diff line
@@ -255,6 +255,7 @@ export default { 
        syncDefine: state.syncDefine

      }, res => {

        resolve(res)

        state.isEditDag = false

      }).catch(e => {

        reject(e)

      })