Commit d4e168bdc2bad0710d53d3a77cdf416f21fff774
1 parent
fb822c9b
优化 工具函数-formatObjText;
Showing
1 changed file
with
6 additions
and
6 deletions
src/utils/utils.ts
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | * @Author: wangqiang@feewee.cn |
3 | 3 | * @Date: 2022-05-11 15:58:56 |
4 | 4 | * @LastEditors: wangqiang@feewee.cn |
5 | - * @LastEditTime: 2023-05-06 14:51:12 | |
5 | + * @LastEditTime: 2023-05-09 14:04:54 | |
6 | 6 | */ |
7 | 7 | |
8 | 8 | import { checkNull } from "@/utils/validate"; |
... | ... | @@ -32,12 +32,12 @@ const isAntDesignProOrDev = (): boolean => { |
32 | 32 | |
33 | 33 | export { isAntDesignProOrDev, isAntDesignPro, isUrl }; |
34 | 34 | |
35 | -export const formatObjText = ( | |
36 | - list: any[], | |
37 | - formatKey: string = "staffName", | |
35 | +export function formatObjText<T>( | |
36 | + list: T[], | |
37 | + formatKey: keyof T, | |
38 | 38 | maxCount: number = 2, |
39 | 39 | unit: string = "人" |
40 | -) => { | |
40 | +): string { | |
41 | 41 | if (!list || (list && !list.length)) return "-"; |
42 | 42 | else { |
43 | 43 | let result = ""; |
... | ... | @@ -50,7 +50,7 @@ export const formatObjText = ( |
50 | 50 | } |
51 | 51 | return result; |
52 | 52 | } |
53 | -}; | |
53 | +} | |
54 | 54 | |
55 | 55 | export function isNumber(str: string | number) { |
56 | 56 | // 匹配整数或带有小数点的数字 | ... | ... |