ui/vant
1
0
Fork 0
mirror of https://github.com/youzan/vant.git synced 2026-01-28 01:10:04 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

feat(Badge): max support string type

Browse Source
This commit is contained in:
chenjiahan
2020-10-02 17:05:08 +08:00
parent 56c50666ce
commit 839b8654ee
7 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/utils/format/unit.ts
View File

@@ -6,8 +6,7 @@ export function addUnit(value?: string | number): string | undefined {
return undefined;
}
value = String(value);
return isNumeric(value) ? `${value}px` : value;
return isNumeric(value) ? `${value}px` : String(value);
}
export function getSizeStyle(originSize?: string | number) {

1
src/utils/test/index.spec.js
View File

@@ -91,6 +91,7 @@ test('isMobile', () => {
});
test('isNumeric', () => {
expect(isNumeric(1)).toBeTruthy();
expect(isNumeric('1')).toBeTruthy();
expect(isNumeric('1.2')).toBeTruthy();
expect(isNumeric('1..2')).toBeFalsy();

4
src/utils/validate/number.ts
View File

@@ -1,5 +1,5 @@
export function isNumeric(val: string): boolean {
return /^\d+(\.\d+)?$/.test(val);
export function isNumeric(val: string | number): val is string {
return typeof val === 'number' || /^\d+(\.\d+)?$/.test(val);
}
export function isNaN(val: number): val is typeof NaN {