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

package/dist/element-ui-extended.common.js

@@ -6203,12 +6203,12 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/CompositeTable/index.vue?vue&type=template&id=0ed61922&scoped=true&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],staticClass:"composite-table"},[_vm._t("default",function(){return [_c('el-row',{attrs:{"gutter":20}},[_c('el-col',{attrs:{"span":18}},[_vm._t("quick-search-filter",function(){return [(_vm.topFilter)?_c('quick-search-filter',{attrs:{"filter":_vm.topFilter,"search":_vm.topSearch},on:{"apply:filter":_vm.handleApplyTopFilter,"reset:filter":_vm.handleResetTopFilter}}):_vm._e()]},null,{ topFilter: _vm.topFilter, search: _vm.search }),_vm._t("table",function(){return [_c('generic-table',{attrs:{"fields":_vm.fields,"data":_vm.data},on:{"sort:change":_vm.handleChangeSort}})]},null,{ fields: _vm.fields, data: _vm.data }),_c('el-row',[_c('el-col',[_vm._t("paginator",function(){return [_c('generic-paginator',{attrs:{"total":_vm.total,"limit":_vm.limit,"current-page":_vm.currentPage},on:{"size:change":_vm.handleSizeChange,"page:change":_vm.handleCurrentChange}})]},null,{ total: _vm.total, limit: _vm.limit, currentPage: _vm.currentPage })],2)],1)],2),_c('el-col',{attrs:{"span":6}},[_vm._t("filter",function(){return [(_vm.filters.length)?_c('generic-filter',{attrs:{"filters":_vm.filters,"search":_vm.search},on:{"apply:filter":_vm.handleApplyFilter,"reset:filter":_vm.handleResetFilter}}):_vm._e()]},null,{ filters: _vm.filters, search: _vm.search })],2)],1)]})],2)}
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/CompositeTable/index.vue?vue&type=template&id=1e175ae0&scoped=true&
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],staticClass:"composite-table"},[_vm._t("default",function(){return [_c('el-row',{attrs:{"gutter":20}},[_c('el-col',{attrs:{"span":_vm.filters.length ? 18 : 24}},[_vm._t("quick-search-filter",function(){return [(_vm.topFilter)?_c('quick-search-filter',{attrs:{"filter":_vm.topFilter,"search":_vm.topSearch},on:{"apply:filter":_vm.handleApplyTopFilter,"reset:filter":_vm.handleResetTopFilter}}):_vm._e()]},null,{ topFilter: _vm.topFilter, search: _vm.search }),_vm._t("table",function(){return [_c('generic-table',{attrs:{"fields":_vm.fields,"data":_vm.data},on:{"sort:change":_vm.handleChangeSort}})]},null,{ fields: _vm.fields, data: _vm.data }),_c('el-row',[_c('el-col',[_vm._t("paginator",function(){return [_c('generic-paginator',{attrs:{"total":_vm.total,"limit":_vm.limit,"current-page":_vm.currentPage},on:{"size:change":_vm.handleSizeChange,"page:change":_vm.handleCurrentChange}})]},null,{ total: _vm.total, limit: _vm.limit, currentPage: _vm.currentPage })],2)],1)],2),_c('el-col',{attrs:{"span":_vm.filters.length ? 6 : 0}},[_vm._t("filter",function(){return [(_vm.filters.length)?_c('generic-filter',{attrs:{"filters":_vm.filters,"search":_vm.search},on:{"apply:filter":_vm.handleApplyFilter,"reset:filter":_vm.handleResetFilter}}):_vm._e()]},null,{ filters: _vm.filters, search: _vm.search })],2)],1)]})],2)}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/CompositeTable/index.vue?vue&type=template&id=0ed61922&scoped=true&
+// CONCATENATED MODULE: ./src/components/CompositeTable/index.vue?vue&type=template&id=1e175ae0&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
 var es_object_to_string = __webpack_require__("d3b7");
