ph-utils 0.2.2 → 0.2.6

package/lib/dom.d.ts

@@ -15,6 +15,13 @@ export declare function addClass(elem: HTMLElement, clazz: string): void;
  * @param {string} clazz     需要移除的 class
  */
 export declare function removeClass(elem: HTMLElement, clazz: string): void;
+/**
+ * 判断节点是否包含某个 class
+ * @param elem  待判断 class 的节点
+ * @param clazz 待判断的 class
+ * @returns
+ */
+export declare function hasClass(elem: HTMLElement, clazz: string): boolean;
 /**
  * 为节点添加 transition 属性，包括浏览器前缀
  * @param {HTMLElement} element 需要添加 css Transition 属性的节点
@@ -34,7 +41,7 @@ export declare function transform(element: HTMLElement, value: string): void;
  * @param {function}    event     事件处理函数
  * @param {boolean}     onceOrConfig  是否是只运行一次的处理函数或者配置，其中 eventFlag 为 string，如果配置该项，则表明为委托事件
  */
-export declare function on(element: HTMLElement, listener: string, fn: (e: Event, target?: HTMLElement, flag?: string) => void, once?: boolean | {
+export declare function on<T extends Event>(element: HTMLElement, listener: string, fn: (e: T, target?: HTMLElement, flag?: string) => void, once?: boolean | {
     once?: boolean;
     eventFlag?: string;
     eventStop?: boolean;

package/lib/dom.js

@@ -32,6 +32,15 @@ export function addClass(elem, clazz) {
 export function removeClass(elem, clazz) {
     elem.classList.remove(clazz);
 }
+/**
+ * 判断节点是否包含某个 class
+ * @param elem  待判断 class 的节点
+ * @param clazz 待判断的 class
+ * @returns
+ */
+export function hasClass(elem, clazz) {
+    return elem.classList.contains(clazz);
+}
 /**
  * 为节点添加 transition 属性，包括浏览器前缀
  * @param {HTMLElement} element 需要添加 css Transition 属性的节点

package/lib/validator.d.ts

@@ -1,8 +1,15 @@
+/**
+ * 数据验证器
+ */
 interface RuleItem {
     rule: RegExp | ((v: any) => boolean);
     message: string;
     sameKey?: string;
 }
+export declare type RuleType = string | RegExp | ((v: any) => boolean) | (RegExp | string | ((v: any) => boolean) | {
+    rule: string | RegExp | ((v: any) => boolean);
+    message?: string;
+});
 /**
  * 数据验证器，除了进行数据验证外，还可以同时进行数据转化
  */
@@ -20,10 +27,7 @@ declare class Validator {
     constructor(schemas: {
         key: string;
         type?: string | ((v: any) => void);
-        rules: string | RegExp | ((v: any) => boolean) | (RegExp | string | ((v: any) => boolean) | {
-            rule: string | RegExp | ((v: any) => boolean);
-            message?: string;
-        })[];
+        rules: RuleType[];
     }[]);
     /**
      * 进行数据验证，同时根据 type 进行数据类型转换

package/lib/validator.js

@@ -53,9 +53,11 @@ const typeFns = {
 };
 class ValidateError extends Error {
     name;
-    constructor(msg) {
+    key;
+    constructor(key, msg) {
         super(msg);
         this.name = 'ValidateError';
+        this.key = key;
     }
 }
 /**
@@ -95,7 +97,7 @@ class Validator {
                     }
                     else {
                         if (typeof ruleItem.rule === 'string') {
-                            rules = rules.concat(this._parseStringRule(ruleItem.rule));
+                            rules = rules.concat(this._parseStringRule(ruleItem.rule, ruleItem.message));
                         }
                         else {
                             rules.push({ rule: ruleItem.rule, message: ruleItem.message || defaultMsg });
@@ -119,6 +121,7 @@ class Validator {
     validate(data) {
         return new Promise((resolve, reject) => {
             let errMsg = '';
+            let errKey = '';
             let resData = {};
             for (let key in this.rules) {
                 if ({}.hasOwnProperty.call(this.rules, key)) {
@@ -127,6 +130,7 @@ class Validator {
                         resData[key] = this._conversionType(this.types[key], data[key]);
                     }
                     else {
+                        errKey = key;
                         errMsg = errMsg.replace('%s', key);
                         break;
                     }
@@ -136,7 +140,7 @@ class Validator {
                 resolve(resData);
             }
             else {
-                reject(new ValidateError(errMsg));
+                reject(new ValidateError(errKey, errMsg));
             }
         });
     }
@@ -154,7 +158,7 @@ class Validator {
             }
             else {
                 errMsg = errMsg.replace('%s', key);
-                reject(new ValidateError(errMsg));
+                reject(new ValidateError(key, errMsg));
             }
         });
     }
@@ -192,7 +196,7 @@ class Validator {
         }
         return errMsg;
     }
-    _parseStringRule(rule) {
+    _parseStringRule(rule, ruleErrMsg) {
         let rules = [];
         let trule = rule.split('|');
         for (let r of trule) {
@@ -211,6 +215,7 @@ class Validator {
                 rrule = ruleRegexs[r];
                 message = defaultMsgs[r] || defaultMsg;
             }
+            message = ruleErrMsg || message;
             rules.push({ rule: rrule, message: message, sameKey });
         }
         return rules;

package/lib/validator_m.d.ts

@@ -1,8 +1,15 @@
+/**
+ * 数据验证器
+ */
 interface RuleItem {
     rule: RegExp | ((v: any) => boolean);
     message: string;
     sameKey?: string;
 }
+export declare type RuleType = string | RegExp | ((v: any) => boolean) | (RegExp | string | ((v: any) => boolean) | {
+    rule: string | RegExp | ((v: any) => boolean);
+    message?: string;
+});
 /**
  * 数据验证器，除了进行数据验证外，还可以同时进行数据转化
  */
@@ -20,10 +27,7 @@ declare class Validator {
     constructor(schemas: {
         key: string;
         type?: string | ((v: any) => void);
-        rules: string | RegExp | ((v: any) => boolean) | (RegExp | string | ((v: any) => boolean) | {
-            rule: string | RegExp | ((v: any) => boolean);
-            message?: string;
-        })[];
+        rules: RuleType[];
     }[]);
     /**
      * 进行数据验证，同时根据 type 进行数据类型转换

package/lib/validator_m.js

@@ -51,9 +51,10 @@ const typeFns = {
     },
 };
 class ValidateError extends Error {
-    constructor(msg) {
+    constructor(key, msg) {
         super(msg);
         this.name = 'ValidateError';
+        this.key = key;
     }
 }
 /**
@@ -91,7 +92,7 @@ class Validator {
                     }
                     else {
                         if (typeof ruleItem.rule === 'string') {
-                            rules = rules.concat(this._parseStringRule(ruleItem.rule));
+                            rules = rules.concat(this._parseStringRule(ruleItem.rule, ruleItem.message));
                         }
                         else {
                             rules.push({ rule: ruleItem.rule, message: ruleItem.message || defaultMsg });
@@ -115,6 +116,7 @@ class Validator {
     validate(data) {
         return new Promise((resolve, reject) => {
             let errMsg = '';
+            let errKey = '';
             let resData = {};
             for (let key in this.rules) {
                 if ({}.hasOwnProperty.call(this.rules, key)) {
@@ -123,6 +125,7 @@ class Validator {
                         resData[key] = this._conversionType(this.types[key], data[key]);
                     }
                     else {
+                        errKey = key;
                         errMsg = errMsg.replace('%s', key);
                         break;
                     }
@@ -132,7 +135,7 @@ class Validator {
                 resolve(resData);
             }
             else {
-                reject(new ValidateError(errMsg));
+                reject(new ValidateError(errKey, errMsg));
             }
         });
     }
@@ -150,7 +153,7 @@ class Validator {
             }
             else {
                 errMsg = errMsg.replace('%s', key);
-                reject(new ValidateError(errMsg));
+                reject(new ValidateError(key, errMsg));
             }
         });
     }
@@ -188,7 +191,7 @@ class Validator {
         }
         return errMsg;
     }
-    _parseStringRule(rule) {
+    _parseStringRule(rule, ruleErrMsg) {
         let rules = [];
         let trule = rule.split('|');
         for (let r of trule) {
@@ -207,6 +210,7 @@ class Validator {
                 rrule = ruleRegexs[r];
                 message = defaultMsgs[r] || defaultMsg;
             }
+            message = ruleErrMsg || message;
             rules.push({ rule: rrule, message: message, sameKey });
         }
         return rules;

package/lib/web.js

@@ -1,7 +1,7 @@
 /**
  * web(浏览器) 端工具类
  */
-import { isBlank, isBoolean, isNumeric } from './index';
+import { isBlank, isBoolean, isNumeric } from './index_m';
 /**
  * 解析 Form 表单中的 input 元素的数据为 JSON 格式，key: input-name；value: input-value
  * @param form {object} Form 节点对象

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.2",
+  "version": "0.2.6",
   "repository": {
     "type": "git",
     "url": "git+https//gitee.com/towardly/ph.git",
@@ -18,8 +18,8 @@
   },
   "homepage": "https://gitee.com/towardly/ph/tree/master/packages/utils",
   "devDependencies": {
-    "@types/node": "^15.0.3",
-    "typescript": "^4.4.4"
+    "@types/node": "^17.0.21",
+    "typescript": "^4.5.5"
   },
   "scripts": {
     "build": "node scripts/build.js"