[shardingsphere-elasticjob-ui] 38/44: Fixes pagination

[zhangyonglun]

This is an automated email from the ASF dual-hosted git repository.

zhangyonglun pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-ui.git

commit 48a9a9317f4e9f7ad2676bb3c60095878063984f
Author: menghaoranss <loca...@163.com>
AuthorDate: Wed Jul 22 18:29:15 2020 +0800

    Fixes pagination
---
 .../lite/ui/dto/request/BasePageRequest.java       |  2 --
 .../views/history-status/module/historyStatus.vue  | 20 +++++++++++------
 .../views/history-trace/module/historyTrace.vue    | 26 +++++++++++++++-------
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git 
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dto/request/BasePageRequest.java
 
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dto/request/BasePageRequest.java
index 941bc18..f2ce8b0 100644
--- 
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dto/request/BasePageRequest.java
+++ 
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dto/request/BasePageRequest.java
@@ -37,13 +37,11 @@ public class BasePageRequest {
     /**
      * Page size of request.
      */
-    @JsonProperty("per_page")
     private Integer pageSize = DEFAULT_PAGE_SIZE;
     
     /**
      * Page number of request.
      */
-    @JsonProperty("page")
     private Integer pageNumber = 1;
     
     /**
diff --git 
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-status/module/historyStatus.vue
 
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-status/module/historyStatus.vue
index 70779ed..c076c05 100644
--- 
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-status/module/historyStatus.vue
+++ 
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-status/module/historyStatus.vue
@@ -90,7 +90,7 @@ export default {
         },
         {
           label: this.$t('historyStatus').column.shardingItem,
-          prop: 'shardingItem'
+          prop: 'shardingItems'
         },
         {
           label: this.$t('historyStatus').column.state,
@@ -147,15 +147,21 @@ export default {
   methods: {
     ...mapActions(['setRegCenterActivated']),
     handleCurrentChange(val) {
-      const data = clone(this.cloneTableData)
-      this.tableData = data.splice(val - 1, this.pageSize)
+      const page = {
+        pageSize: this.pageSize,
+        pageNumber: val
+      }
+      API.loadStatus(Object.assign(this.searchForm, page)).then(res => {
+        const data = res.model.rows
+        this.total = res.model.total
+        this.tableData = data
+      })
     },
     getJobStatus() {
       API.loadStatus(this.searchForm).then(res => {
-        const data = res.model
-        this.total = data.length
-        this.cloneTableData = clone(res.model)
-        this.tableData = data.splice(0, this.pageSize)
+        const data = res.model.rows
+        this.total = res.model.total
+        this.tableData = data
       })
     }
   }
diff --git 
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-trace/module/historyTrace.vue
 
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-trace/module/historyTrace.vue
index 797eb28..0c7dc63 100644
--- 
a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-trace/module/historyTrace.vue
+++ 
b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-trace/module/historyTrace.vue
@@ -25,7 +25,7 @@
       </el-input>
       <el-input
         :placeholder="$t('historyTrace.searchForm.serverIp')"
-        v-model="searchForm.serverIp"
+        v-model="searchForm.ip"
         clearable>
       </el-input>
       <el-date-picker
@@ -65,6 +65,7 @@
           :prop="item.prop"
           :label="item.label"
           :width="item.width"
+          :formatter = "item.formatter"
         />
       </el-table>
       <div class="pagination">
@@ -103,7 +104,10 @@ export default {
         },
         {
           label: this.$t('historyTrace').column.executeResult,
-          prop: 'success'
+          prop: 'success',
+          formatter: function(row,cell,value) {
+            return value+''
+          }
         },
         {
           label: this.$t('historyTrace').column.failureCause,
@@ -147,15 +151,21 @@ export default {
   methods: {
     ...mapActions(['setRegCenterActivated']),
     handleCurrentChange(val) {
-      const data = clone(this.cloneTableData)
-      this.tableData = data.splice(val - 1, this.pageSize)
+      const page = {
+        pageSize: this.pageSize,
+        pageNumber: val
+      }
+      API.loadExecution(Object.assign(this.searchForm, page)).then(res => {
+        const data = res.model.rows
+        this.total = res.model.total
+        this.tableData = data
+      })
     },
     getJobTrace() {
       API.loadExecution(this.searchForm).then(res => {
-        const data = res.model
-        this.total = data.length
-        this.cloneTableData = clone(res.model)
-        this.tableData = data.splice(0, this.pageSize)
+        const data = res.model.rows
+        this.total = res.model.total
+        this.tableData = data
       })
     }
   }