@whitesev/domutils 1.4.0 → 1.4.3

package/dist/index.amd.js

@@ -213,6 +213,7 @@ define((function () { 'use strict';
             else {
                 elementList.push(element);
             }
+            // 事件名
             let eventTypeList = [];
             if (Array.isArray(eventType)) {
                 eventTypeList = eventTypeList.concat(eventType);
@@ -220,8 +221,17 @@ define((function () { 'use strict';
             else if (typeof eventType === "string") {
                 eventTypeList = eventTypeList.concat(eventType.split(" "));
             }
-            let _selector_ = selector;
+            // 子元素选择器
+            let selectorList = [];
+            if (Array.isArray(selector)) {
+                selectorList = selectorList.concat(selector);
+            }
+            else if (typeof selector === "string") {
+                selectorList.push(selector);
+            }
+            // 事件回调
             let _callback_ = callback;
+            // 事件配置
             let _option_ = {
                 capture: false,
                 once: false,
@@ -229,7 +239,6 @@ define((function () { 'use strict';
             };
             if (typeof selector === "function") {
                 /* 这是为没有selector的情况 */
-                _selector_ = void 0;
                 _callback_ = selector;
                 _option_ = getOption(args, 3, _option_);
             }
@@ -246,30 +255,39 @@ define((function () { 'use strict';
                 }
             }
             elementList.forEach((elementItem) => {
-                function ownCallBack(event) {
+                /**
+                 * 事件回调
+                 * @param event
+                 */
+                function domUtilsEventCallBack(event) {
                     let target = event.target;
-                    if (_selector_) {
+                    if (selectorList.length) {
                         /* 存在自定义子元素选择器 */
                         let totalParent = DOMUtilsCommonUtils.isWin(elementItem)
                             ? DOMUtilsContext.windowApi.document.documentElement
                             : elementItem;
-                        if (target.matches(_selector_)) {
-                            /* 当前目标可以被selector所匹配到 */
-                            _callback_.call(target, event);
-                            checkOptionOnceToRemoveEventListener();
-                        }
-                        else if (target.closest(_selector_) &&
-                            totalParent.contains(target.closest(_selector_))) {
-                            /* 在上层与主元素之间寻找可以被selector所匹配到的 */
-                            let closestElement = target.closest(_selector_);
-                            /* event的target值不能直接修改 */
-                            OriginPrototype.Object.defineProperty(event, "target", {
-                                get() {
-                                    return closestElement;
-                                },
-                            });
-                            _callback_.call(closestElement, event);
-                            checkOptionOnceToRemoveEventListener();
+                        for (let index = 0; index < selectorList.length; index++) {
+                            const selectorItem = selectorList[index];
+                            if (target.matches(selectorItem)) {
+                                /* 当前目标可以被selector所匹配到 */
+                                _callback_.call(target, event);
+                                checkOptionOnceToRemoveEventListener();
+                                break;
+                            }
+                            else if (target.closest(selectorItem) &&
+                                totalParent.contains(target.closest(selectorItem))) {
+                                /* 在上层与主元素之间寻找可以被selector所匹配到的 */
+                                let closestElement = target.closest(selectorItem);
+                                /* event的target值不能直接修改 */
+                                OriginPrototype.Object.defineProperty(event, "target", {
+                                    get() {
+                                        return closestElement;
+                                    },
+                                });
+                                _callback_.call(closestElement, event);
+                                checkOptionOnceToRemoveEventListener();
+                                break;
+                            }
                         }
                     }
                     else {
@@ -279,21 +297,19 @@ define((function () { 'use strict';
                 }
                 /* 遍历事件名设置元素事件 */
                 eventTypeList.forEach((eventName) => {
-                    elementItem.addEventListener(eventName, ownCallBack, _option_);
-                    if (_callback_ && _callback_.delegate) {
-                        elementItem.setAttribute("data-delegate", _selector_);
-                    }
+                    elementItem.addEventListener(eventName, domUtilsEventCallBack, _option_);
                     /* 获取对象上的事件 */
                     let elementEvents = elementItem[DOMUtilsData.SymbolEvents] || {};
                     /* 初始化对象上的xx事件 */
                     elementEvents[eventName] = elementEvents[eventName] || [];
                     elementEvents[eventName].push({
-                        selector: _selector_,
+                        selector: selectorList,
                         option: _option_,
-                        callback: ownCallBack,
+                        callback: domUtilsEventCallBack,
                         originCallBack: _callback_,
                     });
                     /* 覆盖事件 */
+                    // @ts-ignore
                     elementItem[DOMUtilsData.SymbolEvents] = elementEvents;
                 });
             });
@@ -338,10 +354,14 @@ define((function () { 'use strict';
             else if (typeof eventType === "string") {
                 eventTypeList = eventTypeList.concat(eventType.split(" "));
             }
-            /**
-             * 子元素选择器
-             */
-            let _selector_ = selector;
+            // 子元素选择器
+            let selectorList = [];
+            if (Array.isArray(selector)) {
+                selectorList = selectorList.concat(selector);
+            }
+            else if (typeof selector === "string") {
+                selectorList.push(selector);
+            }
             /**
              * 事件的回调函数
              */
@@ -354,7 +374,6 @@ define((function () { 'use strict';
             };
             if (typeof selector === "function") {
                 /* 这是为没有selector的情况 */
-                _selector_ = void 0;
                 _callback_ = selector;
                 _option_ = getOption(args, 3, _option_);
             }
@@ -363,6 +382,7 @@ define((function () { 'use strict';
             }
             elementList.forEach((elementItem) => {
                 /* 获取对象上的事件 */
+                // @ts-ignore
                 let elementEvents = elementItem[DOMUtilsData.SymbolEvents] || {};
                 eventTypeList.forEach((eventName) => {
                     let handlers = elementEvents[eventName] || [];
@@ -372,14 +392,21 @@ define((function () { 'use strict';
                     for (let index = 0; index < handlers.length; index++) {
                         let handler = handlers[index];
                         let flag = false;
-                        if (!_selector_ || handler.selector === _selector_) {
-                            /* selector不为空，进行selector判断 */
+                        if (!selectorList.length) {
+                            // selectorList是空的，默认移除
                             flag = true;
                         }
+                        else {
+                            if (Array.isArray(handler.selector) &&
+                                JSON.stringify(handler.selector) === JSON.stringify(selectorList)) {
+                                // 元素上的selectorList不为空且和传入的相同
+                                flag = true;
+                            }
+                        }
                         if (!_callback_ ||
                             handler.callback === _callback_ ||
                             handler.originCallBack === _callback_) {
-                            /* callback不为空，进行callback判断 */
+                            /* callback不为空，且callback相同 */
                             flag = true;
                         }
                         if (flag) {
@@ -392,6 +419,7 @@ define((function () { 'use strict';
                         DOMUtilsCommonUtils.delete(elementEvents, eventType);
                     }
                 });
+                // @ts-ignore
                 elementItem[DOMUtilsData.SymbolEvents] = elementEvents;
             });
         }
@@ -441,6 +469,7 @@ define((function () { 'use strict';
                                 capture: handler["option"]["capture"],
                             });
                         }
+                        // @ts-ignore
                         DOMUtilsCommonUtils.delete(elementItem[symbolEvents], eventName);
                     });
                 });
@@ -935,8 +964,8 @@ define((function () { 'use strict';
                     return $ele?.innerHTML?.trim() === "";
                 });
             }
-            else if (selector.match(/[^\s]{1}:contains\("(.*)"\)$/gi) ||
-                selector.match(/[^\s]{1}:contains\('(.*)'\)$/gi)) {
+            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];
@@ -946,12 +975,18 @@ define((function () { 'use strict';
                     return ($ele?.textContent || $ele?.innerText)?.includes(text);
                 });
             }
-            else if (selector.match(/[^\s]{1}:regexp\("(.*)"\)$/gi) ||
-                selector.match(/[^\s]{1}:regexp\('(.*)'\)$/gi)) {
+            else if (selector.match(/[^\s]{1}:regexp\("(.*)"\)$/i) ||
+                selector.match(/[^\s]{1}:regexp\('(.*)'\)$/i)) {
                 // regexp 语法
                 let textMatch = selector.match(/:regexp\(("|')(.*)("|')\)$/i);
-                let text = textMatch[2];
-                let regexp = new RegExp(text);
+                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(context.windowApi.document.querySelectorAll(selector)).filter(($ele) => {
                     // @ts-ignore
@@ -977,7 +1012,7 @@ define((function () { 'use strict';
             super(option);
         }
         /** 版本号 */
-        version = "2024.11.6";
+        version = "2024.12.3";
         attr(element, attrName, attrValue) {
             let DOMUtilsContext = this;
             if (typeof element === "string") {