@@ -6483,16 +6483,64 @@ var GenericFiltersvue_type_template_id_577eb898_scoped_true_staticRenderFns = []
 
 // CONCATENATED MODULE: ./src/components/GenericFilters/index.vue?vue&type=template&id=577eb898&scoped=true&
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/FilterRow.vue?vue&type=template&id=980096d6&scoped=true&
-var FilterRowvue_type_template_id_980096d6_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-row',{staticClass:"m-b-10"},[_c('el-row',[_c('el-col',{attrs:{"lg":4,"md":4,"sm":4,"xs":4}},[_c('el-checkbox',{model:{value:(_vm.showFilter),callback:function ($$v) {_vm.showFilter=$$v},expression:"showFilter"}},[_c('span',[_vm._v(_vm._s(_vm.column.label))])])],1)],1),(_vm.showFilter)?_c('el-row',{staticClass:"m-t-5"},[_c('el-col',{staticClass:"p-b-10",attrs:{"span":24}},[_c('el-select',{attrs:{"placeholder":"Select"},model:{value:(_vm.search.operator),callback:function ($$v) {_vm.$set(_vm.search, "operator", $$v)},expression:"search.operator"}},_vm._l((_vm.column.type==='string' ? _vm.stringOperators : _vm.enumOperators),function(operator){return _c('el-option',{key:operator.value,attrs:{"value":operator.value,"label":operator.label}})}),1)],1),_c('el-col',{attrs:{"span":24}},[(_vm.column.type==='string')?_c('el-input',{directives:[{name:"show",rawName:"v-show",value:(!_vm.isDisableInput(_vm.search.operator)),expression:"!isDisableInput(search.operator)"}],model:{value:(_vm.search.value),callback:function ($$v) {_vm.$set(_vm.search, "value", $$v)},expression:"search.value"}}):_c('el-select',{attrs:{"placeholder":"Select","multiple":_vm.isMultiple},model:{value:(_vm.search.value),callback:function ($$v) {_vm.$set(_vm.search, "value", $$v)},expression:"search.value"}},_vm._l(((_vm.column.type==='enum' ? _vm.column.values : _vm.boolValues)),function(label,value){return _c('el-option',{key:value,attrs:{"value":value,"label":label}})}),1)],1)],1):_vm._e()],1)}
-var FilterRowvue_type_template_id_980096d6_scoped_true_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/FilterRow.vue?vue&type=template&id=71e0b52e&
+var FilterRowvue_type_template_id_71e0b52e_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-row',{staticClass:"m-b-10"},[_c('el-row',[_c('el-col',{attrs:{"lg":4,"md":4,"sm":4,"xs":4}},[_c('el-checkbox',{model:{value:(_vm.showFilter),callback:function ($$v) {_vm.showFilter=$$v},expression:"showFilter"}},[_c('span',[_vm._v(_vm._s(_vm.column.label))])])],1)],1),(_vm.showFilter)?_c('el-row',{staticClass:"m-t-5"},[(_vm.operators.length !== 1)?_c('el-col',{staticClass:"p-b-10",attrs:{"span":24}},[_c('el-select',{attrs:{"placeholder":"Select"},model:{value:(_vm.search.operator),callback:function ($$v) {_vm.$set(_vm.search, "operator", $$v)},expression:"search.operator"}},_vm._l((_vm.operators),function(operator){return _c('el-option',{key:operator.value,attrs:{"label":operator.label,"value":operator.value}})}),1)],1):_vm._e(),_c('el-col',{attrs:{"span":24}},[(_vm.column.type === 'string')?_c('el-input',{directives:[{name:"show",rawName:"v-show",value:(!_vm.isDisableInput(_vm.search.operator)),expression:"!isDisableInput(search.operator)"}],model:{value:(_vm.search.value),callback:function ($$v) {_vm.$set(_vm.search, "value", $$v)},expression:"search.value"}}):(_vm.column.type === 'date')?_c('el-date-picker',{staticClass:"w-100",attrs:{"end-placeholder":"To","format":"dd.MM.yy","placeholder":"Pick a day","range-separator":"-","start-placeholder":"From","type":"daterange","value-format":"yyyy-MM-dd"},model:{value:(_vm.search.value),callback:function ($$v) {_vm.$set(_vm.search, "value", $$v)},expression:"search.value"}}):_c('el-select',{attrs:{"refs":"select","multiple":_vm.isMultiple,"placeholder":"Select","filterable":_vm.filterable,"remote":_vm.remote,"remote-method":_vm.remoteMethodHandler,"loading":_vm.loading,"clearable":""},on:{"change":_vm.updateSearch},model:{value:(_vm.search.value),callback:function ($$v) {_vm.$set(_vm.search, "value", $$v)},expression:"search.value"}},_vm._l((_vm.selectListLocal),function(item){return _c('el-option',{key:item[_vm.selectKey],attrs:{"label":item[_vm.selectLabel],"value":item[_vm.selectValue]}})}),1)],1)],1):_vm._e()],1)}
+var FilterRowvue_type_template_id_71e0b52e_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/GenericFilters/FilterRow.vue?vue&type=template&id=980096d6&scoped=true&
+// CONCATENATED MODULE: ./src/components/GenericFilters/FilterRow.vue?vue&type=template&id=71e0b52e&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/FilterRow.vue?vue&type=script&lang=js&
 
 
+
+
+
+
+
+
+
+
+
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -6517,7 +6565,6 @@ var FilterRowvue_type_template_id_980096d6_scoped_true_staticRenderFns = []
 //
 //
 /* harmony default export */ var FilterRowvue_type_script_lang_js_ = ({
-  name: "FilterRow",
   props: {
     column: {
       type: Object,
@@ -6532,79 +6579,183 @@ var FilterRowvue_type_template_id_980096d6_scoped_true_staticRenderFns = []
       }
     }
   },
-  computed: {
-    isMultiple: function isMultiple() {
-      return this.column.is_multiple ? this.column.is_multiple : false;
-    }
-  },
   data: function data() {
+    var _this$column$selectKe, _this$column$selectLa, _this$column$selectVa, _this$column$filterab, _this$column$remote, _this$column$remoteMe;
+
     return {
-      showFilter: this.search.operator !== '',
+      loading: false,
+      selectKey: (_this$column$selectKe = this.column.selectKey) !== null && _this$column$selectKe !== void 0 ? _this$column$selectKe : "key",
+      selectLabel: (_this$column$selectLa = this.column.selectLabel) !== null && _this$column$selectLa !== void 0 ? _this$column$selectLa : "label",
+      selectValue: (_this$column$selectVa = this.column.selectValue) !== null && _this$column$selectVa !== void 0 ? _this$column$selectVa : "key",
+      filterable: (_this$column$filterab = this.column.filterable) !== null && _this$column$filterab !== void 0 ? _this$column$filterab : false,
+      remote: (_this$column$remote = this.column.remote) !== null && _this$column$remote !== void 0 ? _this$column$remote : false,
+      remoteMethod: (_this$column$remoteMe = this.column.remoteMethod) !== null && _this$column$remoteMe !== void 0 ? _this$column$remoteMe : null,
+      selectListLocal: this.search.selectList ? this.search.selectList : this.column.type === "enum" ? this.column.values : this.boolValues,
+      showFilter: this.search.operator !== "",
       stringOperators: [{
-        'value': 'equal',
-        'label': 'is equal'
+        value: "equal",
+        label: "is equal"
       }, {
-        'value': 'not_equal',
-        'label': 'is not equal'
+        value: "not_equal",
+        label: "is not equal"
       }, {
-        'value': 'contains',
-        'label': 'contains'
+        value: "contains",
+        label: "contains"
       }, {
-        'value': 'not_contains',
-        'label': 'doesn’t contain'
+        value: "not_contains",
+        label: "doesn’t contain"
       }, {
-        'value': 'is_null',
-        'label': 'is empty'
+        value: "is_null",
+        label: "is empty"
       }, {
-        'value': 'is_not_null',
-        'label': 'is not empty'
+        value: "is_not_null",
+        label: "is not empty"
       }, {
-        'value': 'start_with',
-        'label': 'begins with'
+        value: "start_with",
+        label: "begins with"
       }, {
-        'value': 'end_with',
-        'label': 'ends with'
+        value: "end_with",
+        label: "ends with"
       }],
-      disabledInputOperations: ['is_null', 'is_not_null'],
+      disabledInputOperations: ["is_null", "is_not_null"],
       enumOperators: [{
-        'value': 'equal',
-        'label': 'is'
-      }, {
-        'value': 'in',
-        'label': 'in'
+        value: "equal",
+        label: "is"
+      }],
+      enumOperatorsMultiple: [{
+        value: "in",
+        label: "in"
+      }],
+      dateOperators: [{
+        value: "between",
+        label: "between"
       }],
       boolValues: {
-        null: 'empty',
-        true: 'true',
-        false: 'false'
+        null: "empty",
+        true: "true",
+        false: "false"
       }
     };
   },
+  computed: {
+    operators: function operators() {
+      var operators = [];
+
+      switch (this.column.type) {
+        case "string":
+          operators = this.stringOperators;
+          break;
+
+        case "enum":
+          if (this.column.is_multiple) {
+            operators = this.enumOperatorsMultiple;
+          } else {
+            operators = this.enumOperators;
+          }
+
+          break;
+
+        case "date":
+          operators = this.dateOperators;
+          break;
+      }
+
+      return operators;
+    },
+    isMultiple: function isMultiple() {
+      return this.column.is_multiple ? this.column.is_multiple : false;
+    },
+    remoteMethodHandler: {
+      get: function get() {
+        if (this.remoteMethod !== null) {
+          return this.remoteCall;
+        }
+
+        return null;
+      }
+    }
+  },
   watch: {
     showFilter: function showFilter() {
       if (this.showFilter === false) {
-        this.search.operator = '';
-        this.search.value = '';
+        this.search.operator = "";
+        this.search.value = "";
+      } else if (this.search.operator === "" && this.operators.length === 1) {
+        this.search.operator = this.operators[0].value;
       }
     },
-    search: {
-      handler: function handler(newValue) {
-        if (newValue.operator === '') {
-          this.showFilter = false;
-        }
-      },
-      deep: true
+    search: function search() {
+      if (this.search.operator === "") {
+        this.showFilter = false;
+      }
+    }
+  },
+  mounted: function mounted() {
+    if (this.operators.length === 1) {// this.search.operator = this.operators[0].value;
     }
   },
   methods: {
     isDisableInput: function isDisableInput(operator) {
-      var disable = this.disabledInputOperations.indexOf(operator) !== -1;
+      var disable = this.disabledInputOperations.includes(operator);
 
       if (disable) {
-        this.search.value = '';
+        this.search.value = "";
       }
 
       return disable;
+    },
+    remoteCall: function remoteCall(query) {
+      var _this = this;
+
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var response;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _this.loading = true;
+                _context.next = 3;
+                return _this.remoteMethod.all({
+                  search: _this.selectLabel + ":" + query,
+                  searchFields: _this.selectLabel + ":like"
+                });
+
+              case 3:
+                response = _context.sent;
+                _this.selectListLocal = response.data;
+                _this.search["selectList"] = response.data;
+                _this.loading = false;
+
+              case 7:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
+    updateSearch: function updateSearch(key) {
+      if (key && this.remote) {
+        var obj = _defineProperty({}, this.selectKey, key);
+
+        var _iterator = _createForOfIteratorHelper(this.selectListLocal),
+            _step;
+
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var item = _step.value;
+
+            if (item[this.selectKey] === key) {
+              obj[this.selectLabel] = item[this.selectLabel];
+              this.search.selectList = [obj];
+            }
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+      }
     }
   }
 });
@@ -6720,11 +6871,11 @@ function normalizeComponent (
 
 var component = normalizeComponent(
   GenericFilters_FilterRowvue_type_script_lang_js_,
-  FilterRowvue_type_template_id_980096d6_scoped_true_render,
-  FilterRowvue_type_template_id_980096d6_scoped_true_staticRenderFns,
+  FilterRowvue_type_template_id_71e0b52e_render,
+  FilterRowvue_type_template_id_71e0b52e_staticRenderFns,
   false,
   null,
-  "980096d6",
+  null,
   null
   
 )
@@ -7017,8 +7168,8 @@ var end_with_filter_EndWithFilter = /*#__PURE__*/function (_ContainsFilter) {
     key: "applyFilter",
     value: function applyFilter() {
       return {
-        searchItem: this.field + ':%' + this.value,
-        searchFieldItem: this.field + ':' + this.operator
+        searchItem: this.field + ":%" + this.value,
+        searchFieldItem: this.field + ":" + this.operator
       };
     }
   }]);
