Commit 9a13d97d authored by 向偲彪's avatar 向偲彪 Committed by lgcareer
Browse files

fix udfs assignment and task instance page jump #1789 (#1791) 

* merge dev branch front-end code

* fix udfs assignment

* Fix task instance page jump

* fix udfs assignment and task instance page jump #1789
parent 21498332

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

+3 −0
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ 
      background: #F2F3F7;

      position: relative;

      border-radius: 0 3px 0 0;

      .ans-btn-text {

        color: #337ab7;

      }

      .assist-btn {

        position: absolute;

        left: 10px;

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

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
            _.map(udfs, v => {

              _.map(this.udfsList, v1 => {

                if (parseInt(v) === v1.id) {

                  arr.push(v1)

                  arr.push(parseInt(v))

                }

              })

            })

dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
       */

      _onQuery (o) {

        this.searchParams = _.assign(this.searchParams, o)

        this.searchParams.processInstanceId = ''

        if (this.searchParams.taskName) {

          this.searchParams.taskName = ''

        }