ls-pro-common 1.0.37 → 1.0.38
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/common.js +1 -1
- package/dist/common.min.js +1 -1
- package/es/utils/index.d.ts +1 -1
- package/es/utils/index.js +9 -0
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +9 -0
- package/package.json +1 -1
package/es/utils/index.d.ts
CHANGED
|
@@ -53,7 +53,7 @@ export declare const dateAdd: (dt: Date | null, addDay: number, addMonth?: numbe
|
|
|
53
53
|
* @param dec 小数位数,默认为2位小数
|
|
54
54
|
* @returns xx,xxx.xx
|
|
55
55
|
*/
|
|
56
|
-
export declare const formatMoney: (num: number, dec?: number) => string;
|
|
56
|
+
export declare const formatMoney: (num: number | string, dec?: number) => string;
|
|
57
57
|
/**
|
|
58
58
|
* 获取Cookie
|
|
59
59
|
* @param {String} name cookie名
|
package/es/utils/index.js
CHANGED
|
@@ -108,6 +108,15 @@ export var dateAdd = function dateAdd(dt, addDay) {
|
|
|
108
108
|
|
|
109
109
|
export var formatMoney = function formatMoney(num) {
|
|
110
110
|
var dec = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
|
|
111
|
+
|
|
112
|
+
if (typeof num === 'string') {
|
|
113
|
+
try {
|
|
114
|
+
num = Number(num);
|
|
115
|
+
} catch (e) {
|
|
116
|
+
num = 0;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
|
|
111
120
|
var str = num.toFixed(dec);
|
|
112
121
|
|
|
113
122
|
if (str.indexOf('.') === -1) {
|
package/lib/utils/index.d.ts
CHANGED
|
@@ -53,7 +53,7 @@ export declare const dateAdd: (dt: Date | null, addDay: number, addMonth?: numbe
|
|
|
53
53
|
* @param dec 小数位数,默认为2位小数
|
|
54
54
|
* @returns xx,xxx.xx
|
|
55
55
|
*/
|
|
56
|
-
export declare const formatMoney: (num: number, dec?: number) => string;
|
|
56
|
+
export declare const formatMoney: (num: number | string, dec?: number) => string;
|
|
57
57
|
/**
|
|
58
58
|
* 获取Cookie
|
|
59
59
|
* @param {String} name cookie名
|
package/lib/utils/index.js
CHANGED
|
@@ -177,6 +177,15 @@ exports.dateAdd = dateAdd;
|
|
|
177
177
|
|
|
178
178
|
var formatMoney = function formatMoney(num) {
|
|
179
179
|
var dec = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
|
|
180
|
+
|
|
181
|
+
if (typeof num === 'string') {
|
|
182
|
+
try {
|
|
183
|
+
num = Number(num);
|
|
184
|
+
} catch (e) {
|
|
185
|
+
num = 0;
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
|
|
180
189
|
var str = num.toFixed(dec);
|
|
181
190
|
|
|
182
191
|
if (str.indexOf('.') === -1) {
|