@tripup-company/element-ui-extended 0.0.64 → 0.0.67

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

@@ -1 +1 @@
-{"version":3,"file":"filter-convertor.d.ts","sourceRoot":"","sources":["../../../../src/components/GenericFilters/filter-convertor.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,eAAe;IAGlC,WAAW,CAAC,MAAM,KAAA;;;;CAgBnB"}
+{"version":3,"file":"filter-convertor.d.ts","sourceRoot":"","sources":["../../../../src/components/GenericFilters/filter-convertor.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,OAAO,OAAO,eAAe;IAGlC,WAAW,CAAC,MAAM,KAAA;;;;CAiBnB"}

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

@@ -12,6 +12,7 @@ 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 { InArrayOfObject } from "./filters/in-array-of-object";
 import { InArray } from "./filters/in-array";
 import { WeekDayFilter } from "./filters/week-day-filter";
 import { YoungerWeekFilter } from "./filters/younger-week-filter";
@@ -34,6 +35,7 @@ export default class FilterFactory {
         group_by_fields: (field: string, value: string) => GroupByFilter;
         in_object: (field: string, value: string) => InObject;
         in_array: (field: string, value: string) => InArray;
+        in_array_of_object: (field: string, value: string) => InArrayOfObject;
     };
     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,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"}
+{"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,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,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;oCACV,MAAM,SAAQ,MAAM;;IAG5C,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,GAAG,UAAU;CAQlE"}

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tripup-company/element-ui-extended",
-  "version": "0.0.64",
+  "version": "0.0.67",
   "main": "./dist/element-ui-extended.umd.js",
   "scripts": {
     "serve": "vue-cli-service serve && tsc --emitDeclarationOnly",

package/src/components/GenericFilters/FilterRow.vue

@@ -13,7 +13,7 @@
         :span="24"
         class="p-b-10"
       >
-        <el-select v-model="search.operator" placeholder="Select">
+        <el-select v-model="searchLocal.operator" placeholder="Select">
           <el-option
             v-for="operator in operators"
             :key="operator.value"
@@ -25,12 +25,12 @@
       <el-col :span="24">
         <el-input
           v-if="column.type === 'string'"
-          v-show="!isDisableInput(search.operator)"
-          v-model="search.value"
+          v-show="!isDisableInput(searchLocal.operator)"
+          v-model="searchLocal.value"
         />
         <el-date-picker
           v-else-if="column.type === 'date'"
-          v-model="search.value"
+          v-model="searchLocal.value"
           class="w-100"
           end-placeholder="To"
           format="dd.MM.yy"
@@ -44,13 +44,14 @@
         <el-select
           refs="select"
           v-else
-          v-model="search.value"
+          v-model="searchLocal.value"
           :multiple="isMultiple"
           placeholder="Select"
           :filterable="filterable"
           :remote="remote"
           :remote-method="remoteMethodHandler"
           :loading="loading"
+          :value-key="objectValueKey"
           clearable
           @change="updateSearch"
         >
@@ -67,7 +68,7 @@
 </template>
 <script>
 import { upperFirst } from 'lodash'
-
+import Vue from "vue";
 export default {
   props: {
     column: {
@@ -82,6 +83,10 @@ export default {
         return {};
       },
     },
+    name: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     const boolValues = [
@@ -90,11 +95,14 @@ export default {
       { value: false, name: "false" },
     ];
     return {
+      searchLocal: this.search,
       loading: false,
       selectKey: this.column.selectKey ?? "value",
       selectLabel: this.column.selectLabel ?? "name",
       selectValue: this.column.selectValue ?? "value",
       filterable: this.column.filterable ?? false,
+      objectValueKey: this.column.objectValueKey ?? "value",
+      selectJson: this.column.selectJson ?? false,
       remote: this.column.remote ?? false,
       remoteMethod: this.column.remoteMethod ?? null,
       selectListLocal: this.column.selectList
@@ -161,16 +169,27 @@ export default {
   watch: {
     showFilter() {
       if (this.showFilter === false) {
-        this.search.operator = "";
-        this.search.value = "";
-      } else if (this.search.operator === "" && this.operators.length === 1) {
-        this.search.operator = this.operators[0].value;
+        this.searchLocal.operator = "";
+        this.searchLocal.value = "";
+      } else if (this.searchLocal.operator === "" && this.operators.length === 1) {
+        this.searchLocal.operator = this.operators[0].value;
       }
     },
-    search: {
+    search (newValue ) {
+      console.log('seach updated');
+      if (newValue !== this.search) {
+        this.searchLocal = Object.assign({}, this.search);
+      }
+
+      console.log(this.searchLocal);
+    },
+    searchLocal: {
       deep: true,
       handler() {
-        if (this.search.operator == '') {
+        console.log('searchLocal updated');
+        this.$emit("update:search", { name: this.name, value: this.searchLocal});
+        console.log(this.searchLocal);
+        if (this.searchLocal.operator == '') {
           this.showFilter = false;
         }
       }
@@ -180,7 +199,7 @@ export default {
     isDisableInput(operator) {
       const disable = this.disabledInputOperations.includes(operator);
       if (disable) {
-        this.search.value = "";
+        this.searchLocal.value = "";
       }
       return disable;
     },
@@ -191,7 +210,7 @@ export default {
         searchFields: this.selectLabel + ":like",
       });
       this.selectListLocal = response.data;
-      this.search["selectList"] = response.data;
+      this.searchLocal["selectList"] = response.data;
       this.loading = false;
     },
     updateSearch(key) {
@@ -200,7 +219,7 @@ export default {
         for (const item of this.selectListLocal) {
           if (item[this.selectKey] === key) {
             obj[this.selectLabel] = item[this.selectLabel];
-            this.search.selectList = [obj];
+            this.searchLocal.selectList = [obj];
           }
         }
       }

package/src/components/GenericFilters/index.vue

@@ -1,10 +1,12 @@
 <template>
   <el-card>
     <filter-row
-      v-for="(column) in filters"
+      v-for="column in filters"
       :key="column.name"
+      :name="column.name"
       :column="column"
       :search="search[column.name]"
+      @search:upate="filterRowUpdate"
     />
     <el-button @click="applyFilter">Filter</el-button>
     <el-button @click="resetFilter">Reset filter</el-button>
@@ -16,15 +18,19 @@ import FilterRow from "./FilterRow";
 import FilterConverter from "./filter-convertor";
 
 export default {
-name: "GenericFilter",
+  name: "GenericFilter",
   props: {
     filters: {
       type: Array,
-      default: () => { return {}}
+      default: () => {
+        return {};
+      },
     },
     search: {
       type: Object,
-      default: () => { return {}}
+      default: () => {
+        return {};
+      },
     },
   },
   components: { FilterRow },
@@ -40,15 +46,16 @@ name: "GenericFilter",
     },
     applyFilter() {
       console.log(this.search);
-      this.$emit('apply:filter', this.filterConvertor.applyFilter(this.search) );
+      this.$emit("apply:filter", this.search);
     },
     resetFilter() {
-      this.$emit('reset:filter', {});
+      this.$emit("reset:filter", {});
     },
-  }
-}
+    filterRowUpdate(name, value) {
+      this.$set(this.search, name, value);
+    },
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>