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

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

@@ -24470,12 +24470,12 @@ var es_string_includes = __webpack_require__("2532");
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__("8bbf");
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3ffeb5ea-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/index.vue?vue&type=template&id=577eb898&scoped=true&
-var GenericFiltersvue_type_template_id_577eb898_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-card',[_vm._l((_vm.filters),function(column){return _c('filter-row',{key:column.name,attrs:{"column":column,"search":_vm.search[column.name]}})}),_c('el-button',{on:{"click":_vm.applyFilter}},[_vm._v("Filter")]),_c('el-button',{on:{"click":_vm.resetFilter}},[_vm._v("Reset filter")])],2)}
-var GenericFiltersvue_type_template_id_577eb898_scoped_true_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3ffeb5ea-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/index.vue?vue&type=template&id=1057bdaf&scoped=true&
+var GenericFiltersvue_type_template_id_1057bdaf_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-card',[_vm._l((_vm.filters),function(column){return _c('filter-row',{key:column.name,attrs:{"column":column,"search":_vm.search[column.name]}})}),_c('el-button',{on:{"click":_vm.applyFilter}},[_vm._v("Filter")]),_c('el-button',{on:{"click":_vm.resetFilter}},[_vm._v("Reset filter")])],2)}
+var GenericFiltersvue_type_template_id_1057bdaf_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/GenericFilters/index.vue?vue&type=template&id=577eb898&scoped=true&
+// CONCATENATED MODULE: ./src/components/GenericFilters/index.vue?vue&type=template&id=1057bdaf&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3ffeb5ea-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=32b631a7&
 var FilterRowvue_type_template_id_32b631a7_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 && _vm.operators.length !== 0)?_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)}
@@ -25713,7 +25713,7 @@ var filter_convertor_FilterConverter = /*#__PURE__*/function () {
       var searchArray = [],
           searchFieldsArray = [];
       Object.keys(search).forEach(function (key) {
-        if (search[key].operator && search[key].value.length || ['is_null', 'is_not_null'].includes(search[key].operator) || search[key].value === false) {
+        if (['is_null', 'is_not_null'].includes(search[key].operator) || search[key].operator && search[key].value.length || search[key].value === false) {
           var filter = filterFactory.createFilter(key, search[key]);
 
           var _filter$applyFilter = filter.applyFilter(),
@@ -25785,6 +25785,7 @@ var filter_convertor_FilterConverter = /*#__PURE__*/function () {
       return this.filterConvertor.applyFilter(this.search);
     },
     applyFilter: function applyFilter() {
+      console.log(this.search);
       this.$emit('apply:filter', this.filterConvertor.applyFilter(this.search));
     },
     resetFilter: function resetFilter() {
@@ -25804,11 +25805,11 @@ var filter_convertor_FilterConverter = /*#__PURE__*/function () {
 
 var GenericFilters_component = normalizeComponent(
   components_GenericFiltersvue_type_script_lang_js_,
-  GenericFiltersvue_type_template_id_577eb898_scoped_true_render,
-  GenericFiltersvue_type_template_id_577eb898_scoped_true_staticRenderFns,
+  GenericFiltersvue_type_template_id_1057bdaf_scoped_true_render,
+  GenericFiltersvue_type_template_id_1057bdaf_scoped_true_staticRenderFns,
   false,
   null,
-  "577eb898",
+  "1057bdaf",
   null
   
 )