@whitesev/domutils 1.7.0 → 1.7.2

package/dist/index.amd.js

@@ -523,7 +523,7 @@ define((function () { 'use strict';
         },
     };
 
-    const version = "1.7.0";
+    const version = "1.7.2";
 
     /* 数据 */
     const GlobalData = {
@@ -1673,28 +1673,30 @@ define((function () { 'use strict';
                 element = that.selectorAll(element);
             }
             if (element == null) {
-                return;
+                return {
+                    off() { },
+                    trigger() { },
+                };
             }
-            let elementList = [];
+            let $elList = [];
             if (element instanceof NodeList || Array.isArray(element)) {
-                element = element;
-                elementList = [...element];
+                $elList = $elList.concat(Array.from(element));
             }
             else {
-                elementList.push(element);
+                $elList.push(element);
             }
             // 事件名
             let eventTypeList = [];
             if (Array.isArray(eventType)) {
-                eventTypeList = eventTypeList.concat(eventType.filter((eventTypeItem) => typeof eventTypeItem === "string" && eventTypeItem.toString() !== ""));
+                eventTypeList = eventTypeList.concat(eventType.filter((it) => typeof it === "string" && it.toString() !== ""));
             }
             else if (typeof eventType === "string") {
-                eventTypeList = eventTypeList.concat(eventType.split(" ").filter((eventTypeItem) => eventTypeItem !== ""));
+                eventTypeList = eventTypeList.concat(eventType.split(" ").filter((it) => it !== ""));
             }
             // 子元素选择器
             let selectorList = [];
             if (Array.isArray(selector)) {
-                selectorList = selectorList.concat(selector.filter((selectorItem) => typeof selectorItem === "string" && selectorItem.toString() !== ""));
+                selectorList = selectorList.concat(selector.filter((it) => typeof it === "string" && it.toString() !== ""));
             }
             else if (typeof selector === "string") {
                 selectorList.push(selector);
@@ -1726,7 +1728,7 @@ define((function () { 'use strict';
                     that.off(element, eventType, selector, callback, option);
                 }
             }
-            elementList.forEach((elementItem) => {
+            $elList.forEach((elementItem) => {
                 /**
                  * 事件回调
                  * @param event
@@ -1752,7 +1754,7 @@ define((function () { 'use strict';
                             }
                             /* 在上层与主元素之间寻找可以被selector所匹配到的 */
                             const $closestMatches = that.closest(eventTarget, selectorItem);
-                            if ($closestMatches && totalParent?.contains($closestMatches)) {
+                            if ($closestMatches && totalParent?.contains?.($closestMatches)) {
                                 eventTarget = $closestMatches;
                                 return true;
                             }
@@ -1797,6 +1799,23 @@ define((function () { 'use strict';
                     Reflect.set(elementItem, GlobalData.domEventSymbol, elementEvents);
                 });
             });
+            return {
+                /**
+                 * 取消绑定的监听事件
+                 * @param filter (可选)过滤函数，对元素属性上的事件进行过滤出想要删除的事件
+                 */
+                off: (filter) => {
+                    that.off($elList, eventTypeList, selectorList, listenerCallBack, listenerOption, filter);
+                },
+                /**
+                 * 主动触发事件
+                 * @param details 赋予触发的Event的额外属性，如果是Event类型，那么将自动代替默认new的Event对象
+                 * @param useDispatchToTriggerEvent 是否使用dispatchEvent来触发事件，默认true，如果为false，则直接调用callback，但是这种会让使用了selectorTarget的没有值
+                 */
+                trigger: (details, useDispatchToTriggerEvent) => {
+                    that.trigger($elList, eventTypeList, details, useDispatchToTriggerEvent);
+                },
+            };
         }
         off(element, eventType, selector, callback, option, filter) {
             /**
@@ -1827,22 +1846,22 @@ define((function () { 'use strict';
             let $elList = [];
             if (element instanceof NodeList || Array.isArray(element)) {
                 element = element;
-                $elList = [...element];
+                $elList = $elList.concat(Array.from(element));
             }
             else {
                 $elList.push(element);
             }
             let eventTypeList = [];
             if (Array.isArray(eventType)) {
-                eventTypeList = eventTypeList.concat(eventType.filter((eventTypeItem) => typeof eventTypeItem === "string" && eventTypeItem.toString() !== ""));
+                eventTypeList = eventTypeList.concat(eventType.filter((it) => typeof it === "string" && it.toString() !== ""));
             }
             else if (typeof eventType === "string") {
-                eventTypeList = eventTypeList.concat(eventType.split(" ").filter((eventTypeItem) => eventTypeItem !== ""));
+                eventTypeList = eventTypeList.concat(eventType.split(" ").filter((it) => it !== ""));
             }
             // 子元素选择器
             let selectorList = [];
             if (Array.isArray(selector)) {
-                selectorList = selectorList.concat(selector.filter((selectorItem) => typeof selectorItem === "string" && selectorItem.toString() !== ""));
+                selectorList = selectorList.concat(selector.filter((it) => typeof it === "string" && it.toString() !== ""));
             }
             else if (typeof selector === "string") {
                 selectorList.push(selector);
@@ -1937,7 +1956,7 @@ define((function () { 'use strict';
             }
             let $elList = [];
             if (element instanceof NodeList || Array.isArray(element)) {
-                $elList = [...element];
+                $elList = $elList.concat(Array.from(element));
             }
             else {
                 $elList.push(element);
@@ -2043,7 +2062,7 @@ define((function () { 'use strict';
             }
             if (checkDOMReadyState()) {
                 /* 检查document状态 */
-                CommonUtils.setTimeout(callback);
+                CommonUtils.setTimeout(callback, 0);
             }
             else {
                 /* 添加监听 */
@@ -2055,7 +2074,7 @@ define((function () { 'use strict';
          * @param element 需要触发的元素|元素数组|window
          * @param eventType 需要触发的事件
          * @param details 赋予触发的Event的额外属性，如果是Event类型，那么将自动代替默认new的Event对象
-         * @param useDispatchToTriggerEvent 是否使用dispatchEvent来触发事件，默认true
+         * @param useDispatchToTriggerEvent 是否使用dispatchEvent来触发事件，默认true，如果为false，则直接调用callback，但是这种会让使用了selectorTarget的没有值
          * @example
          * // 触发元素a.xx的click事件
          * DOMUtils.trigger(document.querySelector("a.xx"),"click")
@@ -2074,15 +2093,14 @@ define((function () { 'use strict';
             }
             let $elList = [];
             if (element instanceof NodeList || Array.isArray(element)) {
-                element = element;
-                $elList = [...element];
+                $elList = $elList.concat(Array.from(element));
             }
             else {
-                $elList = [element];
+                $elList.push(element);
             }
             let eventTypeList = [];
             if (Array.isArray(eventType)) {
-                eventTypeList = eventType;
+                eventTypeList = eventType.filter((it) => typeof it === "string" && it.trim() !== "");
             }
             else if (typeof eventType === "string") {
                 eventTypeList = eventType.split(" ");
@@ -2090,25 +2108,26 @@ define((function () { 'use strict';
             $elList.forEach(($elItem) => {
                 /* 获取对象上的事件 */
                 const elementEvents = Reflect.get($elItem, GlobalData.domEventSymbol) || {};
-                eventTypeList.forEach((__eventType) => {
+                eventTypeList.forEach((eventTypeItem) => {
                     let event = null;
                     if (details && details instanceof Event) {
                         event = details;
                     }
                     else {
                         // 构造事件
-                        event = new Event(__eventType);
+                        event = new Event(eventTypeItem);
                         if (details) {
-                            Object.keys(details).forEach((keyName) => {
+                            const detailKeys = Object.keys(details);
+                            detailKeys.forEach((keyName) => {
                                 const value = Reflect.get(details, keyName);
                                 // 在event上添加属性
                                 Reflect.set(event, keyName, value);
                             });
                         }
                     }
-                    if (useDispatchToTriggerEvent == false && __eventType in elementEvents) {
+                    if (useDispatchToTriggerEvent == false && eventTypeItem in elementEvents) {
                         // 直接调用监听的事件
-                        elementEvents[__eventType].forEach((eventsItem) => {
+                        elementEvents[eventTypeItem].forEach((eventsItem) => {
                             eventsItem.callback(event);
                         });
                     }