Merge branch 'master' of https://github.com/xaksis/vue-good-table

xaksis · Sep 29, 2021 · 2f5764c · 2f5764c
2 parents beb87ea + 733b28d
commit 2f5764c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/docs/guide/configuration/pagination-options.html b/docs/guide/configuration/pagination-options.html
@@ -216,7 +216,7 @@
     position: <span class="token punctuation">'</span>top<span class="token punctuation">'</span>
   }<span class="token punctuation">&quot;</span></span><span class="token punctuation">&gt;</span></span>
 <span class="token tag"><span class="token tag"><span class="token punctuation">&lt;/</span>vue-good-table</span><span class="token punctuation">&gt;</span></span>
-</code></pre></div><h2 id="perpage"><a href="#perpage" class="header-anchor">#</a> perPage</h2> <p>type: <code>Integer (default: 10)</code></p> <p>Number of rows to show per page</p> <div class="language-html extra-class"><pre class="language-html"><code><span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>vue-good-table</span>
+</code></pre></div><h2 id="perpage"><a href="#perpage" class="header-anchor">#</a> perPage</h2> <p>type: <code>Integer (default: 10)</code></p> <p>Number of rows to show per page. This option can be set to -1 to show all rows.</p> <div class="language-html extra-class"><pre class="language-html"><code><span class="token tag"><span class="token tag"><span class="token punctuation">&lt;</span>vue-good-table</span>
   <span class="token attr-name">:columns</span><span class="token attr-value"><span class="token punctuation attr-equals">=</span><span class="token punctuation">&quot;</span>columns<span class="token punctuation">&quot;</span></span>
   <span class="token attr-name">:rows</span><span class="token attr-value"><span class="token punctuation attr-equals">=</span><span class="token punctuation">&quot;</span>rows<span class="token punctuation">&quot;</span></span>
   <span class="token attr-name">:pagination-options</span><span class="token attr-value"><span class="token punctuation attr-equals">=</span><span class="token punctuation">&quot;</span>{

diff --git a/src/components/Table.vue b/src/components/Table.vue
@@ -902,7 +902,7 @@ export default {
         // calculate page end now
         let pageEnd = paginatedRows.length + 1;
 
-        // if the setting is set to 'all'
+        // if the setting is not set to 'all'
         if (this.currentPerPage !== -1) {
           pageEnd = this.currentPage * this.currentPerPage;
         }

diff --git a/src/components/pagination/VgtPagination.vue b/src/components/pagination/VgtPagination.vue
@@ -17,7 +17,7 @@
             :value="option">
             {{ option }}
           </option>
-          <option v-if="paginateDropdownAllowAll" :value="total">{{allText}}</option>
+          <option v-if="paginateDropdownAllowAll" :value="-1">{{allText}}</option>
         </select>
       </form>
     </div>
@@ -118,6 +118,10 @@ export default {
   computed: {
     // Number of pages
     pagesCount() {
+      // if the setting is set to 'all'
+      if(this.currentPerPage === -1) {
+        return 1;
+      }
       const quotient = Math.floor(this.total / this.currentPerPage);
       const remainder = this.total % this.currentPerPage;
 

diff --git a/src/components/pagination/VgtPaginationPageInfo.vue b/src/components/pagination/VgtPaginationPageInfo.vue
@@ -70,6 +70,10 @@ export default {
       return ((this.currentPage - 1) * this.currentPerPage) + 1;
     },
     lastRecordOnPage() {
+      // if the setting is set to 'all'
+      if(this.currentPerPage === -1) {
+        return this.totalRecords;
+      }
       return Math.min(this.totalRecords, this.currentPage * this.currentPerPage);
     },
     recordInfo() {