version upgrade

xaksis · Mar 28, 2021 · 3595a25 · 3595a25
1 parent 7a9c967
commit 3595a25
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 49 deletions.
diff --git a/dist/vue-good-table.cjs.js b/dist/vue-good-table.cjs.js
@@ -1,5 +1,5 @@
 /**
- * vue-good-table v2.21.8
+ * vue-good-table v2.21.9
  * (c) 2018-present xaksis <[email protected]>
  * https://github.com/xaksis/vue-good-table
  * Released under the MIT License.
@@ -2190,9 +2190,16 @@ var script = {
       return "".concat(first, " - ").concat(last, " ").concat(this.ofText, " ").concat(this.totalRecords);
     },
     infoParams: function infoParams() {
+      var first = this.firstRecordOnPage;
+      var last = this.lastRecordOnPage;
+
+      if (last === 0) {
+        first = 0;
+      }
+
       return {
-        firstRecordOnPage: this.firstRecordOnPage,
-        lastRecordOnPage: this.lastRecordOnPage,
+        firstRecordOnPage: first,
+        lastRecordOnPage: last,
         totalRecords: this.totalRecords,
         currentPage: this.currentPage,
         totalPages: this.lastPage
@@ -2356,7 +2363,7 @@ var __vue_staticRenderFns__ = [];
 var __vue_inject_styles__ = undefined;
 /* scoped */
 
-var __vue_scope_id__ = "data-v-375daa9e";
+var __vue_scope_id__ = "data-v-3b496d41";
 /* module identifier */
 
 var __vue_module_identifier__ = undefined;
@@ -2480,7 +2487,7 @@ var script$1 = {
       if (pageNumber > 0 && this.total > this.currentPerPage * (pageNumber - 1)) {
         this.prevPage = this.currentPage;
         this.currentPage = pageNumber;
-        if (emit) this.pageChanged();
+        this.pageChanged(emit);
       }
     },
     // Go to next page
@@ -2501,10 +2508,13 @@ var script$1 = {
     },
     // Indicate page changing
     pageChanged: function pageChanged() {
-      this.$emit('page-changed', {
+      var emit = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      var payload = {
         currentPage: this.currentPage,
         prevPage: this.prevPage
-      });
+      };
+      if (!emit) payload.noEmit = true;
+      this.$emit('page-changed', payload);
     },
     // Indicate per page changing
     perPageChanged: function perPageChanged(oldValue) {
@@ -2516,7 +2526,7 @@ var script$1 = {
         });
       }
 
