@phoenix-cg/v-filters 0.1.15 → 0.1.17

package/.browserslistrc

@@ -1,3 +1,3 @@
-> 1%
-last 2 versions
-not dead
+> 1%
+last 2 versions
+not dead

package/.eslintrc.js

@@ -1,26 +1,26 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true
-  },
-  extends: ["plugin:vue/essential", "eslint:recommended"],
-  parserOptions: {
-    parser: "babel-eslint"
-  },
-  rules: {
-    "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
-    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
-    'quotes': ['error', 'single']
-  },
-  overrides: [
-    {
-      files: [
-        "**/__tests__/*.{j,t}s?(x)",
-        "**/tests/unit/**/*.spec.{j,t}s?(x)"
-      ],
-      env: {
-        jest: true
-      }
-    }
-  ]
-};
+module.exports = {
+  root: true,
+  env: {
+    node: true
+  },
+  extends: ["plugin:vue/essential", "eslint:recommended"],
+  parserOptions: {
+    parser: "babel-eslint"
+  },
+  rules: {
+    "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
+    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
+    'quotes': ['error', 'single']
+  },
+  overrides: [
+    {
+      files: [
+        "**/__tests__/*.{j,t}s?(x)",
+        "**/tests/unit/**/*.spec.{j,t}s?(x)"
+      ],
+      env: {
+        jest: true
+      }
+    }
+  ]
+};

package/README.md

@@ -1,40 +1,40 @@
-# v-filters
-
-## Project setup
-```
-npm install @phoenix-cg/v-filters
-```
-
-## Props
-
-| Props              | Description                                                                                                                      | Default value  |
-|--------------------|----------------------------------------------------------------------------------------------------------------------------------|----------------|
-| componentsMap      | [Object], required. Object with components name mapping to field types                                                           | none           |
-| fieldComponentName | [String] Component for field rendering. Should has "title" prop and a slot for field component                                   | v-filter-field |
-| fields             | [Array], required. Array with fields                                                                                             | none           |
-| showWords          | [Array] Array with words to put before found result count. First element should be in future tense and a last one in past tense. | []             |
-| notFoundTitle      | [String] Will be shown in button if count is 0                                                                                   | ''             |
-| declensionWords    | [Array] Array of words to put after found result count.                                                                          | []             |
-| count              | [Number] Found count                                                                                                             | 0              |
-| showParams         | [Boolean] If true current filters state will be reflected in page query params.                                                  | true           |
-| isResultShown      | [Boolean] If true action button title will be constructed in past tense                                                          | false          |
-| humanLink          | [String] Human link feature                                                                                                      | ''             |
-| editedOutside      | [Boolean] If true reset button will be shown even if the v-filters itself is untouched.                                          | false          |
-| immediate          | [Boolean] If true action button will not be shown and show-result event will fire immediately after change                       | false          |
-
-## Slots
-
-| Slot          | Description                             | Scope                                                  |
-|---------------|-----------------------------------------|--------------------------------------------------------|
-| before-fields | Slot to place anything before fields    | none                                                   |
-| after-fields  | Slot to place anything after fields     | none                                                   |
-| actions       | Slot for actions. Displays after fields | { showResult, resetFilters, count, immediate, edited } |
-| actions-after | Slot for actions. Displays after fields | { showResult, resetFilters, count, immediate, edited } |
-
-## Events
-
-| Event         | Description         | Payload                                 |
-|---------------|---------------------|-----------------------------------------|
-| request-count | Request count event | flatFilters: { ..., name: [1, 2] ,... } |
-| show-result   | Show result event   | flatFilters: { ..., name: [1, 2],...  } |
+# v-filters
+
+## Project setup
+```
+npm install @phoenix-cg/v-filters
+```
+
+## Props
+
+| Props              | Description                                                                                                                      | Default value  |
+|--------------------|----------------------------------------------------------------------------------------------------------------------------------|----------------|
+| componentsMap      | [Object], required. Object with components name mapping to field types                                                           | none           |
+| fieldComponentName | [String] Component for field rendering. Should has "title" prop and a slot for field component                                   | v-filter-field |
+| fields             | [Array], required. Array with fields                                                                                             | none           |
+| showWords          | [Array] Array with words to put before found result count. First element should be in future tense and a last one in past tense. | []             |
+| notFoundTitle      | [String] Will be shown in button if count is 0                                                                                   | ''             |
+| declensionWords    | [Array] Array of words to put after found result count.                                                                          | []             |
+| count              | [Number] Found count                                                                                                             | 0              |
+| showParams         | [Boolean] If true current filters state will be reflected in page query params.                                                  | true           |
+| isResultShown      | [Boolean] If true action button title will be constructed in past tense                                                          | false          |
+| humanLink          | [String] Human link feature                                                                                                      | ''             |
+| editedOutside      | [Boolean] If true reset button will be shown even if the v-filters itself is untouched.                                          | false          |
+| immediate          | [Boolean] If true action button will not be shown and show-result event will fire immediately after change                       | false          |
+
+## Slots
+
+| Slot          | Description                             | Scope                                                  |
+|---------------|-----------------------------------------|--------------------------------------------------------|
+| before-fields | Slot to place anything before fields    | none                                                   |
+| after-fields  | Slot to place anything after fields     | none                                                   |
+| actions       | Slot for actions. Displays after fields | { showResult, resetFilters, count, immediate, edited } |
+| actions-after | Slot for actions. Displays after fields | { showResult, resetFilters, count, immediate, edited } |
+
+## Events
+
+| Event         | Description         | Payload                                 |
+|---------------|---------------------|-----------------------------------------|
+| request-count | Request count event | flatFilters: { ..., name: [1, 2] ,... } |
+| show-result   | Show result event   | flatFilters: { ..., name: [1, 2],...  } |
 | reset-filters | Reset filters event | none                                    |

