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

Fix page number loading issue and dag not getting value(#1810) (#1815) 

* merge dev branch front-end code

* fix udfs assignment

* Fix task instance page jump

* fix udfs assignment and task instance page jump #1789

* Fixed space and icon display issues before and after the input box

* add license

* add license

* Fix data echo, style and popup cannot be closed

* Fix page number loading issue and dag not getting value
parent 81308ec2

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

+4 −2
Original line number Diff line number Diff line
@@ -511,6 +511,8 @@ 
            this.workerGroupId = o.workerGroupId

          }



          this.params = o.params || {}

          this.dependence = o.dependence || {}

      }

      this.isContentBox = true

    },

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
            v-model="sqlTypeId"

            :disabled="isDetails"

            @on-change="_handleSqlTypeChanged"

            style="width: 90px;">

            style="width: 120px;">

      <x-option

              v-for="city in sqlTypeList"

              :key="city.id"

dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue

+8 −4
Original line number Diff line number Diff line
@@ -124,10 +124,14 @@ 
      _getList (flag) {

        this.isLoading = !flag

        this.getDatasourcesListP(this.searchParams).then(res => {

          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {

            this.searchParams.pageNo = this.searchParams.pageNo -1

          } else {

            this.datasourcesList = []

            this.datasourcesList = res.totalList

            this.total = res.total

            this.isLoading = false

          }

        }).catch(e => {

          this.isLoading = false

        })

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

+8 −4
Original line number Diff line number Diff line
@@ -100,10 +100,14 @@ 
      _getList (flag) {

        this.isLoading = !flag

        this.getProcessListP(this.searchParams).then(res => {

          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {

            this.searchParams.pageNo = this.searchParams.pageNo -1

          } else {

            this.processListP = []

            this.processListP = res.totalList

            this.total = res.total

            this.isLoading = false

          }

        }).catch(e => {

          this.isLoading = false

        })

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

+8 −4
Original line number Diff line number Diff line
@@ -105,10 +105,14 @@ 
      _getProcessInstanceListP (flag) {

        this.isLoading = !flag

        this.getProcessInstance(this.searchParams).then(res => {

          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {

            this.searchParams.pageNo = this.searchParams.pageNo -1

          } else {

            this.processInstanceList = []

            this.processInstanceList = res.totalList

            this.total = res.total

            this.isLoading = false

          }

        }).catch(e => {

          this.isLoading = false

        })