@quillsql/react 2.16.61 → 2.16.62
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/dist/index.cjs +35 -5
- package/dist/index.js +35 -5
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
|
@@ -66412,12 +66412,41 @@ function useReport(reportIdArg, options = {}) {
|
|
|
66412
66412
|
resolvedYAxisFieldsForDisplay
|
|
66413
66413
|
);
|
|
66414
66414
|
if (String(baseChart.chartType ?? "").toLowerCase() === "table" && baseChart.pivot) {
|
|
66415
|
-
|
|
66416
|
-
|
|
66417
|
-
|
|
66418
|
-
|
|
66419
|
-
|
|
66415
|
+
const pivotAggregations = getPivotAggregations(baseChart);
|
|
66416
|
+
const hasCustomMeasureLabel = resolvedYAxisFields.some((axis) => {
|
|
66417
|
+
const aggregation = findAggregationForFieldStrict(
|
|
66418
|
+
axis.field,
|
|
66419
|
+
pivotAggregations
|
|
66420
|
+
);
|
|
66421
|
+
if (!aggregation) return false;
|
|
66422
|
+
const label = String(axis.label ?? "").trim();
|
|
66423
|
+
const defaultLabel = buildAggregationLabel(aggregation, baseChart);
|
|
66424
|
+
return Boolean(label) && label !== defaultLabel;
|
|
66420
66425
|
});
|
|
66426
|
+
if (pivotAggregations.length > 1 || hasCustomMeasureLabel) {
|
|
66427
|
+
columns2 = mergePivotTableDisplayColumnLabelsFromYAxis({
|
|
66428
|
+
columns: columns2 ?? baseChart.columns,
|
|
66429
|
+
yAxisFields: resolvedYAxisFieldsForDisplay,
|
|
66430
|
+
pivotRowField: String(baseChart.pivot.rowField ?? ""),
|
|
66431
|
+
xAxisLabel: resolvedXAxisLabel
|
|
66432
|
+
});
|
|
66433
|
+
} else {
|
|
66434
|
+
const pivotRowField = String(baseChart.pivot.rowField ?? "").trim();
|
|
66435
|
+
const pivotLabelByField = new Map(
|
|
66436
|
+
(baseChart.pivotColumns ?? []).map((column) => [
|
|
66437
|
+
String(column.field ?? "").trim(),
|
|
66438
|
+
String(column.label ?? "").trim()
|
|
66439
|
+
])
|
|
66440
|
+
);
|
|
66441
|
+
columns2 = (columns2 ?? baseChart.columns)?.map((column) => {
|
|
66442
|
+
const field = String(column.field ?? "").trim();
|
|
66443
|
+
const rowLabel = field === pivotRowField ? String(resolvedXAxisLabel).trim() : "";
|
|
66444
|
+
return {
|
|
66445
|
+
...column,
|
|
66446
|
+
label: rowLabel || pivotLabelByField.get(field) || column.label || field
|
|
66447
|
+
};
|
|
66448
|
+
});
|
|
66449
|
+
}
|
|
66421
66450
|
}
|
|
66422
66451
|
return {
|
|
66423
66452
|
...baseChart,
|
|
@@ -66432,6 +66461,7 @@ function useReport(reportIdArg, options = {}) {
|
|
|
66432
66461
|
resolvedXAxisField,
|
|
66433
66462
|
resolvedXAxisFormat,
|
|
66434
66463
|
resolvedXAxisLabel,
|
|
66464
|
+
resolvedYAxisFields,
|
|
66435
66465
|
resolvedYAxisFieldsForDisplay
|
|
66436
66466
|
]);
|
|
66437
66467
|
const pivotDateFilterRangeCacheRef = (0, import_react61.useRef)({ key: "", min: null, max: null });
|
package/dist/index.js
CHANGED
|
@@ -66624,12 +66624,41 @@ function useReport(reportIdArg, options = {}) {
|
|
|
66624
66624
|
resolvedYAxisFieldsForDisplay
|
|
66625
66625
|
);
|
|
66626
66626
|
if (String(baseChart.chartType ?? "").toLowerCase() === "table" && baseChart.pivot) {
|
|
66627
|
-
|
|
66628
|
-
|
|
66629
|
-
|
|
66630
|
-
|
|
66631
|
-
|
|
66627
|
+
const pivotAggregations = getPivotAggregations(baseChart);
|
|
66628
|
+
const hasCustomMeasureLabel = resolvedYAxisFields.some((axis) => {
|
|
66629
|
+
const aggregation = findAggregationForFieldStrict(
|
|
66630
|
+
axis.field,
|
|
66631
|
+
pivotAggregations
|
|
66632
|
+
);
|
|
66633
|
+
if (!aggregation) return false;
|
|
66634
|
+
const label = String(axis.label ?? "").trim();
|
|
66635
|
+
const defaultLabel = buildAggregationLabel(aggregation, baseChart);
|
|
66636
|
+
return Boolean(label) && label !== defaultLabel;
|
|
66632
66637
|
});
|
|
66638
|
+
if (pivotAggregations.length > 1 || hasCustomMeasureLabel) {
|
|
66639
|
+
columns2 = mergePivotTableDisplayColumnLabelsFromYAxis({
|
|
66640
|
+
columns: columns2 ?? baseChart.columns,
|
|
66641
|
+
yAxisFields: resolvedYAxisFieldsForDisplay,
|
|
66642
|
+
pivotRowField: String(baseChart.pivot.rowField ?? ""),
|
|
66643
|
+
xAxisLabel: resolvedXAxisLabel
|
|
66644
|
+
});
|
|
66645
|
+
} else {
|
|
66646
|
+
const pivotRowField = String(baseChart.pivot.rowField ?? "").trim();
|
|
66647
|
+
const pivotLabelByField = new Map(
|
|
66648
|
+
(baseChart.pivotColumns ?? []).map((column) => [
|
|
66649
|
+
String(column.field ?? "").trim(),
|
|
66650
|
+
String(column.label ?? "").trim()
|
|
66651
|
+
])
|
|
66652
|
+
);
|
|
66653
|
+
columns2 = (columns2 ?? baseChart.columns)?.map((column) => {
|
|
66654
|
+
const field = String(column.field ?? "").trim();
|
|
66655
|
+
const rowLabel = field === pivotRowField ? String(resolvedXAxisLabel).trim() : "";
|
|
66656
|
+
return {
|
|
66657
|
+
...column,
|
|
66658
|
+
label: rowLabel || pivotLabelByField.get(field) || column.label || field
|
|
66659
|
+
};
|
|
66660
|
+
});
|
|
66661
|
+
}
|
|
66633
66662
|
}
|
|
66634
66663
|
return {
|
|
66635
66664
|
...baseChart,
|
|
@@ -66644,6 +66673,7 @@ function useReport(reportIdArg, options = {}) {
|
|
|
66644
66673
|
resolvedXAxisField,
|
|
66645
66674
|
resolvedXAxisFormat,
|
|
66646
66675
|
resolvedXAxisLabel,
|
|
66676
|
+
resolvedYAxisFields,
|
|
66647
66677
|
resolvedYAxisFieldsForDisplay
|
|
66648
66678
|
]);
|
|
66649
66679
|
const pivotDateFilterRangeCacheRef = useRef24({ key: "", min: null, max: null });
|