@@ -7190,6 +7341,138 @@ var between_filter_BetweenFilter = /*#__PURE__*/function (_BaseFilter) {
 
   return BetweenFilter;
 }(base_filter_BaseFilter);
+// CONCATENATED MODULE: ./src/components/GenericFilters/filters/in-filter.ts
+
+
+
+
+
+var in_filter_InFilter = /*#__PURE__*/function (_BaseFilter) {
+  _inherits(InFilter, _BaseFilter);
+
+  var _super = _createSuper(InFilter);
+
+  function InFilter() {
+    var _this;
+
+    _classCallCheck(this, InFilter);
+
+    _this = _super.apply(this, arguments);
+    _this.operator = 'in';
+    return _this;
+  }
+
+  _createClass(InFilter, [{
+    key: "applyFilter",
+    value: function applyFilter() {
+      return {
+        searchItem: this.field + ':' + this.value,
+        searchFieldItem: this.field + ':' + this.operator
+      };
+    }
+  }]);
+
+  return InFilter;
+}(base_filter_BaseFilter);
+// CONCATENATED MODULE: ./src/components/GenericFilters/filters/week-day-filter.ts
+
+
+
+
+
+var week_day_filter_WeekDayFilter = /*#__PURE__*/function (_BaseFilter) {
+  _inherits(WeekDayFilter, _BaseFilter);
+
+  var _super = _createSuper(WeekDayFilter);
+
+  function WeekDayFilter(field, value) {
+    var _this;
+
+    _classCallCheck(this, WeekDayFilter);
+
+    _this = _super.call(this, field, value);
+    _this.operator = 'weekday';
+    return _this;
+  }
+
+  _createClass(WeekDayFilter, [{
+    key: "applyFilter",
+    value: function applyFilter() {
+      return {
+        searchItem: this.field + ':' + this.value,
+        searchFieldItem: this.field + ':' + this.operator
+      };
+    }
+  }]);
+
+  return WeekDayFilter;
+}(base_filter_BaseFilter);
+// CONCATENATED MODULE: ./src/components/GenericFilters/filters/younger-week-filter.ts
+
+
+
+
+
+var younger_week_filter_YoungerWeekFilter = /*#__PURE__*/function (_BaseFilter) {
+  _inherits(YoungerWeekFilter, _BaseFilter);
+
+  var _super = _createSuper(YoungerWeekFilter);
+
+  function YoungerWeekFilter(field, value) {
+    var _this;
+
+    _classCallCheck(this, YoungerWeekFilter);
+
+    _this = _super.call(this, field, value);
+    _this.operator = 'younger week';
+    return _this;
+  }
+
+  _createClass(YoungerWeekFilter, [{
+    key: "applyFilter",
+    value: function applyFilter() {
+      return {
+        searchItem: this.field + ':' + this.value,
+        searchFieldItem: this.field + ':' + this.operator
+      };
+    }
+  }]);
+
+  return YoungerWeekFilter;
+}(base_filter_BaseFilter);
+// CONCATENATED MODULE: ./src/components/GenericFilters/filters/group-by-filter.ts
+
+
+
+
+
+var group_by_filter_GroupByFilter = /*#__PURE__*/function (_BaseFilter) {
+  _inherits(GroupByFilter, _BaseFilter);
+
+  var _super = _createSuper(GroupByFilter);
+
+  function GroupByFilter(field, value) {
+    var _this;
+
+    _classCallCheck(this, GroupByFilter);
+
+    _this = _super.call(this, field, value);
+    _this.operator = 'group by fields';
+    return _this;
+  }
+
+  _createClass(GroupByFilter, [{
+    key: "applyFilter",
+    value: function applyFilter() {
+      return {
+        searchItem: this.field + ':' + this.value,
+        searchFieldItem: this.field + ':' + this.operator
+      };
+    }
+  }]);
+
+  return GroupByFilter;
+}(base_filter_BaseFilter);
 // CONCATENATED MODULE: ./src/components/GenericFilters/filter-factory.ts
 
 
