@datorama/core 22.7.1 → 22.7.2
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 +5 -3
- 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 +5 -3
- package/esm2015/lib/version.js +2 -2
- package/esm5/lib/grid-v2/grid-store/grid.service.js +5 -3
- package/esm5/lib/version.js +2 -2
- package/fesm2015/datorama-core.js +5 -3
- package/fesm2015/datorama-core.js.map +1 -1
- package/fesm5/datorama-core.js +5 -3
- package/fesm5/datorama-core.js.map +1 -1
- package/package.json +1 -1
|
@@ -14465,7 +14465,7 @@
|
|
|
14465
14465
|
}
|
|
14466
14466
|
};
|
|
14467
14467
|
GridService.prototype.setGridSort = function (gridSort) {
|
|
14468
|
-
if (this.api &&
|
|
14468
|
+
if (gridSort && this.api && this.api.grid.getDisplayedRowCount() > 0) {
|
|
14469
14469
|
var colId_1 = gridSort.colId, sort = gridSort.sort, sortIndex = gridSort.sortIndex;
|
|
14470
14470
|
var sortToApply = gridSort;
|
|
14471
14471
|
if (!isNil(sortIndex)) {
|
|
@@ -14477,7 +14477,9 @@
|
|
|
14477
14477
|
if (isPivotColId || valueColumn) {
|
|
14478
14478
|
/** Column is pivot value column, sort by index */
|
|
14479
14479
|
var columnByIndex = gridColumns[sortIndex];
|
|
14480
|
-
|
|
14480
|
+
var pivotValueColumn = columnByIndex && columnByIndex.getColDef().pivotValueColumn;
|
|
14481
|
+
var pivotValueColumnId = pivotValueColumn && pivotValueColumn.getColId();
|
|
14482
|
+
if (pivotValueColumnId === colId_1) {
|
|
14481
14483
|
sortToApply = { colId: columnByIndex.getColId(), sort: sort };
|
|
14482
14484
|
}
|
|
14483
14485
|
}
|
|
@@ -25436,7 +25438,7 @@
|
|
|
25436
25438
|
};
|
|
25437
25439
|
}
|
|
25438
25440
|
|
|
25439
|
-
window.coreVersion = '22.7.
|
|
25441
|
+
window.coreVersion = '22.7.2';
|
|
25440
25442
|
|
|
25441
25443
|
exports.APP_TRANSLATE = APP_TRANSLATE;
|
|
25442
25444
|
exports.AceService = AceService;
|