@datorama/core 22.8.1 → 22.8.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 +9 -11
- 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 +9 -11
- package/esm2015/lib/version.js +2 -2
- package/esm5/lib/grid-v2/grid-store/grid.service.js +9 -11
- package/esm5/lib/version.js +2 -2
- package/fesm2015/datorama-core.js +9 -11
- package/fesm2015/datorama-core.js.map +1 -1
- package/fesm5/datorama-core.js +9 -11
- package/fesm5/datorama-core.js.map +1 -1
- package/package.json +1 -1
|
@@ -14482,7 +14482,14 @@
|
|
|
14482
14482
|
var gridColumns = this.api.columns.getAllGridColumns();
|
|
14483
14483
|
if (gridColumns) {
|
|
14484
14484
|
var sortToApply = gridSort;
|
|
14485
|
-
|
|
14485
|
+
/** Sort by column id */
|
|
14486
|
+
var columnById = gridColumns.find(function (col) {
|
|
14487
|
+
return (col.getColDef().showRowGroup || col.getColId()) === colId_1;
|
|
14488
|
+
});
|
|
14489
|
+
if (columnById) {
|
|
14490
|
+
sortToApply = { colId: columnById.getColId(), sort: sort };
|
|
14491
|
+
}
|
|
14492
|
+
else if (!isNil(sortIndex)) {
|
|
14486
14493
|
var valueColumns = this.api.columns.getValueColumns();
|
|
14487
14494
|
var valueColumn = valueColumns.find(function (col) { return col.getColId() === colId_1; });
|
|
14488
14495
|
var isPivotColId = colId_1.startsWith('pivot');
|
|
@@ -14492,15 +14499,6 @@
|
|
|
14492
14499
|
sortToApply = { colId: columnByIndex.getColId(), sort: sort, sortIndex: sortIndex };
|
|
14493
14500
|
}
|
|
14494
14501
|
}
|
|
14495
|
-
else {
|
|
14496
|
-
/** Sort by column id */
|
|
14497
|
-
var columnById = gridColumns.find(function (col) {
|
|
14498
|
-
return (col.getColDef().showRowGroup || col.getColId()) === colId_1;
|
|
14499
|
-
});
|
|
14500
|
-
if (columnById) {
|
|
14501
|
-
sortToApply = { colId: columnById.getColId(), sort: sort };
|
|
14502
|
-
}
|
|
14503
|
-
}
|
|
14504
14502
|
this.updateSettings({ sort: sortToApply });
|
|
14505
14503
|
this.api.grid.setSortModel([sortToApply]);
|
|
14506
14504
|
}
|
|
@@ -25446,7 +25444,7 @@
|
|
|
25446
25444
|
};
|
|
25447
25445
|
}
|
|
25448
25446
|
|
|
25449
|
-
window.coreVersion = '22.8.
|
|
25447
|
+
window.coreVersion = '22.8.2';
|
|
25450
25448
|
|
|
25451
25449
|
exports.APP_TRANSLATE = APP_TRANSLATE;
|
|
25452
25450
|
exports.AceService = AceService;
|