@syncfusion/ej2-treegrid 20.4.42 → 20.4.48

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

@@ -1719,7 +1719,7 @@ class Render {
                 const portals = 'portals';
                 const 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}`];
                     }
@@ -2004,7 +2004,7 @@ class DataManipulation {
                     if (isRemoteData(this.parent) && this.parent.enableVirtualization) {
                         const childRecords = [];
                         const parent = this.parent;
-                        records.filter(function (e) {
+                        records.filter((e) => {
                             if (e[`${parent.parentIdMapping}`] === records[parseInt(rec.toString(), 10)][`${parent.idMapping}`]) {
                                 childRecords.push(e);
                             }
@@ -2055,7 +2055,7 @@ class DataManipulation {
             && 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) {
             const query = 'query';
-            const summaryQuery = args[`${query}`].queries.filter((q) => { q.fn === 'onAggregates'; });
+            const summaryQuery = args[`${query}`].queries.filter((q) => q.fn === 'onAggregates');
             args.result = this.parent.summaryModule.calculateSummaryValue(summaryQuery, this.parent.flatData, true);
         }
         this.parent.notify('updateResults', args);
@@ -2119,13 +2119,13 @@ class DataManipulation {
         qry.isCountRequired = true;
         if (this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
             qry.take(this.parent.pageSettings.pageSize);
-            let expandDetail = [];
+            const 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);
-            var expandDetail = [];
+            const expandDetail = [];
             expandDetail.push('CollapsingAction', rowDetails.record[this.parent.idMapping]);
             qry.expand(expandDetail);
         }
@@ -4640,7 +4640,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         }
         let treeGridColumn;
         let gridColumn;
-        if (this.columnModel.length == 0) {
+        if (this.columnModel.length === 0) {
             index = index === 0 ? -1 : index;
         }
         const gridColumnCollection = [];
@@ -6128,6 +6128,14 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 if ((!isCountRequired(this) || childRecords.length) || action === 'collapse') {
                     this.localExpand(action, row, record);
                 }
+                const lastrowIdx = this.getVisibleRecords()[this.getVisibleRecords().length - 1]['index'];
+                const 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');
@@ -6305,27 +6313,29 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         if (freeze) {
             freezeRightRows = this.getFrozenRightRows().filter((r) => r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1)));
         }
-        let gridRowsObject = this.grid.getRowsObject();
+        const gridRowsObject = this.grid.getRowsObject();
         const currentViewData = this.getCurrentViewRecords();
         const currentRecord = currentViewData.filter((e) => {
             return e.uniqueID === record.uniqueID;
         });
         const 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;
         }
         const detailrows = gridRows.filter((r) => r.classList.contains('e-griddetailrowindex' + record.index + 'level' + (record.level + 1)));
         for (let i = 0; i < rows.length; i++) {
             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;
                 const parentRecord = currentViewData.filter((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)) {
@@ -6344,12 +6354,14 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             }
         }
         for (let 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() });
         }
     }