@fnmain/number 1.8.0 → 1.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.d.ts +6 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +20 -5
- package/dist/index.js.map +1 -1
- package/dist/test.js +8 -0
- package/dist/test.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +43 -5
- package/src/test.ts +20 -1
package/dist/index.d.ts
CHANGED
|
@@ -8,16 +8,18 @@ type Options = {
|
|
|
8
8
|
space?: string;
|
|
9
9
|
};
|
|
10
10
|
export declare function trimTrailingZeros(numberString: string): string;
|
|
11
|
-
export declare function toWan(value: any, { fixed, trimEndZeros, space, nanString }?: Options): string;
|
|
12
|
-
export declare function toYi(value: any, { fixed, trimEndZeros, space, nanString }?: Options): string;
|
|
13
|
-
export declare function toWanYi(value: any, { fixed, trimEndZeros, space, nanString }?: Options): string;
|
|
11
|
+
export declare function toWan(value: any, { fixed, trimEndZeros, space, nanString, }?: Options): string;
|
|
12
|
+
export declare function toYi(value: any, { fixed, trimEndZeros, space, nanString, }?: Options): string;
|
|
13
|
+
export declare function toWanYi(value: any, { fixed, trimEndZeros, space, nanString, }?: Options): string;
|
|
14
14
|
export declare function toAuto(value: any, { fixed, wanFixed, yiFixed, wanYiFixed, trimEndZeros, space, nanString, }?: Options): string;
|
|
15
|
-
export declare function toPercent(value: any, { fixed, trimEndZeros, space, nanString }?: Options): string;
|
|
15
|
+
export declare function toPercent(value: any, { fixed, trimEndZeros, space, nanString, }?: Options): string;
|
|
16
16
|
export declare function parseNumber(input: any): number;
|
|
17
17
|
export declare function isNumber(value: any): boolean;
|
|
18
18
|
export declare function isNotNumber(value: any): boolean;
|
|
19
19
|
export declare function formatWithCommas(value: any, { strNaN }?: {
|
|
20
20
|
strNaN: string;
|
|
21
21
|
}): string;
|
|
22
|
+
export declare function removeNumberCommas(str: string): string;
|
|
23
|
+
export declare function numberFallback(...args: any[]): number;
|
|
22
24
|
export {};
|
|
23
25
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GAAG;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ9D;AAED,wBAAgB,KAAK,CACnB,KAAK,EAAE,GAAG,EACV,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GAAG;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAQ9D;AAED,wBAAgB,KAAK,CACnB,KAAK,EAAE,GAAG,EACV,EACE,KAAS,EACT,YAAoB,EACpB,KAAU,EACV,SAAiB,GAClB,GAAE,OAAY,GACd,MAAM,CAQR;AAED,wBAAgB,IAAI,CAClB,KAAK,EAAE,GAAG,EACV,EACE,KAAS,EACT,YAAoB,EACpB,KAAU,EACV,SAAiB,GAClB,GAAE,OAAY,GACd,MAAM,CAQR;AAED,wBAAgB,OAAO,CACrB,KAAK,EAAE,GAAG,EACV,EACE,KAAS,EACT,YAAoB,EACpB,KAAU,EACV,SAAiB,GAClB,GAAE,OAAY,GACd,MAAM,CAQR;AAED,wBAAgB,MAAM,CACpB,KAAK,EAAE,GAAG,EACV,EACE,KAAS,EACT,QAAQ,EACR,OAAO,EACP,UAAU,EACV,YAAoB,EACpB,KAAU,EACV,SAAiB,GAClB,GAAE,OAAY,GACd,MAAM,CAqBR;AAED,wBAAgB,SAAS,CACvB,KAAK,EAAE,GAAG,EACV,EACE,KAAS,EACT,YAAoB,EACpB,KAAU,EACV,SAAiB,GAClB,GAAE,OAAY,GACd,MAAM,CAQR;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM,CAwD9C;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAE5C;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAE/C;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,GAAG,EACV,EAAE,MAAM,EAAE;;CAAoB,GAC7B,MAAM,CAMR;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAItD;AAED,wBAAgB,cAAc,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAOrD"}
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.formatWithCommas = exports.isNotNumber = exports.isNumber = exports.parseNumber = exports.toPercent = exports.toAuto = exports.toWanYi = exports.toYi = exports.toWan = exports.trimTrailingZeros = void 0;
|
|
3
|
+
exports.numberFallback = exports.removeNumberCommas = exports.formatWithCommas = exports.isNotNumber = exports.isNumber = exports.parseNumber = exports.toPercent = exports.toAuto = exports.toWanYi = exports.toYi = exports.toWan = exports.trimTrailingZeros = void 0;
|
|
4
4
|
function trimTrailingZeros(numberString) {
|
|
5
5
|
// Check if the string contains a decimal point
|
|
6
6
|
if (numberString.includes(".")) {
|
|
@@ -11,7 +11,7 @@ function trimTrailingZeros(numberString) {
|
|
|
11
11
|
return numberString;
|
|
12
12
|
}
|
|
13
13
|
exports.trimTrailingZeros = trimTrailingZeros;
|
|
14
|
-
function toWan(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" } = {}) {
|
|
14
|
+
function toWan(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN", } = {}) {
|
|
15
15
|
value = parseNumber(value);
|
|
16
16
|
if (isNaN(value)) {
|
|
17
17
|
return nanString;
|
|
@@ -21,7 +21,7 @@ function toWan(value, { fixed = 0, trimEndZeros = false, space = "", nanString =
|
|
|
21
21
|
return ret + space + "万";
|
|
22
22
|
}
|
|
23
23
|
exports.toWan = toWan;
|
|
24
|
-
function toYi(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" } = {}) {
|
|
24
|
+
function toYi(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN", } = {}) {
|
|
25
25
|
value = parseNumber(value);
|
|
26
26
|
if (isNaN(value)) {
|
|
27
27
|
return nanString;
|
|
@@ -31,7 +31,7 @@ function toYi(value, { fixed = 0, trimEndZeros = false, space = "", nanString =
|
|
|
31
31
|
return ret + space + "亿";
|
|
32
32
|
}
|
|
33
33
|
exports.toYi = toYi;
|
|
34
|
-
function toWanYi(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" } = {}) {
|
|
34
|
+
function toWanYi(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN", } = {}) {
|
|
35
35
|
value = parseNumber(value);
|
|
36
36
|
if (isNaN(value)) {
|
|
37
37
|
return nanString;
|
|
@@ -64,7 +64,7 @@ function toAuto(value, { fixed = 0, wanFixed, yiFixed, wanYiFixed, trimEndZeros
|
|
|
64
64
|
return toWanYi(value, { fixed, trimEndZeros, space });
|
|
65
65
|
}
|
|
66
66
|
exports.toAuto = toAuto;
|
|
67
|
-
function toPercent(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN" } = {}) {
|
|
67
|
+
function toPercent(value, { fixed = 0, trimEndZeros = false, space = "", nanString = "NaN", } = {}) {
|
|
68
68
|
value = parseNumber(value);
|
|
69
69
|
if (isNaN(value)) {
|
|
70
70
|
return nanString;
|
|
@@ -142,4 +142,19 @@ function formatWithCommas(value, { strNaN } = { strNaN: "NaN" }) {
|
|
|
142
142
|
return val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
|
|
143
143
|
}
|
|
144
144
|
exports.formatWithCommas = formatWithCommas;
|
|
145
|
+
function removeNumberCommas(str) {
|
|
146
|
+
// 使用更严格的正则匹配千分位逗号
|
|
147
|
+
// 匹配规则：逗号右侧必须是3的倍数的连续数字，直到遇到非数字字符或结尾
|
|
148
|
+
return str.replace(/(?<=\d{1,3}),(?=(\d{3})+(?!\d))/g, "");
|
|
149
|
+
}
|
|
150
|
+
exports.removeNumberCommas = removeNumberCommas;
|
|
151
|
+
function numberFallback(...args) {
|
|
152
|
+
for (const arg of args) {
|
|
153
|
+
if (isNumber(arg)) {
|
|
154
|
+
return arg;
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
return NaN;
|
|
158
|
+
}
|
|
159
|
+
exports.numberFallback = numberFallback;
|
|
145
160
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAUA,SAAgB,iBAAiB,CAAC,YAAoB;IACpD,+CAA+C;IAC/C,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC9B,iFAAiF;QACjF,OAAO,YAAY,CAAC,OAAO,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;KAC7D;IACD,0DAA0D;IAC1D,OAAO,YAAY,CAAC;AACtB,CAAC;AARD,8CAQC;AAED,SAAgB,KAAK,CACnB,KAAU,EACV,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAUA,SAAgB,iBAAiB,CAAC,YAAoB;IACpD,+CAA+C;IAC/C,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC9B,iFAAiF;QACjF,OAAO,YAAY,CAAC,OAAO,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;KAC7D;IACD,0DAA0D;IAC1D,OAAO,YAAY,CAAC;AACtB,CAAC;AARD,8CAQC;AAED,SAAgB,KAAK,CACnB,KAAU,EACV,EACE,KAAK,GAAG,CAAC,EACT,YAAY,GAAG,KAAK,EACpB,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,KAAK,MACN,EAAE;IAEf,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,GAAG,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACzC,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAClD,OAAO,GAAG,GAAG,KAAK,GAAG,GAAG,CAAC;AAC3B,CAAC;AAhBD,sBAgBC;AAED,SAAgB,IAAI,CAClB,KAAU,EACV,EACE,KAAK,GAAG,CAAC,EACT,YAAY,GAAG,KAAK,EACpB,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,KAAK,MACN,EAAE;IAEf,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,GAAG,GAAG,CAAC,KAAK,GAAG,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAClD,OAAO,GAAG,GAAG,KAAK,GAAG,GAAG,CAAC;AAC3B,CAAC;AAhBD,oBAgBC;AAED,SAAgB,OAAO,CACrB,KAAU,EACV,EACE,KAAK,GAAG,CAAC,EACT,YAAY,GAAG,KAAK,EACpB,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,KAAK,MACN,EAAE;IAEf,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,GAAG,GAAG,CAAC,KAAK,GAAG,aAAa,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACjD,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAClD,OAAO,GAAG,GAAG,KAAK,GAAG,IAAI,CAAC;AAC5B,CAAC;AAhBD,0BAgBC;AAED,SAAgB,MAAM,CACpB,KAAU,EACV,EACE,KAAK,GAAG,CAAC,EACT,QAAQ,EACR,OAAO,EACP,UAAU,EACV,YAAY,GAAG,KAAK,EACpB,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,KAAK,MACN,EAAE;IAEf,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5B,IAAI,GAAG,GAAG,KAAK,EAAE;QACf,IAAI,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC/B,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QAClD,OAAO,GAAG,CAAC;KACZ;IACD,IAAI,GAAG,GAAG,SAAS,EAAE;QACnB,KAAK,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,IAAI,KAAK,CAAC;QAClD,OAAO,KAAK,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;KACrD;IACD,IAAI,GAAG,GAAG,aAAa,EAAE;QACvB,KAAK,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC;QAChD,OAAO,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;KACpD;IACD,KAAK,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC;IACtD,OAAO,OAAO,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;AACxD,CAAC;AAhCD,wBAgCC;AAED,SAAgB,SAAS,CACvB,KAAU,EACV,EACE,KAAK,GAAG,CAAC,EACT,YAAY,GAAG,KAAK,EACpB,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,KAAK,MACN,EAAE;IAEf,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,KAAK,CAAC,KAAK,CAAC,EAAE;QAChB,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,GAAG,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvC,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAClD,OAAO,GAAG,GAAG,KAAK,GAAG,GAAG,CAAC;AAC3B,CAAC;AAhBD,8BAgBC;AAED,SAAgB,WAAW,CAAC,KAAU;IACpC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,KAAK,CAAC;KACd;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAC7B,OAAO,GAAG,CAAC;KACZ;IAED,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,oBAAoB;IAC1C,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB;IAEjD,8CAA8C;IAC9C,MAAM,YAAY,GAAG,CAAC,MAAc,EAAE,MAAc,EAAU,EAAE;QAC9D,QAAQ,MAAM,CAAC,WAAW,EAAE,EAAE;YAC5B,KAAK,GAAG;gBACN,OAAO,MAAM,GAAG,GAAG,CAAC;YACtB,KAAK,GAAG;gBACN,OAAO,MAAM,GAAG,GAAG,CAAC;YACtB,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,OAAO,MAAM,GAAG,GAAG,CAAC;YACtB,KAAK,GAAG;gBACN,OAAO,MAAM,GAAG,IAAI,CAAC;YACvB,KAAK,GAAG,CAAC;YACT,KAAK,GAAG,CAAC;YACT,KAAK,GAAG;gBACN,OAAO,MAAM,GAAG,GAAG,CAAC;YACtB,KAAK,GAAG;gBACN,OAAO,MAAM,GAAG,GAAG,CAAC;YACtB;gBACE,OAAO,MAAM,CAAC;SACjB;IACH,CAAC,CAAC;IAEF,uBAAuB;IACvB,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACvB,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,GAAG,CAAC;KAC3C;IAED,sBAAsB;IACtB,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACvB,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC;KAC5C;IAED,kCAAkC;IAClC,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnD,IAAI,WAAW,EAAE;QACf,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9C,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;KACnE;IAED,kDAAkD;IAClD,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IACjC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;AACtC,CAAC;AAxDD,kCAwDC;AAED,SAAgB,QAAQ,CAAC,KAAU;IACjC,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAChC,CAAC;AAFD,4BAEC;AAED,SAAgB,WAAW,CAAC,KAAU;IACpC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AAFD,kCAEC;AAED,SAAgB,gBAAgB,CAC9B,KAAU,EACV,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE;IAE9B,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAC/B,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE;QACd,OAAO,MAAM,CAAC;KACf;IACD,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;AAC9D,CAAC;AATD,4CASC;AAED,SAAgB,kBAAkB,CAAC,GAAW;IAC5C,kBAAkB;IAClB,qCAAqC;IACrC,OAAO,GAAG,CAAC,OAAO,CAAC,kCAAkC,EAAE,EAAE,CAAC,CAAC;AAC7D,CAAC;AAJD,gDAIC;AAED,SAAgB,cAAc,CAAC,GAAG,IAAW;IAC3C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;QACtB,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE;YACjB,OAAO,GAAG,CAAC;SACZ;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAPD,wCAOC"}
|
package/dist/test.js
CHANGED
|
@@ -39,4 +39,12 @@ console.log((0, index_1.formatWithCommas)("12345.6789")); // 12,345.678,9
|
|
|
39
39
|
console.log((0, index_1.formatWithCommas)("123")); // 123
|
|
40
40
|
console.log((0, index_1.formatWithCommas)("abc")); // "NaN"
|
|
41
41
|
console.log((0, index_1.formatWithCommas)("abc", { strNaN: "" })); // ""
|
|
42
|
+
console.log((0, index_1.removeNumberCommas)("123,456,789")); // 123456789
|
|
43
|
+
console.log((0, index_1.removeNumberCommas)("1,23,456")); // 1,23456
|
|
44
|
+
console.log((0, index_1.removeNumberCommas)(""));
|
|
45
|
+
console.log((0, index_1.numberFallback)(1, 2, 3, "abc")); // 1
|
|
46
|
+
console.log((0, index_1.numberFallback)(undefined, 2, 3, "abc")); // 2
|
|
47
|
+
console.log((0, index_1.numberFallback)(null, 2, 3, "abc")); // 2
|
|
48
|
+
console.log((0, index_1.numberFallback)(NaN, 2, 3, "abc")); // 2
|
|
49
|
+
console.log((0, index_1.numberFallback)(0, 2, 3, "abc")); // 0
|
|
42
50
|
//# sourceMappingURL=test.js.map
|
package/dist/test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -20,7 +20,12 @@ export function trimTrailingZeros(numberString: string): string {
|
|
|
20
20
|
|
|
21
21
|
export function toWan(
|
|
22
22
|
value: any,
|
|
23
|
-
{
|
|
23
|
+
{
|
|
24
|
+
fixed = 0,
|
|
25
|
+
trimEndZeros = false,
|
|
26
|
+
space = "",
|
|
27
|
+
nanString = "NaN",
|
|
28
|
+
}: Options = {}
|
|
24
29
|
): string {
|
|
25
30
|
value = parseNumber(value);
|
|
26
31
|
if (isNaN(value)) {
|
|
@@ -33,7 +38,12 @@ export function toWan(
|
|
|
33
38
|
|
|
34
39
|
export function toYi(
|
|
35
40
|
value: any,
|
|
36
|
-
{
|
|
41
|
+
{
|
|
42
|
+
fixed = 0,
|
|
43
|
+
trimEndZeros = false,
|
|
44
|
+
space = "",
|
|
45
|
+
nanString = "NaN",
|
|
46
|
+
}: Options = {}
|
|
37
47
|
): string {
|
|
38
48
|
value = parseNumber(value);
|
|
39
49
|
if (isNaN(value)) {
|
|
@@ -46,7 +56,12 @@ export function toYi(
|
|
|
46
56
|
|
|
47
57
|
export function toWanYi(
|
|
48
58
|
value: any,
|
|
49
|
-
{
|
|
59
|
+
{
|
|
60
|
+
fixed = 0,
|
|
61
|
+
trimEndZeros = false,
|
|
62
|
+
space = "",
|
|
63
|
+
nanString = "NaN",
|
|
64
|
+
}: Options = {}
|
|
50
65
|
): string {
|
|
51
66
|
value = parseNumber(value);
|
|
52
67
|
if (isNaN(value)) {
|
|
@@ -93,7 +108,12 @@ export function toAuto(
|
|
|
93
108
|
|
|
94
109
|
export function toPercent(
|
|
95
110
|
value: any,
|
|
96
|
-
{
|
|
111
|
+
{
|
|
112
|
+
fixed = 0,
|
|
113
|
+
trimEndZeros = false,
|
|
114
|
+
space = "",
|
|
115
|
+
nanString = "NaN",
|
|
116
|
+
}: Options = {}
|
|
97
117
|
): string {
|
|
98
118
|
value = parseNumber(value);
|
|
99
119
|
if (isNaN(value)) {
|
|
@@ -170,10 +190,28 @@ export function isNotNumber(value: any): boolean {
|
|
|
170
190
|
return !Number.isFinite(value);
|
|
171
191
|
}
|
|
172
192
|
|
|
173
|
-
export function formatWithCommas(
|
|
193
|
+
export function formatWithCommas(
|
|
194
|
+
value: any,
|
|
195
|
+
{ strNaN } = { strNaN: "NaN" }
|
|
196
|
+
): string {
|
|
174
197
|
const val = parseNumber(value);
|
|
175
198
|
if (isNaN(val)) {
|
|
176
199
|
return strNaN;
|
|
177
200
|
}
|
|
178
201
|
return val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
|
|
179
202
|
}
|
|
203
|
+
|
|
204
|
+
export function removeNumberCommas(str: string): string {
|
|
205
|
+
// 使用更严格的正则匹配千分位逗号
|
|
206
|
+
// 匹配规则：逗号右侧必须是3的倍数的连续数字，直到遇到非数字字符或结尾
|
|
207
|
+
return str.replace(/(?<=\d{1,3}),(?=(\d{3})+(?!\d))/g, "");
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
export function numberFallback(...args: any[]): number {
|
|
211
|
+
for (const arg of args) {
|
|
212
|
+
if (isNumber(arg)) {
|
|
213
|
+
return arg;
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
return NaN;
|
|
217
|
+
}
|
package/src/test.ts
CHANGED
|
@@ -1,4 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
formatWithCommas,
|
|
3
|
+
isNotNumber,
|
|
4
|
+
isNumber,
|
|
5
|
+
numberFallback,
|
|
6
|
+
parseNumber,
|
|
7
|
+
removeNumberCommas,
|
|
8
|
+
toAuto,
|
|
9
|
+
toPercent,
|
|
10
|
+
} from "./index";
|
|
2
11
|
|
|
3
12
|
console.log(toAuto(NaN)); // NaN
|
|
4
13
|
console.log(toAuto(NaN, { nanString: "invalid" })); // invalid
|
|
@@ -43,3 +52,13 @@ console.log(formatWithCommas("12345.6789")); // 12,345.678,9
|
|
|
43
52
|
console.log(formatWithCommas("123")); // 123
|
|
44
53
|
console.log(formatWithCommas("abc")); // "NaN"
|
|
45
54
|
console.log(formatWithCommas("abc", { strNaN: "" })); // ""
|
|
55
|
+
|
|
56
|
+
console.log(removeNumberCommas("123,456,789")); // 123456789
|
|
57
|
+
console.log(removeNumberCommas("1,23,456")); // 1,23456
|
|
58
|
+
console.log(removeNumberCommas(""));
|
|
59
|
+
|
|
60
|
+
console.log(numberFallback(1, 2, 3, "abc")); // 1
|
|
61
|
+
console.log(numberFallback(undefined, 2, 3, "abc")); // 2
|
|
62
|
+
console.log(numberFallback(null, 2, 3, "abc")); // 2
|
|
63
|
+
console.log(numberFallback(NaN, 2, 3, "abc")); // 2
|
|
64
|
+
console.log(numberFallback(0, 2, 3, "abc")); // 0
|