lshcom 1.0.8 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lshcom",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "files": [
     "src/assets/*",
     "src/common/common.js",

package/src/common/common.js

@@ -530,6 +530,7 @@ Date.prototype.Format = function (fmt = 'yyyy-MM-dd hh:mm:ss') {
     var o = {
         "M+": this.getMonth() + 1,
         "d+": this.getDate(),
+        "H+": this.getHours(),
         "h+": this.getHours(),
         "m+": this.getMinutes(),
         "s+": this.getSeconds(),

package/src/components/el/Page.vue

@@ -43,22 +43,19 @@
         this.currentPage = val
         this.change()
       },
-      change(){
+      change(pageStart, pageNums){
+        if(pageStart || pageNums){
+          this.reset(pageStart, pageNums)
+        }
         this.$emit('change', {
           pageStart: this.currentPage,
           pageNums: this.pageSize
         })
       },
-      reset(){
-        this.currentPage = this.pageStart
-        this.pageSize = this.pageNums
-      },
-      resetCurrent(currentPage){
-        if (this.currentPage != currentPage) {
-          this.currentPage = currentPage
-        } else {
-          this.change()
-        }
+      // 重置页数和个数，但不触发change
+      reset(pageStart, pageNums){
+        this.currentPage = pageStart ? pageStart : this.pageStart
+        this.pageSize = pageNums ? pageNums : this.pageNums
       },
     }
   };

package/src/components/el/Table.vue

@@ -67,9 +67,9 @@
         });
       },
       // 从默认第一页开始获取数据
-      resetData(currentPage = 1){
+      resetData(pageStart = 1, pageNums){
         if(this.ifPage) {
-          this.$refs.ElePage.resetCurrent(currentPage)
+          this.$refs.ElePage.change(pageStart, pageNums)
         } else {
           this.getData({})
         }