ph-utils 0.15.4 → 0.15.5

package/lib/dom.d.ts

@@ -48,7 +48,7 @@ export declare function $$(tag: string, option?: {
  * @param dom - 可选的父级 DOM 元素，默认为当前文档。
  * @returns 返回匹配的第一个 HTMLElement，如果没有找到则返回 undefined。
  */
-export declare function $one(selector: string | HTMLElement, dom?: DocumentContext): HTMLElement | undefined;
+export declare function $one(selector: string | HTMLElement, dom?: DocumentContext): HTMLElement | null;
 /**
  * 为节点添加 class
  * @param {HTMLElement} elem 待添加 class 的节点
@@ -155,7 +155,7 @@ export declare function parent(el: HTMLElement): HTMLElement;
  * @param parent - 添加临时节点的父节点, 如果传递 null, 则通过修改原始样式方式计算，默认为: body.
  * @returns The DOMRect of the element.
  */
-export declare function queryHideNodeSize(hideNode: string | HTMLElement, parent?: HTMLElement): {
+export declare function queryHideNodeSize(hideNode: string | HTMLElement, parent?: null | HTMLElement): {
     width: number;
     height: number;
 };

package/lib/dom.js

@@ -78,8 +78,10 @@ export function $$(tag, option = {}, ctx) {
  * @returns 返回匹配的第一个 HTMLElement，如果没有找到则返回 undefined。
  */
 export function $one(selector, dom) {
-    const els = elem(selector, dom);
-    return els.length > 0 ? els[0] : undefined;
+    if (typeof selector === "string") {
+        return (dom || document).querySelector(selector);
+    }
+    return selector;
 }
 /**
  * 为节点添加 class
@@ -317,9 +319,9 @@ export function queryHideNodeSize(hideNode, parent = document.body) {
         $tmpInner.appendChild(hideNode.cloneNode(true));
     }
     $tmp.appendChild($tmpInner);
-    parent.appendChild($tmp);
+    (parent || document.body).appendChild($tmp);
     let rect = $tmpInner.children[0].getBoundingClientRect();
-    parent.removeChild($tmp);
+    (parent || document.body).removeChild($tmp);
     return { width: rect.width, height: rect.height };
 }
 /**

package/lib/validator.js

@@ -13,7 +13,7 @@ const ruleRegexs = {
     /** 验证跟其余数据相等的正则，一般用于验证再次输入密码 */
     same: /^same:(.+)$/i,
     /** 验证手机号的正则表达式 */
-    mobile: /^1[345678]\d{9}$/,
+    mobile: /^1[3456789]\d{9}$/,
     /** 非空验证的正则表达式 */
     required: /^\S{1}.*/,
 };
@@ -128,6 +128,8 @@ class Validator {
     _validateRule(rules, value, data) {
         let errMsg = "";
         for (let rule of rules) {
+            if (!rule)
+                continue;
             // 如果数据为空，则判断是否是必填
             if (rule.rule === "required") {
                 if (value == null || !ruleFns.pattern(ruleRegexs.required, value)) {
@@ -147,7 +149,7 @@ class Validator {
                 }
             }
             else {
-                if (!ruleFns.pattern(rule.rule, value)) {
+                if (rule && !ruleFns.pattern(rule.rule, value)) {
                     errMsg = rule.message;
                 }
             }
@@ -166,7 +168,7 @@ class Validator {
         }
         if (rule != null) {
             if (typeof rule === "string") {
-                rules = rules.concat(this._parseStringRule(rule, schema.message));
+                rules.push(...this._parseStringRule(rule, schema.message));
             }
             else if (rule instanceof Array) {
                 for (let ruleItem of rule) {
@@ -181,13 +183,14 @@ class Validator {
                         });
                     }
                     else {
+                        const emessage = ruleItem.message || schema.message || defaultMsg;
                         if (typeof ruleItem.rule === "string") {
-                            rules.push(...this._parseStringRule(ruleItem.rule, ruleItem.message));
+                            rules.push(...this._parseStringRule(ruleItem.rule, emessage));
                         }
                         else {
                             rules.push({
                                 rule: ruleItem.rule,
-                                message: ruleItem.message || defaultMsg,
+                                message: emessage,
                             });
                         }
                     }
@@ -225,7 +228,9 @@ class Validator {
                 rrule = ruleRegexs[r];
                 message = message || defaultMsgs[r];
             }
-            rules.push({ rule: rrule, message: message, sameKey });
+            if (rrule) {
+                rules.push({ rule: rrule, message: message, sameKey });
+            }
         }
         return rules;
     }

package/package.json

@@ -68,7 +68,7 @@
     },
     "./*": "./lib/*"
   },
-  "version": "0.15.4",
+  "version": "0.15.5",
   "type": "module",
   "repository": {
     "type": "git",