oak-domain 5.1.31 → 5.1.32

package/lib/utils/money.d.ts

@@ -2,5 +2,5 @@ declare const ToCent: (float: number) => number;
 declare const ToYuan: (int: number) => number;
 declare const StringToCent: (value: string, allowNegative?: true) => number | undefined;
 declare const CentToString: (value: number, fixed?: number) => string | undefined;
-declare const ThousandCont: (value: number | string, decimalPlaces?: number) => string | undefined;
+declare const ThousandCont: (value: number | string, decimalPlaces?: number) => string;
 export { ToCent, ToYuan, StringToCent, CentToString, ThousandCont };

package/lib/utils/money.js

@@ -23,29 +23,40 @@ const CentToString = (value, fixed) => {
 };
 exports.CentToString = CentToString;
 const ThousandCont = (value, decimalPlaces) => {
-    let value1 = typeof value === 'number' ? `${value}` : value;
-    const numArr = value1.split('.');
-    value1 = numArr[0];
-    let result = '';
-    while (value1.length > 3) {
-        result = ',' + value1.slice(-3) + result;
-        value1 = value1.slice(0, value1.length - 3);
-    }
-    if (value1) {
-        result = value1 + result;
-    }
-    if (decimalPlaces && decimalPlaces > 0) {
-        if (numArr[1]) {
-            const decimalPart = numArr[1].padEnd(decimalPlaces, '0').slice(0, decimalPlaces);
-            result = result + '.' + decimalPart;
-        }
-        else {
-            result = result + '.' + '0'.repeat(decimalPlaces);
-        }
+    let valueStr = typeof value === 'number' ? value.toString() : value;
+    // 处理负号
+    let isNegative = false;
+    if (valueStr.startsWith('-')) {
+        isNegative = true;
+        valueStr = valueStr.slice(1); // 移除负号
+    }
+    // 分离整数部分和小数部分
+    const [integerPart, decimalPart = ''] = valueStr.split('.');
+    // 千分位格式化整数部分
+    let formattedInteger = '';
+    let remainingInteger = integerPart;
+    while (remainingInteger.length > 3) {
+        formattedInteger = ',' + remainingInteger.slice(-3) + formattedInteger;
+        remainingInteger = remainingInteger.slice(0, remainingInteger.length - 3);
+    }
+    if (remainingInteger) {
+        formattedInteger = remainingInteger + formattedInteger;
+    }
+    // 恢复负号
+    if (isNegative) {
+        formattedInteger = '-' + formattedInteger;
+    }
+    // 处理小数部分
+    let formattedDecimal = '';
+    if (decimalPlaces !== undefined && decimalPlaces > 0) {
+        formattedDecimal = decimalPart.padEnd(decimalPlaces, '0').slice(0, decimalPlaces);
+        return formattedInteger + '.' + formattedDecimal;
+    }
+    else if (decimalPart) {
+        return formattedInteger + '.' + decimalPart;
     }
     else {
-        result = numArr[1] ? result + '.' + numArr[1] : result;
+        return formattedInteger;
     }
-    return result;
 };
 exports.ThousandCont = ThousandCont;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.1.31",
+    "version": "5.1.32",
     "author": {
         "name": "XuChang"
     },