package/babel.config.js

@@ -1,3 +1,3 @@
-module.exports = {
-  presets: ["@vue/cli-plugin-babel/preset"],
-};
+module.exports = {
+  presets: ["@vue/cli-plugin-babel/preset"],
+};

package/dist/v-filters.common.js

@@ -539,6 +539,39 @@ $({ target: 'String', proto: true, forced: !correctIsRegExpLogic('includes') },
 });
 
 
+/***/ }),
+
+/***/ "25f0":
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+var redefine = __webpack_require__("6eeb");
+var anObject = __webpack_require__("825a");
+var fails = __webpack_require__("d039");
+var flags = __webpack_require__("ad6d");
+
+var TO_STRING = 'toString';
+var RegExpPrototype = RegExp.prototype;
+var nativeToString = RegExpPrototype[TO_STRING];
+
+var NOT_GENERIC = fails(function () { return nativeToString.call({ source: 'a', flags: 'b' }) != '/a/b'; });
+// FF44- RegExp#toString has a wrong name
+var INCORRECT_NAME = nativeToString.name != TO_STRING;
+
+// `RegExp.prototype.toString` method
+// https://tc39.es/ecma262/#sec-regexp.prototype.tostring
+if (NOT_GENERIC || INCORRECT_NAME) {
+  redefine(RegExp.prototype, TO_STRING, function toString() {
+    var R = anObject(this);
+    var p = String(R.source);
+    var rf = R.flags;
+    var f = String(rf === undefined && R instanceof RegExp && !('flags' in RegExpPrototype) ? flags.call(R) : rf);
+    return '/' + p + '/' + f;
+  }, { unsafe: true });
+}
+
+
 /***/ }),
 
 /***/ "2a62":
@@ -4345,7 +4378,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":"689fa985-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=6f58a782&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"585bd80c-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=6d42a410&
 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 +4395,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=6f58a782&
+// CONCATENATED MODULE: ./src/components/VFilters.vue?vue&type=template&id=6d42a410&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.keys.js
 var es_object_keys = __webpack_require__("b64b");
@@ -4556,6 +4589,9 @@ var es_string_includes = __webpack_require__("2532");
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.map.js
 var es_array_map = __webpack_require__("d81d");
 
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.regexp.to-string.js
+var es_regexp_to_string = __webpack_require__("25f0");
+
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.reduce.js
 var es_array_reduce = __webpack_require__("13d5");
 
@@ -5061,6 +5097,8 @@ _curry2(function equals(a, b) {
 
 
 
+
+
 //
 //
 //
@@ -5201,7 +5239,8 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
     return {
       filters: {},
       editedInside: false,
-      editedFields: []
+      editedFields: [],
+      inited: false
     };
   },
   computed: {
@@ -5228,7 +5267,7 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
           var filtersValue = _this.filters[name];
           var wrappedValue = getType(filtersValue) === 'Object' ? [filtersValue] : filtersValue;
           filters[name] = wrappedValue.map(function (value) {
-            return value._id || value;
+            return value._id && value._id.toString() || value;
           });
         }
       });
@@ -5243,7 +5282,6 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
       var _this2 = this;
 
       var params = query || this.getUrlParams();
-      var editedInside = false;
       this.fields.forEach(function (field) {
         var value = field._type === 'range' ? field.value : [];
         var valueNotArray = ['select', 'tab'].includes(field._type);
@@ -5307,7 +5345,7 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
         _this2.$set(_this2.filters, field._name, value);
       });
       this.setUrlParams(isReset);
-      this.editedInside = editedInside;
+      this.editedInside = this.editedFields.length > 0;
       this.doAction();
     },
     resetFilters: function resetFilters(isOutside) {
@@ -5323,7 +5361,12 @@ var VFiltersvue_type_script_lang_js_unserialize = function unserialize(input) {
       }
     },
     doAction: function doAction() {
-      this.immediate ? this.showResult() : this.requestCount();
+      if (!this.inited && !this.immediate) {
+        this.showResult();
+        this.inited = true;
+      } else {
+        this.immediate ? this.showResult() : this.requestCount();
+      }
     },
     requestCount: function requestCount() {
       this.$emit('request-count', this.flatFilters);