@syncfusion/ej2-treegrid 29.1.33 → 29.1.37
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ej2-treegrid.min.js +2 -2
- package/dist/ej2-treegrid.umd.min.js +2 -2
- package/dist/ej2-treegrid.umd.min.js.map +1 -1
- package/dist/es6/ej2-treegrid.es2015.js +8 -2
- package/dist/es6/ej2-treegrid.es2015.js.map +1 -1
- package/dist/es6/ej2-treegrid.es5.js +8 -2
- package/dist/es6/ej2-treegrid.es5.js.map +1 -1
- package/dist/global/ej2-treegrid.min.js +2 -2
- package/dist/global/ej2-treegrid.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/package.json +8 -8
- package/src/treegrid/actions/rowdragdrop.js +5 -1
- package/src/treegrid/base/treegrid.js +3 -1
|
@@ -6442,7 +6442,9 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
|
|
|
6442
6442
|
};
|
|
6443
6443
|
TreeGrid.prototype.mergeColumns = function (storedColumn, columns) {
|
|
6444
6444
|
var persist2 = 'mergeColumns';
|
|
6445
|
+
var mergedColumns = 'mergedColumns';
|
|
6445
6446
|
this.grid["" + persist2].apply(this, [storedColumn, columns]);
|
|
6447
|
+
this.grid["" + mergedColumns] = true;
|
|
6446
6448
|
};
|
|
6447
6449
|
TreeGrid.prototype.setFrozenCount = function () {
|
|
6448
6450
|
var persist3 = 'setFrozenCount';
|
|
@@ -6453,7 +6455,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
|
|
|
6453
6455
|
this.grid["" + persist4].apply(this.grid, [columns]);
|
|
6454
6456
|
};
|
|
6455
6457
|
TreeGrid.prototype.isFrozenGrid = function () {
|
|
6456
|
-
return this.grid.isFrozenGrid();
|
|
6458
|
+
return this.grid.isFrozenGrid.apply(this);
|
|
6457
6459
|
};
|
|
6458
6460
|
TreeGrid.prototype.updateTreeGridModel = function () {
|
|
6459
6461
|
this.setProperties({ filterSettings: getObject('properties', this.grid.filterSettings) }, true);
|
|
@@ -9353,7 +9355,7 @@ var RowDD = /** @__PURE__ @class */ (function () {
|
|
|
9353
9355
|
var regex = /index(\d+)|level(\d+)/g;
|
|
9354
9356
|
var parentIndexLevel = e === null || e === undefined ? undefined : e.cells["" + treeColIndex].className.match(regex);
|
|
9355
9357
|
var dropIndexLevel = targetRow[0].cells["" + treeColIndex].className.match(regex);
|
|
9356
|
-
if (isNullOrUndefined(dropIndexLevel) || isNullOrUndefined(dropIndexLevel)) {
|
|
9358
|
+
if (isNullOrUndefined(dropIndexLevel) || isNullOrUndefined(dropIndexLevel) || isNullOrUndefined(parentIndexLevel)) {
|
|
9357
9359
|
return true;
|
|
9358
9360
|
}
|
|
9359
9361
|
var parentLevel = +parentIndexLevel[1].match(/\d+/)[0];
|
|
@@ -9630,6 +9632,9 @@ var RowDD = /** @__PURE__ @class */ (function () {
|
|
|
9630
9632
|
RowDD.prototype.removetopOrBottomBorder = function () {
|
|
9631
9633
|
var border = [];
|
|
9632
9634
|
border = [].slice.call(this.parent.element.querySelectorAll('.e-dropbottom, .e-droptop'));
|
|
9635
|
+
if (this.parent.rowDropSettings.targetID) {
|
|
9636
|
+
border = [].slice.call(document.querySelectorAll('.e-dropbottom, .e-droptop'));
|
|
9637
|
+
}
|
|
9633
9638
|
if (border.length) {
|
|
9634
9639
|
this.addRemoveClasses(border, false, 'e-dropbottom');
|
|
9635
9640
|
this.addRemoveClasses(border, false, 'e-droptop');
|
|
@@ -9719,6 +9724,7 @@ var RowDD = /** @__PURE__ @class */ (function () {
|
|
|
9719
9724
|
if (dropElement && dropElement.id === this.parent.rowDropSettings.targetID) {
|
|
9720
9725
|
var srcControl = dropElement.ej2_instances[0];
|
|
9721
9726
|
srcControl.rowDragAndDropModule.updateIcon(args.rows, rowIdx, args);
|
|
9727
|
+
this.dropPosition = srcControl.rowDragAndDropModule.dropPosition;
|
|
9722
9728
|
}
|
|
9723
9729
|
}
|
|
9724
9730
|
if (args.target && closest(args.target, '#' + tObj.rowDropSettings.targetID)) {
|