@adaptabletools/adaptable 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",
|
|
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",
|
|
@@ -333,12 +333,21 @@ export const pivotLayoutModelToPivotLayout = (layoutModel, defaults) => {
|
|
|
333
333
|
if (layoutModel.GrandTotalRow) {
|
|
334
334
|
pivotLayout.GrandTotalRow = layoutModel.GrandTotalRow;
|
|
335
335
|
}
|
|
336
|
+
else {
|
|
337
|
+
delete pivotLayout.GrandTotalRow;
|
|
338
|
+
}
|
|
336
339
|
if (layoutModel.GrandTotalColumn) {
|
|
337
340
|
pivotLayout.GrandTotalColumn = layoutModel.GrandTotalColumn;
|
|
338
341
|
}
|
|
342
|
+
else {
|
|
343
|
+
delete pivotLayout.GrandTotalColumn;
|
|
344
|
+
}
|
|
339
345
|
if (layoutModel.PivotGroupTotalColumn) {
|
|
340
346
|
pivotLayout.PivotGroupTotalColumn = layoutModel.PivotGroupTotalColumn;
|
|
341
347
|
}
|
|
348
|
+
else {
|
|
349
|
+
delete pivotLayout.PivotGroupTotalColumn;
|
|
350
|
+
}
|
|
342
351
|
if (layoutModel.PivotAggregationColumns) {
|
|
343
352
|
pivotLayout.PivotAggregationColumns = (layoutModel.PivotAggregationColumns || []).map(({ ColumnId, AggFunc, TotalColumn }) => ({
|
|
344
353
|
ColumnId,
|
package/src/env.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export default {
|
|
2
2
|
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" || '',
|
|
3
|
-
PUBLISH_TIMESTAMP:
|
|
4
|
-
VERSION: "20.0.4-canary.
|
|
3
|
+
PUBLISH_TIMESTAMP: 1744658441173 || Date.now(),
|
|
4
|
+
VERSION: "20.0.4-canary.3" || '--current-version--',
|
|
5
5
|
};
|
|
@@ -256,6 +256,18 @@ export class LayoutManager extends LMEmitter {
|
|
|
256
256
|
PivotAggregationColumns: layout.TableAggregationColumns,
|
|
257
257
|
PivotExpandLevel: prevLayout?.PivotExpandLevel ?? -1,
|
|
258
258
|
};
|
|
259
|
+
const grandTotalRow = this.gridApi.getGridOption('grandTotalRow');
|
|
260
|
+
if (grandTotalRow) {
|
|
261
|
+
pivotLayout.GrandTotalRow = grandTotalRow;
|
|
262
|
+
}
|
|
263
|
+
const grandTotalColumn = this.gridApi.getGridOption('pivotRowTotals');
|
|
264
|
+
if (grandTotalColumn) {
|
|
265
|
+
pivotLayout.GrandTotalColumn = grandTotalColumn;
|
|
266
|
+
}
|
|
267
|
+
const pivotGroupTotalColumn = this.gridApi.getGridOption('pivotColumnGroupTotals');
|
|
268
|
+
if (pivotGroupTotalColumn) {
|
|
269
|
+
pivotLayout.PivotGroupTotalColumn = pivotGroupTotalColumn;
|
|
270
|
+
}
|
|
259
271
|
return simplifyPivotLayoutModel(pivotLayout);
|
|
260
272
|
}
|
|
261
273
|
getTableLayoutModelFromGrid() {
|
|
@@ -1165,6 +1177,7 @@ export class LayoutManager extends LMEmitter {
|
|
|
1165
1177
|
else {
|
|
1166
1178
|
pivotRowTotalColDefsBefore.push(colDef);
|
|
1167
1179
|
}
|
|
1180
|
+
return;
|
|
1168
1181
|
}
|
|
1169
1182
|
if (isPivotTotalColDef(colDef)) {
|
|
1170
1183
|
if (!colDef.colId.startsWith('pivot_')) {
|