qmwts 1.1.65 → 1.1.66

package/dist/utils/number-utils.d.ts

@@ -1,9 +1,10 @@
 declare const _default: {
-    ifNaN(number: any, substitute: any): any;
-    isNumber(...number: any[]): boolean;
-    thousandths(number: any, fixed?: number): string;
-    summation(array?: any[]): number;
-    isBetween(a: number, min: number, max: number): boolean;
-    isInside(a: number, min: number, max: number): boolean;
+    ifNaN(value: any, substitute: any): any;
+    isNumber(...values: any[]): boolean;
+    thousandths(value: any, fixed?: number): string;
+    summation(...values: any[]): number;
+    isBetween(value: number, min: number, max: number): boolean;
+    isInside(value: number, min: number, max: number): boolean;
+    extractNumbers(value: any): string;
 };
 export default _default;

package/dist/utils/number-utils.js

@@ -2,42 +2,62 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     // 判断是否数字
-    ifNaN(number, substitute) {
-        return this.isNumber(number) ? +number : substitute;
+    ifNaN(value, substitute) {
+        return this.isNumber(value) ? +value : substitute;
     },
-    isNumber(...number) {
-        for (let i = number.length - 1; i >= 0; i--) {
-            const e = String(number[i]).trim();
-            if (e === '' || !isFinite(+e) || isNaN(+e))
+    isNumber(...values) {
+        for (let i = values.length - 1; i >= 0; i--) {
+            const e = String(values[i]).trim();
+            if (e === '' || !Number.isFinite(+e) || Number.isNaN(+e))
                 return false;
         }
         return true;
     },
     // 增加千分位分隔符
-    thousandths(number, fixed = 2) {
-        if (!this.isNumber(number))
+    thousandths(value, fixed = 2) {
+        if (!this.isNumber(value))
             return '';
-        number = new Intl.NumberFormat('en-US', {
+        value = new Intl.NumberFormat('en-US', {
             minimumFractionDigits: fixed,
             maximumFractionDigits: fixed,
-        }).format(number);
-        if (+number === 0) // -0转为普通0
+        }).format(value);
+        if (+value === 0) // -0转为0
             return (0).toFixed(fixed);
-        return number;
+        return value;
     },
-    summation(array = []) {
+    summation(...values) {
         let sum = 0;
-        for (let i = array.length - 1; i >= 0; i--) {
-            const e = +array[i];
+        const values0 = values.flat(Infinity);
+        for (let i = values0.length - 1; i >= 0; i--) {
+            const e = +values0[i];
             if (this.isNumber(e))
                 sum += e;
         }
         return sum;
     },
-    isBetween(a, min, max) {
-        return a >= Math.min(min, max) && a <= Math.max(max, min);
+    isBetween(value, min, max) {
+        return value >= Math.min(min, max) && value <= Math.max(max, min);
     },
-    isInside(a, min, max) {
-        return a > Math.min(min, max) && a < Math.max(max, min);
+    isInside(value, min, max) {
+        return value > Math.min(min, max) && value < Math.max(max, min);
+    },
+    extractNumbers(value) {
+        const v = String(value);
+        let result = '';
+        let hasDot = false;
+        for (let i = 0; i < v.length; i++) {
+            const ch = v[i];
+            if (/[0-9]/.test(ch)) {
+                result += ch;
+            }
+            else if (ch === '-' && result === '') { // 负号只能在最前
+                result += ch;
+            }
+            else if (ch === '.' && !hasDot) { // 只能有一个小数点
+                result += ch;
+                hasDot = true;
+            }
+        }
+        return result;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qmwts",
-  "version": "1.1.65",
+  "version": "1.1.66",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",