@syncfusion/ej2-treegrid 19.3.46 → 19.3.55

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

@@ -2165,7 +2165,9 @@ class DataManipulation {
             const query = getObject('query', args);
             const srtQry = new Query();
             for (let srt = this.parent.grid.sortSettings.columns.length - 1; srt >= 0; srt--) {
-                const col = this.parent.grid.getColumnByField(this.parent.grid.sortSettings.columns[srt].field);
+                const getColumnByField = 'getColumnByField';
+                const col = this.parent.grid.renderModule.data[getColumnByField](this.parent.grid.
+                    sortSettings.columns[srt].field);
                 const compFun = col.sortComparer && isOffline(this.parent) ?
                     col.sortComparer.bind(col) :
                     this.parent.grid.sortSettings.columns[srt].direction;
@@ -3569,6 +3571,15 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             this.trigger(rowSelecting, args);
         };
         this.grid.rowSelected = (args) => {
+            if (this.enableVirtualization && args.isHeaderCheckboxClicked &&
+                this.grid.currentViewData.length !== this.grid.selectionModule.selectedRowIndexes.length) {
+                const updateRowSelection = 'updateRowSelection';
+                for (let i = 0; i < this.getRows().length; i++) {
+                    if (this.getRows()[i].getElementsByClassName("e-frame e-icons e-uncheck").length) {
+                        this.grid.selectionModule[updateRowSelection](this.getRows()[i], this.getCurrentViewRecords()[i].index);
+                    }
+                }
+            }
             this.selectedRowIndex = this.grid.selectedRowIndex;
             this.notify(rowSelected, args);
             this.trigger(rowSelected, args);
@@ -3871,6 +3882,10 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 && (this.grid.filterSettings.columns.length === 0 || this.grid.searchSettings.key.length === 0)) {
                 this.notify('clearFilters', { flatData: this.grid.dataSource });
                 this.grid.setProperties({ dataSource: this.dataResults.result }, true);
+                if (isNullOrUndefined(this.grid['changedProperties'].dataSource)) {
+                    this.grid.renderModule.data.dataManager = this.grid.dataSource instanceof DataManager ? this.grid.dataSource :
+                        (isNullOrUndefined(this.grid.dataSource) ? new DataManager() : new DataManager(this.grid.dataSource));
+                }
             }
             const callBackPromise = new Deferred();
             this.trigger(actionBegin, args, (actionArgs) => {
@@ -4412,6 +4427,11 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         if (isNullOrUndefined(this.grid)) {
             return;
         }
+        if (!isNullOrUndefined(this.rowDropSettings.targetID) &&
+            isNullOrUndefined(document.getElementById(this.grid.rowDropSettings.targetID))) {
+            document.getElementById(this.rowDropSettings.targetID).id = this.grid.rowDropSettings.targetID;
+            this.rowDropSettings.targetID = this.grid.rowDropSettings.targetID;
+        }
         super.dataBind();
         this.grid.dataBind();
     }
@@ -4423,7 +4443,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
      */
     getPersistData() {
         const keyEntity = ['pageSettings', 'sortSettings',
-            'filterSettings', 'columns', 'searchSettings', 'selectedRowIndex'];
+            'filterSettings', 'columns', 'searchSettings', 'selectedRowIndex', 'treeColumnIndex'];
         const ignoreOnPersist = {
             pageSettings: ['template', 'pageSizes', 'pageSizeMode', 'enableQueryString', 'totalRecordsCount', 'pageCount'],
             filterSettings: ['type', 'mode', 'showFilterBarStatus', 'immediateModeDelay', 'ignoreAccent', 'hierarchyMode'],
@@ -4434,8 +4454,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             'commandTemplate', 'commands', 'dataSource'];
         for (let i = 0; i < keyEntity.length; i++) {
             const currentObject = this[keyEntity[i]];
-            for (const val of ignoreOnPersist[keyEntity[i]]) {
-                delete currentObject[val];
+            for (let k = 0, val = ignoreOnPersist[keyEntity[i]]; (!isNullOrUndefined(val) && k < val.length); k++) {
+                let objVal = val[k];
+                delete currentObject[objVal];
             }
         }
         this.ignoreInArrays(ignoreOnColumn, this.columns);
@@ -7112,7 +7133,7 @@ class RowDD$1 {
         }
         else {
             if (args.target && closest(args.target, '#' + tObj.rowDropSettings.targetID) || parentsUntil(args.target, 'e-treegrid') &&
-                parentsUntil(args.target, 'e-treegrid').id === tObj.rowDropSettings.targetID) {
+                parentsUntil(args.target, 'e-treegrid').id === tObj.rowDropSettings.targetID || args.target && document.getElementById(tObj.rowDropSettings.targetID)) {
                 setValue('dropPosition', this.dropPosition, args);
                 tObj.trigger(rowDrop, args);
                 if (!args.cancel && tObj.rowDropSettings.targetID) {
@@ -9441,7 +9462,7 @@ class BatchEdit {
             focusModule.getContent().matrix.current = [actualIndex, focusModule.getContent().matrix.current[1]];
         }
     }
-    beforeBatchDelete() {
+    beforeBatchDelete(args) {
         if (!this.batchRecords.length) {
             this.batchRecords = extendArray(this.parent.grid.getCurrentViewRecords());
             this.currentViewRecords = extendArray(this.parent.grid.getCurrentViewRecords());
@@ -9451,9 +9472,19 @@ class BatchEdit {
         const row = [];
         let records = [];
         const primarykey = this.parent.grid.getPrimaryKeyFieldNames()[0];
-        const data = this.parent.grid.getSelectedRecords()[this.parent.grid.getSelectedRecords().length - 1];
-        const childs = findChildrenRecords(data);
-        const uid = this.parent.getSelectedRows()[0].getAttribute('data-uid');
+        let data;
+        let childs;
+        let uid;
+        if (!isNullOrUndefined(args.row) && this.parent.getSelectedRows().indexOf(args.row) === -1) {
+            data = args.rowData;
+            childs = findChildrenRecords(data);
+            uid = args.row.getAttribute('data-uid');
+        }
+        else {
+            data = this.parent.grid.getSelectedRecords()[this.parent.grid.getSelectedRecords().length - 1];
+            childs = findChildrenRecords(data);
+            uid = this.parent.getSelectedRows()[0].getAttribute('data-uid');
+        }
         const parentRowIndex = parseInt(this.parent.grid.getRowElementByUID(uid).getAttribute('aria-rowindex'), 10);
         if (childs.length) {
             const totalCount = parentRowIndex + childs.length;
@@ -10507,6 +10538,7 @@ class Edit$1 {
         }
         if (this.isAddedRowByMethod && args.index !== 0) {
             this.addRowRecord = this.parent.flatData[args.index];
+            this.addRowIndex = args.index;
         }
         if (this.parent.editSettings.newRowPosition === 'Child' && isNullOrUndefined(this.addRowRecord)
             && !isNullOrUndefined(this.parent.getSelectedRecords()[0])) {
@@ -10535,6 +10567,11 @@ class Edit$1 {
             let position = null;
             value.taskData = isNullOrUndefined(value.taskData) ? extend({}, args.data) : value.taskData;
             const currentData = this.parent.grid.getCurrentViewRecords();
+            if (this.parent.enableVirtualization && args.index !== 0) {
+                this.addRowIndex = this.parent.grid.getCurrentViewRecords().indexOf(this.addRowRecord);
+                this.selectedIndex = parseInt(this.parent.getRows()[this.addRowIndex].getAttribute('aria-rowindex'));
+                
+            }
             let index = this.addRowIndex;
             value.uniqueID = getUid(this.parent.element.id + '_data_');
             setValue('uniqueIDCollection.' + value.uniqueID, value, this.parent);
@@ -11037,7 +11074,9 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
         if (isNullOrUndefined(this.observer[containerRect])) {
             this.observer[containerRect] = this.observers[containerRect];
         }
-        super[selectVirtualRow](args);
+        if (args.selectedIndex !== 0 || isNullOrUndefined(this.parent['clipboardModule'].treeGridParent.editModule['addRowIndex'])) {
+            super[selectVirtualRow](args);
+        }
     }
     refreshCell(rowObj) {
         rowObj.cells = this.generateCells();
@@ -11503,11 +11542,16 @@ class VirtualScroll$1 {
             }
             //if ((this.prevendIndex !== -1 && this.prevstartIndex !== -1) &&
             //this.prevendIndex === endIndex && this.prevstartIndex === startIndex) {
+            if (!isNullOrUndefined(this.expandCollapseRec) && (pageingDetails.actionArgs.requestType === 'virtualscroll' ||
+                (pageingDetails.actionArgs.requestType === 'refresh' && startIndex !== this.prevstartIndex)) &&
+                (startIndex < this.parent.getRows().length && endIndex <= startIndex + this.parent.getRows().length)) {
+                startIndex = 0;
+            }
             if (!isNullOrUndefined(this.expandCollapseRec)) {
                 const resourceCount = this.parent.getRows();
                 let sIndex = visualData.indexOf(this.expandCollapseRec);
                 const tempdata = visualData.slice(sIndex, sIndex + resourceCount.length);
-                if (tempdata.length < resourceCount.length && sIndex >= 0) {
+                if (tempdata.length < resourceCount.length && sIndex >= 0 && startIndex !== 0) {
                     sIndex = visualData.length - resourceCount.length;
                     sIndex = sIndex > 0 ? sIndex : 0;
                     startIndex = sIndex;