@tripup-company/element-ui-extended 0.0.66 → 0.0.69

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

@@ -24477,12 +24477,12 @@ var GenericFiltersvue_type_template_id_3f2de7fc_scoped_true_staticRenderFns = []
 
 // CONCATENATED MODULE: ./src/components/GenericFilters/index.vue?vue&type=template&id=3f2de7fc&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=d2e1ff54&
-var FilterRowvue_type_template_id_d2e1ff54_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.searchLocal.operator),callback:function ($$v) {_vm.$set(_vm.searchLocal, "operator", $$v)},expression:"searchLocal.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.searchLocal.operator)),expression:"!isDisableInput(searchLocal.operator)"}],model:{value:(_vm.searchLocal.value),callback:function ($$v) {_vm.$set(_vm.searchLocal, "value", $$v)},expression:"searchLocal.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.searchLocal.value),callback:function ($$v) {_vm.$set(_vm.searchLocal, "value", $$v)},expression:"searchLocal.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.searchLocal.value),callback:function ($$v) {_vm.$set(_vm.searchLocal, "value", $$v)},expression:"searchLocal.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_d2e1ff54_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/FilterRow.vue?vue&type=template&id=268843d6&
+var FilterRowvue_type_template_id_268843d6_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.searchLocal.operator),callback:function ($$v) {_vm.$set(_vm.searchLocal, "operator", $$v)},expression:"searchLocal.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.searchLocal.operator)),expression:"!isDisableInput(searchLocal.operator)"}],model:{value:(_vm.searchLocal.value),callback:function ($$v) {_vm.$set(_vm.searchLocal, "value", $$v)},expression:"searchLocal.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.searchLocal.value),callback:function ($$v) {_vm.$set(_vm.searchLocal, "value", $$v)},expression:"searchLocal.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,"value-key":_vm.objectValueKey,"clearable":""},on:{"change":_vm.updateSearch},model:{value:(_vm.searchLocal.value),callback:function ($$v) {_vm.$set(_vm.searchLocal, "value", $$v)},expression:"searchLocal.value"}},_vm._l((_vm.selectListLocal),function(item){return _c('el-option',{key:item[_vm.selectKey],attrs:{"label":item[_vm.selectLabel],"value":_vm.selectJson ? item : item[_vm.selectValue]}})}),1)],1)],1):_vm._e()],1)}
+var FilterRowvue_type_template_id_268843d6_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/GenericFilters/FilterRow.vue?vue&type=template&id=d2e1ff54&
+// CONCATENATED MODULE: ./src/components/GenericFilters/FilterRow.vue?vue&type=template&id=268843d6&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__("5319");
@@ -24573,6 +24573,7 @@ var lodash_default = /*#__PURE__*/__webpack_require__.n(lodash);
 //
 //
 //
