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

Merge pull request #2549 from break60/dev 

Fix page display incomplete
parents 4f9d8cae 76b61c15

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

+11 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
      <template v-if="!processListP.length && total<=0">

        <m-no-data></m-no-data>

      </template>

      <m-spin :is-spin="isLoading"></m-spin>

      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>

    </template>

  </m-list-construction>

</template>
@@ -64,7 +64,8 @@ 
          pageNo: 1,

          searchVal: '',

          userId: ''

        }

        },

        isLeft: true

      }

    },

    mixins: [listUrlParamHandle],
@@ -98,6 +99,11 @@ 
       * get data list

       */

      _getList (flag) {

        if(sessionStorage.getItem('isLeft')==0) {

          this.isLeft = false

        } else {

          this.isLeft = true

        }

        this.isLoading = !flag

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

          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -133,6 +139,9 @@ 
    mounted() {

      this.$modal.destroy()

    },

    beforeDestroy () {

      sessionStorage.setItem('isLeft',1)

    },

    components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }

  }

</script>

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

+9 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
      <template v-if="!processInstanceList.length && total<=0">

        <m-no-data></m-no-data>

      </template>

      <m-spin :is-spin="isLoading"></m-spin>

      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>

    </template>

  </m-list-construction>

</template>
@@ -74,7 +74,8 @@ 
          endDate: '',

          // Exectuor Name

          executorName: ''

        }

        },

        isLeft: true

      }

    },

    props: {},
@@ -136,6 +137,11 @@ 
       * @desc Prevent functions from being called multiple times

       */

      _debounceGET: _.debounce(function (flag) {

        if(sessionStorage.getItem('isLeft')==0) {

          this.isLeft = false

        } else {

          this.isLeft = true

        }

        this._getProcessInstanceListP(flag)

      }, 100, {

        'leading': false,
@@ -183,6 +189,7 @@ 
    beforeDestroy () {

      // Destruction wheel

      clearInterval(this.setIntervalP)

      sessionStorage.setItem('isLeft',1)

    },

    components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }

  }

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

+9 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
      <template v-if="!taskInstanceList.length">

        <m-no-data></m-no-data>

      </template>

      <m-spin :is-spin="isLoading"></m-spin>

      <m-spin :is-spin="isLoading" :is-left="isLeft"></m-spin>

    </template>

  </m-list-construction>

</template>
@@ -71,7 +71,8 @@ 
          endDate: '',

          // Exectuor Name

          executorName: ''

        }

        },

        isLeft: true

      }

    },

    mixins: [listUrlParamHandle],
@@ -118,6 +119,11 @@ 
       * @desc Prevent functions from being called multiple times

       */

      _debounceGET: _.debounce(function (flag) {

        if(sessionStorage.getItem('isLeft')==0) {

          this.isLeft = false

        } else {

          this.isLeft = true

        }

        this._getList(flag)

      }, 100, {

        'leading': false,
@@ -146,6 +152,7 @@ 
    beforeDestroy () {

      // Destruction wheel

      clearInterval(this.setIntervalP)

      sessionStorage.setItem('isLeft',1)

    },

    components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }

  }

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

+11 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
      <template v-if="!fileResourcesList.length && total<=0">

        <m-no-data></m-no-data>

      </template>

      <m-spin :is-spin="isLoading">

      <m-spin :is-spin="isLoading" :is-left="isLeft">

      </m-spin>

    </template>

  </m-list-construction>
@@ -67,7 +67,8 @@ 
          pageNo: 1,

          searchVal: '',

          type: 'FILE'

        }

        },

        isLeft: true

      }

    },

    mixins: [listUrlParamHandle],
@@ -91,6 +92,11 @@ 
        this.searchParams.pageSize = val

      },

      _getList (flag) {

        if(sessionStorage.getItem('isLeft')==0) {

          this.isLeft = false

        } else {

          this.isLeft = true

        }

        this.isLoading = !flag

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

          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -125,6 +131,9 @@ 
    mounted () {

      this.$modal.destroy()

    },

    beforeDestroy () {

      sessionStorage.setItem('isLeft',1)

    },

    components: { mListConstruction, mConditions, mList, mSpin, mNoData }

  }

</script>

dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue

+10 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
      <template v-if="!fileResourcesList.length && total<=0">

        <m-no-data></m-no-data>

      </template>

      <m-spin :is-spin="isLoading">

      <m-spin :is-spin="isLoading" :is-left="isLeft">

      </m-spin>

   </div>

   </div>
@@ -73,6 +73,7 @@ 
          searchVal: '',

          type: 'FILE'

        },

        isLeft: true,

        breadList: []

      }

    },
@@ -97,6 +98,11 @@ 
        this.searchParams.pageSize = val

      },

      _getList (flag) {

        if(sessionStorage.getItem('isLeft')==0) {

          this.isLeft = false

        } else {

          this.isLeft = true

        }

        this.isLoading = !flag

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

          if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
@@ -159,6 +165,9 @@ 
      this.breadList = dir

      this.$modal.destroy()

    },

    beforeDestroy () {

      sessionStorage.setItem('isLeft',1)

    },

    components: { mListConstruction, mConditions, mList, mSpin, mNoData }

  }

</script>