moblor-vue 0.1.17 → 0.1.18

package/dist/moblor-components.esm.js

@@ -4643,9 +4643,6 @@ var ReportDataConvertor = /** @class */ (function (_super) {
             if (index1 > -1) {
                 row.recordCount = rowAggregates[index1].label;
             }
-            else if (aggregates.length === 1) {
-                row.recordCount = rowAggregates[0].label;
-            }
             else if (rows) {
                 row.recordCount = 0;
                 if (subGroupings.length > 0) {
@@ -4671,16 +4668,6 @@ var ReportDataConvertor = /** @class */ (function (_super) {
                 }
             }
             tableData.rows.push(row);
-            if (showSubtotals && aggregates.length > 1) {
-                var aggregateRows = _this.getSummaryAggregateRows({
-                    aggregates: aggregates,
-                    hasDetailRows: hasDetailRows,
-                    detailColumns: detailColumns,
-                    rowAggregates: rowAggregates,
-                    background: background,
-                });
-                (_a = tableData.rows).push.apply(_a, aggregateRows);
-            }
             if (subGroupings.length === 0) {
                 if (hasDetailRows) {
                     var detailRows = rows.map(function (dataRow) { return ({
@@ -4688,7 +4675,7 @@ var ReportDataConvertor = /** @class */ (function (_super) {
                         type: 'data',
                         cells: dataRow.dataCells,
                     }); });
-                    (_b = tableData.rows).push.apply(_b, detailRows);
+                    (_a = tableData.rows).push.apply(_a, detailRows);
                 }
             }
             else {
@@ -4696,6 +4683,16 @@ var ReportDataConvertor = /** @class */ (function (_super) {
                     recursive(ssubGrouping);
                 });
             }
+            if (showSubtotals && aggregates.length > 0) {
+                var aggregateRows = _this.getSummaryAggregateRows({
+                    aggregates: aggregates,
+                    hasDetailRows: hasDetailRows,
+                    detailColumns: detailColumns,
+                    rowAggregates: rowAggregates,
+                    background: background,
+                });
+                (_b = tableData.rows).push.apply(_b, aggregateRows);
+            }
         };
         groupings.forEach(function (grouping) {
             recursive(grouping);