diff --git a/src/components/base/PieChartBase.ts b/src/components/base/PieChartBase.ts index 320cbb56..60593c4f 100644 --- a/src/components/base/PieChartBase.ts +++ b/src/components/base/PieChartBase.ts @@ -39,7 +39,11 @@ export interface CommonPieChartProps { } export function usePieChartBase(props: CommonPieChartProps) { - const { formatAmountToLocalizedNumeralsWithCurrency, formatPercentToLocalizedNumerals } = useI18n(); + const { + formatAmountToLocalizedNumeralsWithCurrency, + formatNumberToLocalizedNumerals, + formatPercentToLocalizedNumerals + } = useI18n(); const selectedIndex = ref(0); @@ -77,7 +81,7 @@ export function usePieChartBase(props: CommonPieChartProps) { accumulatedPaintPercent += finalItem.paintPercent; finalItem.displayPercent = formatPercentToLocalizedNumerals(finalItem.percent, 2, '<0.01'); - finalItem.displayValue = props.amountValue ? formatAmountToLocalizedNumeralsWithCurrency(value, props.defaultCurrency) : value.toString(); + finalItem.displayValue = props.amountValue ? formatAmountToLocalizedNumeralsWithCurrency(value, props.defaultCurrency) : formatNumberToLocalizedNumerals(value); validItems.push(finalItem); } diff --git a/src/components/desktop/AxisChart.vue b/src/components/desktop/AxisChart.vue index d1f6bc5c..0cc88d19 100644 --- a/src/components/desktop/AxisChart.vue +++ b/src/components/desktop/AxisChart.vue @@ -84,6 +84,7 @@ const { getCurrentLanguageTextDirection, formatAmountToWesternArabicNumeralsWithoutDigitGrouping, formatAmountToLocalizedNumeralsWithCurrency, + formatNumberToLocalizedNumerals, formatPercentToLocalizedNumerals } = useI18n(); @@ -403,7 +404,7 @@ function getDisplayValue(value: number): string { return formatAmountToLocalizedNumeralsWithCurrency(value, props.defaultCurrency); } - return value.toString(); + return formatNumberToLocalizedNumerals(value); } function clickItem(e: ECElementEvent): void { diff --git a/src/components/desktop/RadarChart.vue b/src/components/desktop/RadarChart.vue index 8c2f90db..fbacde83 100644 --- a/src/components/desktop/RadarChart.vue +++ b/src/components/desktop/RadarChart.vue @@ -45,7 +45,11 @@ const props = defineProps<{ const theme = useTheme(); -const { formatAmountToLocalizedNumeralsWithCurrency, formatPercentToLocalizedNumerals } = useI18n(); +const { + formatAmountToLocalizedNumeralsWithCurrency, + formatNumberToLocalizedNumerals, + formatPercentToLocalizedNumerals +} = useI18n(); const isDarkMode = computed(() => theme.global.name.value === ThemeType.Dark); @@ -80,7 +84,7 @@ const radarData = computed(() => { const finalPercent = (isNumber(percent) && percent >= 0) ? percent : (value > 0 ? value / totalValidValue * 100 : 0); const displayPercent = formatPercentToLocalizedNumerals(finalPercent, 2, '<0.01'); - const displayValue = props.amountValue ? formatAmountToLocalizedNumeralsWithCurrency(value, props.defaultCurrency) : value.toString(); + const displayValue = props.amountValue ? formatAmountToLocalizedNumeralsWithCurrency(value, props.defaultCurrency) : formatNumberToLocalizedNumerals(value); indicators.push({ name: name,