[se] Fix CT_pivotTableDefinition.getItemsIndexesByItemFieldsMap for d…

…efaultSubtotal=false
ONLYOFFICE · Feb 6, 2024 · 751d04b · 751d04b
1 parent be69cd5
commit 751d04b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cell/model/PivotTables.js b/cell/model/PivotTables.js
@@ -7893,7 +7893,7 @@ CT_pivotTableDefinition.prototype.getItemsIndexesByItemFieldsMap = function(rowI
 					let rowX = rowItemX[rowItemX.length - 1];
 					visible = pivotField.asc_getVisible(rowX.getV())
 				}
-				canShowSubtotal = (pivotField.defaultSubtotal || !visible);
+				canShowSubtotal = (1 === pivotField.asc_getSubtotals(true).length) || !visible || (maxRowR === rowFields.length - 1);
 			}
 			if (!canShowSubtotal) {
 				rowItemIndex = null;
@@ -7918,7 +7918,7 @@ CT_pivotTableDefinition.prototype.getItemsIndexesByItemFieldsMap = function(rowI
 					let colX = colItemX[colItemX.length - 1];
 					visible = pivotField.asc_getVisible(colX.getV())
 				}
-				canShowSubtotal = (pivotField.defaultSubtotal || !visible);
+				canShowSubtotal = (1 === pivotField.asc_getSubtotals(true).length) || !visible || (maxColR === colFields.length - 1);
 			}
 			if (!canShowSubtotal) {
 				colItemIndex = null;