n20-common-lib 2.5.5-beta.13 → 2.5.5-beta.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.5-beta.13",
+  "version": "2.5.5-beta.14",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/Upload/uploadMsg.vue

@@ -163,12 +163,14 @@ export default {
     colfF
   },
   data() {
-    console.log(this.$slots)
     return {
       tableData: [],
       errorListC: [],
-      current: 1,
-      pageSize: 6,
+      page: {
+        current: 1,
+        pageSize: 6,
+        total: 0
+      },
       index: 0
     }
   },
@@ -176,7 +178,14 @@ export default {
     errorList: {
       handler() {
         this.errorListC = this.errorList
+        this.page.total = Math.ceil(this.tableData.length / this.page.pageSize)
       }
+    },
+    page: {
+      handler(v) {
+        this.pageSize = v
+      },
+      deep: true
     }
   },
   computed: {
@@ -188,16 +197,7 @@ export default {
         this.$emit('update:visible', v)
       }
     },
-    total() {
-      return Math.ceil(this.tableData.length / this.pageSize)
-    },
-    page() {
-      return {
-        total: this.total,
-        current: this.current,
-        pageSize: this.pageSize
-      }
-    },
+
     columnsList() {
       return (this.validateResult && this.validateResult.columnsList) || []
     },
@@ -218,7 +218,8 @@ export default {
           this.tableData = cloneDeep(_errorList)
           const startIndex = (this.page.current - 1) * this.page.pageSize
           const endIndex = startIndex + this.page.pageSize
-          return this.tableData.slice(startIndex, endIndex)
+          let dto = this.tableData.slice(startIndex, endIndex)
+          return dto
         } else {
           return undefined
         }
@@ -245,6 +246,7 @@ export default {
       const startIndex = (this.page.current - 1) * this.page.pageSize
       const endIndex = startIndex + this.page.pageSize
       this.errorListC = this.tableData.slice(startIndex, endIndex)
+
       this.index += 1
       this.$nextTick(() => {
         this.$refs.tables.doLayout()