@phoenix-cg/v-filters 0.2.0-beta.4 → 0.2.0-beta.7

package/dist/v-filters.common.js

@@ -4345,7 +4345,7 @@ 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":"1120b0fb-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/VFilters.vue?vue&type=template&id=687faba8&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"cf5396ca-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/VFilters.vue?vue&type=template&id=765a2cf6&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"v-filters"},[_c('div',{staticClass:"v-filters_fields"},[_vm._t("before-fields"),_vm._l((_vm.fields),function(field){return _c(_vm.fieldComponentName,{key:field._name,tag:"component",attrs:{"title":field.title}},[_c(_vm.componentsMap[field._type],_vm._b({key:_vm.fieldKey,tag:"component",on:{"input":function($event){return _vm.handleFieldChange(field._name)}},model:{value:(_vm.filters[field._name]),callback:function ($$v) {_vm.$set(_vm.filters, field._name, $$v)},expression:"filters[field._name]"}},'component',field._fieldProps || {},false))],1)}),_vm._t("after-fields"),_vm._t("actions",[_c(_vm.fieldComponentName,{tag:"component"},[(!_vm.immediate)?_c('button',{staticClass:"v-button v-filters_button",on:{"click":_vm.showResult}},[_vm._v(" "+_vm._s(_vm.actionTitle)+" ")]):_vm._e(),(_vm.edited)?_c('button',{staticClass:"v-button v-filters_button __reset",on:{"click":_vm.resetFilters}},[_vm._v(" Сбросить параметры ")]):_vm._e()])],null,{
         showResult: _vm.showResult,
         resetFilters: _vm.resetFilters,
@@ -4362,7 +4362,7 @@ var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._sel
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/VFilters.vue?vue&type=template&id=687faba8&
+// CONCATENATED MODULE: ./src/components/VFilters.vue?vue&type=template&id=765a2cf6&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
 var es_object_keys = __webpack_require__("b64b");
@@ -5318,6 +5318,28 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
           }
 
           _this2.addEditedField(field._name);
+        } else if (params[field._name] && isUpdate && field._type !== 'range') {
+          if (valueNotArray) {
+            var isValueInData = field.data.some(function (dataValue) {
+              return dataValue._id === value._id || dataValue._id === value;
+            });
+
+            if (!isValueInData) {
+              value = field.data[0];
+            }
+          } else {
+            value = field.value.reduce(function (acc, currentValue) {
+              var isValueInData = field.data.some(function (dataValue) {
+                return dataValue._id === currentValue._id || dataValue._id === currentValue;
+              });
+
+              if (isValueInData) {
+                acc.push(currentValue);
+              }
+
+              return acc;
+            }, []);
+          }
         } else if ((!params[field._name] || isUpdate) && valueNotArray) {
           var _field$value2 = _slicedToArray(field.value, 1);
 
@@ -5353,7 +5375,7 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
         _this2.$set(_this2.filters, field._name, value);
       });
       this.setUrlParams(isUpdate);
-      !isUpdate && this.doAction();
+      !isUpdate && this.doAction(true);
     },
     resetFilters: function resetFilters() {
       this.editedFields = [];
@@ -5365,7 +5387,14 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
       }
     },
     doAction: function doAction() {
-      this.immediate ? this.showResult() : this.requestCount();
+      var both = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
+      if (both) {
+        this.requestCount();
+        this.showResult();
+      } else {
+        this.immediate ? this.showResult() : this.requestCount();
+      }
     },
     requestCount: function requestCount() {
       this.$emit('request-count', this.flatFilters);