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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phoenix-cg/v-filters",
-  "version": "0.2.0-beta.4",
+  "version": "0.2.0-beta.7",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/VFilters.vue

@@ -197,6 +197,21 @@ export default {
             value = paramsValue
           }
           this.addEditedField(field._name)
+        } else if (params[field._name] && isUpdate && field._type !== 'range') {
+          if (valueNotArray) {
+            const isValueInData = field.data.some(dataValue => dataValue._id === value._id || dataValue._id === value)
+            if (!isValueInData) {
+              value = field.data[0]
+            }
+          } else {
+            value = field.value.reduce((acc, currentValue) => {
+              const isValueInData = field.data.some(dataValue => dataValue._id === currentValue._id || dataValue._id === currentValue)
+              if (isValueInData) {
+                acc.push(currentValue)
+              }
+              return acc
+            }, [])
+          }
         } else if ((!params[field._name] || isUpdate) && valueNotArray) {
           [value] = field.value
         } else if (!params[field._name] || isUpdate) {
@@ -221,7 +236,7 @@ export default {
         this.$set(this.filters, field._name, value)
       })
       this.setUrlParams(isUpdate)
-      !isUpdate && this.doAction()
+      !isUpdate && this.doAction(true)
     },
     resetFilters () {
       this.editedFields = []
@@ -232,8 +247,13 @@ export default {
         this.editedFields.push(name)
       }
     },
-    doAction () {
-      this.immediate ? this.showResult() : this.requestCount()
+    doAction (both = false) {
+      if (both) {
+        this.requestCount()
+        this.showResult()
+      } else {
+        this.immediate ? this.showResult() : this.requestCount()
+      }
     },
     requestCount () {
       this.$emit('request-count', this.flatFilters)