@tripup-company/element-ui-extended 0.0.51 → 0.0.52

package/dist/src/services/list-query-service.d.ts

@@ -2,7 +2,7 @@ export default class ListQueryService {
     key: string;
     storageService: any;
     constructor(key: any, storageService: any);
-    updateSort(column: any): void;
+    updateSort(column: any): {};
     getListQuery(): {
         meta: {
             page: number;

package/dist/src/services/list-query-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"list-query-service.d.ts","sourceRoot":"","sources":["../../../src/services/list-query-service.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,GAAG,CAAC;gBAER,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG;IAIzC,UAAU,CAAC,MAAM,KAAA;IAcjB,YAAY;;;;;;IAUZ,eAAe,CAAC,SAAS,EAAE,GAAG;IAG9B,YAAY,CAAC,SAAS,EAAE,GAAG;CAG5B"}
+{"version":3,"file":"list-query-service.d.ts","sourceRoot":"","sources":["../../../src/services/list-query-service.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,OAAO,OAAO,gBAAgB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,GAAG,CAAC;gBAER,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG;IAIzC,UAAU,CAAC,MAAM,KAAA;IAiBjB,YAAY;;;;;;IAUZ,eAAe,CAAC,SAAS,EAAE,GAAG;IAG9B,YAAY,CAAC,SAAS,EAAE,GAAG;CAG5B"}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@tripup-company/element-ui-extended",
-  "version": "0.0.51",
+  "version": "0.0.52",
   "main": "./dist/element-ui-extended.umd.js",
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "serve": "vue-cli-service serve && tsc --emitDeclarationOnly",
     "build": "vue-cli-service build && tsc --emitDeclarationOnly",
     "lint": "vue-cli-service lint",
     "build-lib": "vue-cli-service build --target lib src/index.ts && tsc --emitDeclarationOnly",

package/src/components/CompositeTable/index.vue

@@ -3,7 +3,15 @@
     <slot>
       <el-row :gutter="20">
         <el-col :span="filters.length ? 18 : 24">
-          <slot name="quick-search-filter" v-bind="{ topFilter, search, handleApplyTopFilter, handleResetTopFilter }">
+          <slot
+            name="quick-search-filter"
+            v-bind="{
+              topFilter,
+              search,
+              handleApplyTopFilter,
+              handleResetTopFilter,
+            }"
+          >
             <quick-search-filter
               v-if="topFilter"
               :filter="topFilter"
@@ -34,7 +42,10 @@
           </el-row>
         </el-col>
         <el-col :span="filters.length ? 6 : 0">
-          <slot name="filter" v-bind="{ filters, search, handleApplyFilter, handleResetFilter }">
+          <slot
+            name="filter"
+            v-bind="{ filters, search, handleApplyFilter, handleResetFilter }"
+          >
             <generic-filter
               v-if="filters.length"
               :filters="filters"
@@ -111,6 +122,7 @@ export default {
       this.$route ? this.$route.name : "storage.key",
       localStorage
     );
+    let listQueryObj = listQueryService.getListQuery();
     const filterConvertor = new FilterConverter();
     let search = {};
     let topSearch = {};
@@ -127,11 +139,18 @@ export default {
       };
     }
 
-    search = Object.assign(search, listQueryService.getListQuery().search);
+    search = Object.assign(search, listQueryObj.search);
     topSearch = Object.assign(
       topSearch,
-      listQueryService.getListQuery().topSearch
+      listQueryObj.topSearch
     );
+    let sort = {};
+    if (listQueryObj.orderBy) {
+      sort = Object.assign(sort, {orderBy: listQueryObj.orderBy})
+    }
+    if (listQueryObj.sortedBy) {
+      sort = Object.assign(sort, {sortedBy: listQueryObj.sortedBy})
+    }
     return {
       loading: false,
       filter: {},
@@ -142,14 +161,18 @@ export default {
       meta: listQueryService.getListQuery().meta,
       metaModel: new MetaModel(),
       listQueryService: listQueryService,
+      sort: sort,
     };
   },
   computed: {
     queryFilter() {
-      const query = {
-        page: this.meta.page,
-        limit: this.meta.limit,
-      };
+      let query = Object.assign(
+        {
+          page: this.meta.page,
+          limit: this.meta.limit,
+        },
+        this.sort
+      );
       const filter = this.filterConvertor.applyFilter({
         ...this.search,
         ...this.topSearch,
@@ -195,7 +218,7 @@ export default {
       this.loading = false;
     },
     handleChangeSort(val) {
-      this.listQueryService.updateSort(val);
+      this.sort = this.listQueryService.updateSort(val);
       this.fetch();
     },
     handleSizeChange(val) {

package/src/services/list-query-service.ts

@@ -16,8 +16,11 @@ export default class ListQueryService {
       delete query['orderBy'];
       delete query['sortedBy'];
       this.setListQuery(query);
+      return {};
     } else {
-      this.setListQuery(Object.assign(this.getListQuery(), { orderBy: column.prop, sortedBy: sortTypes[column.order] }));
+      const sortObj = { orderBy: column.prop, sortedBy: sortTypes[column.order] };
+      this.setListQuery(Object.assign(this.getListQuery(), sortObj));
+      return sortObj;
     }
   }
   getListQuery() {