File tree 3 files changed +17
-14
lines changed
projects/igniteui-angular/src/lib/grids
3 files changed +17
-14
lines changed Original file line number Diff line number Diff line change @@ -5930,6 +5930,9 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
5930
5930
const numberPipe = new IgxDecimalPipeComponent ( this . locale ) ;
5931
5931
const datePipe = new IgxDatePipeComponent ( this . locale ) ;
5932
5932
data . forEach ( ( dataRow ) => {
5933
+ const ghostRec = dataRow . ghostRec !== undefined ;
5934
+ const data = { ...dataRow } ;
5935
+ dataRow = ghostRec ? dataRow . recordData : dataRow ;
5933
5936
columnItems . forEach ( ( c ) => {
5934
5937
const value = c . formatter ? c . formatter ( dataRow [ c . field ] ) :
5935
5938
c . dataType === 'number' ? numberPipe . transform ( dataRow [ c . field ] , this . locale ) :
@@ -5941,7 +5944,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
5941
5944
if ( exactMatch ) {
5942
5945
if ( searchValue === searchText ) {
5943
5946
this . lastSearchInfo . matchInfoCache . push ( {
5944
- row : dataRow ,
5947
+ row : data ,
5945
5948
column : c . field ,
5946
5949
index : 0 ,
5947
5950
} ) ;
@@ -5952,7 +5955,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
5952
5955
5953
5956
while ( searchIndex !== - 1 ) {
5954
5957
this . lastSearchInfo . matchInfoCache . push ( {
5955
- row : dataRow ,
5958
+ row : data ,
5956
5959
column : c . field ,
5957
5960
index : occurenceIndex ++ ,
5958
5961
} ) ;
Original file line number Diff line number Diff line change 1
1
< ng-template #defaultCell >
2
2
< div igxTextHighlight style ="pointer-events: none " [cssClass] ="highlightClass " [activeCssClass] ="activeHighlightClass " [groupName] ="gridID "
3
3
[value] ="formatter ? formatter(value) : column.dataType === 'number' ? (value | igxdecimal: grid.locale) : column.dataType === 'date' ? (value | igxdate: grid.locale) : value "
4
- [row] ="rowData " [column] ="this.column.field " [containerClass] ="'igx-grid__td-text' "
4
+ [row] ="row.treeRow.data " [column] ="this.column.field " [containerClass] ="'igx-grid__td-text' "
5
5
class ="igx-grid__td-text "> {{ formatter ? formatter(value) : column.dataType === 'number' ? (value | igxdecimal:
6
6
grid.locale) : column.dataType === 'date' ? (value | igxdate: grid.locale) : value }}</ div >
7
7
</ ng-template >
Original file line number Diff line number Diff line change 81
81
| treeGridRowPinning:id:pipeTrigger
82
82
| treeGridFiltering:filteringExpressionsTree:filterStrategy:advancedFilteringExpressionsTree:id:pipeTrigger:filteringPipeTrigger:true
83
83
| treeGridSorting:sortingExpressions:sortStrategy:id:pipeTrigger:true as pinnedData '>
84
- < div #pinContainer *ngIf ='pinnedData.length > 0 '
85
- [ngClass] ="{
86
- 'igx-grid__tr--pinned-bottom': !isRowPinningToTop,
87
- 'igx-grid__tr--pinned-top': isRowPinningToTop
88
- } "
89
- class ='igx-grid__tr--pinned ' [style.bottom.px] =' !isRowPinningToTop ? pinnedBottom : null '>
90
- < ng-container *ngFor ="let rowData of pinnedData;let rowIndex = index; ">
91
- < ng-container *ngTemplateOutlet ="record_template; context: getContext(rowData, rowIndex, true) ">
84
+ < div #pinContainer *ngIf ='pinnedData.length > 0 '
85
+ [ngClass] ="{
86
+ 'igx-grid__tr--pinned-bottom': !isRowPinningToTop,
87
+ 'igx-grid__tr--pinned-top': isRowPinningToTop
88
+ } "
89
+ class ='igx-grid__tr--pinned ' [style.bottom.px] =' !isRowPinningToTop ? pinnedBottom : null '>
90
+ < ng-container *ngFor ="let rowData of pinnedData;let rowIndex = index; ">
91
+ < ng-container *ngTemplateOutlet ="record_template; context: getContext(rowData, rowIndex, true) ">
92
+ </ ng-container >
92
93
</ ng-container >
93
- </ ng-container >
94
- </ div >
95
- </ ng-container >
94
+ </ div >
95
+ </ ng-container >
96
96
</ ng-template >
97
97
< ng-container *ngTemplateOutlet ="hasPinnedRecords && isRowPinningToTop ? pinnedRecordsTemplate : null "> </ ng-container >
98
98
< ng-template igxGridFor let-rowData [igxGridForOf] ="data
You can’t perform that action at this time.
0 commit comments