File tree 2 files changed +4
-3
lines changed
projects/igniteui-angular/src/lib/grids
2 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -2932,7 +2932,8 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
2932
2932
if ( this . hasPinnedRecords && pinned ) {
2933
2933
this . _filteredPinnedData = data || [ ] ;
2934
2934
const filteredUnpinned = this . _filteredUnpinnedData || [ ] ;
2935
- this . filteredData = [ ... this . _filteredPinnedData , ... filteredUnpinned ] ;
2935
+ const filteredData = [ ... this . _filteredPinnedData , ... filteredUnpinned ] ;
2936
+ this . filteredData = filteredData . length > 0 ? filteredData : this . _filteredUnpinnedData ;
2936
2937
} else if ( this . hasPinnedRecords && ! pinned ) {
2937
2938
this . _filteredUnpinnedData = data ;
2938
2939
} else {
Original file line number Diff line number Diff line change 81
81
82
82
< div class ="sample-column ">
83
83
< div > igxTreeGrid</ div >
84
- < igx-tree-grid [pinning] ="pinningConfig " #treegrid [allowFiltering] ='true ' [data] ="treeData " primaryKey ="employeeID " foreignKey ="PID " [rowSelectable] ="true "
84
+ < igx-tree-grid [paging] =' true ' [ pinning] ="pinningConfig " #treegrid [allowFiltering] ='true ' [data] ="treeData " primaryKey ="employeeID " foreignKey ="PID " [rowSelectable] ="true "
85
85
[width] ="'900px' " [height] ="'800px' " [showToolbar] ="true "
86
86
[columnHiding] ="true " [columnPinning] ="true " [exportExcel] ="true " [exportCsv] ="true " exportText ="Export "
87
87
>
94
94
</ igx-column >
95
95
< igx-column *ngFor ="let c of treeColumns " [field] ="c.field " [dataType] ="c.dataType " [header] ="c.label "
96
96
[pinned] ="c.pinned " [movable] ="c.movable " [groupable] ="false " [resizable] ="c.resizable " [width] ="c.width "
97
- [sortable] ="true " [filterable] ="true " [editable] ="true " [hidden] ="c.hidden " [hasSummary] =" c.hasSummary "
97
+ [sortable] ="true " [filterable] ="true " [editable] ="true " [hidden] ="c.hidden "
98
98
[minWidth] ="c.minWidth " [maxWidth] ="c.maxWidth ">
99
99
</ igx-column >
100
100
You can’t perform that action at this time.
0 commit comments