@phoenix-cg/v-filters 0.1.12 → 0.2.0-beta.1

package/package.json

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

package/src/components/VFilters.vue

@@ -126,9 +126,7 @@ export default {
   },
   data () {
     return {
-      inited: false,
       filters: {},
-      editedInside: false,
       editedFields: []
     }
   },
@@ -136,6 +134,9 @@ export default {
     edited () {
       return this.editedInside || this.editedOutside
     },
+    editedInside () {
+      return this.editedFields.length > 0
+    },
     actionTitle () {
       let title = this.notFoundTitle
       if (this.count > 0) {
@@ -155,20 +156,27 @@ export default {
       return filters
     }
   },
+  watch: {
+    fields: {
+      deep: true,
+      handler () {
+        this.setFilters(true)
+      }
+    }
+  },
   created () {
     this.setFilters()
   },
   methods: {
-    setFilters (isReset, query) {
-      let params = query || this.getUrlParams()
-      let editedInside = false
-
+    setFilters (isUpdate) {
+      let params = this.getUrlParams()
       this.fields.forEach(field => {
         let value = field._type === 'range' ? field.value : []
-        if (field._type === 'select') {
+        const valueNotArray = ['select', 'tab'].includes(field._type)
+        if (valueNotArray) {
           [value] = field.value
         }
-        if (params[field._name] && !isReset) {
+        if (params[field._name] && !isUpdate) {
           let paramsValue = params[field._name]
           if (field._type !== 'range') {
             value = field.data.reduce((acc, item) => {
@@ -182,9 +190,9 @@ export default {
             value = paramsValue
           }
           this.addEditedField(field._name)
-        } else if ((!params[field._name] || isReset) && field._type === 'select') {
+        } else if ((!params[field._name] || isUpdate) && valueNotArray) {
           [value] = field.value
-        } else if (!params[field._name] || isReset) {
+        } else if (!params[field._name] || isUpdate) {
           value = field.value
         }
         // Detect changed fields
@@ -192,26 +200,25 @@ export default {
         switch (field._type) {
           case 'range':
             fieldIsEdited = field.data.map((dataValue, index) => field.value[index] === dataValue)
-                                      .some(checkedValue => !checkedValue)
+              .some(checkedValue => !checkedValue)
             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                                    
+            break
         }
         fieldIsEdited && this.addEditedField(field._name)
         this.$set(this.filters, field._name, value)
       })
-      this.setUrlParams(isReset)
-      this.editedInside = editedInside
-      this.doAction()
+      this.setUrlParams(isUpdate)
+      !isUpdate && this.doAction()
     },
-    resetFilters (isOutside) {
-      this.$emit('reset-filters', isOutside)
-      this.setFilters(true)
+    resetFilters () {
       this.editedFields = []
-      this.editedInside = false
-      this.doAction()
+      this.$emit('reset-filters')
     },
     addEditedField (name) {
       if (!this.editedFields.includes(name)) {
@@ -219,29 +226,7 @@ export default {
       }
     },
     doAction () {
-      if (this.immediate) {
-        this.showResult()
-      } else {
-        this.requestCount()
-        if (!this.inited && !this.hideResult) {
-          this.showResult()
-        }
-        this.inited = true
-      }
-    },
-    isFieldsEqual (arr1, arr2) {
-      let equal = true
-      arr1.forEach(item => {
-        let arr2Item = arr2.find(arr2Item => {
-          let val = item._id || item
-          let val2 = arr2Item._id || arr2Item
-          return val === val2
-        })
-        if (!arr2Item) {
-          equal = false
-        }
-      })
-      return equal
+      this.immediate ? this.showResult() : this.requestCount()
     },
     requestCount () {
       this.$emit('request-count', this.flatFilters)
@@ -279,7 +264,6 @@ export default {
     },
     handleFieldChange (name) {
       this.addEditedField(name)
-      this.editedInside = true
       this.setUrlParams()
       this.doAction()
     }