ph-utils 0.2.11 → 0.2.14

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.d.ts

@@ -58,4 +58,4 @@ export declare class BaseError extends Error {
  * @param wait 需要节流的毫秒
  * @returns
  */
-export declare function throttle<T extends (...args: any) => any>(func: T, wait: number): (...args: any[]) => void;
+export declare function throttle<T extends (...args: any) => any>(func: T, wait?: number): (...args: any[]) => void;

package/lib/index.js

@@ -83,14 +83,14 @@ exports.BaseError = BaseError;
  * @param wait 需要节流的毫秒
  * @returns
  */
-function throttle(func, wait) {
-    let lastTime = 0;
+function throttle(func, wait = 300) {
+    let t = -1;
     return function (...args) {
-        let now = Date.now();
-        if (now - lastTime >= wait) {
-            func(...args);
-            lastTime = now;
-        }
+        const self = this;
+        clearTimeout(t);
+        t = setTimeout(() => {
+            func.apply(self, args);
+        }, wait);
     };
 }
 exports.throttle = throttle;

package/lib/index_m.d.ts

@@ -58,4 +58,4 @@ export declare class BaseError extends Error {
  * @param wait 需要节流的毫秒
  * @returns
  */
-export declare function throttle<T extends (...args: any) => any>(func: T, wait: number): (...args: any[]) => void;
+export declare function throttle<T extends (...args: any) => any>(func: T, wait?: number): (...args: any[]) => void;

package/lib/index_m.js

@@ -70,13 +70,13 @@ export class BaseError extends Error {
  * @param wait 需要节流的毫秒
  * @returns
  */
-export function throttle(func, wait) {
-    let lastTime = 0;
+export function throttle(func, wait = 300) {
+    let t = -1;
     return function (...args) {
-        let now = Date.now();
-        if (now - lastTime >= wait) {
-            func(...args);
-            lastTime = now;
-        }
+        const self = this;
+        clearTimeout(t);
+        t = setTimeout(() => {
+            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[];
 }

package/lib/validator.js

@@ -1,4 +1,5 @@
 "use strict";
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 /**
  * 数据验证器
  */
@@ -79,10 +80,15 @@ class Validator {
                 types[schema.key] = schema.type;
             }
             else {
-                types[schema.key] = validTypes.has(schema.type || '') ? schema.type : 'string';
+                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 +98,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 +107,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,
+                            });
                         }
                     }
                 }
@@ -173,21 +183,34 @@ class Validator {
     _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, value)) {
+                        errMsg = rule.message;
+                    }
+                }
+                else {
+                    if (!ruleFns.pattern(rule.rule, value)) {
+                        errMsg = rule.message;
+                    }
                 }
             }
             if (errMsg !== '') {
@@ -211,7 +234,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[];
 }

package/lib/validator_m.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
 /**
  * 数据验证器
  */
@@ -74,10 +75,15 @@ class Validator {
                 types[schema.key] = schema.type;
             }
             else {
-                types[schema.key] = validTypes.has(schema.type || '') ? schema.type : 'string';
+                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 +93,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 +102,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,
+                            });
                         }
                     }
                 }
@@ -168,21 +178,34 @@ class Validator {
     _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, value)) {
+                        errMsg = rule.message;
+                    }
+                }
+                else {
+                    if (!ruleFns.pattern(rule.rule, value)) {
+                        errMsg = rule.message;
+                    }
                 }
             }
             if (errMsg !== '') {
@@ -206,7 +229,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 +243,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.11",
+  "version": "0.2.14",
   "repository": {
     "type": "git",
     "url": "git+https//gitee.com/towardly/ph.git",