@datarailsshared/dr_renderer 1.5.105 → 1.5.107
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
|
@@ -679,7 +679,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
679
679
|
}
|
|
680
680
|
|
|
681
681
|
try {
|
|
682
|
-
const aggr = pivotData.getAggregator(rows, cols);
|
|
683
682
|
const percentageArray = [];
|
|
684
683
|
|
|
685
684
|
if (is_drill_down_pie && !highchartsRenderer.selfStartsWith(series_name, "Series ") && !isChartWithMultiValues) {
|
|
@@ -688,7 +687,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
688
687
|
rows = temp;
|
|
689
688
|
}
|
|
690
689
|
|
|
691
|
-
if (!is_drill_down_pie && labelOptions.show_out_of_x_axis &&
|
|
690
|
+
if (!is_drill_down_pie && labelOptions.show_out_of_x_axis && pivotData.getAggregator(rows, cols).widget_values_format !== "#,###%") {
|
|
692
691
|
const axisTotal = pivotData.getAggregator([], cols).value();
|
|
693
692
|
if (value && axisTotal) {
|
|
694
693
|
percentageArray.push(Math.round(value / axisTotal * 100) + '%');
|
|
@@ -723,6 +722,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
723
722
|
|
|
724
723
|
highchartsRenderer.replaceDrOthersKeys(cols, rows, drOthersInAxis, othersName);
|
|
725
724
|
|
|
725
|
+
var aggr = pivotData.getAggregator(rows, cols);
|
|
726
|
+
|
|
726
727
|
let formattedValue = is_drill_down_pie || labelOptions.show_value ? $.pivotUtilities.getFormattedNumber(value, aggr, opts, true) : '';
|
|
727
728
|
formattedValue = removeNumberFormatValueUnitSign(formattedValue, labelOptions);
|
|
728
729
|
return String(formattedValue) + percentageWrapper;
|