@@ -7204,6 +7487,10 @@ var between_filter_BetweenFilter = /*#__PURE__*/function (_BaseFilter) {
 
 
 
+
+
+
+
 var filter_factory_FilterFactory = /*#__PURE__*/function () {
   function FilterFactory() {
     _classCallCheck(this, FilterFactory);
@@ -7219,7 +7506,7 @@ var filter_factory_FilterFactory = /*#__PURE__*/function () {
         return registeredFilter[type](field, condition.value);
       }
 
-      throw new Error('Unknown filter type');
+      throw new Error("Unknown filter type");
     }
   }], [{
     key: "getRegisteredFilters",
@@ -7254,6 +7541,18 @@ var filter_factory_FilterFactory = /*#__PURE__*/function () {
         },
         between: function between(field, value) {
           return new between_filter_BetweenFilter(field, value);
+        },
+        in: function _in(field, value) {
+          return new in_filter_InFilter(field, value);
+        },
+        weekDay: function weekDay(field, value) {
+          return new week_day_filter_WeekDayFilter(field, value);
+        },
+        younger_weeks: function younger_weeks(field, value) {
+          return new younger_week_filter_YoungerWeekFilter(field, value);
+        },
+        group_by_fields: function group_by_fields(field, value) {
+          return new group_by_filter_GroupByFilter(field, value);
         }
       };
     }