+//
 
 
 /* harmony default export */ var FilterRowvue_type_script_lang_js_ = ({
@@ -24591,11 +24592,11 @@ var lodash_default = /*#__PURE__*/__webpack_require__.n(lodash);
     },
     name: {
       type: String,
-      default: ''
+      default: ""
     }
   },
   data: function data() {
-    var _this$column$selectKe, _this$column$selectLa, _this$column$selectVa, _this$column$filterab, _this$column$remote, _this$column$remoteMe;
+    var _this$column$selectKe, _this$column$selectLa, _this$column$selectVa, _this$column$filterab, _this$column$objectVa, _this$column$selectJs, _this$column$remote, _this$column$remoteMe;
 
     var boolValues = [{
       value: null,
@@ -24607,6 +24608,18 @@ var lodash_default = /*#__PURE__*/__webpack_require__.n(lodash);
       value: false,
       name: "false"
     }];
+    var selectValues = [];
+
+    if (this.column.selectList && this.column.selectList.length) {
+      selectValues = this.column.selectList;
+    } else if (this.search.selectList && this.search.selectList.length) {
+      selectValues = this.search.selectList;
+    } else if (this.column.type === "enum") {
+      selectValues = this.column.values;
+    } else {
+      selectValues = boolValues;
+    }
+
     return {
       searchLocal: this.search,
       loading: false,
@@ -24614,9 +24627,10 @@ var lodash_default = /*#__PURE__*/__webpack_require__.n(lodash);
       selectLabel: (_this$column$selectLa = this.column.selectLabel) !== null && _this$column$selectLa !== void 0 ? _this$column$selectLa : "name",
       selectValue: (_this$column$selectVa = this.column.selectValue) !== null && _this$column$selectVa !== void 0 ? _this$column$selectVa : "value",
       filterable: (_this$column$filterab = this.column.filterable) !== null && _this$column$filterab !== void 0 ? _this$column$filterab : false,
+      objectValueKey: (_this$column$objectVa = this.column.objectValueKey) !== null && _this$column$objectVa !== void 0 ? _this$column$objectVa : "value",
+      selectJson: (_this$column$selectJs = this.column.selectJson) !== null && _this$column$selectJs !== void 0 ? _this$column$selectJs : 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.column.selectList ? this.column.selectList : this.column.type === "enum" ? this.column.values : boolValues,
       showFilter: this.search.operator !== "",
       stringOperators: [{
         value: "equal",
@@ -24663,7 +24677,8 @@ var lodash_default = /*#__PURE__*/__webpack_require__.n(lodash);
       boolOperators: [{
         value: "equal",
         label: "is"
-      }]
+      }],
+      selectListLocal: selectValues
     };
   },
   computed: {
@@ -24679,7 +24694,7 @@ var lodash_default = /*#__PURE__*/__webpack_require__.n(lodash);
           if (this.column.operator) {
             operators = [{
               value: this.column.operator,
-              label: Object(lodash["upperFirst"])(this.column.operator.replace('_', ' '))
+              label: Object(lodash["upperFirst"])(this.column.operator.replace("_", " "))
             }];
           } else if (this.column.selectMultiple) {
             operators = this.enumOperatorsMultiple;
@@ -24723,7 +24738,7 @@ var lodash_default = /*#__PURE__*/__webpack_require__.n(lodash);
       }
     },
     search: function search(newValue) {
-      console.log('seach updated');
+      console.log("seach updated");
 
       if (newValue !== this.search) {
         this.searchLocal = Object.assign({}, this.search);
@@ -24734,14 +24749,14 @@ var lodash_default = /*#__PURE__*/__webpack_require__.n(lodash);
     searchLocal: {
       deep: true,
       handler: function handler() {
-        console.log('searchLocal updated');
+        console.log("searchLocal updated");
         this.$emit("update:search", {
           name: this.name,
           value: this.searchLocal
         });
         console.log(this.searchLocal);
 
-        if (this.searchLocal.operator == '') {
+        if (this.searchLocal.operator == "") {
           this.showFilter = false;
         }
       }
@@ -24924,8 +24939,8 @@ function normalizeComponent (
 
 var component = normalizeComponent(
   GenericFilters_FilterRowvue_type_script_lang_js_,
-  FilterRowvue_type_template_id_d2e1ff54_render,
-  FilterRowvue_type_template_id_d2e1ff54_staticRenderFns,
+  FilterRowvue_type_template_id_268843d6_render,
+  FilterRowvue_type_template_id_268843d6_staticRenderFns,
   false,
   null,
   null,
@@ -25774,7 +25789,7 @@ var filter_convertor_FilterConverter = /*#__PURE__*/function () {
       var searchArray = [],
           searchFieldsArray = [];
       Object.keys(search).forEach(function (key) {
-        if (search[key].operator && search[key].value || ['is_null', 'is_not_null'].includes(search[key].operator) || search[key].value === false) {
+        if (search[key].operator && search[key].value || ['is_null', 'is_not_null'].includes(search[key].operator) || [null, false].includes(search[key].value)) {
           var filter = filterFactory.createFilter(key, search[key]);
 
           var _filter$applyFilter = filter.applyFilter(),