-      this.changePage(1, true);
+      this.changePage(1, false);
     },
     // Handle per page changing
     handlePerPage: function handlePerPage() {
@@ -8895,7 +8905,6 @@ var script$6 = {
           var children = filteredRows.filter(function (r) {
             return r.vgt_id === i;
           });
-          console.log(children);
 
           if (children.length) {
             var newHeaderRow = JSON.parse(JSON.stringify(headerRow));
@@ -9201,12 +9210,15 @@ var script$6 = {
     },
     pageChanged: function pageChanged(pagination) {
       this.currentPage = pagination.currentPage;
-      var pageChangedEvent = this.pageChangedEvent();
-      pageChangedEvent.prevPage = pagination.prevPage;
-      this.$emit('on-page-change', pageChangedEvent);
 
-      if (this.mode === 'remote') {
-        this.$emit('update:isLoading', true);
+      if (!pagination.noEmit) {
+        var pageChangedEvent = this.pageChangedEvent();
+        pageChangedEvent.prevPage = pagination.prevPage;
+        this.$emit('on-page-change', pageChangedEvent);
+
+        if (this.mode === 'remote') {
+          this.$emit('update:isLoading', true);
+        }
       }
     },
     perPageChanged: function perPageChanged(pagination) {
@@ -9497,7 +9509,9 @@ var script$6 = {
         if (_typeof(_ret) === "object") return _ret.v;
       }
 
-      this.filteredRows = computedRows;
+      this.filteredRows = computedRows.filter(function (h) {
+        return h.children && h.children.length;
+      });
     },
     getCurrentIndex: function getCurrentIndex(rowId) {
       var index = 0;

diff --git a/dist/vue-good-table.esm.js b/dist/vue-good-table.esm.js
@@ -1,5 +1,5 @@
 /**
- * vue-good-table v2.21.8
+ * vue-good-table v2.21.9
  * (c) 2018-present xaksis <[email protected]>
  * https://github.com/xaksis/vue-good-table
  * Released under the MIT License.
@@ -2186,9 +2186,16 @@ var script = {
       return "".concat(first, " - ").concat(last, " ").concat(this.ofText, " ").concat(this.totalRecords);
     },
     infoParams: function infoParams() {
+      var first = this.firstRecordOnPage;
+      var last = this.lastRecordOnPage;
+
+      if (last === 0) {
+        first = 0;
+      }
+
       return {
-        firstRecordOnPage: this.firstRecordOnPage,
-        lastRecordOnPage: this.lastRecordOnPage,
+        firstRecordOnPage: first,
+        lastRecordOnPage: last,
         totalRecords: this.totalRecords,
         currentPage: this.currentPage,
         totalPages: this.lastPage
@@ -2352,7 +2359,7 @@ var __vue_staticRenderFns__ = [];
 var __vue_inject_styles__ = undefined;
 /* scoped */
 
-var __vue_scope_id__ = "data-v-375daa9e";
+var __vue_scope_id__ = "data-v-3b496d41";
 /* module identifier */
 
 var __vue_module_identifier__ = undefined;
@@ -2476,7 +2483,7 @@ var script$1 = {
       if (pageNumber > 0 && this.total > this.currentPerPage * (pageNumber - 1)) {
         this.prevPage = this.currentPage;
         this.currentPage = pageNumber;
-        if (emit) this.pageChanged();
+        this.pageChanged(emit);
       }
     },
     // Go to next page
@@ -2497,10 +2504,13 @@ var script$1 = {
     },
     // Indicate page changing
     pageChanged: function pageChanged() {
-      this.$emit('page-changed', {
+      var emit = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      var payload = {
         currentPage: this.currentPage,
         prevPage: this.prevPage
-      });
+      };
+      if (!emit) payload.noEmit = true;
+      this.$emit('page-changed', payload);
     },
     // Indicate per page changing
     perPageChanged: function perPageChanged(oldValue) {
@@ -2512,7 +2522,7 @@ var script$1 = {
         });
       }
 
-      this.changePage(1, true);
+      this.changePage(1, false);
     },
     // Handle per page changing
     handlePerPage: function handlePerPage() {
@@ -8891,7 +8901,6 @@ var script$6 = {
           var children = filteredRows.filter(function (r) {
             return r.vgt_id === i;
           });
-          console.log(children);
 
           if (children.length) {
             var newHeaderRow = JSON.parse(JSON.stringify(headerRow));
@@ -9197,12 +9206,15 @@ var script$6 = {
     },
     pageChanged: function pageChanged(pagination) {
       this.currentPage = pagination.currentPage;
-      var pageChangedEvent = this.pageChangedEvent();
-      pageChangedEvent.prevPage = pagination.prevPage;
-      this.$emit('on-page-change', pageChangedEvent);
 
-      if (this.mode === 'remote') {
-        this.$emit('update:isLoading', true);
+      if (!pagination.noEmit) {
+        var pageChangedEvent = this.pageChangedEvent();
+        pageChangedEvent.prevPage = pagination.prevPage;
+        this.$emit('on-page-change', pageChangedEvent);
+
+        if (this.mode === 'remote') {
+          this.$emit('update:isLoading', true);
+        }
       }
     },
     perPageChanged: function perPageChanged(pagination) {
@@ -9493,7 +9505,9 @@ var script$6 = {
         if (_typeof(_ret) === "object") return _ret.v;
       }
 
-      this.filteredRows = computedRows;
+      this.filteredRows = computedRows.filter(function (h) {
+        return h.children && h.children.length;
+      });
     },
     getCurrentIndex: function getCurrentIndex(rowId) {
       var index = 0;

diff --git a/dist/vue-good-table.js b/dist/vue-good-table.js
@@ -1,5 +1,5 @@
 /**
- * vue-good-table v2.21.8
+ * vue-good-table v2.21.9
  * (c) 2018-present xaksis <[email protected]>
  * https://github.com/xaksis/vue-good-table
  * Released under the MIT License.
@@ -2192,9 +2192,16 @@
         return "".concat(first, " - ").concat(last, " ").concat(this.ofText, " ").concat(this.totalRecords);
       },
       infoParams: function infoParams() {
+        var first = this.firstRecordOnPage;
+        var last = this.lastRecordOnPage;
+
+        if (last === 0) {
+          first = 0;
+        }
+
         return {
-          firstRecordOnPage: this.firstRecordOnPage,
-          lastRecordOnPage: this.lastRecordOnPage,
+          firstRecordOnPage: first,
+          lastRecordOnPage: last,
           totalRecords: this.totalRecords,
           currentPage: this.currentPage,
           totalPages: this.lastPage
@@ -2358,7 +2365,7 @@
   var __vue_inject_styles__ = undefined;
   /* scoped */
 
-  var __vue_scope_id__ = "data-v-375daa9e";
+  var __vue_scope_id__ = "data-v-3b496d41";
   /* module identifier */
 
   var __vue_module_identifier__ = undefined;
@@ -2482,7 +2489,7 @@
         if (pageNumber > 0 && this.total > this.currentPerPage * (pageNumber - 1)) {
           this.prevPage = this.currentPage;
           this.currentPage = pageNumber;
-          if (emit) this.pageChanged();
+          this.pageChanged(emit);
         }
       },
       // Go to next page
@@ -2503,10 +2510,13 @@
       },
       // Indicate page changing
       pageChanged: function pageChanged() {
-        this.$emit('page-changed', {
+        var emit = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+        var payload = {
           currentPage: this.currentPage,
           prevPage: this.prevPage
-        });
+        };
+        if (!emit) payload.noEmit = true;
+        this.$emit('page-changed', payload);
       },
       // Indicate per page changing
       perPageChanged: function perPageChanged(oldValue) {
@@ -2518,7 +2528,7 @@
           });
         }
 
-        this.changePage(1, true);
+        this.changePage(1, false);
       },
       // Handle per page changing
       handlePerPage: function handlePerPage() {
@@ -8897,7 +8907,6 @@
             var children = filteredRows.filter(function (r) {
               return r.vgt_id === i;
             });
-            console.log(children);
 
             if (children.length) {
               var newHeaderRow = JSON.parse(JSON.stringify(headerRow));
@@ -9203,12 +9212,15 @@
       },
       pageChanged: function pageChanged(pagination) {
         this.currentPage = pagination.currentPage;
-        var pageChangedEvent = this.pageChangedEvent();
-        pageChangedEvent.prevPage = pagination.prevPage;
-        this.$emit('on-page-change', pageChangedEvent);
 
-        if (this.mode === 'remote') {
-          this.$emit('update:isLoading', true);
+        if (!pagination.noEmit) {
+          var pageChangedEvent = this.pageChangedEvent();
+          pageChangedEvent.prevPage = pagination.prevPage;
+          this.$emit('on-page-change', pageChangedEvent);
+
+          if (this.mode === 'remote') {
+            this.$emit('update:isLoading', true);
+          }
         }
       },
       perPageChanged: function perPageChanged(pagination) {
@@ -9499,7 +9511,9 @@
           if (_typeof(_ret) === "object") return _ret.v;
         }
 
-        this.filteredRows = computedRows;
+        this.filteredRows = computedRows.filter(function (h) {
+          return h.children && h.children.length;
+        });
       },
       getCurrentIndex: function getCurrentIndex(rowId) {
         var index = 0;

diff --git a/dist/vue-good-table.min.js b/dist/vue-good-table.min.js
diff --git a/dist/vue-good-table.min.js.map b/dist/vue-good-table.min.js.map