ph-utils 0.2.12 → 0.2.16

package/lib/dom.d.ts

@@ -80,3 +80,13 @@ export declare function attr(elem: HTMLElement, key: string, value?: string): st
  * @returns
  */
 export declare function parent(el: HTMLElement): HTMLElement;
+/**
+ * 获取隐藏节点的尺寸
+ * @param {string | HTMLElement} hideNode - The node to hide.
+ * @param parent - 添加临时节点的父节点，默认为: body.
+ * @returns The DOMRect of the element.
+ */
+export declare function queryHideNodeSize(hideNode: string | HTMLElement, parent?: HTMLElement): {
+    width: number;
+    height: number;
+};

package/lib/dom.js

@@ -164,3 +164,27 @@ export function attr(elem, key, value) {
 export function parent(el) {
     return el.parentNode;
 }
+/**
+ * 获取隐藏节点的尺寸
+ * @param {string | HTMLElement} hideNode - The node to hide.
+ * @param parent - 添加临时节点的父节点，默认为: body.
+ * @returns The DOMRect of the element.
+ */
+export function queryHideNodeSize(hideNode, parent = document.body) {
+    // 计算折叠菜单的高度
+    let $tmp = document.createElement('div');
+    $tmp.style.cssText = 'position:fixed;left:-1000px;top:-1000px;opacity:0;';
+    let $tmpInner = document.createElement('div');
+    $tmpInner.style.cssText = 'position:relative;';
+    if (typeof hideNode === 'string') {
+        $tmpInner.innerHTML = hideNode;
+    }
+    else {
+        $tmpInner.appendChild(hideNode.cloneNode(true));
+    }
+    $tmp.appendChild($tmpInner);
+    parent.appendChild($tmp);
+    let rect = $tmpInner.children[0].getBoundingClientRect();
+    parent.removeChild($tmp);
+    return { width: rect.width, height: rect.height };
+}

package/lib/index.js

@@ -86,9 +86,10 @@ exports.BaseError = BaseError;
 function throttle(func, wait = 300) {
     let t = -1;
     return function (...args) {
+        const self = this;
         clearTimeout(t);
         t = setTimeout(() => {
-            func(...args);
+            func.apply(self, args);
         }, wait);
     };
 }

package/lib/index_m.js

@@ -73,9 +73,10 @@ export class BaseError extends Error {
 export function throttle(func, wait = 300) {
     let t = -1;
     return function (...args) {
+        const self = this;
         clearTimeout(t);
         t = setTimeout(() => {
-            func(...args);
+            func.apply(self, args);
         }, wait);
     };
 }

package/lib/validator.d.ts

@@ -2,7 +2,7 @@
  * 数据验证器
  */
 interface RuleItem {
-    rule: RegExp | ((v: any) => boolean);
+    rule: RegExp | ((v: any) => boolean) | 'required';
     message: string;
     sameKey?: string;
 }
@@ -12,6 +12,7 @@ export declare type RuleType = string | RegExp | ((v: any) => boolean) | (RegExp
 });
 export interface SchemaType {
     key: string;
+    required?: boolean;
     type?: string | ((v: any) => void);
     rules: RuleType[];
 }
@@ -22,9 +23,6 @@ declare class Validator {
     rules: {
         [index: string]: RuleItem[];
     };
-    types: {
-        [index: string]: string | ((v: any) => void);
-    };
     /**
      * 构造数据验证转换器
      * @param schemas 配置验证转换规则
@@ -35,14 +33,13 @@ declare class Validator {
      * @param data 待验证的数据
      * @returns
      */
-    validate<T>(data: any): Promise<unknown>;
+    validate(data: any): Promise<boolean>;
     /**
      * 只验证指定 key 的数据格式
      * @param key   指定待验证的 key
      * @param value 待验证的数据
      */
-    validateKey(key: string, value: any): Promise<unknown>;
-    private _conversionType;
+    validateKey(key: string, value: any): Promise<boolean>;
     private _validateRule;
     private _parseStringRule;
 }

package/lib/validator.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 /**
  * 数据验证器
  */
@@ -9,8 +10,6 @@ const defaultMsgs = {
     required: '%s为必填字段',
 };
 const defaultMsg = '请输入正确的数据';
-// 允许的内置 type
-const validTypes = new Set(['string', 'boolean', 'number', 'float', 'int']);
 // 一些常用的验证正则
 const ruleRegexs = {
     /** 验证跟其余数据相等的正则，一般用于验证再次输入密码 */
@@ -34,23 +33,6 @@ const ruleFns = {
         return regex.test(String(val));
     },
 };
-const typeFns = {
-    string(v) {
-        return String(v);
-    },
-    boolean(v) {
-        return Boolean(v);
-    },
-    number(v) {
-        return Number(v);
-    },
-    int(v) {
-        return parseInt(v, 10);
-    },
-    floag(v) {
-        return parseFloat(v);
-    },
-};
 class ValidateError extends Error {
     name;
     key;
@@ -65,24 +47,18 @@ class ValidateError extends Error {
  */
 class Validator {
     rules;
-    types;
     /**
      * 构造数据验证转换器
      * @param schemas 配置验证转换规则
      */
     constructor(schemas) {
         let parsedRules = {};
-        let types = {};
         for (let schema of schemas) {
-            // 解析 types 用于进行数据类型转换
-            if (typeof schema.type === 'function') {
-                types[schema.key] = schema.type;
-            }
-            else {
-                types[schema.key] = validTypes.has(schema.type || '') ? schema.type : 'string';
-            }
             // 解析规则
             let rules = [];
+            if (schema.required === true) {
+                rules.push(this._parseStringRule('required'));
+            }
             let rule = schema.rules;
             if (typeof rule === 'string') {
                 rules = rules.concat(this._parseStringRule(rule));
@@ -92,7 +68,8 @@ class Validator {
                     if (typeof ruleItem === 'string') {
                         rules = rules.concat(this._parseStringRule(ruleItem));
                     }
-                    else if (ruleItem instanceof RegExp || typeof ruleItem === 'function') {
+                    else if (ruleItem instanceof RegExp ||
+                        typeof ruleItem === 'function') {
                         rules.push({ rule: ruleItem, message: defaultMsg });
                     }
                     else {
@@ -100,7 +77,10 @@ class Validator {
                             rules = rules.concat(this._parseStringRule(ruleItem.rule, ruleItem.message));
                         }
                         else {
-                            rules.push({ rule: ruleItem.rule, message: ruleItem.message || defaultMsg });
+                            rules.push({
+                                rule: ruleItem.rule,
+                                message: ruleItem.message || defaultMsg,
+                            });
                         }
                     }
                 }
@@ -110,7 +90,6 @@ class Validator {
             }
             parsedRules[schema.key] = rules;
         }
-        this.types = types;
         this.rules = parsedRules;
     }
     /**
@@ -122,14 +101,10 @@ class Validator {
         return new Promise((resolve, reject) => {
             let errMsg = '';
             let errKey = '';
-            let resData = {};
             for (let key in this.rules) {
                 if ({}.hasOwnProperty.call(this.rules, key)) {
                     errMsg = this._validateRule(this.rules[key], data[key], data);
-                    if (errMsg === '') {
-                        resData[key] = this._conversionType(this.types[key], data[key]);
-                    }
-                    else {
+                    if (errMsg !== '') {
                         errKey = key;
                         errMsg = errMsg.replace('%s', key);
                         break;
@@ -137,7 +112,7 @@ class Validator {
                 }
             }
             if (errMsg === '') {
-                resolve(resData);
+                resolve(true);
             }
             else {
                 reject(new ValidateError(errKey, errMsg));
@@ -153,41 +128,46 @@ class Validator {
         return new Promise((resolve, reject) => {
             let keyRules = this.rules[key];
             let errMsg = this._validateRule(keyRules, value, null);
-            if (errMsg === '') {
-                resolve(this._conversionType(this.types[key], value));
-            }
-            else {
+            if (errMsg !== '') {
                 errMsg = errMsg.replace('%s', key);
                 reject(new ValidateError(key, errMsg));
             }
+            else {
+                resolve(true);
+            }
         });
     }
-    _conversionType(type, v) {
-        if (typeof type === 'function') {
-            return type(v);
-        }
-        else {
-            return typeFns[type](v);
-        }
-    }
     _validateRule(rules, value, data) {
         let errMsg = '';
         for (let rule of rules) {
-            if (typeof rule.rule === 'function') {
-                if (!rule.rule(value)) {
+            // 如果数据为空，则判断是否是必填
+            if (value == null || !ruleFns.pattern(ruleRegexs.required, value)) {
+                if (rule.rule === 'required') {
                     errMsg = rule.message;
                 }
             }
-            else if (rule.sameKey != null) {
-                if (data != null) {
-                    if (!ruleFns.same(value, data[rule.sameKey])) {
+            else {
+                if (typeof rule.rule === 'function') {
+                    if (!rule.rule(value)) {
                         errMsg = rule.message;
                     }
                 }
-            }
-            else {
-                if (!ruleFns.pattern(rule.rule, value)) {
-                    errMsg = rule.message;
+                else if (rule.sameKey != null) {
+                    if (data != null) {
+                        if (!ruleFns.same(value, data[rule.sameKey])) {
+                            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 !== '') {
@@ -211,7 +191,11 @@ class Validator {
                     message = defaultMsgs['same'];
                 }
             }
-            else if (ruleRegexs.hasOwnProperty(r)) {
+            else if (rule === 'required') {
+                rrule = 'required';
+                message = defaultMsgs.required;
+            }
+            else if (Object.prototype.hasOwnProperty.call(ruleRegexs, r)) {
                 rrule = ruleRegexs[r];
                 message = defaultMsgs[r] || defaultMsg;
             }

package/lib/validator_m.d.ts

@@ -2,7 +2,7 @@
  * 数据验证器
  */
 interface RuleItem {
-    rule: RegExp | ((v: any) => boolean);
+    rule: RegExp | ((v: any) => boolean) | 'required';
     message: string;
     sameKey?: string;
 }
@@ -12,6 +12,7 @@ export declare type RuleType = string | RegExp | ((v: any) => boolean) | (RegExp
 });
 export interface SchemaType {
     key: string;
+    required?: boolean;
     type?: string | ((v: any) => void);
     rules: RuleType[];
 }
@@ -22,9 +23,6 @@ declare class Validator {
     rules: {
         [index: string]: RuleItem[];
     };
-    types: {
-        [index: string]: string | ((v: any) => void);
-    };
     /**
      * 构造数据验证转换器
      * @param schemas 配置验证转换规则
@@ -35,14 +33,13 @@ declare class Validator {
      * @param data 待验证的数据
      * @returns
      */
-    validate<T>(data: any): Promise<unknown>;
+    validate(data: any): Promise<boolean>;
     /**
      * 只验证指定 key 的数据格式
      * @param key   指定待验证的 key
      * @param value 待验证的数据
      */
-    validateKey(key: string, value: any): Promise<unknown>;
-    private _conversionType;
+    validateKey(key: string, value: any): Promise<boolean>;
     private _validateRule;
     private _parseStringRule;
 }

package/lib/validator_m.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 /**
  * 数据验证器
  */
@@ -8,8 +9,6 @@ const defaultMsgs = {
     required: '%s为必填字段',
 };
 const defaultMsg = '请输入正确的数据';
-// 允许的内置 type
-const validTypes = new Set(['string', 'boolean', 'number', 'float', 'int']);
 // 一些常用的验证正则
 const ruleRegexs = {
     /** 验证跟其余数据相等的正则，一般用于验证再次输入密码 */
@@ -33,23 +32,6 @@ const ruleFns = {
         return regex.test(String(val));
     },
 };
-const typeFns = {
-    string(v) {
-        return String(v);
-    },
-    boolean(v) {
-        return Boolean(v);
-    },
-    number(v) {
-        return Number(v);
-    },
-    int(v) {
-        return parseInt(v, 10);
-    },
-    floag(v) {
-        return parseFloat(v);
-    },
-};
 class ValidateError extends Error {
     constructor(key, msg) {
         super(msg);
@@ -67,17 +49,12 @@ class Validator {
      */
     constructor(schemas) {
         let parsedRules = {};
-        let types = {};
         for (let schema of schemas) {
-            // 解析 types 用于进行数据类型转换
-            if (typeof schema.type === 'function') {
-                types[schema.key] = schema.type;
-            }
-            else {
-                types[schema.key] = validTypes.has(schema.type || '') ? schema.type : 'string';
-            }
             // 解析规则
             let rules = [];
+            if (schema.required === true) {
+                rules.push(this._parseStringRule('required'));
+            }
             let rule = schema.rules;
             if (typeof rule === 'string') {
                 rules = rules.concat(this._parseStringRule(rule));
@@ -87,7 +64,8 @@ class Validator {
                     if (typeof ruleItem === 'string') {
                         rules = rules.concat(this._parseStringRule(ruleItem));
                     }
-                    else if (ruleItem instanceof RegExp || typeof ruleItem === 'function') {
+                    else if (ruleItem instanceof RegExp ||
+                        typeof ruleItem === 'function') {
                         rules.push({ rule: ruleItem, message: defaultMsg });
                     }
                     else {
@@ -95,7 +73,10 @@ class Validator {
                             rules = rules.concat(this._parseStringRule(ruleItem.rule, ruleItem.message));
                         }
                         else {
-                            rules.push({ rule: ruleItem.rule, message: ruleItem.message || defaultMsg });
+                            rules.push({
+                                rule: ruleItem.rule,
+                                message: ruleItem.message || defaultMsg,
+                            });
                         }
                     }
                 }
@@ -105,7 +86,6 @@ class Validator {
             }
             parsedRules[schema.key] = rules;
         }
-        this.types = types;
         this.rules = parsedRules;
     }
     /**
@@ -117,14 +97,10 @@ class Validator {
         return new Promise((resolve, reject) => {
             let errMsg = '';
             let errKey = '';
-            let resData = {};
             for (let key in this.rules) {
                 if ({}.hasOwnProperty.call(this.rules, key)) {
                     errMsg = this._validateRule(this.rules[key], data[key], data);
-                    if (errMsg === '') {
-                        resData[key] = this._conversionType(this.types[key], data[key]);
-                    }
-                    else {
+                    if (errMsg !== '') {
                         errKey = key;
                         errMsg = errMsg.replace('%s', key);
                         break;
@@ -132,7 +108,7 @@ class Validator {
                 }
             }
             if (errMsg === '') {
-                resolve(resData);
+                resolve(true);
             }
             else {
                 reject(new ValidateError(errKey, errMsg));
@@ -148,41 +124,46 @@ class Validator {
         return new Promise((resolve, reject) => {
             let keyRules = this.rules[key];
             let errMsg = this._validateRule(keyRules, value, null);
-            if (errMsg === '') {
-                resolve(this._conversionType(this.types[key], value));
-            }
-            else {
+            if (errMsg !== '') {
                 errMsg = errMsg.replace('%s', key);
                 reject(new ValidateError(key, errMsg));
             }
+            else {
+                resolve(true);
+            }
         });
     }
-    _conversionType(type, v) {
-        if (typeof type === 'function') {
-            return type(v);
-        }
-        else {
-            return typeFns[type](v);
-        }
-    }
     _validateRule(rules, value, data) {
         let errMsg = '';
         for (let rule of rules) {
-            if (typeof rule.rule === 'function') {
-                if (!rule.rule(value)) {
+            // 如果数据为空，则判断是否是必填
+            if (value == null || !ruleFns.pattern(ruleRegexs.required, value)) {
+                if (rule.rule === 'required') {
                     errMsg = rule.message;
                 }
             }
-            else if (rule.sameKey != null) {
-                if (data != null) {
-                    if (!ruleFns.same(value, data[rule.sameKey])) {
+            else {
+                if (typeof rule.rule === 'function') {
+                    if (!rule.rule(value)) {
                         errMsg = rule.message;
                     }
                 }
-            }
-            else {
-                if (!ruleFns.pattern(rule.rule, value)) {
-                    errMsg = rule.message;
+                else if (rule.sameKey != null) {
+                    if (data != null) {
+                        if (!ruleFns.same(value, data[rule.sameKey])) {
+                            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 !== '') {
@@ -206,7 +187,11 @@ class Validator {
                     message = defaultMsgs['same'];
                 }
             }
-            else if (ruleRegexs.hasOwnProperty(r)) {
+            else if (rule === 'required') {
+                rrule = 'required';
+                message = defaultMsgs.required;
+            }
+            else if (Object.prototype.hasOwnProperty.call(ruleRegexs, r)) {
                 rrule = ruleRegexs[r];
                 message = defaultMsgs[r] || defaultMsg;
             }
@@ -216,5 +201,5 @@ class Validator {
         return rules;
     }
 }
-// @ts-ignore
+// @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.12",
+  "version": "0.2.16",
   "repository": {
     "type": "git",
     "url": "git+https//gitee.com/towardly/ph.git",