Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(statistic): fix with missing default precision in animation #2933

Merged
merged 1 commit into from
Nov 28, 2023
Merged

fix(statistic): fix with missing default precision in animation #2933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions src/statistic/statistic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,18 @@ export default defineComponent({

setup(props) {
const classPrefix = usePrefixClass('statistic');
const {
value, decimalPlaces, separator, color,
} = toRefs(props);

const numberValue = computed(() => (isNumber(props.value) ? props.value : 0));
const innerValue = ref(props.animation?.valueFrom ?? props.value);

const tween = ref(null);
const { value } = toRefs(props);

const numberValue = computed(() => (isNumber(props.value) ? props.value : 0));
const valueStyle = computed(() => ({ color: COLOR_MAP[color.value] || color.value }));
const innerDecimalPlaces = computed(
() => decimalPlaces.value ?? numberValue.value.toString().split('.')[1]?.length ?? 0,
);

const start = (from: number = props.animation?.valueFrom ?? 0, to: number = numberValue.value) => {
if (from !== to) {
Expand All @@ -41,7 +47,7 @@ export default defineComponent({
},
duration: props.animation.duration,
onUpdate: (keys) => {
innerValue.value = keys.value;
innerValue.value = Number(keys.value.toFixed(innerDecimalPlaces.value));
},
onFinish: () => {
innerValue.value = to;
Expand All @@ -53,29 +59,21 @@ export default defineComponent({

const formatValue = computed(() => {
let _value: number | undefined | string = innerValue.value;
const { decimalPlaces, separator } = props;

if (isFunction(props.format)) {
return props.format(_value);
}
const options = {
minimumFractionDigits: decimalPlaces || 0,
maximumFractionDigits: decimalPlaces || 20,
minimumFractionDigits: decimalPlaces.value || 0,
maximumFractionDigits: decimalPlaces.value || 20,
useGrouping: !!separator,
};
// replace的替换的方案仅能应对大部分地区
_value = _value.toLocaleString(undefined, options).replace(/,|，/g, separator);
_value = _value.toLocaleString(undefined, options).replace(/,|，/g, separator.value);

return _value;
});

const valueStyle = computed(() => {
const { color } = props;
return {
color: COLOR_MAP[color] || color,
};
});

onMounted(() => props.animation && props.animationStart && start());

watch(
Expand Down
Loading