Skip to content

Commit b846588

Browse files
committed
feat(h-grid): support notInQuery in adv filtering
1 parent 2f41c93 commit b846588

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

projects/igniteui-angular/src/lib/data-operations/filtering-strategy.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ export abstract class BaseFilteringStrategy implements IFilteringStrategy {
4141
public findMatchByExpression(rec: any, expr: IFilteringExpression, isDate?: boolean, isTime?: boolean, grid?: GridType): boolean {
4242
if (expr.searchTree) {
4343
const records = rec[expr.searchTree.entity];
44+
const shouldMatchRecords = expr.conditionName === 'inQuery';
4445
for (let index = 0; index < records.length; index++) {
4546
const record = records[index];
46-
if (this.matchRecord(record, expr.searchTree, grid, expr.searchTree.entity)) {
47+
if ((shouldMatchRecords && this.matchRecord(record, expr.searchTree, grid, expr.searchTree.entity)) ||
48+
(!shouldMatchRecords && !this.matchRecord(record, expr.searchTree, grid, expr.searchTree.entity))) {
4749
return true;
4850
}
4951
}

projects/igniteui-angular/src/lib/query-builder/query-builder-tree.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,6 @@ export class IgxQueryBuilderTreeComponent implements AfterViewInit, OnDestroy {
698698
* @hidden @internal
699699
*/
700700
public get selectedField(): FieldType {
701-
console.log('get selectedField');
702701
if (this._selectedField && !this._selectedField.filters) {
703702
this._selectedField.filters = this.getFilters(this._selectedField);
704703
}

0 commit comments

Comments
 (0)