@datorama/core 22.8.2-rc.2 → 22.9.1-rc.1
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/bundles/datorama-core.umd.js +14 -20
- package/bundles/datorama-core.umd.js.map +1 -1
- package/bundles/datorama-core.umd.min.js +2 -2
- package/bundles/datorama-core.umd.min.js.map +1 -1
- package/esm2015/lib/grid-v2/grid-store/grid.service.js +14 -20
- package/esm2015/lib/version.js +2 -2
- package/esm5/lib/grid-v2/grid-store/grid.service.js +14 -20
- package/esm5/lib/version.js +2 -2
- package/fesm2015/datorama-core.js +14 -20
- package/fesm2015/datorama-core.js.map +1 -1
- package/fesm5/datorama-core.js +14 -20
- package/fesm5/datorama-core.js.map +1 -1
- package/package.json +1 -1
|
@@ -14474,35 +14474,29 @@
|
|
|
14474
14474
|
GridService.prototype.setGridSort = function (gridSort) {
|
|
14475
14475
|
if (gridSort && this.api && this.api.grid.getDisplayedRowCount() > 0) {
|
|
14476
14476
|
var colId_1 = gridSort.colId, sort = gridSort.sort, sortIndex = gridSort.sortIndex;
|
|
14477
|
-
var
|
|
14478
|
-
if (
|
|
14479
|
-
var
|
|
14480
|
-
|
|
14477
|
+
var gridColumns = this.api.columns.getAllGridColumns();
|
|
14478
|
+
if (gridColumns) {
|
|
14479
|
+
var sortToApply = gridSort;
|
|
14480
|
+
/** Sort by column id */
|
|
14481
|
+
var columnById = gridColumns.find(function (col) {
|
|
14482
|
+
return (col.getColDef().showRowGroup || col.getColId()) === colId_1;
|
|
14483
|
+
});
|
|
14484
|
+
if (columnById) {
|
|
14485
|
+
sortToApply = { colId: columnById.getColId(), sort: sort };
|
|
14486
|
+
}
|
|
14487
|
+
else if (!isNil(sortIndex)) {
|
|
14481
14488
|
var valueColumns = this.api.columns.getValueColumns();
|
|
14482
14489
|
var valueColumn = valueColumns.find(function (col) { return col.getColId() === colId_1; });
|
|
14483
14490
|
var isPivotColId = colId_1.startsWith('pivot');
|
|
14484
14491
|
if (isPivotColId || valueColumn) {
|
|
14485
14492
|
/** Column is pivot value column, sort by index */
|
|
14486
14493
|
var columnByIndex = gridColumns[sortIndex];
|
|
14487
|
-
// const pivotValueColumn = columnByIndex && columnByIndex.getColDef().pivotValueColumn;
|
|
14488
|
-
// const pivotValueColumnId = pivotValueColumn && pivotValueColumn.getColId();
|
|
14489
|
-
// if (pivotValueColumnId === colId) {
|
|
14490
14494
|
sortToApply = { colId: columnByIndex.getColId(), sort: sort, sortIndex: sortIndex };
|
|
14491
|
-
// }
|
|
14492
|
-
}
|
|
14493
|
-
else {
|
|
14494
|
-
/** Sort by column id */
|
|
14495
|
-
var columnById = gridColumns.find(function (col) {
|
|
14496
|
-
return (col.getColDef().showRowGroup || col.getColId()) === colId_1;
|
|
14497
|
-
});
|
|
14498
|
-
if (columnById) {
|
|
14499
|
-
sortToApply = { colId: columnById.getColId(), sort: sort };
|
|
14500
|
-
}
|
|
14501
14495
|
}
|
|
14502
14496
|
}
|
|
14497
|
+
this.updateSettings({ sort: sortToApply });
|
|
14498
|
+
this.api.grid.setSortModel([sortToApply]);
|
|
14503
14499
|
}
|
|
14504
|
-
this.updateSettings({ sort: sortToApply });
|
|
14505
|
-
this.api.grid.setSortModel([sortToApply]);
|
|
14506
14500
|
}
|
|
14507
14501
|
};
|
|
14508
14502
|
GridService.prototype.updateFilter = function (column, filter) {
|
|
@@ -25479,7 +25473,7 @@
|
|
|
25479
25473
|
};
|
|
25480
25474
|
}
|
|
25481
25475
|
|
|
25482
|
-
window.coreVersion = '22.
|
|
25476
|
+
window.coreVersion = '22.9.1-rc.';
|
|
25483
25477
|
|
|
25484
25478
|
exports.APP_TRANSLATE = APP_TRANSLATE;
|
|
25485
25479
|
exports.AceService = AceService;
|