Skip to content

Commit 3a907ea

Browse files
committed
fix(adv-filtering): added header name property to filtering expression #5993
(cherry picked from commit 094cf65)
1 parent ac576f9 commit 3a907ea

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export enum FilteringLogic {
1010
*/
1111
export declare interface IFilteringExpression {
1212
fieldName: string;
13+
headerName?: string;
1314
condition: IFilteringOperation;
1415
searchVal?: any;
1516
ignoreCase?: boolean;

projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ <h6 class="igx-filter-empty__title">
9999
(onRemove)="onChipRemove(expressionItem)"
100100
(onSelectionDone)="onChipSelectionEnd()"
101101
>
102-
<span igxPrefix class="igx-filter-tree__expression-column">{{ expressionItem.expression.fieldName }}</span>
102+
<span igxPrefix class="igx-filter-tree__expression-column">{{ expressionItem.expression.headerName || expressionItem.expression.fieldName }}</span>
103103
<igx-icon
104104
igxPrefix
105105
fontSet="filtering-icons"

projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
468468
public commitOperandEdit() {
469469
if (this.editedExpression) {
470470
this.editedExpression.expression.fieldName = this.selectedColumn.field;
471+
this.editedExpression.expression.headerName = this.selectedColumn.header;
471472
this.editedExpression.expression.condition = this.selectedColumn.filters.condition(this.selectedCondition);
472473
this.editedExpression.expression.searchVal = DataUtil.parseValue(this.selectedColumn.dataType, this.searchValue);
473474

@@ -563,6 +564,7 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
563564
const filteringExpr = expr as IFilteringExpression;
564565
const exprCopy: IFilteringExpression = {
565566
fieldName: filteringExpr.fieldName,
567+
headerName: filteringExpr.headerName,
566568
condition: filteringExpr.condition,
567569
searchVal: filteringExpr.searchVal,
568570
ignoreCase: filteringExpr.ignoreCase

src/app/grid-filtering/grid-filtering.sample.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
exportExcelText="Export to Excel"
3232
exportCsvText="Export to CSV">
3333
<igx-column *ngFor="let c of columns" [field]="c.field"
34-
[header]="c.field"
34+
[header]="c.header"
3535
[movable]="c.movable"
3636
[groupable]="true"
3737
[resizable]="c.resizable"

0 commit comments

Comments
 (0)