feat(datatable): make default per page value properly computed, relat…

…ed to epicmaxco#130
yevdyko · Mar 28, 2018 · ca71dc6 · ca71dc6
1 parent a65b1e0
commit ca71dc6
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/vuestic-theme/vuestic-components/vuestic-datatable/VuesticDataTable.vue b/src/vuestic-theme/vuestic-components/vuestic-datatable/VuesticDataTable.vue
@@ -3,7 +3,7 @@
     <div class="d-flex flex-md-row flex-column justify-content-md-between align-items-center">
       <filter-bar @filter="onFilterSet"></filter-bar>
       <items-per-page :options="itemsPerPage"
-                      :defaultPerPage="defaultPerPage"
+                      :defaultPerPage="defaultPerPageComputed"
                       @items-per-page="onItemsPerPage"></items-per-page>
     </div>
     <vuetable ref="vuetable"
@@ -65,13 +65,7 @@
       },
       defaultPerPage: {
         type: Number,
-        default: () => {
-          let defaultPerPage = DefaultPerPageDefinition.itemsPerPage[0].value
-          if (this.itemsPerPage) {
-            defaultPerPage = this.itemsPerPage[0].value
-          }
-          return defaultPerPage
-        }
+        default: DefaultPerPageDefinition.itemsPerPage[0].value
       },
       onEachSide: {
         type: Number,
@@ -108,6 +102,15 @@
         css: DataTableStyles
       }
     },
+    computed: {
+      defaultPerPageComputed () {
+        let defaultPerPage = DefaultPerPageDefinition.itemsPerPage[0].value
+        if (this.$options.propsData.itemsPerPage) {
+          defaultPerPage = this.$options.propsData.itemsPerPage[0].value
+        }
+        return defaultPerPage
+      }
+    },
     methods: {
       onFilterSet (filterText) {
         if (this.apiMode) {