@tripup-company/element-ui-extended 0.0.10 → 0.0.11

package/package.json

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

package/src/components/CompositeTable/index.vue

@@ -124,7 +124,10 @@ export default {
     }
 
     search = Object.assign(search, listQueryService.getListQuery().search);
-    topSearch = Object.assign(topSearch, listQueryService.getListQuery().topSearch);
+    topSearch = Object.assign(
+      topSearch,
+      listQueryService.getListQuery().topSearch
+    );
     return {
       loading: false,
       filter: {},
@@ -132,43 +135,36 @@ export default {
       search: search,
       topSearch: topSearch,
       filterConvertor: filterConvertor,
-      meta: Object.assign(
-        new MetaModel(),
-        listQueryService.getListQuery().meta
-      ),
+      meta: listQueryService.getListQuery().meta,
+      metaModel: new MetaModel(),
       listQueryService: listQueryService,
     };
   },
   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,
+        page: this.meta.page,
+        limit: this.meta.limit,
       };
-      const filter = this.filterConvertor.applyFilter({ ...this.search, ...this.topSearch });
+      const filter = this.filterConvertor.applyFilter({
+        ...this.search,
+        ...this.topSearch,
+      });
       return { ...query, ...filter };
     },
     currentPage() {
-      if (this.data.meta?.pagination) {
-        return this.data.meta.pagination.current_page;
+      if (this.listQueryService.getListQuery().meta) {
+        return this.listQueryService.getListQuery().meta.page;
       }
       return 0;
     },
     total() {
-      if (this.data.meta?.pagination) {
-        return this.data.meta.pagination.total;
+      if (this.metaModel?.pagination) {
+        return this.metaModel.pagination.total;
       }
       return 0;
     },
     limit() {
-      if (this.data.meta?.pagination) {
-        return this.data.meta.pagination.per_page;
-      }
       if (this.listQueryService.getListQuery().meta?.limit) {
         return this.listQueryService.getListQuery().meta?.limit;
       }
@@ -187,7 +183,7 @@ export default {
           this.includes
         );
         this.data = response.data;
-        Vue.set(this.data, "meta", response.meta);
+        Vue.set(this, "metaModel", response.meta);
       } catch (e) {
         this.$message.error(e.message);
       }
@@ -204,7 +200,7 @@ export default {
           page: this.listQueryService.getListQuery().meta.page,
         },
       });
-      Vue.set(this.data, "meta.per_page.current_page", val);
+      Vue.set(this.meta, "limit", val);
       this.fetch();
     },
     handleCurrentChange(val) {
@@ -214,12 +210,11 @@ export default {
           limit: this.listQueryService.getListQuery().meta.limit,
         },
       });
-      Vue.set(this.data, "meta.pagination.current_page", val);
+      Vue.set(this.meta, "page", val);
       this.fetch();
     },
     handleFilterChange() {
-      Vue.set(this.data, "meta.pagination.current_page", 1);
-      this.fetch();
+      this.handleCurrentChange(1);
     },
     handleApplyFilter() {
       this.listQueryService.updateListQuery({ search: this.search });