@@ -7470,12 +7769,12 @@ var GenericPaginator_component = normalizeComponent(
 )
 
 /* harmony default export */ var GenericPaginator = (GenericPaginator_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericTable/index.vue?vue&type=template&id=78fe6b34&
-var GenericTablevue_type_template_id_78fe6b34_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('el-table',{attrs:{"data":_vm.data,"border":""},on:{"sort-change":_vm.sortChange}},[_vm._l((_vm.fields),function(field){return [(field.callback)?[_c('el-table-column',{key:field.prop,attrs:{"prop":field.prop,"label":field.label,"width":field.width ? field.width : null,"sortable":field.sortable ? field.sortable : null},scopedSlots:_vm._u([{key:"default",fn:function(context){return [_c('el-link',{on:{"click":function($event){return field.callback(field.prop, context.$index, context.row)}}},[_vm._v(" "+_vm._s(typeof field.formatter === "function" ? field.formatter(context.row) : context.row[field.prop])+" ")])]}}],null,true)})]:[_c('el-table-column',{key:field.prop,attrs:{"formatter":typeof field.formatter === 'function' ? field.formatter : null,"prop":field.prop,"label":field.label,"width":field.width ? field.width : null,"sortable":field.sortable ? field.sortable : null}})]]})],2)],1)}
-var GenericTablevue_type_template_id_78fe6b34_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericTable/index.vue?vue&type=template&id=f10830f8&
+var GenericTablevue_type_template_id_f10830f8_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('el-table',{attrs:{"data":_vm.data,"border":""},on:{"sort-change":_vm.sortChange}},[_vm._l((_vm.fields),function(field){return [(field.callback)?[_c('el-table-column',{key:field.prop,attrs:{"prop":field.prop,"label":field.label,"width":field.width ? field.width : null,"sortable":field.sortable ? field.sortable : null},scopedSlots:_vm._u([{key:"default",fn:function(context){return [_c('el-link',{on:{"click":function($event){return field.callback(field.prop, context.$index, context.row)}}},[_vm._v(" "+_vm._s(typeof field.formatter === "function" ? field.formatter(context.row) : context.row[field.prop])+" ")])]}}],null,true)})]:[_c('el-table-column',{key:field.prop,attrs:{"formatter":typeof field.formatter === 'function' ? field.formatter : null,"prop":field.prop,"label":field.label,"width":field.width ? field.width : null,"sortable":field.sortable ? field.sortable : null}})]]})],2)],1)}
+var GenericTablevue_type_template_id_f10830f8_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/GenericTable/index.vue?vue&type=template&id=78fe6b34&
+// CONCATENATED MODULE: ./src/components/GenericTable/index.vue?vue&type=template&id=f10830f8&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericTable/index.vue?vue&type=script&lang=js&
 //
