fix(table): only perform filter if search string is present (#358)

akveo · May 21, 2017 · 3886007 · 3886007
1 parent 27abbb5
commit 3886007
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/ng2-smart-table/lib/data-source/local/local.data-source.ts b/src/ng2-smart-table/lib/data-source/local/local.data-source.ts
@@ -235,14 +235,18 @@ export class LocalDataSource extends DataSource {
  if (this.filterConf.filters) {
  if (this.filterConf.andOperator) {
  this.filterConf.filters.forEach((fieldConf: any) => {
- data = LocalFilter
- .filter(data, fieldConf['field'], fieldConf['search'], fieldConf['filter']);
+ if (fieldConf['search'].length > 0) {
+ data = LocalFilter
+ .filter(data, fieldConf['field'], fieldConf['search'], fieldConf['filter']);
+ }
  });
  } else {
  let mergedData: any = [];
  this.filterConf.filters.forEach((fieldConf: any) => {
- mergedData = mergedData.concat(LocalFilter
- .filter(data, fieldConf['field'], fieldConf['search'], fieldConf['filter']));
+ if (fieldConf['search'].length > 0) {
+ mergedData = mergedData.concat(LocalFilter
+ .filter(data, fieldConf['field'], fieldConf['search'], fieldConf['filter']));
+ }
  });
  // remove non unique items
  data = mergedData.filter((elem: any, pos: any, arr: any) => {