@phoenix-cg/v-filters 0.1.11 → 0.2.0-beta.0

package/dist/v-filters.common.js

@@ -1875,35 +1875,6 @@ module.exports = Object.create || function create(O, Properties) {
 };
 
 
-/***/ }),
-
-/***/ "7db0":
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-
-var $ = __webpack_require__("23e7");
-var $find = __webpack_require__("b727").find;
-var addToUnscopables = __webpack_require__("44d2");
-
-var FIND = 'find';
-var SKIPS_HOLES = true;
-
-// Shouldn't skip holes
-if (FIND in []) Array(1)[FIND](function () { SKIPS_HOLES = false; });
-
-// `Array.prototype.find` method
-// https://tc39.es/ecma262/#sec-array.prototype.find
-$({ target: 'Array', proto: true, forced: SKIPS_HOLES }, {
-  find: function find(callbackfn /* , that = undefined */) {
-    return $find(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
-  }
-});
-
-// https://tc39.es/ecma262/#sec-array.prototype-@@unscopables
-addToUnscopables(FIND);
-
-
 /***/ }),
 
 /***/ "7dd0":
@@ -4374,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":"4376f3fe-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=79be4712&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"eb88cebc-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=922779fe&
 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,
@@ -4391,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=79be4712&
+// CONCATENATED MODULE: ./src/components/VFilters.vue?vue&type=template&id=922779fe&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
 var es_object_keys = __webpack_require__("b64b");
@@ -4588,9 +4559,6 @@ var es_array_map = __webpack_require__("d81d");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.reduce.js
 var es_array_reduce = __webpack_require__("13d5");
 
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.find.js
-var es_array_find = __webpack_require__("7db0");
-
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.search.js
 var es_string_search = __webpack_require__("841c");
 
@@ -5093,7 +5061,6 @@ _curry2(function equals(a, b) {
 
 
 
-
 //
 //
 //
@@ -5232,9 +5199,7 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
   },
   data: function data() {
     return {
-      inited: false,
       filters: {},
-      editedInside: false,
       editedFields: []
     };
   },
@@ -5242,6 +5207,9 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
     edited: function edited() {
       return this.editedInside || this.editedOutside;
     },
+    editedInside: function editedInside() {
+      return this.editedFields.length > 0;
+    },
     actionTitle: function actionTitle() {
       var title = this.notFoundTitle;
 
@@ -5267,25 +5235,33 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
       return filters;
     }
   },
+  watch: {
+    fields: {
+      deep: true,
+      handler: function handler() {
+        this.setFilters(true);
+      }
+    }
+  },
   created: function created() {
     this.setFilters();
   },
   methods: {
-    setFilters: function setFilters(isReset, query) {
+    setFilters: function setFilters(isUpdate) {
       var _this2 = this;
 
-      var params = query || this.getUrlParams();
-      var editedInside = false;
+      var params = this.getUrlParams();
       this.fields.forEach(function (field) {
         var value = field._type === 'range' ? field.value : [];
+        var valueNotArray = ['select', 'tab'].includes(field._type);
 
-        if (field._type === 'select') {
+        if (valueNotArray) {
           var _field$value = _slicedToArray(field.value, 1);
 
           value = _field$value[0];
         }
 
-        if (params[field._name] && !isReset) {
+        if (params[field._name] && !isUpdate) {
           var paramsValue = params[field._name];
 
           if (field._type !== 'range') {
@@ -5303,11 +5279,11 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
           }
 
           _this2.addEditedField(field._name);
-        } else if ((!params[field._name] || isReset) && field._type === 'select') {
+        } else if ((!params[field._name] || isUpdate) && valueNotArray) {
           var _field$value2 = _slicedToArray(field.value, 1);
 
           value = _field$value2[0];
-        } else if (!params[field._name] || isReset) {
+        } else if (!params[field._name] || isUpdate) {
           value = field.value;
         } // Detect changed fields
 
@@ -5324,6 +5300,10 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
             break;
 
           case 'select':
+          case 'tab':
+            fieldIsEdited = field.value.length > 0 && field.value[0]._id !== field.data[0]._id;
+            break;
+
           case 'checkbox':
             fieldIsEdited = field.value.length > 0;
             break;
@@ -5333,16 +5313,13 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
 
         _this2.$set(_this2.filters, field._name, value);
       });
-      this.setUrlParams(isReset);
-      this.editedInside = editedInside;
-      this.doAction();
+      this.setUrlParams(isUpdate);
+      !isUpdate && this.doAction();
     },
-    resetFilters: function resetFilters(isOutside) {
-      this.$emit('reset-filters', isOutside);
-      this.setFilters(true);
+    resetFilters: function resetFilters() {
       this.editedFields = [];
       this.editedInside = false;
-      this.doAction();
+      this.$emit('reset-filters');
     },
     addEditedField: function addEditedField(name) {
       if (!this.editedFields.includes(name)) {
@@ -5350,32 +5327,7 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
       }
     },
     doAction: function doAction() {
-      if (this.immediate) {
-        this.showResult();
-      } else {
-        this.requestCount();
-
-        if (!this.inited && !this.hideResult) {
-          this.showResult();
-        }
-
-        this.inited = true;
-      }
-    },
-    isFieldsEqual: function isFieldsEqual(arr1, arr2) {
-      var equal = true;
-      arr1.forEach(function (item) {
-        var arr2Item = arr2.find(function (arr2Item) {
-          var val = item._id || item;
-          var val2 = arr2Item._id || arr2Item;
-          return val === val2;
-        });
-
-        if (!arr2Item) {
-          equal = false;
-        }
-      });
-      return equal;
+      this.immediate ? this.showResult() : this.requestCount();
     },
     requestCount: function requestCount() {
       this.$emit('request-count', this.flatFilters);