@tripup-company/element-ui-extended 0.0.8 → 0.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tripup-company/element-ui-extended",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "main": "./dist/element-ui-extended.umd.js",
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/App.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <composite-table :fields="fields" :filters="filters" :filters-top="filtersTop" :repository="repository"></composite-table>
+    <composite-table :storageKey="'Project_name'" :fields="fields" :filters="filters" :filters-top="filtersTop" :repository="repository"></composite-table>
     <img alt="Vue logo" src="./assets/logo.png" />
   </div>
 </template>

package/src/components/CompositeTable/index.vue

@@ -94,9 +94,13 @@ export default {
       default: '--',
       type: String,
     },
+    storageKey: {
+      default: "storage.key",
+      type: String,
+    },
   },
   data: function () {
-    const localStorage = new LocalStorageService();
+    const localStorage = new LocalStorageService(this.storageKey);
     const listQueryService = new ListQueryService(
       this.$route ? this.$route.name : "storage.key",
       localStorage
@@ -128,6 +132,14 @@ export default {
     };
   },
   computed: {
+    queryFilter() {
+      const meta = this.listQueryService.getListQuery().meta;
+      const query = {
+        page: this.meta?.pagination?.current_page ? this.meta.pagination.current_page : meta.page,
+        limit: this.meta?.pagination?.per_page ? this.meta.pagination.per_page : meta.limit,
+      };
+      return { ...query, ...this.filter };
+    },
     currentPage() {
       if (this.data.meta?.pagination) {
         return this.data.meta.pagination.current_page;
@@ -157,10 +169,7 @@ export default {
     async fetch() {
       this.loading = true;
       try {
-        const response = await this.repository.all(
-          this.listQueryService.getListQuery(),
-          this.includes
-        );
+        const response = await this.repository.all(this.queryFilter, this.includes);
         this.data = response.data;
         Vue.set(this.data, "meta", response.meta);
       } catch (e) {
@@ -189,12 +198,12 @@ export default {
           limit: this.listQueryService.getListQuery().meta.limit,
         },
       });
-      this.meta.pagination.current_page = val;
+      this.data.meta.pagination.current_page = val;
       this.fetch();
     },
     handleFilterChange(val) {
       this.filter = val;
-      this.meta.pagination.current_page = 1;
+      this.data.meta.pagination.current_page = 1;
       this.fetch();
     },
     handleApplyFilter(filters) {