@@ -7528,10 +7827,6 @@ var GenericTablevue_type_template_id_78fe6b34_staticRenderFns = []
       },
       type: Array
     },
-    title: {
-      default: "",
-      type: String
-    },
     fields: {
       default: function _default() {
         return [];
@@ -7562,8 +7857,8 @@ var GenericTablevue_type_template_id_78fe6b34_staticRenderFns = []
 
 var GenericTable_component = normalizeComponent(
   components_GenericTablevue_type_script_lang_js_,
-  GenericTablevue_type_template_id_78fe6b34_render,
-  GenericTablevue_type_template_id_78fe6b34_staticRenderFns,
+  GenericTablevue_type_template_id_f10830f8_render,
+  GenericTablevue_type_template_id_f10830f8_staticRenderFns,
   false,
   null,
   null,
@@ -7721,12 +8016,12 @@ var meta_model_MetaModel = /*#__PURE__*/function (_BaseModel) {
 }(base_model_BaseModel);
 
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/QuickSearchFilter.vue?vue&type=template&id=61231db6&
-var QuickSearchFiltervue_type_template_id_61231db6_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-row',{staticClass:"m-b-20"},[(_vm.filter)?_c('el-col',[(_vm.filter.type === 'string')?_c('el-input',{attrs:{"clearable":""},on:{"clear":_vm.resetFilter},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.applyFilter.apply(null, arguments)}},model:{value:(_vm.search[_vm.filter.name].value),callback:function ($$v) {_vm.$set(_vm.search[_vm.filter.name], "value", $$v)},expression:"search[filter.name].value"}}):_vm._e()],1):_vm._e()],1)}
-var QuickSearchFiltervue_type_template_id_61231db6_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/QuickSearchFilter.vue?vue&type=template&id=ecf5bd9c&
+var QuickSearchFiltervue_type_template_id_ecf5bd9c_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-row',[(_vm.filter)?_c('el-col',[(_vm.filter.type === 'string')?_c('el-input',{staticClass:"m-b-20",attrs:{"clearable":""},on:{"clear":_vm.resetFilter},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.applyFilter.apply(null, arguments)}},model:{value:(_vm.search[_vm.filter.name].value),callback:function ($$v) {_vm.$set(_vm.search[_vm.filter.name], "value", $$v)},expression:"search[filter.name].value"}}):_vm._e()],1):_vm._e()],1)}
+var QuickSearchFiltervue_type_template_id_ecf5bd9c_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/GenericFilters/QuickSearchFilter.vue?vue&type=template&id=61231db6&
+// CONCATENATED MODULE: ./src/components/GenericFilters/QuickSearchFilter.vue?vue&type=template&id=ecf5bd9c&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/QuickSearchFilter.vue?vue&type=script&lang=js&
 //
@@ -7743,6 +8038,7 @@ var QuickSearchFiltervue_type_template_id_61231db6_staticRenderFns = []
 //
 //
 //
+//
 /* harmony default export */ var QuickSearchFiltervue_type_script_lang_js_ = ({
   name: "QuickSearchFilter",
   props: {
@@ -7780,8 +8076,8 @@ var QuickSearchFiltervue_type_template_id_61231db6_staticRenderFns = []
 
 var QuickSearchFilter_component = normalizeComponent(
   GenericFilters_QuickSearchFiltervue_type_script_lang_js_,
-  QuickSearchFiltervue_type_template_id_61231db6_render,
-  QuickSearchFiltervue_type_template_id_61231db6_staticRenderFns,
+  QuickSearchFiltervue_type_template_id_ecf5bd9c_render,
+  QuickSearchFiltervue_type_template_id_ecf5bd9c_staticRenderFns,
   false,
   null,
   null,
@@ -7947,51 +8243,39 @@ var QuickSearchFilter_component = normalizeComponent(
       search: search,
       topSearch: topSearch,
       filterConvertor: filterConvertor,
-      meta: Object.assign(new meta_model_MetaModel(), listQueryService.getListQuery().meta),
+      meta: listQueryService.getListQuery().meta,
+      metaModel: new meta_model_MetaModel(),
       listQueryService: listQueryService
     };
   },
   computed: {
     queryFilter: function queryFilter() {
-      var _this$meta, _this$meta$pagination, _this$meta2, _this$meta2$paginatio;
-
-      var meta = this.listQueryService.getListQuery().meta;
       var query = {
-        page: (_this$meta = this.meta) !== null && _this$meta !== void 0 && (_this$meta$pagination = _this$meta.pagination) !== null && _this$meta$pagination !== void 0 && _this$meta$pagination.current_page ? this.meta.pagination.current_page : meta.page,
-        limit: (_this$meta2 = this.meta) !== null && _this$meta2 !== void 0 && (_this$meta2$paginatio = _this$meta2.pagination) !== null && _this$meta2$paginatio !== void 0 && _this$meta2$paginatio.per_page ? this.meta.pagination.per_page : meta.limit
+        page: this.meta.page,
+        limit: this.meta.limit
       };
       var filter = this.filterConvertor.applyFilter(_objectSpread2(_objectSpread2({}, this.search), this.topSearch));
       return _objectSpread2(_objectSpread2({}, query), filter);
     },
     currentPage: function currentPage() {
-      var _this$data$meta;
-
-      if ((_this$data$meta = this.data.meta) !== null && _this$data$meta !== void 0 && _this$data$meta.pagination) {
-        return this.data.meta.pagination.current_page;
+      if (this.meta) {
+        return this.meta.page;
       }
 
       return 0;
     },
     total: function total() {
-      var _this$data$meta2;
+      var _this$metaModel;
 
-      if ((_this$data$meta2 = this.data.meta) !== null && _this$data$meta2 !== void 0 && _this$data$meta2.pagination) {
-        return this.data.meta.pagination.total;
+      if ((_this$metaModel = this.metaModel) !== null && _this$metaModel !== void 0 && _this$metaModel.pagination) {
+        return this.metaModel.pagination.total;
       }
 
       return 0;
     },
     limit: function limit() {
-      var _this$data$meta3, _this$listQueryServic;
-
-      if ((_this$data$meta3 = this.data.meta) !== null && _this$data$meta3 !== void 0 && _this$data$meta3.pagination) {
-        return this.data.meta.pagination.per_page;
-      }
-
-      if ((_this$listQueryServic = this.listQueryService.getListQuery().meta) !== null && _this$listQueryServic !== void 0 && _this$listQueryServic.limit) {
-        var _this$listQueryServic2;
-
-        return (_this$listQueryServic2 = this.listQueryService.getListQuery().meta) === null || _this$listQueryServic2 === void 0 ? void 0 : _this$listQueryServic2.limit;
+      if (this.meta) {
+        return this.meta.limit;
       }
 
       return 10;
@@ -8018,7 +8302,7 @@ var QuickSearchFilter_component = normalizeComponent(
               case 4:
                 response = _context.sent;
                 _this.data = response.data;
-                external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(_this.data, "meta", response.meta);
+                external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(_this, "metaModel", response.meta);
                 _context.next = 12;
                 break;
 
@@ -8050,7 +8334,7 @@ var QuickSearchFilter_component = normalizeComponent(
           page: this.listQueryService.getListQuery().meta.page
         }
       });
-      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.data, "meta.per_page.current_page", val);
+      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.meta, "limit", val);
       this.fetch();
     },
     handleCurrentChange: function handleCurrentChange(val) {
@@ -8060,12 +8344,11 @@ var QuickSearchFilter_component = normalizeComponent(
           limit: this.listQueryService.getListQuery().meta.limit
         }
       });
-      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.data, "meta.pagination.current_page", val);
+      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.meta, "page", val);
       this.fetch();
     },
     handleFilterChange: function handleFilterChange() {
-      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.data, "meta.pagination.current_page", 1);
-      this.fetch();
+      this.handleCurrentChange(1);
     },
     handleApplyFilter: function handleApplyFilter() {
       this.listQueryService.updateListQuery({
@@ -8122,7 +8405,7 @@ var CompositeTable_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "0ed61922",
+  "1e175ae0",
   null
   
 )