@whitesev/utils 2.6.8 → 2.6.9

package/dist/index.amd.js

@@ -226,6 +226,273 @@ define((function () { 'use strict';
         }
     }
 
+    const TryCatch = function (...args) {
+        /* 定义变量和函数 */
+        let callbackFunction = null;
+        let context = null;
+        let handleError = (error) => { };
+        let defaultDetails = {
+            log: true,
+        };
+        const TryCatchCore = {
+            /**
+             *
+             * @param paramDetails 配置
+             * @returns
+             */
+            config(paramDetails) {
+                defaultDetails = Object.assign(defaultDetails, paramDetails);
+                return TryCatchCore;
+            },
+            /**
+             * 处理错误
+             * @param handler
+             */
+            error(handler) {
+                // @ts-ignore
+                handleError = handler;
+                return TryCatchCore;
+            },
+            /**
+             * 执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。
+             * @param callback 待执行函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
+             * @param __context__ 待执行函数的作用域，用于apply指定
+             * @returns 如果函数有返回值，则返回该返回值；否则返回 tryCatchObj 函数以支持链式调用。
+             * @throws {Error} 如果传入参数不符合要求，则会抛出相应类型的错误。
+             */
+            run(callback, __context__) {
+                callbackFunction = callback;
+                context = __context__ || this;
+                let result = executeTryCatch(callbackFunction, handleError, context);
+                // @ts-ignore
+                return result !== undefined ? result : TryCatchCore;
+            },
+        };
+        /**
+         * 执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。
+         * @param callback - 待执行函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
+         * @param handleErrorFunc - 错误处理函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
+         * @param funcThis - 待执行函数的作用域，用于apply指定
+         * @returns 如果函数有返回值，则返回该返回值；否则返回 undefined。
+         */
+        function executeTryCatch(callback, handleErrorFunc, funcThis) {
+            let result = undefined;
+            try {
+                if (typeof callback === "string") {
+                    result = new Function(callback).apply(funcThis, args);
+                }
+                else {
+                    result = callback.apply(funcThis, args);
+                }
+            }
+            catch (error) {
+                if (defaultDetails.log) {
+                    callback = callback;
+                    console.log(`%c ${callback?.name ? callback?.name : callback + "出现错误"} `, "color: #f20000");
+                    console.log(`%c 错误原因：${error}`, "color: #f20000");
+                    console.trace(callback);
+                }
+                if (handleErrorFunc) {
+                    if (typeof handleErrorFunc === "string") {
+                        result = new Function(handleErrorFunc).apply(funcThis, [
+                            ...args,
+                            error,
+                        ]);
+                    }
+                    else {
+                        result = handleErrorFunc.apply(funcThis, [...args, error]);
+                    }
+                }
+            }
+            return result;
+        }
+        return TryCatchCore;
+    };
+
+    class CommonUtil {
+        assign(target = {}, source = {}, isAdd = false) {
+            let UtilsContext = this;
+            if (Array.isArray(source)) {
+                let canTraverse = source.filter((item) => {
+                    return typeof item === "object";
+                });
+                if (!canTraverse.length) {
+                    return source;
+                }
+            }
+            if (source == null) {
+                return target;
+            }
+            if (target == null) {
+                target = {};
+            }
+            if (isAdd) {
+                for (const sourceKeyName in source) {
+                    const targetKeyName = sourceKeyName;
+                    let targetValue = target[targetKeyName];
+                    let sourceValue = source[sourceKeyName];
+                    if (typeof sourceValue === "object" &&
+                        sourceValue != null &&
+                        sourceKeyName in target &&
+                        !UtilsContext.isDOM(sourceValue)) {
+                        /* 源端的值是object类型，且不是元素节点 */
+                        target[sourceKeyName] = UtilsContext.assign(targetValue, sourceValue, isAdd);
+                        continue;
+                    }
+                    target[sourceKeyName] = sourceValue;
+                }
+            }
+            else {
+                for (const targetKeyName in target) {
+                    if (targetKeyName in source) {
+                        let targetValue = target[targetKeyName];
+                        let sourceValue = source[targetKeyName];
+                        if (typeof sourceValue === "object" &&
+                            sourceValue != null &&
+                            !UtilsContext.isDOM(sourceValue) &&
+                            Object.keys(sourceValue).length) {
+                            /* 源端的值是object类型，且不是元素节点 */
+                            target[targetKeyName] = UtilsContext.assign(targetValue, sourceValue, isAdd);
+                            continue;
+                        }
+                        /* 直接赋值 */
+                        target[targetKeyName] = sourceValue;
+                    }
+                }
+            }
+            return target;
+        }
+        isNull(...args) {
+            let result = true;
+            let checkList = [...args];
+            for (const objItem of checkList) {
+                let itemResult = false;
+                if (objItem === null || objItem === undefined) {
+                    itemResult = true;
+                }
+                else {
+                    switch (typeof objItem) {
+                        case "object":
+                            if (typeof objItem[Symbol.iterator] === "function") {
+                                /* 可迭代 */
+                                itemResult = objItem.length === 0;
+                            }
+                            else {
+                                itemResult = Object.keys(objItem).length === 0;
+                            }
+                            break;
+                        case "number":
+                            itemResult = objItem === 0;
+                            break;
+                        case "string":
+                            itemResult =
+                                objItem.trim() === "" ||
+                                    objItem === "null" ||
+                                    objItem === "undefined";
+                            break;
+                        case "boolean":
+                            itemResult = !objItem;
+                            break;
+                        case "function":
+                            let funcStr = objItem.toString().replace(/\s/g, "");
+                            /* 排除()=>{}、(xxx="")=>{}、function(){}、function(xxx=""){} */
+                            itemResult = Boolean(funcStr.match(/^\(.*?\)=>\{\}$|^function.*?\(.*?\)\{\}$/));
+                            break;
+                    }
+                }
+                result = result && itemResult;
+            }
+            return result;
+        }
+        /**
+         * 判断对象是否是元素
+         * @param target
+         * @returns
+         * + true 是元素
+         * + false 不是元素
+         * @example
+         * Utils.isDOM(document.querySelector("a"))
+         * > true
+         */
+        isDOM(target) {
+            return target instanceof Node;
+        }
+        isNotNull(...args) {
+            let UtilsContext = this;
+            return !UtilsContext.isNull.apply(this, args);
+        }
+        deepClone(obj) {
+            let UtilsContext = this;
+            if (obj === undefined)
+                return undefined;
+            if (obj === null)
+                return null;
+            let clone = obj instanceof Array ? [] : {};
+            for (const [key, value] of Object.entries(obj)) {
+                clone[key] =
+                    typeof value === "object" ? UtilsContext.deepClone(value) : value;
+            }
+            return clone;
+        }
+        /**
+         * 覆盖对象中的函数this指向
+         * @param target 需要覆盖的对象
+         * @param [objectThis] 覆盖的this指向，如果为传入，则默认为对象本身
+         */
+        coverObjectFunctionThis(target, objectThis) {
+            if (typeof target !== "object" || target === null) {
+                throw new Error("target must be object");
+            }
+            objectThis = objectThis || target;
+            Object.keys(target).forEach((key) => {
+                if (typeof target[key] === "function") {
+                    target[key] = target[key].bind(objectThis);
+                }
+            });
+        }
+        toJSON(data, errorCallBack) {
+            let result = {};
+            if (typeof data === "object") {
+                return data;
+            }
+            TryCatch()
+                .config({ log: false })
+                .error((error) => {
+                TryCatch()
+                    .error(() => {
+                    try {
+                        result = new Function("return " + data)();
+                    }
+                    catch (error2) {
+                        if (typeof errorCallBack === "function") {
+                            errorCallBack(error2);
+                        }
+                    }
+                })
+                    .run(() => {
+                    if (data &&
+                        /^[\],:{}\s]*$/.test(data
+                            .replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
+                            .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
+                            .replace(/(?:^|:|,)(?:\s*\[)+/g, ""))) {
+                        result = new Function("return " + data)();
+                    }
+                    else {
+                        if (typeof errorCallBack === "function") {
+                            errorCallBack(new Error("target is not a JSON"));
+                        }
+                    }
+                });
+            })
+                .run(() => {
+                data = data.trim();
+                result = JSON.parse(data);
+            });
+            return result;
+        }
+    }
+    let commonUtil = new CommonUtil();
+
     class UtilsGMCookie {
         windowApi = {
             window: window,
@@ -298,7 +565,7 @@ define((function () { 'use strict';
                     name: "",
                     path: "/",
                 };
-                defaultOption = utils.assign(defaultOption, option);
+                defaultOption = commonUtil.assign(defaultOption, option);
                 let cookies = this.getCookiesList();
                 cookies.forEach((item) => {
                     item = item.trim();
@@ -349,7 +616,7 @@ define((function () { 'use strict';
                 name: "",
                 path: "/",
             };
-            defaultOption = utils.assign(defaultOption, option);
+            defaultOption = commonUtil.assign(defaultOption, option);
             let cookies = this.getCookiesList();
             cookies.forEach((item) => {
                 item = item.trim();
@@ -398,7 +665,7 @@ define((function () { 'use strict';
                      */
                     expirationDate: Math.floor(Date.now()) + 60 * 60 * 24 * 30,
                 };
-                defaultOption = utils.assign(defaultOption, option);
+                defaultOption = commonUtil.assign(defaultOption, option);
                 let life = defaultOption.expirationDate
                     ? defaultOption.expirationDate
                     : Math.floor(Date.now()) + 60 * 60 * 24 * 30;
@@ -408,7 +675,7 @@ define((function () { 'use strict';
                     ";expires=" +
                     new Date(life).toGMTString() +
                     "; path=/";
-                if (utils.isNotNull(defaultOption.domain)) {
+                if (commonUtil.isNull(defaultOption.domain)) {
                     cookieStr += "; domain=" + defaultOption.domain;
                 }
                 this.windowApi.document.cookie = cookieStr;
@@ -436,9 +703,9 @@ define((function () { 'use strict';
                     path: "/",
                     firstPartyDomain: "",
                 };
-                defaultOption = utils.assign(defaultOption, option);
+                defaultOption = commonUtil.assign(defaultOption, option);
                 let cookieStr = `${defaultOption.name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=${defaultOption.path}`;
-                if (utils.isNotNull(defaultOption.firstPartyDomain)) {
+                if (commonUtil.isNull(defaultOption.firstPartyDomain)) {
                     cookieStr += `; domain=${defaultOption.firstPartyDomain};`;
                 }
                 this.windowApi.document.cookie = cookieStr;
@@ -1623,7 +1890,7 @@ define((function () { 'use strict';
                     menuOptions = [menuOptions];
                 }
                 for (let index = 0; index < menuOptions.length; index++) {
-                    let cloneMenuOptionData = utils.deepClone(menuOptions[index].data);
+                    let cloneMenuOptionData = commonUtil.deepClone(menuOptions[index].data);
                     const { showText, clickCallBack } = this.handleMenuData(cloneMenuOptionData);
                     let menuId = that.context.GM_Api.registerMenuCommand(showText, clickCallBack);
                     menuOptions[index].id = menuId;
@@ -2025,16 +2292,12 @@ define((function () { 'use strict';
                     return "";
                 }
                 try {
-                    eval("_context[_funcName] = function " +
-                        _funcName +
-                        "(){\n" +
-                        "let args = Array.prototype.slice.call(arguments,0);\n" +
-                        "let obj = this;\n" +
-                        "hookFunc.apply(obj,args);\n" +
-                        "return _context['realFunc_" +
-                        _funcName +
-                        "'].apply(obj,args);\n" +
-                        "};");
+                    new Function("_context", "_funcName", "hookFunc", `_context[_funcName] = function ${_funcName}() {
+        let args = Array.prototype.slice.call(arguments, 0);
+        let obj = this;
+        hookFunc.apply(obj, args);
+        return _context['realFunc_${_funcName}'].apply(obj, args);
+    };`)(_context, _funcName, hookFunc);
                     _context[_funcName].prototype.isHooked = true;
                     return true;
                 }
@@ -2294,14 +2557,14 @@ define((function () { 'use strict';
                     if (typeof args[1] === "object") {
                         /* 处理第二个参数details */
                         let optionArg = args[1];
-                        utils.assign(option, optionArg, true);
+                        commonUtil.assign(option, optionArg, true);
                         option.url = url;
                     }
                 }
                 else {
                     /* 传入的是配置 */
                     let optionArg = args[0];
-                    utils.assign(option, optionArg, true);
+                    commonUtil.assign(option, optionArg, true);
                 }
                 return option;
             },
@@ -2334,7 +2597,7 @@ define((function () { 'use strict';
                     responseType: userRequestOption.responseType ||
                         this.context.#defaultRequestOption.responseType,
                     /* 对象使用深拷贝 */
-                    headers: utils.deepClone(this.context.#defaultRequestOption.headers),
+                    headers: commonUtil.deepClone(this.context.#defaultRequestOption.headers),
                     data: userRequestOption.data || this.context.#defaultRequestOption.data,
                     redirect: userRequestOption.redirect ||
                         this.context.#defaultRequestOption.redirect,
@@ -2347,7 +2610,7 @@ define((function () { 'use strict';
                     revalidate: userRequestOption.revalidate ||
                         this.context.#defaultRequestOption.revalidate,
                     /* 对象使用深拷贝 */
-                    context: utils.deepClone(userRequestOption.context ||
+                    context: commonUtil.deepClone(userRequestOption.context ||
                         this.context.#defaultRequestOption.context),
                     overrideMimeType: userRequestOption.overrideMimeType ||
                         this.context.#defaultRequestOption.overrideMimeType,
@@ -2355,7 +2618,7 @@ define((function () { 'use strict';
                         this.context.#defaultRequestOption.anonymous,
                     fetch: userRequestOption.fetch || this.context.#defaultRequestOption.fetch,
                     /* 对象使用深拷贝 */
-                    fetchInit: utils.deepClone(this.context.#defaultRequestOption.fetchInit),
+                    fetchInit: commonUtil.deepClone(this.context.#defaultRequestOption.fetchInit),
                     allowInterceptConfig: {
                         beforeRequest: this.context.#defaultRequestOption
                             .allowInterceptConfig.beforeRequest,
@@ -2581,12 +2844,12 @@ define((function () { 'use strict';
                 Object.keys(option).forEach((keyName) => {
                     if (option[keyName] == null ||
                         (option[keyName] instanceof Function &&
-                            utils.isNull(option[keyName]))) {
+                            commonUtil.isNull(option[keyName]))) {
                         Reflect.deleteProperty(option, keyName);
                         return;
                     }
                 });
-                if (utils.isNull(option.url)) {
+                if (commonUtil.isNull(option.url)) {
                     throw new TypeError(`Utils.Httpx 参数 url不符合要求: ${option.url}`);
                 }
                 return option;
@@ -2785,10 +3048,10 @@ define((function () { 'use strict';
                 /* X浏览器会因为设置了responseType导致不返回responseText */
                 let originResponse = argsResult[0];
                 /* responseText为空，response不为空的情况 */
-                if (utils.isNull(originResponse["responseText"]) &&
-                    utils.isNotNull(originResponse["response"])) {
+                if (commonUtil.isNull(originResponse["responseText"]) &&
+                    commonUtil.isNotNull(originResponse["response"])) {
                     if (typeof originResponse["response"] === "object") {
-                        utils.tryCatch().run(() => {
+                        TryCatch().run(() => {
                             originResponse["responseText"] = JSON.stringify(originResponse["response"]);
                         });
                     }
@@ -2805,7 +3068,7 @@ define((function () { 'use strict';
                     // 自定义个新的response
                     let httpxResponse = httpxResponseText;
                     if (details.responseType === "json") {
-                        httpxResponse = utils.toJSON(httpxResponseText);
+                        httpxResponse = commonUtil.toJSON(httpxResponseText);
                     }
                     else if (details.responseType === "document") {
                         let parser = new DOMParser();
@@ -3015,7 +3278,7 @@ define((function () { 'use strict';
                         (typeof fetchResponseType === "string" &&
                             fetchResponseType.includes("application/json"))) {
                         // response返回格式是JSON格式
-                        response = utils.toJSON(responseText);
+                        response = commonUtil.toJSON(responseText);
                     }
                     else if (option.responseType === "document" ||
                         option.responseType == null) {
@@ -3116,7 +3379,7 @@ define((function () { 'use strict';
             if (typeof option.xmlHttpRequest !== "function") {
                 console.warn("[Httpx-constructor] 未传入GM_xmlhttpRequest函数或传入的GM_xmlhttpRequest不是Function，将默认使用window.fetch");
             }
-            utils.coverObjectFunctionThis(this);
+            commonUtil.coverObjectFunctionThis(this);
             this.interceptors.request.context = this;
             this.interceptors.response.context = this;
             this.config(option);
@@ -3129,8 +3392,8 @@ define((function () { 'use strict';
             if (typeof option.xmlHttpRequest === "function") {
                 this.GM_Api.xmlHttpRequest = option.xmlHttpRequest;
             }
-            this.#defaultRequestOption = utils.assign(this.#defaultRequestOption, option);
-            this.#defaultInitOption = utils.assign(this.#defaultInitOption, option);
+            this.#defaultRequestOption = commonUtil.assign(this.#defaultRequestOption, option);
+            this.#defaultInitOption = commonUtil.assign(this.#defaultInitOption, option);
         }
         /**
          * 拦截器
@@ -3694,7 +3957,7 @@ define((function () { 'use strict';
         #flag = false;
         #delayTime = 0;
         #callback;
-        #context;
+        #timeId = undefined;
         lock;
         unlock;
         run;
@@ -3704,23 +3967,22 @@ define((function () { 'use strict';
             this.#callback = callback;
             if (typeof context === "number") {
                 this.#delayTime = context;
-                this.#context = utils;
             }
             else {
                 this.#delayTime = delayTime;
-                this.#context = context;
             }
             /**
              * 锁
              */
             this.lock = function () {
                 that.#flag = true;
+                clearTimeout(that.#timeId);
             };
             /**
              * 解锁
              */
             this.unlock = function () {
-                utils.workerSetTimeout(() => {
+                that.#timeId = setTimeout(() => {
                     that.#flag = false;
                 }, that.#delayTime);
             };
@@ -3738,7 +4000,7 @@ define((function () { 'use strict';
                     return;
                 }
                 that.lock();
-                await that.#callback.apply(that.#context, args);
+                await that.#callback.apply(this, args);
                 that.unlock();
             };
         }
@@ -4026,7 +4288,7 @@ define((function () { 'use strict';
          * @param paramConfig 配置信息
          */
         constructor(paramConfig) {
-            this.#config = utils.assign(this.#config, paramConfig);
+            this.#config = commonUtil.assign(this.#config, paramConfig);
             if (!(this.#config.canvasNode instanceof HTMLCanvasElement)) {
                 throw new Error("Utils.Progress 参数 canvasNode 必须是 HTMLCanvasElement");
             }
@@ -4080,95 +4342,10 @@ define((function () { 'use strict';
             /* 获取文本宽度 */
             let w = this.#ctx.measureText(txt).width;
             let h = this.#config.fontSize / 2;
-            this.#ctx.fillStyle = this.#config.textColor;
-            this.#ctx.fillText(txt, this.#width / 2 - w / 2, this.#height / 2 + h / 2);
-        }
-    }
-
-    const TryCatch = function (...args) {
-        /* 定义变量和函数 */
-        let callbackFunction = null;
-        let context = null;
-        let handleError = (error) => { };
-        let defaultDetails = {
-            log: true,
-        };
-        const TryCatchCore = {
-            /**
-             *
-             * @param paramDetails 配置
-             * @returns
-             */
-            config(paramDetails) {
-                defaultDetails = utils.assign(defaultDetails, paramDetails);
-                return TryCatchCore;
-            },
-            /**
-             * 处理错误
-             * @param handler
-             */
-            error(handler) {
-                // @ts-ignore
-                handleError = handler;
-                return TryCatchCore;
-            },
-            /**
-             * 执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。
-             * @param callback 待执行函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
-             * @param __context__ 待执行函数的作用域，用于apply指定
-             * @returns 如果函数有返回值，则返回该返回值；否则返回 tryCatchObj 函数以支持链式调用。
-             * @throws {Error} 如果传入参数不符合要求，则会抛出相应类型的错误。
-             */
-            run(callback, __context__) {
-                callbackFunction = callback;
-                context = __context__ || this;
-                let result = executeTryCatch(callbackFunction, handleError, context);
-                // @ts-ignore
-                return result !== undefined ? result : TryCatchCore;
-            },
-        };
-        /**
-         * 执行传入的函数并捕获其可能抛出的错误，并通过传入的错误处理函数进行处理。
-         * @param callback - 待执行函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
-         * @param handleErrorFunc - 错误处理函数，可以是 function 或者 string 类型。如果是 string 类型，则会被当做代码进行执行。
-         * @param funcThis - 待执行函数的作用域，用于apply指定
-         * @returns 如果函数有返回值，则返回该返回值；否则返回 undefined。
-         */
-        function executeTryCatch(callback, handleErrorFunc, funcThis) {
-            let result = undefined;
-            try {
-                if (typeof callback === "string") {
-                    (function () {
-                        eval(callback);
-                    }).apply(funcThis, args);
-                }
-                else {
-                    result = callback.apply(funcThis, args);
-                }
-            }
-            catch (error) {
-                if (defaultDetails.log) {
-                    callback = callback;
-                    console.log(`%c ${callback?.name ? callback?.name : callback + "出现错误"} `, "color: #f20000");
-                    console.log(`%c 错误原因：${error}`, "color: #f20000");
-                    console.trace(callback);
-                }
-                if (handleErrorFunc) {
-                    if (typeof handleErrorFunc === "string") {
-                        result = function () {
-                            return eval(handleErrorFunc);
-                            // @ts-ignore
-                        }.apply(funcThis, [...args, error]);
-                    }
-                    else {
-                        result = handleErrorFunc.apply(funcThis, [...args, error]);
-                    }
-                }
-            }
-            return result;
+            this.#ctx.fillStyle = this.#config.textColor;
+            this.#ctx.fillText(txt, this.#width / 2 - w / 2, this.#height / 2 + h / 2);
         }
-        return TryCatchCore;
-    };
+    }
 
     class UtilsDictionary {
         items = {};
@@ -4285,7 +4462,7 @@ define((function () { 'use strict';
          * @param data 需要合并的字典
          */
         concat(data) {
-            this.items = utils.assign(this.items, data.getItems());
+            this.items = commonUtil.assign(this.items, data.getItems());
         }
         forEach(callbackfn) {
             for (const key in this.getItems()) {
@@ -4844,7 +5021,7 @@ define((function () { 'use strict';
 
     const loadOrReturnBroker = createLoadOrReturnBroker(load, worker);
     const clearInterval = (timerId) => loadOrReturnBroker().clearInterval(timerId);
-    const clearTimeout = (timerId) => loadOrReturnBroker().clearTimeout(timerId);
+    const clearTimeout$1 = (timerId) => loadOrReturnBroker().clearTimeout(timerId);
     const setInterval = (...args) => loadOrReturnBroker().setInterval(...args);
     const setTimeout$1 = (...args) => loadOrReturnBroker().setTimeout(...args);
 
@@ -5246,13 +5423,194 @@ define((function () { 'use strict';
         }
     }
 
+    class DOMUtils {
+        windowApi;
+        constructor(option) {
+            this.windowApi = new WindowApi(option);
+        }
+        selector(selector, parent) {
+            return this.selectorAll(selector, parent)[0];
+        }
+        selectorAll(selector, parent) {
+            const context = this;
+            parent = parent || context.windowApi.document;
+            selector = selector.trim();
+            if (selector.match(/[^\s]{1}:empty$/gi)) {
+                // empty 语法
+                selector = selector.replace(/:empty$/gi, "");
+                return Array.from(parent.querySelectorAll(selector)).filter(($ele) => {
+                    return $ele?.innerHTML?.trim() === "";
+                });
+            }
+            else if (selector.match(/[^\s]{1}:contains\("(.*)"\)$/i) ||
+                selector.match(/[^\s]{1}:contains\('(.*)'\)$/i)) {
+                // contains 语法
+                let textMatch = selector.match(/:contains\(("|')(.*)("|')\)$/i);
+                let text = textMatch[2];
+                selector = selector.replace(/:contains\(("|')(.*)("|')\)$/gi, "");
+                return Array.from(parent.querySelectorAll(selector)).filter(($ele) => {
+                    // @ts-ignore
+                    return ($ele?.textContent || $ele?.innerText)?.includes(text);
+                });
+            }
+            else if (selector.match(/[^\s]{1}:regexp\("(.*)"\)$/i) ||
+                selector.match(/[^\s]{1}:regexp\('(.*)'\)$/i)) {
+                // regexp 语法
+                let textMatch = selector.match(/:regexp\(("|')(.*)("|')\)$/i);
+                let pattern = textMatch[2];
+                let flagMatch = pattern.match(/("|'),[\s]*("|')([igm]{0,3})$/i);
+                let flags = "";
+                if (flagMatch) {
+                    pattern = pattern.replace(/("|'),[\s]*("|')([igm]{0,3})$/gi, "");
+                    flags = flagMatch[3];
+                }
+                let regexp = new RegExp(pattern, flags);
+                selector = selector.replace(/:regexp\(("|')(.*)("|')\)$/gi, "");
+                return Array.from(parent.querySelectorAll(selector)).filter(($ele) => {
+                    // @ts-ignore
+                    return Boolean(($ele?.textContent || $ele?.innerText)?.match(regexp));
+                });
+            }
+            else {
+                // 普通语法
+                return Array.from(parent.querySelectorAll(selector));
+            }
+        }
+        /**
+         * 匹配元素，可使用以下的额外语法
+         *
+         * + :contains([text]) 作用: 找到包含指定文本内容的指定元素
+         * + :empty 作用:找到既没有文本内容也没有子元素的指定元素
+         * + :regexp([text]) 作用: 找到符合正则表达式的内容的指定元素
+         * @param $el 元素
+         * @param selector 选择器
+         * @example
+         * DOMUtils.matches("div:contains('测试')")
+         * > true
+         * @example
+         * DOMUtils.matches("div:empty")
+         * > true
+         * @example
+         * DOMUtils.matches("div:regexp('^xxxx$')")
+         * > true
+         * @example
+         * DOMUtils.matches("div:regexp(/^xxx/ig)")
+         * > false
+         */
+        matches($el, selector) {
+            selector = selector.trim();
+            if ($el == null) {
+                return false;
+            }
+            if (selector.match(/[^\s]{1}:empty$/gi)) {
+                // empty 语法
+                selector = selector.replace(/:empty$/gi, "");
+                return $el.matches(selector) && $el?.innerHTML?.trim() === "";
+            }
+            else if (selector.match(/[^\s]{1}:contains\("(.*)"\)$/i) ||
+                selector.match(/[^\s]{1}:contains\('(.*)'\)$/i)) {
+                // contains 语法
+                let textMatch = selector.match(/:contains\(("|')(.*)("|')\)$/i);
+                let text = textMatch[2];
+                selector = selector.replace(/:contains\(("|')(.*)("|')\)$/gi, "");
+                // @ts-ignore
+                let content = $el?.textContent || $el?.innerText;
+                if (typeof content !== "string") {
+                    content = "";
+                }
+                return $el.matches(selector) && content?.includes(text);
+            }
+            else if (selector.match(/[^\s]{1}:regexp\("(.*)"\)$/i) ||
+                selector.match(/[^\s]{1}:regexp\('(.*)'\)$/i)) {
+                // regexp 语法
+                let textMatch = selector.match(/:regexp\(("|')(.*)("|')\)$/i);
+                let pattern = textMatch[2];
+                let flagMatch = pattern.match(/("|'),[\s]*("|')([igm]{0,3})$/i);
+                let flags = "";
+                if (flagMatch) {
+                    pattern = pattern.replace(/("|'),[\s]*("|')([igm]{0,3})$/gi, "");
+                    flags = flagMatch[3];
+                }
+                let regexp = new RegExp(pattern, flags);
+                selector = selector.replace(/:regexp\(("|')(.*)("|')\)$/gi, "");
+                // @ts-ignore
+                let content = $el?.textContent || $el?.innerText;
+                if (typeof content !== "string") {
+                    content = "";
+                }
+                return $el.matches(selector) && Boolean(content?.match(regexp));
+            }
+            else {
+                // 普通语法
+                return $el.matches(selector);
+            }
+        }
+        closest($el, selector) {
+            selector = selector.trim();
+            if (selector.match(/[^\s]{1}:empty$/gi)) {
+                // empty 语法
+                selector = selector.replace(/:empty$/gi, "");
+                let $closest = $el?.closest(selector);
+                if ($closest && $closest?.innerHTML?.trim() === "") {
+                    return $closest;
+                }
+                return null;
+            }
+            else if (selector.match(/[^\s]{1}:contains\("(.*)"\)$/i) ||
+                selector.match(/[^\s]{1}:contains\('(.*)'\)$/i)) {
+                // contains 语法
+                let textMatch = selector.match(/:contains\(("|')(.*)("|')\)$/i);
+                let text = textMatch[2];
+                selector = selector.replace(/:contains\(("|')(.*)("|')\)$/gi, "");
+                let $closest = $el?.closest(selector);
+                if ($closest) {
+                    // @ts-ignore
+                    let content = $el?.textContent || $el?.innerText;
+                    if (typeof content === "string" && content.includes(text)) {
+                        return $closest;
+                    }
+                }
+                return null;
+            }
+            else if (selector.match(/[^\s]{1}:regexp\("(.*)"\)$/i) ||
+                selector.match(/[^\s]{1}:regexp\('(.*)'\)$/i)) {
+                // regexp 语法
+                let textMatch = selector.match(/:regexp\(("|')(.*)("|')\)$/i);
+                let pattern = textMatch[2];
+                let flagMatch = pattern.match(/("|'),[\s]*("|')([igm]{0,3})$/i);
+                let flags = "";
+                if (flagMatch) {
+                    pattern = pattern.replace(/("|'),[\s]*("|')([igm]{0,3})$/gi, "");
+                    flags = flagMatch[3];
+                }
+                let regexp = new RegExp(pattern, flags);
+                selector = selector.replace(/:regexp\(("|')(.*)("|')\)$/gi, "");
+                let $closest = $el?.closest(selector);
+                if ($closest) {
+                    // @ts-ignore
+                    let content = $el?.textContent || $el?.innerText;
+                    if (typeof content === "string" && content.match(regexp)) {
+                        return $closest;
+                    }
+                }
+                return null;
+            }
+            else {
+                // 普通语法
+                let $closest = $el?.closest(selector);
+                return $closest;
+            }
+        }
+    }
+    let domUtils = new DOMUtils();
+
     class Utils {
         windowApi;
         constructor(option) {
             this.windowApi = new WindowApi(option);
         }
         /** 版本号 */
-        version = "2025.5.28";
+        version = "2025.6.7";
         addStyle(cssText) {
             if (typeof cssText !== "string") {
                 throw new Error("Utils.addStyle 参数cssText 必须为String类型");
@@ -5278,58 +5636,22 @@ define((function () { 'use strict';
             }
             return cssNode;
         }
-        assign(target = {}, source = {}, isAdd = false) {
-            let UtilsContext = this;
-            if (Array.isArray(source)) {
-                let canTraverse = source.filter((item) => {
-                    return typeof item === "object";
-                });
-                if (!canTraverse.length) {
-                    return source;
-                }
-            }
-            if (source == null) {
-                return target;
-            }
-            if (target == null) {
-                target = {};
-            }
-            if (isAdd) {
-                for (const sourceKeyName in source) {
-                    const targetKeyName = sourceKeyName;
-                    let targetValue = target[targetKeyName];
-                    let sourceValue = source[sourceKeyName];
-                    if (typeof sourceValue === "object" &&
-                        sourceValue != null &&
-                        sourceKeyName in target &&
-                        !UtilsContext.isDOM(sourceValue)) {
-                        /* 源端的值是object类型，且不是元素节点 */
-                        target[sourceKeyName] = UtilsContext.assign(targetValue, sourceValue, isAdd);
-                        continue;
-                    }
-                    target[sourceKeyName] = sourceValue;
-                }
-            }
-            else {
-                for (const targetKeyName in target) {
-                    if (targetKeyName in source) {
-                        let targetValue = target[targetKeyName];
-                        let sourceValue = source[targetKeyName];
-                        if (typeof sourceValue === "object" &&
-                            sourceValue != null &&
-                            !UtilsContext.isDOM(sourceValue) &&
-                            Object.keys(sourceValue).length) {
-                            /* 源端的值是object类型，且不是元素节点 */
-                            target[targetKeyName] = UtilsContext.assign(targetValue, sourceValue, isAdd);
-                            continue;
-                        }
-                        /* 直接赋值 */
-                        target[targetKeyName] = sourceValue;
-                    }
+        /**
+         * JSON数据从源端替换到目标端中，如果目标端存在该数据则替换，不添加，返回结果为目标端替换完毕的结果
+         * @param target 目标数据
+         * @param source 源数据
+         * @param isAdd 是否可以追加键，默认false
+         * @example
+         * Utils.assign({"1":1,"2":{"3":3}}, {"2":{"3":4}});
+         * >
+         * {
+                "1": 1,
+                "2": {
+                    "3": 4
                 }
             }
-            return target;
-        }
+         */
+        assign = commonUtil.assign.bind(commonUtil);
         async asyncReplaceAll(string, pattern, asyncFn) {
             let UtilsContext = this;
             if (typeof string !== "string") {
@@ -5482,19 +5804,11 @@ define((function () { 'use strict';
          * @returns
          */
         ColorConversion = ColorConversion;
-        deepClone(obj) {
-            let UtilsContext = this;
-            if (obj === undefined)
-                return undefined;
-            if (obj === null)
-                return null;
-            let clone = obj instanceof Array ? [] : {};
-            for (const [key, value] of Object.entries(obj)) {
-                clone[key] =
-                    typeof value === "object" ? UtilsContext.deepClone(value) : value;
-            }
-            return clone;
-        }
+        /**
+         * 深拷贝
+         * @param obj 对象
+         */
+        deepClone = commonUtil.deepClone.bind(commonUtil);
         debounce(fn, delay = 0) {
             let timer = null;
             let UtilsContext = this;
@@ -5517,7 +5831,7 @@ define((function () { 'use strict';
                 throw new Error("Utils.deleteParentNode 参数 targetSelector 必须为 string 类型");
             }
             let result = false;
-            let needRemoveDOM = element.closest(targetSelector);
+            let needRemoveDOM = domUtils.closest(element, targetSelector);
             if (needRemoveDOM) {
                 needRemoveDOM.remove();
                 result = true;
@@ -6505,9 +6819,17 @@ define((function () { 'use strict';
                 throw new TypeError("参数1类型错误" + typeof firstArg);
             }
         }
-        isDOM(target) {
-            return target instanceof Node;
-        }
+        /**
+         * 判断对象是否是元素
+         * @param target
+         * @returns
+         * + true 是元素
+         * + false 不是元素
+         * @example
+         * Utils.isDOM(document.querySelector("a"))
+         * > true
+         */
+        isDOM = commonUtil.isDOM.bind(commonUtil);
         isFullscreenEnabled() {
             return !!(this.windowApi.document.fullscreenEnabled ||
                 this.windowApi.document.webkitFullScreenEnabled ||
@@ -6698,52 +7020,62 @@ define((function () { 'use strict';
             }
             return result;
         }
-        isNotNull(...args) {
-            let UtilsContext = this;
-            return !UtilsContext.isNull.apply(this, args);
-        }
-        isNull(...args) {
-            let result = true;
-            let checkList = [...args];
-            for (const objItem of checkList) {
-                let itemResult = false;
-                if (objItem === null || objItem === undefined) {
-                    itemResult = true;
-                }
-                else {
-                    switch (typeof objItem) {
-                        case "object":
-                            if (typeof objItem[Symbol.iterator] === "function") {
-                                /* 可迭代 */
-                                itemResult = objItem.length === 0;
-                            }
-                            else {
-                                itemResult = Object.keys(objItem).length === 0;
-                            }
-                            break;
-                        case "number":
-                            itemResult = objItem === 0;
-                            break;
-                        case "string":
-                            itemResult =
-                                objItem.trim() === "" ||
-                                    objItem === "null" ||
-                                    objItem === "undefined";
-                            break;
-                        case "boolean":
-                            itemResult = !objItem;
-                            break;
-                        case "function":
-                            let funcStr = objItem.toString().replace(/\s/g, "");
-                            /* 排除()=>{}、(xxx="")=>{}、function(){}、function(xxx=""){} */
-                            itemResult = Boolean(funcStr.match(/^\(.*?\)=>\{\}$|^function.*?\(.*?\)\{\}$/));
-                            break;
-                    }
-                }
-                result = result && itemResult;
-            }
-            return result;
-        }
+        /**
+         * 判断对象是否不为空
+         * @returns {boolean}
+         * + true 不为空
+         * + false 为空
+         * @example
+         * Utils.isNotNull("123");
+         * > true
+         */
+        isNotNull = commonUtil.isNotNull.bind(commonUtil);
+        /**
+         * 判断对象或数据是否为空
+         * + `String`判空的值，如 ""、"null"、"undefined"、"   "
+         * + `Number`判空的值，如 0
+         * + `Object`判空的值，如 {}、null、undefined
+         * + `Array`(存在属性Symbol.iterator)判空的值，如 []
+         * + `Boolean`判空的值，如false
+         * + `Function`判空的值，如()=>{}、(xxx="")=>{}、function(){}、function(xxx=""){}
+         * @returns
+         * + true 为空
+         * + false 不为空
+         * @example
+          Utils.isNull({});
+          > true
+         * @example
+          Utils.isNull([]);
+          > true
+         * @example
+          Utils.isNull(" ");
+          > true
+         * @example
+          Utils.isNull(function(){});
+          > true
+         * @example
+          Utils.isNull(()=>{}));
+          > true
+         * @example
+          Utils.isNull("undefined");
+          > true
+         * @example
+          Utils.isNull("null");
+          > true
+         * @example
+          Utils.isNull(" ", false);
+          > true
+         * @example
+          Utils.isNull([1],[]);
+          > false
+         * @example
+          Utils.isNull([],[1]);
+          > false
+         * @example
+          Utils.isNull(false,[123]);
+          > false
+         **/
+        isNull = commonUtil.isNull.bind(commonUtil);
         isThemeDark() {
             return this.windowApi.globalThis.matchMedia("(prefers-color-scheme: dark)")
                 .matches;
@@ -7552,7 +7884,7 @@ define((function () { 'use strict';
                 return mouseEvent;
             }
             let sliderElement = typeof selector === "string"
-                ? this.windowApi.document.querySelector(selector)
+                ? domUtils.selector(selector)
                 : selector;
             if (!(sliderElement instanceof Node) ||
                 !(sliderElement instanceof Element)) {
@@ -7762,47 +8094,15 @@ define((function () { 'use strict';
             }
             return newTargetString;
         }
-        toJSON(data, errorCallBack) {
-            let UtilsContext = this;
-            let result = {};
-            if (typeof data === "object") {
-                return data;
-            }
-            UtilsContext.tryCatch()
-                .config({ log: false })
-                .error((error) => {
-                UtilsContext.tryCatch()
-                    .error(() => {
-                    try {
-                        result = UtilsContext.windowApi.window.eval("(" + data + ")");
-                    }
-                    catch (error2) {
-                        if (typeof errorCallBack === "function") {
-                            errorCallBack(error2);
-                        }
-                    }
-                })
-                    .run(() => {
-                    if (data &&
-                        /^[\],:{}\s]*$/.test(data
-                            .replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
-                            .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
-                            .replace(/(?:^|:|,)(?:\s*\[)+/g, ""))) {
-                        result = new Function("return " + data)();
-                    }
-                    else {
-                        if (typeof errorCallBack === "function") {
-                            errorCallBack(new Error("target is not a JSON"));
-                        }
-                    }
-                });
-            })
-                .run(() => {
-                data = data.trim();
-                result = JSON.parse(data);
-            });
-            return result;
-        }
+        /**
+         * 字符串转Object对象，类似'{"test":""}' => {"test":""}
+         * @param data
+         * @param errorCallBack （可选）错误回调
+         * @example
+         * Utils.toJSON("{123:123}")
+         * > {123:123}
+         */
+        toJSON = commonUtil.toJSON.bind(commonUtil);
         toSearchParamsStr(obj, addPrefix) {
             let UtilsContext = this;
             let searhParamsStr = "";
@@ -7968,7 +8268,7 @@ define((function () { 'use strict';
                 if (Array.isArray(selector)) {
                     let result = [];
                     for (let index = 0; index < selector.length; index++) {
-                        let node = parent.querySelector(selector[index]);
+                        let node = domUtils.selector(selector[index]);
                         if (node) {
                             result.push(node);
                         }
@@ -7981,7 +8281,7 @@ define((function () { 'use strict';
                     return selector();
                 }
                 else {
-                    return parent.querySelector(selector);
+                    return domUtils.selector(selector, parent);
                 }
             }
             return UtilsContext.wait(() => {
@@ -8111,7 +8411,7 @@ define((function () { 'use strict';
                 if (Array.isArray(selector)) {
                     let result = [];
                     for (let index = 0; index < selector.length; index++) {
-                        let nodeList = parent.querySelectorAll(selector[index]);
+                        let nodeList = domUtils.selectorAll(selector[index], parent);
                         if (nodeList.length) {
                             result.push(nodeList);
                         }
@@ -8121,7 +8421,7 @@ define((function () { 'use strict';
                     }
                 }
                 else {
-                    let nodeList = parent.querySelectorAll(selector);
+                    let nodeList = domUtils.selectorAll(selector, parent);
                     if (nodeList.length) {
                         return nodeList;
                     }
@@ -8430,17 +8730,7 @@ define((function () { 'use strict';
          * @param target 需要覆盖的对象
          * @param [objectThis] 覆盖的this指向，如果为传入，则默认为对象本身
          */
-        coverObjectFunctionThis(target, objectThis) {
-            if (typeof target !== "object" || target === null) {
-                throw new Error("target must be object");
-            }
-            objectThis = objectThis || target;
-            Object.keys(target).forEach((key) => {
-                if (typeof target[key] === "function") {
-                    target[key] = target[key].bind(objectThis);
-                }
-            });
-        }
+        coverObjectFunctionThis = commonUtil.coverObjectFunctionThis.bind(commonUtil);
         /**
          * 生成uuid
          * @example
@@ -8481,7 +8771,7 @@ define((function () { 'use strict';
         workerClearTimeout(timeId) {
             try {
                 if (timeId != null) {
-                    clearTimeout(timeId);
+                    clearTimeout$1(timeId);
                 }
             }
             catch (error) {