Updated rowsTo computed property to have number of rows as max.

inkline · Jan 17, 2020 · 4febf34 · 4febf34
1 parent 1061dfa
commit 4febf34
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Datatable/script.js b/src/components/Datatable/script.js
@@ -49,14 +49,29 @@ export default {
         pagination: {
             type: [Boolean, Object],
             default: true
+        },
+        searchOptions: {
+            type: Object,
+            default: () => ({
+                shouldSort: false,
+                includeMatches: true,
+                includeScore: true,
+                threshold: 0.25,
+                location: 0,
+                distance: 50,
+                tokenize: true,
+                maxPatternLength: 32,
+                minMatchCharLength: 2
+            })
         }
     },
     data() {
         return {
             sortBy: this.defaultSortKey,
             sortDirection: 'asc',
             rowsPerPage: 1,
-            page: 1
+            page: 1,
+            search: new Fuse([], {})
         }
     },
     computed: {
@@ -140,7 +155,12 @@ export default {
                         ...(this.pagination.i18n || {})
                     }
                 } :
-                { ...defaultPaginationConfig };
+                {
+                    ...defaultPaginationConfig,
+                    i18n: {
+                        ...defaultPaginationConfig.i18n
+                    }
+                };
 
             config.rowsPerPage = config.rowsPerPage.toString();
             config.rowsPerPageOptions = config.rowsPerPageOptions.map((v) => v.toString());
@@ -158,7 +178,9 @@ export default {
             return (this.page - 1) * this.rowsPerPage;
         },
         rowsTo() {
-            return this.page * this.rowsPerPage;
+            const to = this.page * this.rowsPerPage;
+
+            return to > this.rowsCount ? this.rowsCount : to;
         }
     },
     methods: {

diff --git a/src/components/Datatable/template.html b/src/components/Datatable/template.html
@@ -6,7 +6,7 @@
                     {{ item }}
                 </i-select-option>
             </i-select>
-            <template v-else> {{part}} </template>
+            <template v-else>{{part}}</template>
         </template>
     </div>