@syncfusion/ej2-treegrid 20.4.42 → 20.4.48

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

@@ -1853,7 +1853,7 @@ var Render = /** @__PURE__ @class */ (function () {
                 var portals = 'portals';
                 var renderReactTemplates = 'renderReactTemplates';
                 if (this.parent.isReact && typeof (args.column.template) !== 'string') {
-                    args.column["" + templateFn](args.data, this.parent, 'template', tempID, null, null, cellElement);
+                    args.column["" + templateFn](args.data, this.parent, 'columnTemplate', tempID, null, null, cellElement);
                     if (isNullOrUndefined(this.parent.grid["" + portals])) {
                         this.parent.grid["" + portals] = this.parent["" + portals];
                     }
@@ -2196,7 +2196,7 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
             && this.parent.grid.aggregates.length && this.parent.grid.sortSettings.columns.length === 0
             && this.parent.grid.filterSettings.columns.length === 0 && !this.parent.grid.searchSettings.key.length) {
             var query = 'query';
-            var summaryQuery = args["" + query].queries.filter(function (q) { q.fn === 'onAggregates'; });
+            var summaryQuery = args["" + query].queries.filter(function (q) { return q.fn === 'onAggregates'; });
             args.result = this.parent.summaryModule.calculateSummaryValue(summaryQuery, this.parent.flatData, true);
         }
         this.parent.notify('updateResults', args);
@@ -2263,9 +2263,9 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
         qry.isCountRequired = true;
         if (this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
             qry.take(this.parent.pageSettings.pageSize);
-            var expandDetail_1 = [];
-            expandDetail_1.push('ExpandingAction', rowDetails.record[this.parent.idMapping]);
-            qry.expand(expandDetail_1);
+            var expandDetail = [];
+            expandDetail.push('ExpandingAction', rowDetails.record[this.parent.idMapping]);
+            qry.expand(expandDetail);
         }
         else if (this.parent.enableVirtualization && rowDetails.action === 'collapse') {
             qry.take(this.parent.grid.pageSettings.pageSize);
@@ -4918,7 +4918,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         }
         var treeGridColumn;
         var gridColumn;
-        if (this.columnModel.length == 0) {
+        if (this.columnModel.length === 0) {
             index = index === 0 ? -1 : index;
         }
         var gridColumnCollection = [];
@@ -6420,6 +6420,14 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 if ((!isCountRequired(this) || childRecords.length) || action === 'collapse') {
                     this.localExpand(action, row, record);
                 }
+                var lastrowIdx = this.getVisibleRecords()[this.getVisibleRecords().length - 1]['index'];
+                var lastRow = this.getRowByIndex(lastrowIdx);
+                if (this.grid.getContentTable().clientHeight <= this.grid.getContent().clientHeight && !isNullOrUndefined(lastRow) && !lastRow.cells[0].classList.contains('e-lastrowcell')) {
+                    this.lastRowBorder(lastRow, true);
+                }
+            }
+            if (isCountRequired(this) && action === 'expand') {
+                this.dataResults.result = this.getCurrentViewRecords();
             }
             if (!isNullOrUndefined(targetEle) && targetEle.closest('.e-treerowcell').classList.contains('e-cellselectionbackground')) {
                 targetEle.closest('.e-treerowcell').classList.remove('e-cellselectionbackground');
@@ -6612,8 +6620,9 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             return e.uniqueID === record.uniqueID;
         });
         var currentIndex = currentViewData.indexOf(currentRecord[0]);
-        if (!isNullOrUndefined(gridRowsObject[currentIndex].visible) && gridRowsObject[currentIndex].visible !== false) {
-            gridRowsObject[currentIndex].visible = true;
+        if (!isNullOrUndefined(gridRowsObject[parseInt(currentIndex.toString(), 10)].visible) &&
+            gridRowsObject[parseInt(currentIndex.toString(), 10)].visible !== false) {
+            gridRowsObject[parseInt(currentIndex.toString(), 10)].visible = true;
         }
         var detailrows = gridRows.filter(function (r) {
             return r.classList.contains('e-griddetailrowindex' + record.index + 'level' + (record.level + 1));
@@ -6622,13 +6631,14 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             if (!isNullOrUndefined(rows[parseInt(i.toString(), 10)])) {
                 rows[parseInt(i.toString(), 10)].style.display = displayAction;
             }
-            if (!isNullOrUndefined(rows[parseInt(i.toString(), 10)]) && !this.allowPaging && !(this.enableVirtualization || this.enableInfiniteScrolling || isRemoteData(this) || isCountRequired(this))) {
-                gridRowsObject[rows[parseInt(i.toString(), 10)].rowIndex].visible = displayAction != 'none' ? true : false;
+            if (!isNullOrUndefined(rows[parseInt(i.toString(), 10)]) && !this.allowPaging && !(this.enableVirtualization
+                || this.enableInfiniteScrolling || isRemoteData(this) || isCountRequired(this))) {
+                gridRowsObject[rows[parseInt(i.toString(), 10)].rowIndex].visible = displayAction !== 'none' ? true : false;
                 var parentRecord = currentViewData.filter(function (e) {
                     return e.uniqueID === currentRecord[0].parentUniqueID;
                 });
                 if (!isNullOrUndefined(parentRecord[0]) && gridRows[currentViewData.indexOf(parentRecord[0])].getElementsByClassName('e-treegridcollapse').length) {
-                    gridRowsObject[currentIndex].visible = false;
+                    gridRowsObject[parseInt(currentIndex.toString(), 10)].visible = false;
                 }
             }
             if (!isNullOrUndefined(movableRows)) {
@@ -6647,12 +6657,14 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             }
         }
         for (var i = 0; i < detailrows.length; i++) {
-            if (!isNullOrUndefined(detailrows[parseInt(i.toString(), 10)]) && !this.allowPaging && !(this.enableVirtualization || this.enableInfiniteScrolling || isRemoteData(this) || isCountRequired(this))) {
-                gridRowsObject[detailrows[parseInt(i.toString(), 10)].rowIndex].visible = displayAction != 'none' ? true : false;
+            if (!isNullOrUndefined(detailrows[parseInt(i.toString(), 10)]) && !this.allowPaging && !(this.enableVirtualization
+                || this.enableInfiniteScrolling || isRemoteData(this) || isCountRequired(this))) {
+                gridRowsObject[detailrows[parseInt(i.toString(), 10)].rowIndex].visible = displayAction !== 'none' ? true : false;
                 detailrows[parseInt(i.toString(), 10)].style.display = displayAction;
             }
         }
-        if (!this.allowPaging && !(this.enableVirtualization || this.enableInfiniteScrolling || isRemoteData(this) || isCountRequired(this))) {
+        if (!this.allowPaging && !(this.enableVirtualization || this.enableInfiniteScrolling || isRemoteData(this)
+            || isCountRequired(this))) {
             this.grid.notify('refresh-Expand-and-Collapse', { rows: this.grid.getRowsObject() });
         }
     };