lib-pajakio-v2 1.0.21 → 1.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lib-pajakio-v2",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "private": false,
   "main": "./dist/lib-pajakio-v2.common.js",
   "scripts": {

package/src/components/DatePicker/index.vue

@@ -790,23 +790,26 @@ export default {
   },
   methods: {
     checkDisableMonth(minMonth, maxMonth, monthPicker){
+      let isDisabled = false
+
       if(minMonth) {
         let convertMonth = minMonth.split("/")
         let propsMonth = new Date(convertMonth[1], convertMonth[0]-1 , 1)
 
         if(propsMonth.getTime() > monthPicker.getTime()) {
-          return true
-        } 
-        return false
+          isDisabled = true
+        }
       }
       if(maxMonth) {
         let convertMonth = maxMonth.split("/")
         let propsMonth = new Date(convertMonth[1], convertMonth[0]-1 , 1)
 
         if(propsMonth.getTime() < monthPicker.getTime()) {
-          return true
-        } 
-        return false
+          isDisabled = true
+        }
+      }
+      if(isDisabled) {
+        return true
       }
       return false
     },

package/src/components/Table/TablePagination.vue

@@ -135,6 +135,9 @@ export default {
     totalPages() {
       this.clickPaging(this.pageNumber);
     },
+    pageNumber() {
+      this.clickPaging(this.pageNumber);
+    },
     pageSize(newVal) {
       this.dataPageSize = newVal;
     }
@@ -175,6 +178,17 @@ export default {
         }
 
         if (this.totalPages > this.limitPage) {
+          const halfPage = Math.floor(this.limitPage / 2);
+          const startPage = Math.max(
+            0,
+            Math.min(page - halfPage - 1, this.totalPages - this.limitPage)
+          );
+          const endPage = startPage + this.limitPage;
+
+          this.pages = datapage.slice(startPage, endPage);
+          this.dotsLeft = startPage > 0;
+          this.dotsRight = endPage < this.totalPages;
+
           if (page == 1) {
             let setPages = datapage.slice(0, this.limitPage);
             this.dotsRight = true;
@@ -203,39 +217,6 @@ export default {
               );
             }
           }
-
-          if (this.pages[this.pages.length - 1] == page) {
-            let setPages = datapage.slice(page - 2, this.limitPage + page - 2);
-            (this.dotsRight =
-              this.totalPages === setPages[setPages.length - 1] ? false : true),
-              (this.dotsLeft = true);
-            if (setPages.length === this.limitPage) {
-              this.pages = setPages;
-            } else {
-              this.pages = datapage.slice(
-                this.totalPages - this.limitPage,
-                this.totalPages
-              );
-            }
-          } else {
-            if (this.pages[0] == page) {
-              let getStart =
-                page - this.limitPage <= 0 ? 0 : page - this.limitPage + 1;
-              let getEnd = getStart === 0 ? this.limitPage : this.pages[0] + 1;
-              let setPages = datapage.slice(getStart, getEnd);
-              this.dotsRight = true;
-              this.dotsLeft =
-                setPages[setPages.length - 1] === this.limitPage ? false : true;
-              if (setPages.length === this.limitPage) {
-                this.pages = setPages;
-              } else {
-                this.pages = datapage.slice(
-                  this.totalPages - this.limitPage,
-                  this.totalPages
-                );
-              }
-            }
-          }
         } else {
           this.pages = datapage;
           this.dotsRight = false;