@syncfusion/ej2-treegrid 32.2.4 → 32.2.9

package/dist/es6/ej2-treegrid.es2015.js

@@ -5521,23 +5521,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             if (args.requestType === 'save' && this.aggregates.map((ag) => ag.showChildSummary === true).length) {
                 this.grid.refresh();
             }
-            if (args.action === 'filter') {
-                if (!args.isCollapseMaintain && this.filterModule['currentFilterObject'] !== '' && this.enableVirtualization && !this.initialRender && !this.expandStateMapping && !(isRemoteData(this) && this.enableVirtualization)) {
-                    this.expandAll();
-                }
-            }
-            if (args.requestType === 'searching') {
-                if (!args.isCollapseMaintain && this.searchSettings.key !== '' && this.enableVirtualization && !this.initialRender && !this.expandStateMapping && !(isRemoteData(this) && this.enableVirtualization)) {
-                    this.expandAll();
-                }
-            }
-            if (args.action === 'clearFilter' && this.enableCollapseAll) {
-                this.collapseAll();
-            }
-            if (args.action === 'clearFilter' && this.enableInfiniteScrolling) {
-                this.expandAll();
-            }
-            if (args.requestType === 'sorting' && this.enableInfiniteScrolling) {
+            if ((args.action === 'clearFilter' || args.action === 'clear-filter' || args.requestType === 'sorting') && this.enableInfiniteScrolling) {
                 this.expandAll();
             }
             if (this.action === 'indenting' || this.action === 'outdenting') {
@@ -11457,11 +11441,22 @@ class ExcelExport {
             let query = new Query();
             if (!this.isLocal()) {
                 query = this.generateQuery(query);
-                query.queries = this.parent.grid.getDataModule().generateQuery().queries;
-                query = ExportHelper.getQuery(this.parent.grid, data);
-                if (isNullOrUndefined(this.parent.filterModule)) {
-                    query.queries = query.queries.slice(1, 2);
-                    query.params = query.params.slice(0, 0);
+                const hasFilter = this.parent.grid.filterSettings &&
+                    Array.isArray(this.parent.grid.filterSettings.columns) &&
+                    this.parent.grid.filterSettings.columns.length > 0;
+                const hasSearch = this.parent.grid.searchSettings &&
+                    typeof this.parent.grid.searchSettings.key === 'string' &&
+                    this.parent.grid.searchSettings.key.trim().length > 0;
+                const hasSorting = this.parent.grid.sortSettings &&
+                    Array.isArray(this.parent.grid.sortSettings.columns) &&
+                    this.parent.grid.sortSettings.columns.length > 0;
+                if (hasFilter || hasSearch || hasSorting) {
+                    query.queries = this.parent.grid.getDataModule().generateQuery().queries;
+                    query = ExportHelper.getQuery(this.parent.grid, data);
+                    if (isNullOrUndefined(this.parent.filterModule)) {
+                        query.queries = query.queries.slice(1, 2);
+                        query.params = query.params.slice(0, 0);
+                    }
                 }
                 setValue('query', query, property);
             }
@@ -11503,6 +11498,24 @@ class ExcelExport {
         if (!isNullOrUndefined(this.parent.grid.getDataModule())) {
             setValue('query', this.parent.grid.getDataModule().generateQuery(true), args);
         }
+        if (!this.isLocal() && !isNullOrUndefined(property) &&
+            !isNullOrUndefined(property.isCollapsedStatePersist) &&
+            property.isCollapsedStatePersist === false) {
+            if (args.query && args.query.queries && args.query.queries.length) {
+                args.query.queries = args.query.queries.filter((q) => {
+                    if (q.fn === 'onWhere' && q.e) {
+                        const preds = q.e;
+                        if (preds && preds.field === this.parent.parentIdMapping && (preds.value === null || preds.value === 'null')) {
+                            return false;
+                        }
+                    }
+                    return true;
+                });
+            }
+            if (args.query && args.query.params && args.query.params.length) {
+                args.query.params = args.query.params.filter((param) => param.key !== 'IdMapping');
+            }
+        }
         setValue('isExport', true, args);
         if (!isNullOrUndefined(property) && !isNullOrUndefined(property.exportType)) {
             setValue('exportType', property.exportType, args);
@@ -11609,6 +11622,7 @@ class PdfExport {
      * @param {TreeGrid} parent - Tree Grid instance
      */
     constructor(parent) {
+        this.isCollapsedStatePersist = false;
         Grid.Inject(PdfExport$1);
         this.parent = parent;
         this.dataResults = {};
@@ -11661,6 +11675,18 @@ class PdfExport {
         const prop = Object();
         const isLocal = !isRemoteData(this.parent) && isOffline(this.parent);
         setValue('cancel', false, prop);
+        if (!isNullOrUndefined(pdfExportProperties)) {
+            this.isCollapsedStatePersist = pdfExportProperties.isCollapsedStatePersist;
+        }
+        if (!isNullOrUndefined(pdfExportProperties)) {
+            if (!isLocal && !isNullOrUndefined(pdfExportProperties.dataSource) && !pdfExportProperties.dataSource['dataSource']) {
+                return this.parent.grid.pdfExportModule.Map(this.parent.grid, pdfExportProperties, isMultipleExport, pdfDoc, isBlob);
+            }
+            if (pdfExportProperties.exportType === 'CurrentPage') {
+                pdfExportProperties.dataSource = this.parent.getCurrentViewRecords();
+                return this.parent.grid.pdfExportModule.Map(this.parent.grid, pdfExportProperties, isMultipleExport, pdfDoc, isBlob);
+            }
+        }
         return new Promise((resolve) => {
             const dm = isLocal && !(dtSrc instanceof DataManager) ? new DataManager(dtSrc)
                 : this.parent.dataSource;
@@ -11702,10 +11728,27 @@ class PdfExport {
         return query;
     }
     manipulatePdfProperties(prop, dtSrc, queryResult) {
-        let args = {};
+        let args = Object();
         //count not required for this query
         const isLocal = !isRemoteData(this.parent) && isOffline(this.parent);
         setValue('query', this.parent.grid.getDataModule().generateQuery(true), args);
+        if (!isLocal && !isNullOrUndefined(prop) && !isNullOrUndefined(prop.isCollapsedStatePersist)
+            && prop.isCollapsedStatePersist === false) {
+            if (args.query && args.query.queries && args.query.queries.length) {
+                args.query.queries = args.query.queries.filter((q) => {
+                    if (q.fn === 'onWhere' && q.e) {
+                        const preds = q.e;
+                        if (preds && preds.field === this.parent.parentIdMapping && (preds.value === null || preds.value === 'null')) {
+                            return false;
+                        }
+                    }
+                    return true;
+                });
+            }
+            if (args.query && args.query.params && args.query.params.length) {
+                args.query.params = args.query.params.filter((param) => param.key !== 'IdMapping');
+            }
+        }
         setValue('isExport', true, args);
         setValue('isPdfExport', true, args);
         if (!isNullOrUndefined(prop) && !isNullOrUndefined(prop.isCollapsedStatePersist)) {
@@ -12396,6 +12439,12 @@ class Sort {
         this.iterateSort(data, srtQry);
         this.storedIndex = -1;
         sortParams.modifiedData = this.flatSortedData;
+        if (srtQry.queries.filter((q) => q.fn === 'onSortBy').length > 0) {
+            this.sortedResult = this.flatSortedData.filter((item) => !item.isSummaryRow);
+        }
+        else {
+            this.sortedResult = [];
+        }
         this.flatSortedData = [];
     }
     iterateSort(data, srtQry) {
@@ -15356,6 +15405,9 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 (this.parent.pageSettings.pageSize / 2) && (this.endIndex - nextSetResIndex) < (this.parent.pageSettings.pageSize / 2)) {
                 this.startIndex = lastIndex - (this.parent.pageSettings.pageSize / 2);
             }
+            if (this.totalRecords < this.parent.pageSettings.pageSize) {
+                this.startIndex = 0;
+            }
             if (scrollArgs.offset.top > (rowHeight * this.totalRecords)) {
                 this.translateY = this.getTranslateY(scrollArgs.offset.top, content.getBoundingClientRect().height);
             }