Skip to content

Commit 7d29500

Browse files
committed
feat: enhance addChineseUnit function with improved unit handling and logging
1 parent 07241c6 commit 7d29500

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

example/index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
var utils = window['cloud-utils'];
1313
console.log('utils', utils)
1414
console.log('toCamelCaseVar', utils.toCamelCaseVar('get_account_list'));
15+
console.log('addChineseUnit', utils.addChineseUnit(566000));
1516

1617
// 测试 getDevice 函数(现在是同步的)
1718
try {

src/addChineseUnit.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,13 @@ export function addChineseUnit(number: number, decimalDigit: number = 2): string
4242
const digit = getDigit(integer);
4343
if (digit > 3) {
4444
let remainder = digit % 8;
45+
// ‘十万’、‘百万’、‘千万’显示为‘万’
4546
if (remainder >= 5) {
46-
remainder = 8 - remainder;
47+
remainder = 4;
4748
}
4849
return Math.round(number / Math.pow(10, remainder + mutiple - decimalDigit)) / Math.pow(10, decimalDigit) + '万';
4950
} else {
50-
return Math.round(number / Math.pow(10, mutiple - decimalDigit)) / Math.pow(10, decimalDigit) + '';
51+
return Math.round(number / Math.pow(10, mutiple - decimalDigit)) / Math.pow(10, decimalDigit) + '';
5152
}
5253
};
5354

@@ -64,6 +65,7 @@ export function addChineseUnit(number: number, decimalDigit: number = 2): string
6465

6566
const integer = Math.floor(number);
6667
const digit = getDigit(integer);
68+
// ['个', '十', '百', '千', '万', '十万', '百万', '千万'];
6769
const unit = [];
6870

6971
if (digit > 3) {
@@ -79,6 +81,6 @@ export function addChineseUnit(number: number, decimalDigit: number = 2): string
7981
return addWan(integer, number, 0, decimalDigit);
8082
}
8183
} else {
82-
return String(number);
84+
return parseFloat(number.toString()).toFixed(decimalDigit);
8385
}
8486
}

0 commit comments

Comments
 (0)