Add page number to list page (#1401)

* Solve the problem that the pop-up box cannot be closed when the browser returns * Change the ans-ui version and API interface name * Add page number to list page
5 years ago · b3a0e1fd14
14 changed files with 59 additions and 14 deletions
--- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
@ -27,7 +27,7 @@
      <template v-if="datasourcesList.length">
        <m-list :datasources-list="datasourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!datasourcesList.length">
@ -108,6 +108,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      /**
       * conditions event
       */
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
@ -29,7 +29,7 @@
      <template v-if="processListP.length">
        <m-list :process-list="processListP" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!processListP.length">
@ -84,6 +84,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      /**
       * conditions
       */
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
@ -140,7 +140,7 @@
          </table>
        </div>
        <div class="page-box">
-          <x-page :current="pageNo" :total="total" show-elevator @on-change="_page"></x-page>
+          <x-page :current="pageNo" :total="total" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!list.length">
@ -207,6 +207,10 @@
        this.pageNo = val
        this._getScheduleList()
      },
+      _pageSize (val) {
+        this.pageSize = val
+        this._getScheduleList()
+      },
      /**
       * Inquire list
       */
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
@ -24,7 +24,7 @@
        <m-list :process-instance-list="processInstanceList" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
        </m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!processInstanceList.length">
@ -94,6 +94,11 @@
        setUrlParams(this.searchParams)
        this._debounceGET()
      },
+      _pageSize(val) {
+        this.searchParams.pageSize = val
+        setUrlParams(this.searchParams)
+        this._debounceGET()
+      },
      /**
       * get list data
       */
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
@ -27,7 +27,7 @@
      <template v-if="projectsList.length">
        <m-list :projects-list="projectsList" @on-update="_onUpdate" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize"></m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!projectsList.length">
@ -78,6 +78,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      _create (item) {
        let self = this
        let modal = this.$modal.dialog({
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
@ -31,7 +31,7 @@
        <m-list :file-resources-list="fileResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
        </m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!fileResourcesList.length">
@ -85,6 +85,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      _getList (flag) {
        this.isLoading = !flag
        this.getResourcesListP(this.searchParams).then(res => {
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
@ -28,7 +28,7 @@
        <m-list :udf-func-list="udfFuncList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize" @on-update="_updateList">
        </m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!udfFuncList.length">
@ -75,6 +75,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      _create () {
        let self = this
        let modal = this.$modal.dialog({
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
@ -28,7 +28,7 @@
        <m-list :udf-resources-list="udfResourcesList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
        </m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!udfResourcesList.length">
@ -82,6 +82,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      _updateList () {
        this.searchParams.pageNo = 1
        this.searchParams.searchVal = ''
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
@ -32,7 +32,7 @@

        </m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!queueList.length">
@ -83,6 +83,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      _onEdit (item) {
        this._create(item)
      },
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
@ -32,7 +32,7 @@

        </m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!tenementList.length">
@ -83,6 +83,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      _onEdit (item) {
        this._create(item)
      },
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
@ -32,7 +32,7 @@

        </m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!userList.length">
@ -81,6 +81,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      _onEdit (item) {
        this._create(item)
      },
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
@ -32,7 +32,7 @@

        </m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!alertgroupList.length">
@ -83,6 +83,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      _onEdit (item) {
        this._create(item)
      },
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
@ -31,7 +31,7 @@
                :page-size="searchParams.pageSize">
        </m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!workerGroupList.length">
@ -82,6 +82,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      _onEdit (item) {
        this._create(item)
      },
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
@ -32,7 +32,7 @@

        </m-list>
        <div class="page-box">
-          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page"></x-page>
+          <x-page :current="parseInt(searchParams.pageNo)" :total="total" :page-size="searchParams.pageSize" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
        </div>
      </template>
      <template v-if="!tokenList.length">
@ -82,6 +82,9 @@
      _page (val) {
        this.searchParams.pageNo = val
      },
+      _pageSize (val) {
+        this.searchParams.pageSize = val
+      },
      _onEdit (item) {
        this._create(item)
      },