@adaptabletools/adaptable-cjs 20.0.4-canary.2 → 20.0.4-canary.3
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/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adaptabletools/adaptable-cjs",
|
|
3
|
-
"version": "20.0.4-canary.
|
|
3
|
+
"version": "20.0.4-canary.3",
|
|
4
4
|
"description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"web-components",
|
|
@@ -347,12 +347,21 @@ const pivotLayoutModelToPivotLayout = (layoutModel, defaults) => {
|
|
|
347
347
|
if (layoutModel.GrandTotalRow) {
|
|
348
348
|
pivotLayout.GrandTotalRow = layoutModel.GrandTotalRow;
|
|
349
349
|
}
|
|
350
|
+
else {
|
|
351
|
+
delete pivotLayout.GrandTotalRow;
|
|
352
|
+
}
|
|
350
353
|
if (layoutModel.GrandTotalColumn) {
|
|
351
354
|
pivotLayout.GrandTotalColumn = layoutModel.GrandTotalColumn;
|
|
352
355
|
}
|
|
356
|
+
else {
|
|
357
|
+
delete pivotLayout.GrandTotalColumn;
|
|
358
|
+
}
|
|
353
359
|
if (layoutModel.PivotGroupTotalColumn) {
|
|
354
360
|
pivotLayout.PivotGroupTotalColumn = layoutModel.PivotGroupTotalColumn;
|
|
355
361
|
}
|
|
362
|
+
else {
|
|
363
|
+
delete pivotLayout.PivotGroupTotalColumn;
|
|
364
|
+
}
|
|
356
365
|
if (layoutModel.PivotAggregationColumns) {
|
|
357
366
|
pivotLayout.PivotAggregationColumns = (layoutModel.PivotAggregationColumns || []).map(({ ColumnId, AggFunc, TotalColumn }) => ({
|
|
358
367
|
ColumnId,
|
package/src/env.js
CHANGED
|
@@ -2,6 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.default = {
|
|
4
4
|
NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
|
|
5
|
-
PUBLISH_TIMESTAMP:
|
|
6
|
-
VERSION: "20.0.4-canary.
|
|
5
|
+
PUBLISH_TIMESTAMP: 1744658469734 || Date.now(),
|
|
6
|
+
VERSION: "20.0.4-canary.3" || '--current-version--',
|
|
7
7
|
};
|
|
@@ -259,6 +259,18 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
|
|
|
259
259
|
PivotAggregationColumns: layout.TableAggregationColumns,
|
|
260
260
|
PivotExpandLevel: prevLayout?.PivotExpandLevel ?? -1,
|
|
261
261
|
};
|
|
262
|
+
const grandTotalRow = this.gridApi.getGridOption('grandTotalRow');
|
|
263
|
+
if (grandTotalRow) {
|
|
264
|
+
pivotLayout.GrandTotalRow = grandTotalRow;
|
|
265
|
+
}
|
|
266
|
+
const grandTotalColumn = this.gridApi.getGridOption('pivotRowTotals');
|
|
267
|
+
if (grandTotalColumn) {
|
|
268
|
+
pivotLayout.GrandTotalColumn = grandTotalColumn;
|
|
269
|
+
}
|
|
270
|
+
const pivotGroupTotalColumn = this.gridApi.getGridOption('pivotColumnGroupTotals');
|
|
271
|
+
if (pivotGroupTotalColumn) {
|
|
272
|
+
pivotLayout.PivotGroupTotalColumn = pivotGroupTotalColumn;
|
|
273
|
+
}
|
|
262
274
|
return (0, simplifyLayoutModel_1.simplifyPivotLayoutModel)(pivotLayout);
|
|
263
275
|
}
|
|
264
276
|
getTableLayoutModelFromGrid() {
|
|
@@ -1168,6 +1180,7 @@ class LayoutManager extends LMEmitter_1.LMEmitter {
|
|
|
1168
1180
|
else {
|
|
1169
1181
|
pivotRowTotalColDefsBefore.push(colDef);
|
|
1170
1182
|
}
|
|
1183
|
+
return;
|
|
1171
1184
|
}
|
|
1172
1185
|
if (isPivotTotalColDef(colDef)) {
|
|
1173
1186
|
if (!colDef.colId.startsWith('pivot_')) {
|