fix filterBy multiple keys (fix vuejs#1479)

yyx990803 · yyx990803 · commit 27bb3311698a · 2015-10-27T15:23:49.000-04:00
diff --git a/src/filters/array-filters.js b/src/filters/array-filters.js
@@ -39,12 +39,11 @@ exports.filterBy = function (arr, search, delimiter /* ...dataKeys */) {
         if ((key === '$key' && contains(item.$key, search)) ||
             contains(Path.get(val, key), search)) {
           res.push(item)
+          break
         }
       }
-    } else {
-      if (contains(item, search)) {
-        res.push(item)
-      }
+    } else if (contains(item, search)) {
+      res.push(item)
     }
   }
   return res
diff --git a/test/unit/specs/filters/filters_spec.js b/test/unit/specs/filters/filters_spec.js
@@ -151,6 +151,8 @@ describe('Filters', function () {
     ]
     // multiple string keys
     var res
+    res = filter(arr, '', 'in', 'firstname', 'lastname')
+    assertArray(res, [arr[0], arr[1], arr[2]])
     res = filter(arr, 'A', 'in', 'firstname', 'lastname')
     assertArray(res, [arr[0], arr[2]])
     // array of keys

Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,11 @@ exports.filterBy = function (arr, search, delimiter /* ...dataKeys */) {`
`39`	`39`	`if ((key === '$key' && contains(item.$key, search)) \|\|`
`40`	`40`	`contains(Path.get(val, key), search)) {`
`41`	`41`	`res.push(item)`
	`42`	`+ break`
`42`	`43`	`}`
`43`	`44`	`}`
`44`		`- } else {`
`45`		`- if (contains(item, search)) {`
`46`		`- res.push(item)`
`47`		`- }`
	`45`	`+ } else if (contains(item, search)) {`
	`46`	`+ res.push(item)`
`48`	`47`	`}`
`49`	`48`	`}`
`50`	`49`	`return res`
Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,8 @@ describe('Filters', function () {`
`151`	`151`	`]`
`152`	`152`	`// multiple string keys`
`153`	`153`	`var res`
	`154`	`+ res = filter(arr, '', 'in', 'firstname', 'lastname')`
	`155`	`+ assertArray(res, [arr[0], arr[1], arr[2]])`
`154`	`156`	`res = filter(arr, 'A', 'in', 'firstname', 'lastname')`
`155`	`157`	`assertArray(res, [arr[0], arr[2]])`
`156`	`158`	`// array of keys`