@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
|
@@ -6132,7 +6132,9 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
|
|
|
6132
6132
|
}
|
|
6133
6133
|
mergeColumns(storedColumn, columns) {
|
|
6134
6134
|
const persist2 = 'mergeColumns';
|
|
6135
|
+
const mergedColumns = 'mergedColumns';
|
|
6135
6136
|
this.grid[`${persist2}`].apply(this, [storedColumn, columns]);
|
|
6137
|
+
this.grid[`${mergedColumns}`] = true;
|
|
6136
6138
|
}
|
|
6137
6139
|
setFrozenCount() {
|
|
6138
6140
|
const persist3 = 'setFrozenCount';
|
|
@@ -6143,7 +6145,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
|
|
|
6143
6145
|
this.grid[`${persist4}`].apply(this.grid, [columns]);
|
|
6144
6146
|
}
|
|
6145
6147
|
isFrozenGrid() {
|
|
6146
|
-
return this.grid.isFrozenGrid();
|
|
6148
|
+
return this.grid.isFrozenGrid.apply(this);
|
|
6147
6149
|
}
|
|
6148
6150
|
updateTreeGridModel() {
|
|
6149
6151
|
this.setProperties({ filterSettings: getObject('properties', this.grid.filterSettings) }, true);
|
|
@@ -9010,7 +9012,7 @@ class RowDD {
|
|
|
9010
9012
|
const regex = /index(\d+)|level(\d+)/g;
|
|
9011
9013
|
const parentIndexLevel = e === null || e === undefined ? undefined : e.cells[`${treeColIndex}`].className.match(regex);
|
|
9012
9014
|
const dropIndexLevel = targetRow[0].cells[`${treeColIndex}`].className.match(regex);
|
|
9013
|
-
if (isNullOrUndefined(dropIndexLevel) || isNullOrUndefined(dropIndexLevel)) {
|
|
9015
|
+
if (isNullOrUndefined(dropIndexLevel) || isNullOrUndefined(dropIndexLevel) || isNullOrUndefined(parentIndexLevel)) {
|
|
9014
9016
|
return true;
|
|
9015
9017
|
}
|
|
9016
9018
|
const parentLevel = +parentIndexLevel[1].match(/\d+/)[0];
|
|
@@ -9286,6 +9288,9 @@ class RowDD {
|
|
|
9286
9288
|
removetopOrBottomBorder() {
|
|
9287
9289
|
let border = [];
|
|
9288
9290
|
border = [].slice.call(this.parent.element.querySelectorAll('.e-dropbottom, .e-droptop'));
|
|
9291
|
+
if (this.parent.rowDropSettings.targetID) {
|
|
9292
|
+
border = [].slice.call(document.querySelectorAll('.e-dropbottom, .e-droptop'));
|
|
9293
|
+
}
|
|
9289
9294
|
if (border.length) {
|
|
9290
9295
|
this.addRemoveClasses(border, false, 'e-dropbottom');
|
|
9291
9296
|
this.addRemoveClasses(border, false, 'e-droptop');
|
|
@@ -9375,6 +9380,7 @@ class RowDD {
|
|
|
9375
9380
|
if (dropElement && dropElement.id === this.parent.rowDropSettings.targetID) {
|
|
9376
9381
|
const srcControl = dropElement.ej2_instances[0];
|
|
9377
9382
|
srcControl.rowDragAndDropModule.updateIcon(args.rows, rowIdx, args);
|
|
9383
|
+
this.dropPosition = srcControl.rowDragAndDropModule.dropPosition;
|
|
9378
9384
|
}
|
|
9379
9385
|
}
|
|
9380
9386
|
if (args.target && closest(args.target, '#' + tObj.rowDropSettings.targetID)) {
|