@phoenix-cg/v-filters 0.1.11 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@phoenix-cg/v-filters",
-  "version": "0.1.11",
+  "version": "0.1.14",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/VFilters.vue

@@ -126,7 +126,6 @@ export default {
   },
   data () {
     return {
-      inited: false,
       filters: {},
       editedInside: false,
       editedFields: []
@@ -149,7 +148,7 @@ export default {
       let filters = {}
       Object.keys(this.filters).forEach(name => {
         if (this.editedFields.includes(name)) {
-          filters[name] = this.filters[name].map(value => value._id || value)
+          filters[name] = this.filters[name].map(value => value._id && value._id.toString() || value)
         }
       })
       return filters
@@ -165,7 +164,8 @@ export default {
 
       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) {
@@ -182,7 +182,7 @@ export default {
             value = paramsValue
           }
           this.addEditedField(field._name)
-        } else if ((!params[field._name] || isReset) && field._type === 'select') {
+        } else if ((!params[field._name] || isReset) && valueNotArray) {
           [value] = field.value
         } else if (!params[field._name] || isReset) {
           value = field.value
@@ -195,6 +195,9 @@ export default {
                                       .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                                    
@@ -219,29 +222,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)