@syncfusion/ej2-treegrid 26.1.41 → 26.1.42

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

@@ -1888,6 +1888,7 @@ class DataManipulation {
         this.hierarchyData = [];
         this.storedIndex = -1;
         this.sortedData = [];
+        this.preCurrentPage = -1;
         this.isSortAction = false;
         this.addEventListener();
         this.dataResults = {};
@@ -2211,7 +2212,7 @@ class DataManipulation {
             idMappingValue = rowDetails.record[this.parent.idMapping].toString();
         }
         if (this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
-            qry.take(this.parent.pageSettings.pageSize);
+            qry.take(this.parent.grid.pageSettings.pageSize);
             const expandDetail = [];
             expandDetail.push('ExpandingAction', idMappingValue.toString());
             qry.expand(expandDetail);
@@ -2399,6 +2400,17 @@ class DataManipulation {
                 }
                 datas.splice(inx + r + 1, 0, result[parseInt(r.toString(), 10)]);
             }
+            if (datas.length > result.length &&
+                datas.length !== this.parent.grid.pageSettings.pageSize + (this.parent.grid.contentModule).getBlockSize() &&
+                this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
+                if ((this.preCurrentPage > 1 || this.parent.grid.pageSettings.currentPage > 1)) {
+                    datas = datas.slice(0, this.parent.grid.pageSettings.pageSize + (this.parent.grid.contentModule).getBlockSize());
+                }
+                else {
+                    datas = datas.slice(0, this.parent.grid.pageSettings.pageSize);
+                }
+                this.preCurrentPage = this.parent.grid.pageSettings.currentPage;
+            }
             setValue('result', datas, e);
             setValue('action', 'beforecontentrender', e);
             this.parent.trigger(actionComplete, e);
@@ -4234,7 +4246,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             || (/[0-9]$/.test(this.height.toString()) && /[px]$/.test(this.height.toString()))) {
             failureCases.push('column width and height should be in pixels');
         }
-        if (!isNullOrUndefined(this.childMapping) && !isNullOrUndefined(this.idMapping)) {
+        if ((this.childMapping !== 'Children') && !isNullOrUndefined(this.idMapping)) {
             failureCases.push('Both IdMapping and ChildMapping should not be used together for tree grid rendering.');
         }
         if ((!isNullOrUndefined(this.idMapping) && (isNullOrUndefined(this.parentIdMapping))) ||
@@ -9536,7 +9548,13 @@ class TreeVirtualRowModelGenerator extends VirtualRowModelGenerator {
             else if (action === 'virtualscroll' && this.cache[parseInt(currentPage.toString(), 10)] &&
                 this.cache[parseInt(currentPage.toString(), 10)].length >
                     (this.parent.contentModule).getBlockSize()) {
-                delete this.cache[parseInt(currentPage.toString(), 10)];
+                if (this.cache[parseInt(currentPage.toString(), 10)].length > (this.parent.contentModule).getBlockSize()) {
+                    this.cache[parseInt(currentPage.toString(), 10)] =
+                        this.cache[parseInt(currentPage.toString(), 10)].slice(0, (this.parent.contentModule).getBlockSize());
+                }
+                else {
+                    delete this.cache[parseInt(currentPage.toString(), 10)];
+                }
             }
         }
         else {