@syncfusion/ej2-treegrid 32.2.4 → 32.2.9

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

@@ -5851,23 +5851,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             if (args.requestType === 'save' && _this.aggregates.map(function (ag) { return 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') {
@@ -11878,11 +11862,22 @@ var ExcelExport = /** @__PURE__ @class */ (function () {
             var 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);
+                var hasFilter = _this.parent.grid.filterSettings &&
+                    Array.isArray(_this.parent.grid.filterSettings.columns) &&
+                    _this.parent.grid.filterSettings.columns.length > 0;
+                var hasSearch = _this.parent.grid.searchSettings &&
+                    typeof _this.parent.grid.searchSettings.key === 'string' &&
+                    _this.parent.grid.searchSettings.key.trim().length > 0;
+                var 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);
             }
@@ -11919,11 +11914,30 @@ var ExcelExport = /** @__PURE__ @class */ (function () {
         return query;
     };
     ExcelExport.prototype.manipulateExportProperties = function (property, dtSrc, queryResult) {
+        var _this = this;
         //count not required for this query
         var args = Object();
         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(function (q) {
+                    if (q.fn === 'onWhere' && q.e) {
+                        var 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(function (param) { return param.key !== 'IdMapping'; });
+            }
+        }
         setValue('isExport', true, args);
         if (!isNullOrUndefined(property) && !isNullOrUndefined(property.exportType)) {
             setValue('exportType', property.exportType, args);
@@ -12031,6 +12045,7 @@ var PdfExport = /** @__PURE__ @class */ (function () {
      * @param {TreeGrid} parent - Tree Grid instance
      */
     function PdfExport(parent) {
+        this.isCollapsedStatePersist = false;
         Grid.Inject(PdfExport$1);
         this.parent = parent;
         this.dataResults = {};
@@ -12084,6 +12099,18 @@ var PdfExport = /** @__PURE__ @class */ (function () {
         var prop = Object();
         var 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(function (resolve) {
             var dm = isLocal && !(dtSrc instanceof DataManager) ? new DataManager(dtSrc)
                 : _this.parent.dataSource;
@@ -12125,10 +12152,28 @@ var PdfExport = /** @__PURE__ @class */ (function () {
         return query;
     };
     PdfExport.prototype.manipulatePdfProperties = function (prop, dtSrc, queryResult) {
-        var args = {};
+        var _this = this;
+        var args = Object();
         //count not required for this query
         var 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(function (q) {
+                    if (q.fn === 'onWhere' && q.e) {
+                        var 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(function (param) { return param.key !== 'IdMapping'; });
+            }
+        }
         setValue('isExport', true, args);
         setValue('isPdfExport', true, args);
         if (!isNullOrUndefined(prop) && !isNullOrUndefined(prop.isCollapsedStatePersist)) {
@@ -12833,6 +12878,12 @@ var Sort = /** @__PURE__ @class */ (function () {
         this.iterateSort(data, srtQry);
         this.storedIndex = -1;
         sortParams.modifiedData = this.flatSortedData;
+        if (srtQry.queries.filter(function (q) { return q.fn === 'onSortBy'; }).length > 0) {
+            this.sortedResult = this.flatSortedData.filter(function (item) { return !item.isSummaryRow; });
+        }
+        else {
+            this.sortedResult = [];
+        }
         this.flatSortedData = [];
     };
     Sort.prototype.iterateSort = function (data, srtQry) {
@@ -15847,6 +15898,9 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
                 (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);
             }