ph-utils 0.2.18 → 0.2.20

package/lib/index.js

@@ -1,37 +1,32 @@
-"use strict";
 /**
  * node 和 web 通用的工具类
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.throttle = exports.BaseError = exports.isBoolean = exports.isNumeric = exports.shieldMobile = exports.isBlank = void 0;
 /**
  * 验证字符串是否为空
  * @param str               待验证的字符串
  * @param ignoreWhitespace  是否忽略空格(包括空白字符串以及[\r\t\n]之类的制表符)，默认为true
  */
-function isBlank(str, ignoreWhitespace = true) {
+export function isBlank(str, ignoreWhitespace = true) {
     if (str == null) {
         return true;
     }
     return (ignoreWhitespace ? str.trim().length : str.length) === 0;
 }
-exports.isBlank = isBlank;
 /**
  * 屏蔽手机号，中间部分用 * 展示
  * @param mobile 待屏蔽的手机号
  * @returns 屏蔽后的手机号，例如：123 **** 1234
  */
-function shieldMobile(mobile) {
-    let x1 = Math.round(mobile.length / 2);
-    let x2 = Math.round(x1 / 2);
+export function shieldMobile(mobile) {
+    let x1 = Math.floor(mobile.length / 2);
+    let x2 = Math.ceil(x1 / 2);
     let shields = [' '];
-    for (let i = 0; i < x1; i++) {
+    for (let i = 0; i < x1 - 1; i++) {
         shields.push('*');
     }
     shields.push(' ');
-    return mobile.substring(0, x2) + shields.join('') + mobile.substring(x2 + x1);
+    return (mobile.substring(0, x2) + shields.join('') + mobile.substring(x2 + x1 - 1));
 }
-exports.shieldMobile = shieldMobile;
 /**
  * 验证参数是否是数字
  * @param str 待验证的字符串
@@ -40,31 +35,24 @@ exports.shieldMobile = shieldMobile;
  * @param numericParam.isFloat 是否是小数
  * @returns true 是数字, false 不是数字
  */
-function isNumeric(str, numericParam) {
+export function isNumeric(str, numericParam) {
     numericParam = { isPositive: false, isFloat: true, ...(numericParam || {}) };
     let symbol = numericParam.isPositive ? '[+]?' : '[+-]?';
     let main = numericParam.isFloat ? '([0-9]*[.])?[0-9]+' : '[0-9]+';
     return new RegExp('^' + symbol + main + '$').test(str);
 }
-exports.isNumeric = isNumeric;
 /**
  * 验证参数是否是Boolean 类型
  * @param str 待验证的字符串
  * @returns
  */
-function isBoolean(str) {
+export function isBoolean(str) {
     return ['true', 'false'].indexOf(str) >= 0;
 }
-exports.isBoolean = isBoolean;
 /**
  * 带有错误名称标记的错误类型
  */
-class BaseError extends Error {
-    /**
-     * 错误名称，类似于 Java 中的不同的 Exception[NullPointerException]；
-     * 增加 name 字段，表明不同的错误，当需要根据不同的错误执行不同的处理的时候，会很有用
-     */
-    name;
+export class BaseError extends Error {
     constructor() {
         if (arguments.length === 1) {
             super(arguments[0]);
@@ -76,6 +64,30 @@ class BaseError extends Error {
         }
     }
 }
+/**
+ * 创建一个节流函数，在 wait 秒内最多执行 func 一次的函数。
+ * @param func 要节流的函数
+ * @param wait 需要节流的毫秒
+ * @returns
+ */
+export function throttle(func, wait = 300) {
+    let t = -1;
+    return function (...args) {
+        const self = this;
+        clearTimeout(t);
+        t = setTimeout(() => {
+            func.apply(self, args);
+        }, wait);
+    };
+}
+
+        }
+        else {
+            super(arguments[1]);
+            this.name = arguments[0];
+        }
+    }
+}
 exports.BaseError = BaseError;
 /**
  * 创建一个节流函数，在 wait 秒内最多执行 func 一次的函数。

package/lib/index_m.js

@@ -18,14 +18,14 @@ export function isBlank(str, ignoreWhitespace = true) {
  * @returns 屏蔽后的手机号，例如：123 **** 1234
  */
 export function shieldMobile(mobile) {
-    let x1 = Math.round(mobile.length / 2);
-    let x2 = Math.round(x1 / 2);
+    let x1 = Math.floor(mobile.length / 2);
+    let x2 = Math.ceil(x1 / 2);
     let shields = [' '];
-    for (let i = 0; i < x1; i++) {
+    for (let i = 0; i < x1 - 1; i++) {
         shields.push('*');
     }
     shields.push(' ');
-    return mobile.substring(0, x2) + shields.join('') + mobile.substring(x2 + x1);
+    return (mobile.substring(0, x2) + shields.join('') + mobile.substring(x2 + x1 - 1));
 }
 /**
  * 验证参数是否是数字

package/lib/validator.d.ts

@@ -15,6 +15,7 @@ export interface SchemaType {
     required?: boolean;
     type?: string | ((v: any) => void);
     rules: RuleType[];
+    message?: string;
 }
 /**
  * 数据验证器，除了进行数据验证外，还可以同时进行数据转化
@@ -29,7 +30,7 @@ declare class Validator {
      */
     constructor(schemas: SchemaType[]);
     /**
-     * 进行数据验证，同时根据 type 进行数据类型转换
+     * 进行数据验证
      * @param data 待验证的数据
      * @returns
      */
@@ -43,4 +44,4 @@ declare class Validator {
     private _validateRule;
     private _parseStringRule;
 }
-export = Validator;
+export default Validator;

package/lib/validator.js

@@ -3,6 +3,7 @@
 /**
  * 数据验证器
  */
+Object.defineProperty(exports, "__esModule", { value: true });
 // 默认的错误提示信息
 const defaultMsgs = {
     mobile: '请输入正确的手机号',
@@ -58,16 +59,19 @@ class Validator {
             let rules = [];
             let rule = schema.rules;
             if (typeof rule === 'string') {
-                rules = rules.concat(this._parseStringRule(rule));
+                rules = rules.concat(this._parseStringRule(rule, schema.message));
             }
             else if (rule instanceof Array) {
                 for (let ruleItem of rule) {
                     if (typeof ruleItem === 'string') {
-                        rules.push(...this._parseStringRule(ruleItem));
+                        rules.push(...this._parseStringRule(ruleItem, schema.message));
                     }
                     else if (ruleItem instanceof RegExp ||
                         typeof ruleItem === 'function') {
-                        rules.push({ rule: ruleItem, message: defaultMsg });
+                        rules.push({
+                            rule: ruleItem,
+                            message: schema.message || defaultMsg,
+                        });
                     }
                     else {
                         if (typeof ruleItem.rule === 'string') {
@@ -94,7 +98,7 @@ class Validator {
         this.rules = parsedRules;
     }
     /**
-     * 进行数据验证，同时根据 type 进行数据类型转换
+     * 进行数据验证
      * @param data 待验证的数据
      * @returns
      */
@@ -103,7 +107,8 @@ class Validator {
             let errMsg = '';
             let errKey = '';
             for (let key in this.rules) {
-                if ({}.hasOwnProperty.call(this.rules, key)) {
+                // eslint-disable-next-line no-prototype-builtins
+                if (this.rules.hasOwnProperty(key)) {
                     errMsg = this._validateRule(this.rules[key], data[key], data);
                     if (errMsg !== '') {
                         errKey = key;
@@ -142,33 +147,31 @@ class Validator {
         let errMsg = '';
         for (let rule of rules) {
             // 如果数据为空，则判断是否是必填
-            if (value == null || !ruleFns.pattern(ruleRegexs.required, value)) {
-                if (rule.rule === 'required') {
+            if (rule.rule === 'required') {
+                if (value == null || !ruleFns.pattern(ruleRegexs.required, value)) {
                     errMsg = rule.message;
                 }
             }
-            else {
-                if (typeof rule.rule === 'function') {
-                    if (!rule.rule(value)) {
-                        errMsg = rule.message;
-                    }
-                }
-                else if (rule.sameKey != null) {
-                    if (data != null) {
-                        if (!ruleFns.same(value, data[rule.sameKey])) {
-                            errMsg = rule.message;
-                        }
-                    }
+            if (typeof rule.rule === 'function') {
+                if (!rule.rule(value)) {
+                    errMsg = rule.message;
                 }
-                else if (rule.rule === 'required') {
-                    if (!ruleFns.pattern(ruleRegexs.required, String(value))) {
+            }
+            else if (rule.sameKey != null) {
+                if (data != null) {
+                    if (!ruleFns.same(value, data[rule.sameKey])) {
                         errMsg = rule.message;
                     }
                 }
-                else {
-                    if (!ruleFns.pattern(rule.rule, String(value))) {
-                        errMsg = rule.message;
-                    }
+            }
+            else if (rule.rule === 'required') {
+                if (!ruleFns.pattern(ruleRegexs.required, String(value))) {
+                    errMsg = rule.message;
+                }
+            }
+            else {
+                if (!ruleFns.pattern(rule.rule, String(value))) {
+                    errMsg = rule.message;
                 }
             }
             if (errMsg !== '') {
@@ -181,29 +184,32 @@ class Validator {
         let rules = [];
         let trule = rule.split('|');
         for (let r of trule) {
-            let message = defaultMsg;
-            let rrule;
+            let message = ruleErrMsg;
+            let rrule = null;
             let sameKey;
             if (ruleRegexs.same.test(r)) {
                 let m = r.match(ruleRegexs.same);
                 if (m != null) {
                     rrule = ruleRegexs.same;
-                    sameKey = r.match(ruleRegexs.same)[1];
-                    message = defaultMsgs['same'];
+                    let m = r.match(ruleRegexs.same);
+                    if (m != null) {
+                        sameKey = m[1];
+                    }
+                    message = message || defaultMsgs['same'];
                 }
             }
             else if (rule === 'required') {
                 rrule = 'required';
-                message = ruleErrMsg || defaultMsgs.required;
+                message = message || ruleErrMsg || defaultMsgs.required;
+                // eslint-disable-next-line no-prototype-builtins
             }
-            else if (Object.prototype.hasOwnProperty.call(ruleRegexs, r)) {
+            else if (ruleRegexs.hasOwnProperty(r)) {
                 rrule = ruleRegexs[r];
-                message = defaultMsgs[r] || defaultMsg;
+                message = message || defaultMsgs[r];
             }
-            message = ruleErrMsg || message;
             rules.push({ rule: rrule, message: message, sameKey });
         }
         return rules;
     }
 }
-module.exports = Validator;
+exports.default = Validator;

package/lib/validator_m.d.ts

@@ -15,6 +15,7 @@ export interface SchemaType {
     required?: boolean;
     type?: string | ((v: any) => void);
     rules: RuleType[];
+    message?: string;
 }
 /**
  * 数据验证器，除了进行数据验证外，还可以同时进行数据转化
@@ -29,7 +30,7 @@ declare class Validator {
      */
     constructor(schemas: SchemaType[]);
     /**
-     * 进行数据验证，同时根据 type 进行数据类型转换
+     * 进行数据验证
      * @param data 待验证的数据
      * @returns
      */

package/lib/validator_m.js

@@ -54,16 +54,19 @@ class Validator {
             let rules = [];
             let rule = schema.rules;
             if (typeof rule === 'string') {
-                rules = rules.concat(this._parseStringRule(rule));
+                rules = rules.concat(this._parseStringRule(rule, schema.message));
             }
             else if (rule instanceof Array) {
                 for (let ruleItem of rule) {
                     if (typeof ruleItem === 'string') {
-                        rules.push(...this._parseStringRule(ruleItem));
+                        rules.push(...this._parseStringRule(ruleItem, schema.message));
                     }
                     else if (ruleItem instanceof RegExp ||
                         typeof ruleItem === 'function') {
-                        rules.push({ rule: ruleItem, message: defaultMsg });
+                        rules.push({
+                            rule: ruleItem,
+                            message: schema.message || defaultMsg,
+                        });
                     }
                     else {
                         if (typeof ruleItem.rule === 'string') {
@@ -90,7 +93,7 @@ class Validator {
         this.rules = parsedRules;
     }
     /**
-     * 进行数据验证，同时根据 type 进行数据类型转换
+     * 进行数据验证
      * @param data 待验证的数据
      * @returns
      */
@@ -99,7 +102,8 @@ class Validator {
             let errMsg = '';
             let errKey = '';
             for (let key in this.rules) {
-                if ({}.hasOwnProperty.call(this.rules, key)) {
+                // eslint-disable-next-line no-prototype-builtins
+                if (this.rules.hasOwnProperty(key)) {
                     errMsg = this._validateRule(this.rules[key], data[key], data);
                     if (errMsg !== '') {
                         errKey = key;
@@ -138,33 +142,31 @@ class Validator {
         let errMsg = '';
         for (let rule of rules) {
             // 如果数据为空，则判断是否是必填
-            if (value == null || !ruleFns.pattern(ruleRegexs.required, value)) {
-                if (rule.rule === 'required') {
+            if (rule.rule === 'required') {
+                if (value == null || !ruleFns.pattern(ruleRegexs.required, value)) {
                     errMsg = rule.message;
                 }
             }
-            else {
-                if (typeof rule.rule === 'function') {
-                    if (!rule.rule(value)) {
-                        errMsg = rule.message;
-                    }
-                }
-                else if (rule.sameKey != null) {
-                    if (data != null) {
-                        if (!ruleFns.same(value, data[rule.sameKey])) {
-                            errMsg = rule.message;
-                        }
-                    }
+            if (typeof rule.rule === 'function') {
+                if (!rule.rule(value)) {
+                    errMsg = rule.message;
                 }
-                else if (rule.rule === 'required') {
-                    if (!ruleFns.pattern(ruleRegexs.required, String(value))) {
+            }
+            else if (rule.sameKey != null) {
+                if (data != null) {
+                    if (!ruleFns.same(value, data[rule.sameKey])) {
                         errMsg = rule.message;
                     }
                 }
-                else {
-                    if (!ruleFns.pattern(rule.rule, String(value))) {
-                        errMsg = rule.message;
-                    }
+            }
+            else if (rule.rule === 'required') {
+                if (!ruleFns.pattern(ruleRegexs.required, String(value))) {
+                    errMsg = rule.message;
+                }
+            }
+            else {
+                if (!ruleFns.pattern(rule.rule, String(value))) {
+                    errMsg = rule.message;
                 }
             }
             if (errMsg !== '') {
@@ -177,30 +179,32 @@ class Validator {
         let rules = [];
         let trule = rule.split('|');
         for (let r of trule) {
-            let message = defaultMsg;
-            let rrule;
+            let message = ruleErrMsg;
+            let rrule = null;
             let sameKey;
             if (ruleRegexs.same.test(r)) {
                 let m = r.match(ruleRegexs.same);
                 if (m != null) {
                     rrule = ruleRegexs.same;
-                    sameKey = r.match(ruleRegexs.same)[1];
-                    message = defaultMsgs['same'];
+                    let m = r.match(ruleRegexs.same);
+                    if (m != null) {
+                        sameKey = m[1];
+                    }
+                    message = message || defaultMsgs['same'];
                 }
             }
             else if (rule === 'required') {
                 rrule = 'required';
-                message = ruleErrMsg || defaultMsgs.required;
+                message = message || ruleErrMsg || defaultMsgs.required;
+                // eslint-disable-next-line no-prototype-builtins
             }
-            else if (Object.prototype.hasOwnProperty.call(ruleRegexs, r)) {
+            else if (ruleRegexs.hasOwnProperty(r)) {
                 rrule = ruleRegexs[r];
-                message = defaultMsgs[r] || defaultMsg;
+                message = message || defaultMsgs[r];
             }
-            message = ruleErrMsg || message;
             rules.push({ rule: rrule, message: message, sameKey });
         }
         return rules;
     }
 }
-// @ts-ignore: Unreachable code error
 export default Validator;

package/package.json

@@ -5,7 +5,7 @@
   "module": "lib/index_m.js",
   "types": "lib/index.d.ts",
   "browser": "lib/index_m.js",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "repository": {
     "type": "git",
     "url": "git+https//gitee.com/towardly/ph.git",

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Tenny
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.