refactor: number validation functions for enhanced accuracy

Author: betavs

packages/components/common/utils.ts

@@ -1,5 +1,5 @@
 import { prefix } from './config';
-import { isString, isNumber, isDef, isBoolean, isObject } from './validator';
+import { isString, isNumeric, isDef, isBoolean, isObject } from './validator';
 import { getWindowInfo, getAppBaseInfo, getDeviceInfo } from './wechat';
 
 interface WxWorkSystemInfo extends WechatMiniprogram.SystemInfo {
@@ -152,7 +152,7 @@ export const addUnit = function (value?: string | number): string | undefined {
     return undefined;
   }
   value = String(value);
-  return isNumber(value) ? `${value}px` : value;
+  return isNumeric(value) ? `${value}px` : value;
 };
 
 /**

packages/components/common/validator.ts

@@ -16,8 +16,16 @@ export function isDef(value: unknown): boolean {
   return !isUndefined(value) && !isNull(value);
 }
 
-export function isNumber(value: string | number): boolean {
-  return typeof value === 'number' || /^-?\d+(\.\d+)?$/.test(value);
+export function isInteger(value: unknown): boolean {
+  return Number.isInteger(value);
+}
+
+export function isNumeric(value: unknown): boolean {
+  return !Number.isNaN(Number(value));
+}
+
+export function isNumber(value: unknown): boolean {
+  return typeof value === 'number';
 }
 
 export function isBoolean(value: unknown): value is boolean {

packages/components/guide/guide.ts

@@ -1,7 +1,7 @@
 import { SuperComponent, wxComponent } from '../common/src/index';
 import props from './props';
 import config from '../common/config';
-import { isFunction, isNumber } from '../common/validator';
+import { isFunction, isNumeric } from '../common/validator';
 import { TdGuideProps, GuideStep } from './type';
 import { debounce, getRect, rpx2px, styles, unitConvert, nextTick, systemInfo } from '../common/utils';
 
@@ -214,8 +214,8 @@ export default class Guide extends SuperComponent {
     },
     getPlacement() {
       const space = rpx2px(32);
-      const offsetLeft = (offset) => unitConvert(isNumber(offset?.[0]) ? `${offset?.[0]}rpx` : offset?.[0] || 0);
-      const offsetTop = (offset) => unitConvert(isNumber(offset?.[1]) ? `${offset?.[1]}rpx` : offset?.[1] || 0);
+      const offsetLeft = (offset) => unitConvert(isNumeric(offset?.[0]) ? `${offset?.[0]}rpx` : offset?.[0] || 0);
+      const offsetTop = (offset) => unitConvert(isNumeric(offset?.[1]) ? `${offset?.[1]}rpx` : offset?.[1] || 0);
       const left = (place) => parseFloat(place.left);
       const right = (place) => parseFloat(place.right);
       const top = (place) => parseFloat(place.top);

packages/components/skeleton/skeleton.ts

@@ -4,7 +4,7 @@ import props from './props';
 import { SkeletonRowColObj } from './type';
 import { ClassName, Styles } from '../common/common';
 import { classNames } from '../common/utils';
-import { isNumber } from '../common/validator';
+import { isInteger, isNumeric, isPlainObject } from '../common/validator';
 
 const { prefix } = config;
 const name = `${prefix}-skeleton`;
@@ -68,12 +68,13 @@ export default class Skeleton extends SuperComponent {
       }
 
       const parsedRowCols = rowCols.map((item) => {
-        if (isNumber(item)) {
+        if (isInteger(item) && item > 0) {
           return new Array(item).fill({
             class: this.getColItemClass({ type: 'text' }),
             style: {},
           });
         }
+
         if (Array.isArray(item)) {
           return item.map((col) => {
             return {
@@ -89,7 +90,7 @@ export default class Skeleton extends SuperComponent {
           {
             ...nItem,
             class: this.getColItemClass(nItem),
-            style: this.getColItemStyle(nItem),
+            style: isPlainObject(nItem) ? this.getColItemStyle(nItem) : {},
           },
         ];
       });
@@ -122,7 +123,7 @@ export default class Skeleton extends SuperComponent {
       const style: Styles = {};
       styleName.forEach((name) => {
         if (name in obj) {
-          const px = isNumber(obj[name]) ? `${obj[name]}px` : obj[name];
+          const px = isNumeric(obj[name]) ? `${obj[name]}px` : obj[name];
           if (name === 'size') {
             [style.width, style.height] = [px, px];
           } else {

packages/components/tag/tag.ts

@@ -2,7 +2,7 @@ import { wxComponent, SuperComponent } from '../common/src/index';
 import config from '../common/config';
 import props from './props';
 import { classNames, calcIcon } from '../common/utils';
-import { isNumber } from '../common/validator';
+import { isNumeric } from '../common/validator';
 
 const { prefix } = config;
 const name = `${prefix}-tag`;
@@ -77,7 +77,7 @@ export default class Tag extends SuperComponent {
       if (!maxWidth) {
         return '';
       }
-      const width = isNumber(maxWidth) ? `${maxWidth}px` : maxWidth;
+      const width = isNumeric(maxWidth) ? `${maxWidth}px` : maxWidth;
       this.setData({ tagStyle: `max-width:${width};` });
     },