Skip to content

Commit 113aee5

Browse files
committed
fix(grid): Export only filtered data #6260
1 parent 0faffd9 commit 113aee5

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

projects/igniteui-angular/src/lib/services/exporter-common/base-export-service.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -255,20 +255,22 @@ export abstract class IgxBaseExporter {
255255

256256
let data = this._isTreeGrid ? this.flatRecords : grid.data;
257257

258-
if (grid.filteringExpressionsTree &&
259-
grid.filteringExpressionsTree.filteringOperands.length > 0 &&
258+
if (((grid.filteringExpressionsTree &&
259+
grid.filteringExpressionsTree.filteringOperands.length > 0) ||
260+
(grid.advancedFilteringExpressionsTree &&
261+
grid.advancedFilteringExpressionsTree.filteringOperands.length > 0)) &&
260262
!options.ignoreFiltering) {
261263
const filteringState: any = {
262264
expressionsTree: grid.filteringExpressionsTree,
263-
advancedExpressionsTree: grid.advancedExpressionsTree,
265+
advancedExpressionsTree: grid.advancedFilteringExpressionsTree,
264266
logic: grid.filteringLogic
265267
};
266268

267269
if (this._isTreeGrid) {
268270
this.flatRecords = [];
269271
filteringState.strategy = new TreeGridFilteringStrategy();
270272
rootRecords = filteringState.strategy.filter(rootRecords,
271-
filteringState.expressionsTree, filteringState.advancedExpressionsTree);
273+
filteringState.expressionsTree, filteringState.advancedFilteringExpressionsTree);
272274
this.prepareHierarchicalData(rootRecords);
273275
data = this.flatRecords;
274276
} else {

0 commit comments

Comments
 (0)