@syncfusion/ej2-treegrid 31.2.12 → 31.2.15

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

@@ -3329,6 +3329,7 @@ function editAction(details, control, isSelfReference, addRowIndex, selectedInde
     var key = control.grid.getPrimaryKeyFieldNames()[0];
     var treeData = control.dataSource instanceof DataManager ?
         control.dataSource.dataSource.json : control.dataSource;
+    var gridData = control.grid.dataSource;
     var modifiedData = [];
     var originalData = value;
     var isSkip = false;
@@ -3356,9 +3357,9 @@ function editAction(details, control, isSelfReference, addRowIndex, selectedInde
             var keys = modifiedData[parseInt(k.toString(), 10)].taskData ?
                 Object.keys(modifiedData[parseInt(k.toString(), 10)].taskData) :
                 Object.keys(modifiedData[parseInt(k.toString(), 10)]);
-            i = treeData.length;
+            i = treeData.length === 0 && gridData.length === 1 ? gridData.length : treeData.length;
             var _loop_1 = function () {
-                if (treeData[parseInt(i.toString(), 10)]["" + key] === modifiedData[parseInt(k.toString(), 10)]["" + key]) {
+                if ((treeData.length === 0 && gridData.length === 1 && gridData[parseInt(i.toString(), 10)]["" + key] === modifiedData[parseInt(k.toString(), 10)]["" + key]) || treeData[parseInt(i.toString(), 10)]["" + key] === modifiedData[parseInt(k.toString(), 10)]["" + key]) {
                     if (action === 'delete') {
                         var currentData_1 = treeData[parseInt(i.toString(), 10)];
                         treeData.splice(i, 1);
@@ -3404,7 +3405,10 @@ function editAction(details, control, isSelfReference, addRowIndex, selectedInde
                         else if (action === 'add' || action === 'batchsave') {
                             var index = void 0;
                             if (control.editSettings.newRowPosition === 'Child') {
-                                if (isSelfReference) {
+                                if (treeData.length === 0 && gridData.length === 1) {
+                                    treeData.push(originalData.taskData);
+                                }
+                                else if (isSelfReference) {
                                     originalData.taskData["" + control.parentIdMapping] = treeData[parseInt(i.toString(), 10)]["" + control.idMapping];
                                     treeData.splice(i + 1, 0, originalData.taskData);
                                 }
@@ -3484,6 +3488,9 @@ function addAction(details, treeData, control, isSelfReference, addRowIndex, sel
                 value = extend$1({}, addRowRecord);
                 value = getPlainData(value);
             }
+            else if (currentViewRecords.length === 0) {
+                value = getPlainData(value);
+            }
             else {
                 value = extend$1({}, currentViewRecords[addRowIndex + 1]);
                 value = getPlainData(value);
@@ -3497,8 +3504,8 @@ function addAction(details, treeData, control, isSelfReference, addRowIndex, sel
             }
             else {
                 var primaryKeys = control.grid.getPrimaryKeyFieldNames()[0];
-                var currentdata = currentViewRecords[parseInt(addRowIndex.toString(), 10)];
-                if (!isNullOrUndefined(currentdata) && currentdata["" + primaryKeys] === details.value["" + primaryKeys] || selectedIndex !== -1) {
+                var currentdata = currentViewRecords.length > 0 ? currentViewRecords[parseInt(addRowIndex.toString(), 10)] : [];
+                if (!isNullOrUndefined(currentdata) && currentdata["" + primaryKeys] === details.value["" + primaryKeys] || selectedIndex !== -1 && treeData.length !== 0) {
                     value = extend$1({}, currentdata);
                 }
                 else {
@@ -4610,6 +4617,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         if (this.isIndentEnabled) {
             this.refreshToolbarItems();
         }
+        this.updateColumnModel();
         this.wireEvents();
         this.renderComplete();
         var destroyTemplate = 'destroyTemplate';
@@ -12926,7 +12934,7 @@ var BatchEdit = /** @__PURE__ @class */ (function () {
                 }
                 else {
                     var totalRecords = extendArray(data);
-                    if (totalRecords.length) {
+                    if (totalRecords.length && currentViewRecords.length !== 0) {
                         var startIndex = totalRecords.map(function (e) { return e["" + primarykey_1]; })
                             .indexOf(currentViewRecords[0]["" + primarykey_1]);
                         var endIndex = startIndex + this.parent.grid.pageSettings.pageSize;
@@ -13803,6 +13811,9 @@ var Edit = /** @__PURE__ @class */ (function () {
     //   }
     // }
     Edit.prototype.beginEdit = function (args) {
+        if (this.parent.flatData.length === 0 && !isNullOrUndefined(this.addRowRecord)) {
+            this.addRowRecord = undefined;
+        }
         if (args.requestType === 'refresh' && this.isOnBatch) {
             args.cancel = true;
             return;