Skip to content

Commit 3886007

Browse files
bylertallazhukaudev
authored andcommitted
fix(table): only perform filter if search string is present (#358)
1 parent 27abbb5 commit 3886007

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/ng2-smart-table/lib/data-source/local/local.data-source.ts

+8-4
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,18 @@ export class LocalDataSource extends DataSource {
235235
if (this.filterConf.filters) {
236236
if (this.filterConf.andOperator) {
237237
this.filterConf.filters.forEach((fieldConf: any) => {
238-
data = LocalFilter
239-
.filter(data, fieldConf['field'], fieldConf['search'], fieldConf['filter']);
238+
if (fieldConf['search'].length > 0) {
239+
data = LocalFilter
240+
.filter(data, fieldConf['field'], fieldConf['search'], fieldConf['filter']);
241+
}
240242
});
241243
} else {
242244
let mergedData: any = [];
243245
this.filterConf.filters.forEach((fieldConf: any) => {
244-
mergedData = mergedData.concat(LocalFilter
245-
.filter(data, fieldConf['field'], fieldConf['search'], fieldConf['filter']));
246+
if (fieldConf['search'].length > 0) {
247+
mergedData = mergedData.concat(LocalFilter
248+
.filter(data, fieldConf['field'], fieldConf['search'], fieldConf['filter']));
249+
}
246250
});
247251
// remove non unique items
248252
data = mergedData.filter((elem: any, pos: any, arr: any) => {

0 commit comments

Comments
 (0)