Unverified Commit 8d902700 authored by kezhenxu94's avatar kezhenxu94 Committed by GitHub
Browse files

Merge branch 'dev' into issue/1463

parents 234d6b60 c94748a6

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

+7 −0
Original line number Diff line number Diff line
@@ -259,8 +259,15 @@ 
                if (v2.name === v1.name) {

                  let dom = $(`#${v2.id}`)

                  let state = dom.find('.state-p')

                  let depState = ''

                   taskList.forEach(item=>{

                    if(item.name==v1.name) {

                      depState = item.state

                    }

                  })

                  dom.attr('data-state-id', v1.stateId)

                  dom.attr('data-dependent-result', v1.dependentResult || '')

                  dom.attr('data-dependent-depState', depState)

                  state.append(`<strong class="${v1.icoUnicode} ${v1.isSpin ? 'as as-spin' : ''}" style="color:${v1.color}" data-toggle="tooltip" data-html="true" data-container="body"></strong>`)

                  state.find('strong').attr('title', titleTpl(v2, v1.desc))

                }

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

+3 −4
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
      <template v-if="isInstance">

        <span class="instance-state">

          <em class="iconfont ans-icon-success-solid" :class="'icon-' + el.state" v-if="el.state === 'SUCCESS'" data-toggle="tooltip" data-container="body" :title="$t('success')"></em>

          <em class="iconfont ans-icon-clock" :class="'icon-' + el.state" v-if="el.state === 'WAITING'" data-toggle="tooltip" data-container="body" :title="$t('waiting')"></em>

          <em class="iconfont ans-icon-fail-solid" :class="'icon-' + el.state" v-if="el.state === 'FAILED'" data-toggle="tooltip" data-container="body" :title="$t('failed')"></em>

          <em class="iconfont ans-icon-clock" :class="'icon-' + el.state" v-if="el.state === 'RUNNING_EXEUTION'" data-toggle="tooltip" data-container="body" :title="$t('waiting')"></em>

          <em class="iconfont ans-icon-fail-solid" :class="'icon-' + el.state" v-if="el.state === 'FAILURE'" data-toggle="tooltip" data-container="body" :title="$t('failed')"></em>

        </span>

      </template>

      <span class="operation">
@@ -176,8 +176,7 @@ 
        }

      })

    },

    mounted () {

    },

    mounted () {},

    components: {}

  }

</script>

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

+8 −1
Original line number Diff line number Diff line
@@ -143,13 +143,20 @@ 
    created () {

      let o = this.backfillItem

      let dependentResult = $(`#${o.id}`).data('dependent-result') || {}

      

      // Does not represent an empty object backfill

      if (!_.isEmpty(o)) {

        this.relation = _.cloneDeep(o.dependence.relation) || 'AND'

        this.dependTaskList = _.cloneDeep(o.dependence.dependTaskList) || []

        let defaultState = this.isDetails ? 'WAITING' : ''

        // Process instance return status display matches by key

        _.map(this.dependTaskList, v => _.map(v.dependItemList, v1 => v1.state = dependentResult[`${v1.definitionId}-${v1.depTasks}-${v1.cycle}-${v1.dateValue}`] || defaultState))

        _.map(this.dependTaskList, v => _.map(v.dependItemList, v1 => {

          $(`#${o.id}`).siblings().each(function(){

            if(v1.depTasks == $(this).text()) {

              v1.state = $(this).attr('data-dependent-depstate')

            }

          });

        }))

      }

    },

    mounted () {