From f9ce45d35d2c544fe8f6214f77712f6ba4e87418 Mon Sep 17 00:00:00 2001 From: liweijie0812 <674416404@qq.com> Date: Fri, 21 Feb 2025 16:39:17 +0800 Subject: [PATCH] fix(statistic): fix decimalPlaces setting 0 is invalid (#3496) * fix(statistic): fix decimalPlaces setting 0 is invalid * chore: format code * chore: del comment --- src/statistic/statistic.tsx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/statistic/statistic.tsx b/src/statistic/statistic.tsx index 72e7d0de0..6d6f594c8 100644 --- a/src/statistic/statistic.tsx +++ b/src/statistic/statistic.tsx @@ -13,7 +13,7 @@ import { useGlobalIcon } from '../hooks/useGlobalIcon'; import Skeleton from '../skeleton'; import Tween from '../_common/js/statistic/tween'; -import { COLOR_MAP } from '../_common/js/statistic/utils'; +import { COLOR_MAP, getFormatValue } from '../_common/js/statistic/utils'; export default defineComponent({ name: 'Statistic', @@ -57,20 +57,11 @@ export default defineComponent({ }; const formatValue = computed(() => { - let _value: number | undefined | string = innerValue.value; - if (isFunction(props.format)) { - return props.format(_value); + return props.format(innerValue.value); } - const options = { - minimumFractionDigits: decimalPlaces.value || 0, - maximumFractionDigits: decimalPlaces.value || 20, - useGrouping: !!separator, - }; - // replace的替换的方案仅能应对大部分地区 - _value = _value.toLocaleString(undefined, options).replace(/,|,/g, separator.value); - return _value; + return getFormatValue(innerValue.value, decimalPlaces.value, separator.value); }); onMounted(() => props.animation && props.animationStart && start());