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

package/dist/src/components/GenericFilters/filter-factory.d.ts

@@ -11,6 +11,8 @@ import { ContainsMultipleFileldsFilter } from "./filters/contains-multiple-filel
 import { IsNotNullFilter } from "./filters/is-not-null-filter";
 import { BetweenFilter } from "./filters/between-filter";
 import { InFilter } from "./filters/in-filter";
+import { InObject } from "./filters/in-object";
+import { InArray } from "./filters/in-array";
 import { WeekDayFilter } from "./filters/week-day-filter";
 import { YoungerWeekFilter } from "./filters/younger-week-filter";
 import { GroupByFilter } from "./filters/group-by-filter";
@@ -30,6 +32,8 @@ export default class FilterFactory {
         weekDay: (field: string, value: string) => WeekDayFilter;
         younger_weeks: (field: string, value: string) => YoungerWeekFilter;
         group_by_fields: (field: string, value: string) => GroupByFilter;
+        in_object: (field: string, value: string) => InObject;
+        in_array: (field: string, value: string) => InArray;
     };
     createFilter(field: any, condition: Condition): BaseFilter;
 }

package/dist/src/components/GenericFilters/filter-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filter-factory.d.ts","sourceRoot":"","sources":["../../../../src/components/GenericFilters/filter-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,aAAa;WAClB,oBAAoB;uBAEf,GAAG,SAAS,GAAG;2BACX,GAAG,SAAS,GAAG;0BAChB,GAAG,SAAS,GAAG;8BACX,GAAG,SAAS,GAAG;yBAEpB,GAAG,SAAS,GAAG;6BACX,GAAG,SAAS,GAAG;4BAEhB,GAAG,SAAS,GAAG;0BACjB,GAAG,SAAS,GAAG;6BACZ,GAAG,SAAS,GAAG;yBAEnB,MAAM,SAAS,MAAM;oBAE3B,MAAM,SAAQ,MAAM;yBACf,MAAM,SAAQ,MAAM;+BACd,MAAM,SAAQ,MAAM;iCAClB,MAAM,SAAQ,MAAM;;IAGzC,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,GAAG,UAAU;CAQlE"}
+{"version":3,"file":"filter-factory.d.ts","sourceRoot":"","sources":["../../../../src/components/GenericFilters/filter-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,gCAAgC,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,6BAA6B,EAAE,MAAM,4CAA4C,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,aAAa;WAClB,oBAAoB;uBAEf,GAAG,SAAS,GAAG;2BACX,GAAG,SAAS,GAAG;0BAChB,GAAG,SAAS,GAAG;8BACX,GAAG,SAAS,GAAG;yBAEpB,GAAG,SAAS,GAAG;6BACX,GAAG,SAAS,GAAG;4BAEhB,GAAG,SAAS,GAAG;0BACjB,GAAG,SAAS,GAAG;6BACZ,GAAG,SAAS,GAAG;yBAEnB,MAAM,SAAS,MAAM;oBAE3B,MAAM,SAAQ,MAAM;yBACf,MAAM,SAAQ,MAAM;+BACd,MAAM,SAAQ,MAAM;iCAClB,MAAM,SAAQ,MAAM;2BAC1B,MAAM,SAAQ,MAAM;0BACrB,MAAM,SAAQ,MAAM;;IAGlC,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,GAAG,UAAU;CAQlE"}

package/dist/src/components/GenericFilters/filters/in-array.d.ts

@@ -0,0 +1,7 @@
+import { BaseFilter } from "./base-filter";
+import { FilterResponse } from "./interfaces/filter-response";
+export declare class InArray extends BaseFilter {
+    protected operator: string;
+    applyFilter(): FilterResponse;
+}
+//# sourceMappingURL=in-array.d.ts.map

package/dist/src/components/GenericFilters/filters/in-array.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"in-array.d.ts","sourceRoot":"","sources":["../../../../../src/components/GenericFilters/filters/in-array.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAE5D,qBAAa,OAAQ,SAAQ,UAAU;IACrC,SAAS,CAAC,QAAQ,SAAc;IACzB,WAAW,IAAI,cAAc;CAMrC"}

package/dist/src/components/GenericFilters/filters/in-object.d.ts

@@ -0,0 +1,7 @@
+import { BaseFilter } from "./base-filter";
+import { FilterResponse } from "./interfaces/filter-response";
+export declare class InObject extends BaseFilter {
+    protected operator: string;
+    applyFilter(): FilterResponse;
+}
+//# sourceMappingURL=in-object.d.ts.map

package/dist/src/components/GenericFilters/filters/in-object.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"in-object.d.ts","sourceRoot":"","sources":["../../../../../src/components/GenericFilters/filters/in-object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAE5D,qBAAa,QAAS,SAAQ,UAAU;IACtC,SAAS,CAAC,QAAQ,SAAe;IAC1B,WAAW,IAAI,cAAc;CAMrC"}

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.49",
+  "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/components/GenericFilters/FilterRow.vue

@@ -66,6 +66,8 @@
   </el-row>
 </template>
 <script>
+import { upperFirst } from 'lodash'
+
 export default {
   props: {
     column: {
@@ -114,6 +116,7 @@ export default {
       disabledInputOperations: ["is_null", "is_not_null"],
       enumOperators: [{ value: "equal", label: "is" }],
       enumOperatorsMultiple: [{ value: "in", label: "in" }],
+      enumOperatorsInObject: [{ value: "in_object", label: "in_object" }],
       dateOperators: [{ value: "between", label: "between" }],
       boolOperators: [{ value: "equal", label: "is" }],
     };
@@ -126,7 +129,9 @@ export default {
           operators = this.stringOperators;
           break;
         case ("enum", "select"):
-          if (this.column.selectMultiple && !this.column.operator) {
+          if (this.column.operator) {
+            operators = [{ value: this.column.operator, label: upperFirst(this.column.operator.replace('_', ' ')) }];
+          } else if (this.column.selectMultiple) {
             operators = this.enumOperatorsMultiple;
           } else {
             operators = this.enumOperators;

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() {