|
@@ -34,15 +34,16 @@ export function useFilters(): Filters {
|
|
|
* @param {boolean} toArray - 是否转化为数组,默认值为false
|
|
* @param {boolean} toArray - 是否转化为数组,默认值为false
|
|
|
* @returns {string} 格式化后的字符串
|
|
* @returns {string} 格式化后的字符串
|
|
|
*/
|
|
*/
|
|
|
- const numberFormat = (value: number | string,toArray:boolean = false): string => {
|
|
|
|
|
|
|
+ const numberFormat = (value: number | string,toArray:boolean = false): string[] | string => {
|
|
|
if (value == '***') {
|
|
if (value == '***') {
|
|
|
return '***';
|
|
return '***';
|
|
|
}
|
|
}
|
|
|
if (isNaN(Number(value))) {
|
|
if (isNaN(Number(value))) {
|
|
|
return '0';
|
|
return '0';
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
- let value1 = value.toString();
|
|
|
|
|
|
|
+
|
|
|
|
|
+ // let value1 = Number(value).toFixed(2)
|
|
|
|
|
+ let value1 = value.toString();
|
|
|
|
|
|
|
|
if (value1.indexOf('-') > -1) {
|
|
if (value1.indexOf('-') > -1) {
|
|
|
value1 = value1.split('-')[1];
|
|
value1 = value1.split('-')[1];
|
|
@@ -62,7 +63,8 @@ export function useFilters(): Filters {
|
|
|
if (index > 0) {
|
|
if (index > 0) {
|
|
|
inter = num[0].substr(0, index) + (inter == '' ? '' : ',') + inter;
|
|
inter = num[0].substr(0, index) + (inter == '' ? '' : ',') + inter;
|
|
|
}
|
|
}
|
|
|
- return toArray ? ['-' + inter,num[1]] : '-' + inter + (num.length == 1 ? '' : '.' + num[1]);
|
|
|
|
|
|
|
+ // return toArray ? ['-' + inter,num[1]] : '-' + inter + (num.length == 1 ? '' : '.' + num[1]);
|
|
|
|
|
+ return '-' + inter + (num.length == 1 ? '' : '.' + num[1]);
|
|
|
} else {
|
|
} else {
|
|
|
let num = value1.split('.');
|
|
let num = value1.split('.');
|
|
|
let interCount = num[0].length;
|
|
let interCount = num[0].length;
|
|
@@ -80,7 +82,8 @@ export function useFilters(): Filters {
|
|
|
if (index > 0) {
|
|
if (index > 0) {
|
|
|
inter = num[0].substr(0, index) + (inter == '' ? '' : ',') + inter;
|
|
inter = num[0].substr(0, index) + (inter == '' ? '' : ',') + inter;
|
|
|
}
|
|
}
|
|
|
- return toArray ? [inter,num[1]] : inter + (num.length == 1 ? '' : '.' + num[1]);
|
|
|
|
|
|
|
+ // return toArray ? [inter,num[1]] : inter + (num.length == 1 ? '' : '.' + num[1]);
|
|
|
|
|
+ return inter + (num.length == 1 ? '' : '.' + num[1]);
|
|
|
}
|
|
}
|
|
|
};
|
|
};
|
|
|
|
|
|