@whitesev/domutils 1.8.8 → 1.9.0

package/dist/index.esm.js

@@ -1,3 +1,5 @@
+const version = "1.9.0";
+
 class WindowApi {
     /** 默认的配置 */
     defaultApi = {
@@ -56,245 +58,6 @@ class WindowApi {
     }
 }
 
-const createCache = (lastNumberWeakMap) => {
-    return (collection, nextNumber) => {
-        lastNumberWeakMap.set(collection, nextNumber);
-        return nextNumber;
-    };
-};
-
-/*
- * The value of the constant Number.MAX_SAFE_INTEGER equals (2 ** 53 - 1) but it
- * is fairly new.
- */
-const MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER === undefined ? 9007199254740991 : Number.MAX_SAFE_INTEGER;
-const TWO_TO_THE_POWER_OF_TWENTY_NINE = 536870912;
-const TWO_TO_THE_POWER_OF_THIRTY = TWO_TO_THE_POWER_OF_TWENTY_NINE * 2;
-const createGenerateUniqueNumber = (cache, lastNumberWeakMap) => {
-    return (collection) => {
-        const lastNumber = lastNumberWeakMap.get(collection);
-        /*
-         * Let's try the cheapest algorithm first. It might fail to produce a new
-         * number, but it is so cheap that it is okay to take the risk. Just
-         * increase the last number by one or reset it to 0 if we reached the upper
-         * bound of SMIs (which stands for small integers). When the last number is
-         * unknown it is assumed that the collection contains zero based consecutive
-         * numbers.
-         */
-        let nextNumber = lastNumber === undefined ? collection.size : lastNumber < TWO_TO_THE_POWER_OF_THIRTY ? lastNumber + 1 : 0;
-        if (!collection.has(nextNumber)) {
-            return cache(collection, nextNumber);
-        }
-        /*
-         * If there are less than half of 2 ** 30 numbers stored in the collection,
-         * the chance to generate a new random number in the range from 0 to 2 ** 30
-         * is at least 50%. It's benifitial to use only SMIs because they perform
-         * much better in any environment based on V8.
-         */
-        if (collection.size < TWO_TO_THE_POWER_OF_TWENTY_NINE) {
-            while (collection.has(nextNumber)) {
-                nextNumber = Math.floor(Math.random() * TWO_TO_THE_POWER_OF_THIRTY);
-            }
-            return cache(collection, nextNumber);
-        }
-        // Quickly check if there is a theoretical chance to generate a new number.
-        if (collection.size > MAX_SAFE_INTEGER) {
-            throw new Error('Congratulations, you created a collection of unique numbers which uses all available integers!');
-        }
-        // Otherwise use the full scale of safely usable integers.
-        while (collection.has(nextNumber)) {
-            nextNumber = Math.floor(Math.random() * MAX_SAFE_INTEGER);
-        }
-        return cache(collection, nextNumber);
-    };
-};
-
-const LAST_NUMBER_WEAK_MAP = new WeakMap();
-const cache = createCache(LAST_NUMBER_WEAK_MAP);
-const generateUniqueNumber = createGenerateUniqueNumber(cache, LAST_NUMBER_WEAK_MAP);
-
-const createBrokerFactory = (createOrGetOngoingRequests, extendBrokerImplementation, generateUniqueNumber, isMessagePort) => (brokerImplementation) => {
-    const fullBrokerImplementation = extendBrokerImplementation(brokerImplementation);
-    return (sender) => {
-        const ongoingRequests = createOrGetOngoingRequests(sender);
-        sender.addEventListener('message', (({ data: message }) => {
-            const { id } = message;
-            if (id !== null && ongoingRequests.has(id)) {
-                const { reject, resolve } = ongoingRequests.get(id);
-                ongoingRequests.delete(id);
-                if (message.error === undefined) {
-                    resolve(message.result);
-                }
-                else {
-                    reject(new Error(message.error.message));
-                }
-            }
-        }));
-        if (isMessagePort(sender)) {
-            sender.start();
-        }
-        const call = (method, params = null, transferables = []) => {
-            return new Promise((resolve, reject) => {
-                const id = generateUniqueNumber(ongoingRequests);
-                ongoingRequests.set(id, { reject, resolve });
-                if (params === null) {
-                    sender.postMessage({ id, method }, transferables);
-                }
-                else {
-                    sender.postMessage({ id, method, params }, transferables);
-                }
-            });
-        };
-        const notify = (method, params, transferables = []) => {
-            sender.postMessage({ id: null, method, params }, transferables);
-        };
-        let functions = {};
-        for (const [key, handler] of Object.entries(fullBrokerImplementation)) {
-            functions = { ...functions, [key]: handler({ call, notify }) };
-        }
-        return { ...functions };
-    };
-};
-
-const createCreateOrGetOngoingRequests = (ongoingRequestsMap) => (sender) => {
-    if (ongoingRequestsMap.has(sender)) {
-        // @todo TypeScript needs to be convinced that has() works as expected.
-        return ongoingRequestsMap.get(sender);
-    }
-    const ongoingRequests = new Map();
-    ongoingRequestsMap.set(sender, ongoingRequests);
-    return ongoingRequests;
-};
-
-const createExtendBrokerImplementation = (portMap) => (partialBrokerImplementation) => ({
-    ...partialBrokerImplementation,
-    connect: ({ call }) => {
-        return async () => {
-            const { port1, port2 } = new MessageChannel();
-            const portId = await call('connect', { port: port1 }, [port1]);
-            portMap.set(port2, portId);
-            return port2;
-        };
-    },
-    disconnect: ({ call }) => {
-        return async (port) => {
-            const portId = portMap.get(port);
-            if (portId === undefined) {
-                throw new Error('The given port is not connected.');
-            }
-            await call('disconnect', { portId });
-        };
-    },
-    isSupported: ({ call }) => {
-        return () => call('isSupported');
-    }
-});
-
-const isMessagePort = (sender) => {
-    return typeof sender.start === 'function';
-};
-
-const createBroker = createBrokerFactory(createCreateOrGetOngoingRequests(new WeakMap()), createExtendBrokerImplementation(new WeakMap()), generateUniqueNumber, isMessagePort);
-
-const createClearIntervalFactory = (scheduledIntervalsState) => (clear) => (timerId) => {
-    if (typeof scheduledIntervalsState.get(timerId) === 'symbol') {
-        scheduledIntervalsState.set(timerId, null);
-        clear(timerId).then(() => {
-            scheduledIntervalsState.delete(timerId);
-        });
-    }
-};
-
-const createClearTimeoutFactory = (scheduledTimeoutsState) => (clear) => (timerId) => {
-    if (typeof scheduledTimeoutsState.get(timerId) === 'symbol') {
-        scheduledTimeoutsState.set(timerId, null);
-        clear(timerId).then(() => {
-            scheduledTimeoutsState.delete(timerId);
-        });
-    }
-};
-
-const createSetIntervalFactory = (generateUniqueNumber, scheduledIntervalsState) => (set) => (func, delay = 0, ...args) => {
-    const symbol = Symbol();
-    const timerId = generateUniqueNumber(scheduledIntervalsState);
-    scheduledIntervalsState.set(timerId, symbol);
-    const schedule = () => set(delay, timerId).then(() => {
-        const state = scheduledIntervalsState.get(timerId);
-        if (state === undefined) {
-            throw new Error('The timer is in an undefined state.');
-        }
-        if (state === symbol) {
-            func(...args);
-            // Doublecheck if the interval should still be rescheduled because it could have been cleared inside of func().
-            if (scheduledIntervalsState.get(timerId) === symbol) {
-                schedule();
-            }
-        }
-    });
-    schedule();
-    return timerId;
-};
-
-const createSetTimeoutFactory = (generateUniqueNumber, scheduledTimeoutsState) => (set) => (func, delay = 0, ...args) => {
-    const symbol = Symbol();
-    const timerId = generateUniqueNumber(scheduledTimeoutsState);
-    scheduledTimeoutsState.set(timerId, symbol);
-    set(delay, timerId).then(() => {
-        const state = scheduledTimeoutsState.get(timerId);
-        if (state === undefined) {
-            throw new Error('The timer is in an undefined state.');
-        }
-        if (state === symbol) {
-            // A timeout can be savely deleted because it is only called once.
-            scheduledTimeoutsState.delete(timerId);
-            func(...args);
-        }
-    });
-    return timerId;
-};
-
-// Prefilling the Maps with a function indexed by zero is necessary to be compliant with the specification.
-const scheduledIntervalsState = new Map([[0, null]]); // tslint:disable-line no-empty
-const scheduledTimeoutsState = new Map([[0, null]]); // tslint:disable-line no-empty
-const createClearInterval = createClearIntervalFactory(scheduledIntervalsState);
-const createClearTimeout = createClearTimeoutFactory(scheduledTimeoutsState);
-const createSetInterval = createSetIntervalFactory(generateUniqueNumber, scheduledIntervalsState);
-const createSetTimeout = createSetTimeoutFactory(generateUniqueNumber, scheduledTimeoutsState);
-const wrap = createBroker({
-    clearInterval: ({ call }) => createClearInterval((timerId) => call('clear', { timerId, timerType: 'interval' })),
-    clearTimeout: ({ call }) => createClearTimeout((timerId) => call('clear', { timerId, timerType: 'timeout' })),
-    setInterval: ({ call }) => createSetInterval((delay, timerId) => call('set', { delay, now: performance.timeOrigin + performance.now(), timerId, timerType: 'interval' })),
-    setTimeout: ({ call }) => createSetTimeout((delay, timerId) => call('set', { delay, now: performance.timeOrigin + performance.now(), timerId, timerType: 'timeout' }))
-});
-const load = (url) => {
-    const worker = new Worker(url);
-    return wrap(worker);
-};
-
-const createLoadOrReturnBroker = (loadBroker, worker) => {
-    let broker = null;
-    return () => {
-        if (broker !== null) {
-            return broker;
-        }
-        const blob = new Blob([worker], { type: 'application/javascript; charset=utf-8' });
-        const url = URL.createObjectURL(blob);
-        broker = loadBroker(url);
-        // Bug #1: Edge up until v18 didn't like the URL to be revoked directly.
-        setTimeout(() => URL.revokeObjectURL(url));
-        return broker;
-    };
-};
-
-// This is the minified and stringified code of the worker-timers-worker package.
-const worker = `(()=>{var e={455(e,t){!function(e){"use strict";var t=function(e){return function(t){var r=e(t);return t.add(r),r}},r=function(e){return function(t,r){return e.set(t,r),r}},n=void 0===Number.MAX_SAFE_INTEGER?9007199254740991:Number.MAX_SAFE_INTEGER,o=536870912,s=2*o,a=function(e,t){return function(r){var a=t.get(r),i=void 0===a?r.size:a<s?a+1:0;if(!r.has(i))return e(r,i);if(r.size<o){for(;r.has(i);)i=Math.floor(Math.random()*s);return e(r,i)}if(r.size>n)throw new Error("Congratulations, you created a collection of unique numbers which uses all available integers!");for(;r.has(i);)i=Math.floor(Math.random()*n);return e(r,i)}},i=new WeakMap,u=r(i),c=a(u,i),l=t(c);e.addUniqueNumber=l,e.generateUniqueNumber=c}(t)}},t={};function r(n){var o=t[n];if(void 0!==o)return o.exports;var s=t[n]={exports:{}};return e[n].call(s.exports,s,s.exports,r),s.exports}(()=>{"use strict";const e=-32603,t=-32602,n=-32601,o=(e,t)=>Object.assign(new Error(e),{status:t}),s=t=>o('The handler of the method called "'.concat(t,'" returned an unexpected result.'),e),a=(t,r)=>async({data:{id:a,method:i,params:u}})=>{const c=r[i];try{if(void 0===c)throw(e=>o('The requested method called "'.concat(e,'" is not supported.'),n))(i);const r=void 0===u?c():c(u);if(void 0===r)throw(t=>o('The handler of the method called "'.concat(t,'" returned no required result.'),e))(i);const l=r instanceof Promise?await r:r;if(null===a){if(void 0!==l.result)throw s(i)}else{if(void 0===l.result)throw s(i);const{result:e,transferables:r=[]}=l;t.postMessage({id:a,result:e},r)}}catch(e){const{message:r,status:n=-32603}=e;t.postMessage({error:{code:n,message:r},id:a})}};var i=r(455);const u=new Map,c=(e,r,n)=>({...r,connect:({port:t})=>{t.start();const n=e(t,r),o=(0,i.generateUniqueNumber)(u);return u.set(o,()=>{n(),t.close(),u.delete(o)}),{result:o}},disconnect:({portId:e})=>{const r=u.get(e);if(void 0===r)throw(e=>o('The specified parameter called "portId" with the given value "'.concat(e,'" does not identify a port connected to this worker.'),t))(e);return r(),{result:null}},isSupported:async()=>{if(await new Promise(e=>{const t=new ArrayBuffer(0),{port1:r,port2:n}=new MessageChannel;r.onmessage=({data:t})=>e(null!==t),n.postMessage(t,[t])})){const e=n();return{result:e instanceof Promise?await e:e}}return{result:!1}}}),l=(e,t,r=()=>!0)=>{const n=c(l,t,r),o=a(e,n);return e.addEventListener("message",o),()=>e.removeEventListener("message",o)},d=(e,t)=>r=>{const n=t.get(r);if(void 0===n)return Promise.resolve(!1);const[o,s]=n;return e(o),t.delete(r),s(!1),Promise.resolve(!0)},m=(e,t,r,n)=>(o,s,a)=>{const i=o+s-t.timeOrigin,u=i-t.now();return new Promise(t=>{e.set(a,[r(n,u,i,e,t,a),t])})},f=new Map,h=d(globalThis.clearTimeout,f),p=new Map,v=d(globalThis.clearTimeout,p),w=((e,t)=>{const r=(n,o,s,a)=>{const i=n-e.now();i>0?o.set(a,[t(r,i,n,o,s,a),s]):(o.delete(a),s(!0))};return r})(performance,globalThis.setTimeout),g=m(f,performance,globalThis.setTimeout,w),T=m(p,performance,globalThis.setTimeout,w);l(self,{clear:async({timerId:e,timerType:t})=>({result:await("interval"===t?h(e):v(e))}),set:async({delay:e,now:t,timerId:r,timerType:n})=>({result:await("interval"===n?g:T)(e,t,r)})})})()})();`; // tslint:disable-line:max-line-length
-
-const loadOrReturnBroker = createLoadOrReturnBroker(load, worker);
-const clearInterval = (timerId) => loadOrReturnBroker().clearInterval(timerId);
-const clearTimeout = (timerId) => loadOrReturnBroker().clearTimeout(timerId);
-const setInterval = (...args) => loadOrReturnBroker().setInterval(...args);
-const setTimeout$1 = (...args) => loadOrReturnBroker().setTimeout(...args);
-
 /** 通用工具类 */
 const CommonUtils = {
     windowApi: new WindowApi({
@@ -444,60 +207,6 @@ const CommonUtils = {
             delete target[propName];
         }
     },
-    /**
-     * 自动使用 Worker 执行 setTimeout
-     */
-    setTimeout(callback, timeout = 0) {
-        try {
-            return setTimeout$1(callback, timeout);
-        }
-        catch {
-            return this.windowApi.setTimeout(callback, timeout);
-        }
-    },
-    /**
-     * 配合 .setTimeout 使用
-     */
-    clearTimeout(timeId) {
-        try {
-            if (timeId != null) {
-                clearTimeout(timeId);
-            }
-        }
-        catch {
-            // TODO
-        }
-        finally {
-            this.windowApi.clearTimeout(timeId);
-        }
-    },
-    /**
-     * 自动使用 Worker 执行 setInterval
-     */
-    setInterval(callback, timeout = 0) {
-        try {
-            return setInterval(callback, timeout);
-        }
-        catch {
-            return this.windowApi.setInterval(callback, timeout);
-        }
-    },
-    /**
-     * 配合 .setInterval 使用
-     */
-    clearInterval(timeId) {
-        try {
-            if (timeId != null) {
-                clearInterval(timeId);
-            }
-        }
-        catch {
-            // TODO
-        }
-        finally {
-            this.windowApi.clearInterval(timeId);
-        }
-    },
     /**
      * 判断是否是元素列表
      * @param $ele
@@ -515,8 +224,6 @@ const CommonUtils = {
     },
 };
 
-const version = "1.8.8";
-
 class ElementSelector {
     windowApi;
     constructor(windowApiOption) {
@@ -602,9 +309,10 @@ class ElementSelector {
      */
     matches($el, selector) {
         selector = selector.trim();
-        if ($el == null) {
+        if ($el == null)
+            return false;
+        if ($el instanceof Document)
             return false;
-        }
         if (selector.match(/[^\s]{1}:empty$/gi)) {
             // empty 语法
             selector = selector.replace(/:empty$/gi, "");
@@ -648,6 +356,10 @@ class ElementSelector {
     }
     closest($el, selector) {
         selector = selector.trim();
+        if ($el == null)
+            return null;
+        if ($el instanceof Document)
+            return null;
         if (selector.match(/[^\s]{1}:empty$/gi)) {
             // empty 语法
             selector = selector.replace(/:empty$/gi, "");
@@ -1045,7 +757,7 @@ class ElementWait extends ElementSelector {
                 },
             });
             if (__timeout__ > 0) {
-                CommonUtils.setTimeout(() => {
+                setTimeout(() => {
                     // 取消观察器
                     if (typeof observer?.disconnect === "function") {
                         observer.disconnect();
@@ -1392,7 +1104,7 @@ class ElementAnimate extends ElementWait {
             from[prop] = element.style[prop] || context.windowApi.globalThis.getComputedStyle(element)[prop];
             to[prop] = styles[prop];
         }
-        const timer = CommonUtils.setInterval(function () {
+        const timer = setInterval(function () {
             const timePassed = performance.now() - start;
             let progress = timePassed / duration;
             if (progress > 1) {
@@ -1402,7 +1114,7 @@ class ElementAnimate extends ElementWait {
                 element.style[prop] = from[prop] + (to[prop] - from[prop]) * progress + "px";
             }
             if (progress === 1) {
-                CommonUtils.clearInterval(timer);
+                clearInterval(timer);
                 if (callback) {
                     callback();
                 }
@@ -1732,17 +1444,17 @@ class ElementEvent extends ElementAnimate {
         /**
          * 如果是once，那么删除该监听和元素上的事件和监听
          */
-        function checkOptionOnceToRemoveEventListener() {
+        const checkOptionOnceToRemoveEventListener = () => {
             if (listenerOption.once) {
                 that.off(element, eventType, selector, callback, option);
             }
-        }
+        };
         $elList.forEach((elementItem) => {
             /**
              * 事件回调
              * @param event
              */
-            function domUtilsEventCallBack(event) {
+            const handlerCallBack = function (event) {
                 if (selectorList.length) {
                     /* 存在子元素选择器 */
                     // 这时候的this和target都是子元素选择器的元素
@@ -1790,10 +1502,10 @@ class ElementEvent extends ElementAnimate {
                     listenerCallBack.call(elementItem, event);
                     checkOptionOnceToRemoveEventListener();
                 }
-            }
+            };
             /* 遍历事件名设置元素事件 */
             eventTypeList.forEach((eventName) => {
-                elementItem.addEventListener(eventName, domUtilsEventCallBack, listenerOption);
+                elementItem.addEventListener(eventName, handlerCallBack, listenerOption);
                 /* 获取对象上的事件 */
                 const elementEvents = Reflect.get(elementItem, GlobalData.domEventSymbol) || {};
                 /* 初始化对象上的xx事件 */
@@ -1801,8 +1513,8 @@ class ElementEvent extends ElementAnimate {
                 elementEvents[eventName].push({
                     selector: selectorList,
                     option: listenerOption,
-                    callback: domUtilsEventCallBack,
-                    originCallBack: listenerCallBack,
+                    handlerCallBack: handlerCallBack,
+                    callback: listenerCallBack,
                 });
                 /* 覆盖事件 */
                 Reflect.set(elementItem, GlobalData.domEventSymbol, elementEvents);
@@ -1818,11 +1530,11 @@ class ElementEvent extends ElementAnimate {
             },
             /**
              * 主动触发事件
-             * @param details 赋予触发的Event的额外属性，如果是Event类型，那么将自动代替默认new的Event对象
-             * @param useDispatchToEmit 是否使用dispatchEvent来触发事件，默认true，如果为false，则直接调用callback，但是这种会让使用了selectorTarget的没有值
+             * @param extraDetails 赋予触发的Event的额外属性，如果是Event类型，那么将自动代替默认new的Event对象
+             * @param useDispatchToTriggerEvent 是否使用dispatchEvent来触发事件，默认true，如果为false，则直接调用callback，但是这种会让使用了$selector的没有值
              */
-            emit: (details, useDispatchToEmit) => {
-                that.emit($elList, eventTypeList, details, useDispatchToEmit);
+            emit: (extraDetails, useDispatchToTriggerEvent) => {
+                that.emit($elList, eventTypeList, extraDetails, useDispatchToTriggerEvent);
             },
         };
     }
@@ -1918,7 +1630,7 @@ class ElementEvent extends ElementAnimate {
                 for (let index = 0; index < filterHandler.length; index++) {
                     const handler = filterHandler[index];
                     let flag = true;
-                    if (flag && listenerCallBack && handler.originCallBack !== listenerCallBack) {
+                    if (flag && listenerCallBack && handler.callback !== listenerCallBack) {
                         // callback不同
                         flag = false;
                     }
@@ -1935,7 +1647,7 @@ class ElementEvent extends ElementAnimate {
                         flag = false;
                     }
                     if (flag || isRemoveAll) {
-                        $elItem.removeEventListener(eventName, handler.callback, handler.option);
+                        $elItem.removeEventListener(eventName, handler.handlerCallBack, handler.option);
                         const findIndex = handlers.findIndex((item) => item === handler);
                         if (findIndex !== -1) {
                             handlers.splice(findIndex, 1);
@@ -1991,7 +1703,7 @@ class ElementEvent extends ElementAnimate {
                         return;
                     }
                     for (const handler of handlers) {
-                        $elItem.removeEventListener(eventName, handler.callback, {
+                        $elItem.removeEventListener(eventName, handler.handlerCallBack, {
                             capture: handler["option"]["capture"],
                         });
                     }
@@ -2073,7 +1785,7 @@ class ElementEvent extends ElementAnimate {
         function check() {
             if (checkDOMReadyState()) {
                 /* 检查document状态 */
-                CommonUtils.setTimeout(completed, 0);
+                setTimeout(completed, 0);
             }
             else {
                 /* 添加监听 */
@@ -2094,8 +1806,8 @@ class ElementEvent extends ElementAnimate {
      * 主动触发事件
      * @param element 需要触发的元素|元素数组|window
      * @param eventType 需要触发的事件
-     * @param details 赋予触发的Event的额外属性，如果是Event类型，那么将自动代替默认new的Event对象
-     * @param useDispatchToEmit 是否使用dispatchEvent来触发事件，默认true，如果为false，则直接调用callback，但是这种会让使用了selectorTarget的没有值
+     * @param extraDetails 赋予触发的Event的额外属性，如果是Event类型，那么将自动代替默认new的Event对象
+     * @param useDispatchToTriggerEvent 是否使用dispatchEvent来触发事件，默认true，如果为false，则直接调用通过.on监听的callback()，但是这种只有一个入参，如果使用$selector则没有值
      * @example
      * // 触发元素a.xx的click事件
      * DOMUtils.emit(document.querySelector("a.xx"),"click")
@@ -2104,7 +1816,7 @@ class ElementEvent extends ElementAnimate {
      * DOMUtils.emit(document.querySelector("a.xx"),"click tap hover")
      * DOMUtils.emit("a.xx",["click","tap","hover"])
      */
-    emit(element, eventType, details, useDispatchToEmit = true) {
+    emit(element, eventType, extraDetails, useDispatchToTriggerEvent = true) {
         const that = this;
         if (typeof element === "string") {
             element = that.selectorAll(element);
@@ -2131,25 +1843,25 @@ class ElementEvent extends ElementAnimate {
             const elementEvents = Reflect.get($elItem, GlobalData.domEventSymbol) || {};
             eventTypeList.forEach((eventTypeItem) => {
                 let event = null;
-                if (details && details instanceof Event) {
-                    event = details;
+                if (extraDetails && extraDetails instanceof Event) {
+                    event = extraDetails;
                 }
                 else {
                     // 构造事件
                     event = new Event(eventTypeItem);
-                    if (details) {
-                        const detailKeys = Object.keys(details);
+                    if (typeof extraDetails === "object" && extraDetails != null) {
+                        const detailKeys = Object.keys(extraDetails);
                         detailKeys.forEach((keyName) => {
-                            const value = Reflect.get(details, keyName);
+                            const value = Reflect.get(extraDetails, keyName);
                             // 在event上添加属性
                             Reflect.set(event, keyName, value);
                         });
                     }
                 }
-                if (useDispatchToEmit == false && eventTypeItem in elementEvents) {
+                if (useDispatchToTriggerEvent == false && eventTypeItem in elementEvents) {
                     // 直接调用监听的事件
                     elementEvents[eventTypeItem].forEach((eventsItem) => {
-                        eventsItem.callback(event);
+                        eventsItem.handlerCallBack(event);
                     });
                 }
                 else {
@@ -2635,14 +2347,14 @@ class ElementEvent extends ElementAnimate {
                 isDoubleClick: true,
             });
         }, options);
-        const touchEndListener = this.on($el, "pointerup", selector, (evt, selectorTarget) => {
+        const touchEndListener = this.on($el, "pointerup", selector, (evt, $selector) => {
             this.preventEvent(evt);
             if (evt.pointerType === "touch") {
                 isMobileTouch = true;
             }
-            CommonUtils.clearTimeout(timer);
+            clearTimeout(timer);
             timer = void 0;
-            if (isDoubleClick && $click === selectorTarget) {
+            if (isDoubleClick && $click === $selector) {
                 isDoubleClick = false;
                 $click = null;
                 /* 判定为双击 */
@@ -2651,7 +2363,7 @@ class ElementEvent extends ElementAnimate {
                 });
             }
             else {
-                timer = CommonUtils.setTimeout(() => {
+                timer = setTimeout(() => {
                     isDoubleClick = false;
                     // 判断为单击
                     dblclick_handler(evt, {
@@ -2659,7 +2371,7 @@ class ElementEvent extends ElementAnimate {
                     });
                 }, checkClickTime);
                 isDoubleClick = true;
-                $click = selectorTarget;
+                $click = $selector;
             }
         }, options);
         return {
@@ -3241,16 +2953,17 @@ class DOMUtils extends ElementHandler {
     /**
      * 函数在元素内部末尾添加子元素或HTML字符串
      * @param $el 目标元素
-     * @param content 子元素或HTML字符串
+     * @param args 子元素或HTML字符串
      * @example
      * // 元素a.xx的内部末尾添加一个元素
-     * DOMUtils.append(document.querySelector("a.xx"),document.querySelector("b.xx"))
-     * DOMUtils.append("a.xx","'<b class="xx"></b>")
+     * DOMUtils.append(document.querySelector("a.xx"), document.querySelector("b.xx"))
+     * DOMUtils.append("a.xx", "<b class="xx"></b>")
+     * DOMUtils.append(document, [document.querySelector("b.xx"), document.querySelector("c.xx"), document.querySelector("d.xx")])
+     * DOMUtils.append(document, document.querySelector("b.xx"), document.querySelector("c.xx"), document.querySelector("d.xx"))
      * */
-    append($el, content) {
-        const that = this;
+    append($el, ...args) {
         if (typeof $el === "string") {
-            $el = that.selectorAll($el);
+            $el = this.selectorAll($el);
         }
         if ($el == null) {
             return;
@@ -3258,55 +2971,55 @@ class DOMUtils extends ElementHandler {
         if (CommonUtils.isNodeList($el)) {
             // 设置
             $el.forEach(($elItem) => {
-                that.append($elItem, content);
+                this.append($elItem, ...args);
             });
             return;
         }
-        function elementAppendChild(ele, text) {
-            if (typeof content === "string") {
-                if (ele instanceof DocumentFragment) {
-                    if (typeof text === "string") {
-                        text = that.toElement(text, true, false);
-                    }
-                    ele.appendChild(text);
+        const handler = ($ele, $target) => {
+            if ($ele instanceof DocumentFragment) {
+                if (typeof $target === "string") {
+                    // 字符串转元素
+                    $target = this.toElement($target, true, false);
+                }
+                $ele.appendChild($target);
+            }
+            else {
+                if (typeof $target === "string") {
+                    $ele.insertAdjacentHTML("beforeend", CommonUtils.createSafeHTML($target));
                 }
                 else {
-                    ele.insertAdjacentHTML("beforeend", CommonUtils.createSafeHTML(text));
+                    $ele.appendChild($target);
                 }
             }
+        };
+        const $fragment = this.windowApi.document.createDocumentFragment();
+        args.forEach((argItem) => {
+            if (CommonUtils.isNodeList(argItem)) {
+                // 数组
+                argItem.forEach((it) => {
+                    handler($fragment, it);
+                });
+            }
             else {
-                ele.appendChild(text);
+                handler($fragment, argItem);
             }
-        }
-        if (Array.isArray(content) || content instanceof NodeList) {
-            /* 数组 */
-            const fragment = that.windowApi.document.createDocumentFragment();
-            content.forEach((ele) => {
-                if (typeof ele === "string") {
-                    // 转为元素
-                    ele = that.toElement(ele, true, false);
-                }
-                fragment.appendChild(ele);
-            });
-            $el.appendChild(fragment);
-        }
-        else {
-            elementAppendChild($el, content);
-        }
+        });
+        handler($el, $fragment);
     }
     /**
      * 函数 在元素内部开头添加子元素或HTML字符串
      * @param $el 目标元素
-     * @param content 子元素或HTML字符串
+     * @param args 子元素或HTML字符串
      * @example
      * // 元素a.xx内部开头添加一个元素
      * DOMUtils.prepend(document.querySelector("a.xx"),document.querySelector("b.xx"))
      * DOMUtils.prepend("a.xx","'<b class="xx"></b>")
+     * DOMUtils.prepend(document, [document.querySelector("b.xx"), document.querySelector("c.xx"), document.querySelector("d.xx")])
+     * DOMUtils.prepend(document, document.querySelector("b.xx"), document.querySelector("c.xx"), document.querySelector("d.xx"))
      * */
-    prepend($el, content) {
-        const that = this;
+    prepend($el, ...args) {
         if (typeof $el === "string") {
-            $el = that.selectorAll($el);
+            $el = this.selectorAll($el);
         }
         if ($el == null) {
             return;
@@ -3314,42 +3027,61 @@ class DOMUtils extends ElementHandler {
         if (CommonUtils.isNodeList($el)) {
             // 设置
             $el.forEach(($elItem) => {
-                that.prepend($elItem, content);
+                this.prepend($elItem, ...args);
             });
             return;
         }
-        if (typeof content === "string") {
-            if ($el instanceof DocumentFragment) {
-                content = that.toElement(content, true, false);
-                $el.prepend(content);
+        const handler = ($ele, $target) => {
+            if ($ele instanceof DocumentFragment) {
+                if (typeof $target === "string") {
+                    // 字符串转元素
+                    $target = this.toElement($target, true, false);
+                }
+                $ele.appendChild($target);
             }
             else {
-                $el.insertAdjacentHTML("afterbegin", CommonUtils.createSafeHTML(content));
+                if (typeof $target === "string") {
+                    $ele.insertAdjacentHTML("afterbegin", CommonUtils.createSafeHTML($target));
+                }
+                else {
+                    const $firstChild = $ele.firstChild;
+                    if ($firstChild) {
+                        $ele.insertBefore($target, $firstChild);
+                    }
+                    else {
+                        $ele.prepend($target);
+                    }
+                }
             }
-        }
-        else {
-            const $firstChild = $el.firstChild;
-            if ($firstChild == null) {
-                $el.prepend(content);
+        };
+        const $fragment = this.windowApi.document.createDocumentFragment();
+        args.forEach((argItem) => {
+            if (CommonUtils.isNodeList(argItem)) {
+                // 数组
+                argItem.forEach((it) => {
+                    handler($fragment, it);
+                });
             }
             else {
-                $el.insertBefore(content, $firstChild);
+                handler($fragment, argItem);
             }
-        }
+        });
+        handler($el, $fragment);
     }
     /**
      * 在元素后面添加兄弟元素或HTML字符串
      * @param $el 目标元素
-     * @param content 兄弟元素或HTML字符串
+     * @param args 兄弟元素或HTML字符串
      * @example
      * // 元素a.xx后面添加一个元素
      * DOMUtils.after(document.querySelector("a.xx"),document.querySelector("b.xx"))
      * DOMUtils.after("a.xx","'<b class="xx"></b>")
+     * DOMUtils.after(document, [document.querySelector("b.xx"), document.querySelector("c.xx"), document.querySelector("d.xx")])
+     * DOMUtils.after(document, document.querySelector("b.xx"), document.querySelector("c.xx"), document.querySelector("d.xx"))
      * */
-    after($el, content) {
-        const that = this;
+    after($el, ...args) {
         if (typeof $el === "string") {
-            $el = that.selectorAll($el);
+            $el = this.selectorAll($el);
         }
         if ($el == null) {
             return;
@@ -3357,38 +3089,63 @@ class DOMUtils extends ElementHandler {
         if (CommonUtils.isNodeList($el)) {
             // 设置
             $el.forEach(($elItem) => {
-                that.after($elItem, content);
+                this.after($elItem, ...args);
             });
             return;
         }
-        if (typeof content === "string") {
-            $el.insertAdjacentHTML("afterend", CommonUtils.createSafeHTML(content));
-        }
-        else {
-            const $parent = $el.parentElement;
-            const $nextSlibling = $el.nextSibling;
-            if (!$parent || $nextSlibling) {
-                // 任意一个不行
-                $el.after(content);
+        const handler = ($ele, $target) => {
+            if ($ele instanceof DocumentFragment) {
+                if (typeof $target === "string") {
+                    // 字符串转元素
+                    $target = this.toElement($target, true, false);
+                }
+                $ele.appendChild($target);
             }
             else {
-                $parent.insertBefore(content, $nextSlibling);
+                if (typeof $target === "string") {
+                    $ele.insertAdjacentHTML("afterend", CommonUtils.createSafeHTML($target));
+                }
+                else {
+                    const $parent = $el.parentElement;
+                    const $nextSlibling = $el.nextSibling;
+                    if ($parent && $nextSlibling) {
+                        $parent.insertBefore($target, $nextSlibling);
+                    }
+                    else {
+                        $el.after($target);
+                    }
+                }
             }
-        }
+        };
+        const $fragment = this.windowApi.document.createDocumentFragment();
+        args.forEach((argItem) => {
+            if (CommonUtils.isNodeList(argItem)) {
+                // 数组
+                argItem.forEach((it) => {
+                    handler($fragment, it);
+                });
+            }
+            else {
+                handler($fragment, argItem);
+            }
+        });
+        handler($el, $fragment);
     }
     /**
      * 在元素前面添加兄弟元素或HTML字符串
      * @param $el 目标元素
-     * @param content 兄弟元素或HTML字符串
+     * @param args 兄弟元素或HTML字符串
      * @example
      * // 元素a.xx前面添加一个元素
      * DOMUtils.before(document.querySelector("a.xx"),document.querySelector("b.xx"))
      * DOMUtils.before("a.xx","'<b class="xx"></b>")
+     * DOMUtils.before(document, [document.querySelector("b.xx"), document.querySelector("c.xx"), document.querySelector("d.xx")])
+     * DOMUtils.before(document, document.querySelector("b.xx"), document.querySelector("c.xx"), document.querySelector("d.xx"))
+     *
      * */
-    before($el, content) {
-        const that = this;
+    before($el, ...args) {
         if (typeof $el === "string") {
-            $el = that.selectorAll($el);
+            $el = this.selectorAll($el);
         }
         if ($el == null) {
             return;
@@ -3396,22 +3153,46 @@ class DOMUtils extends ElementHandler {
         if (CommonUtils.isNodeList($el)) {
             // 设置
             $el.forEach(($elItem) => {
-                that.before($elItem, content);
+                this.before($elItem, ...args);
             });
             return;
         }
-        if (typeof content === "string") {
-            $el.insertAdjacentHTML("beforebegin", CommonUtils.createSafeHTML(content));
-        }
-        else {
-            const $parent = $el.parentElement;
-            if (!$parent) {
-                $el.before(content);
+        const handler = ($ele, $target) => {
+            if ($ele instanceof DocumentFragment) {
+                if (typeof $target === "string") {
+                    // 字符串转元素
+                    $target = this.toElement($target, true, false);
+                }
+                $ele.appendChild($target);
+            }
+            else {
+                if (typeof $target === "string") {
+                    $el.insertAdjacentHTML("beforebegin", CommonUtils.createSafeHTML($target));
+                }
+                else {
+                    const $parent = $el.parentElement;
+                    if ($parent) {
+                        $parent.insertBefore($target, $el);
+                    }
+                    else {
+                        $el.before($target);
+                    }
+                }
+            }
+        };
+        const $fragment = this.windowApi.document.createDocumentFragment();
+        args.forEach((argItem) => {
+            if (CommonUtils.isNodeList(argItem)) {
+                // 数组
+                argItem.forEach((it) => {
+                    handler($fragment, it);
+                });
             }
             else {
-                $parent.insertBefore(content, $el);
+                handler($fragment, argItem);
             }
-        }
+        });
+        handler($el, $fragment);
     }
     /**
      * 移除元素
@@ -3447,7 +3228,7 @@ class DOMUtils extends ElementHandler {
         }
     }
     /**
-     * 移除元素的所有子元素
+     * 移除元素内所有的子元素
      * @param $el 目标元素
      * @example
      * // 移除元素a.xx元素的所有子元素
@@ -4137,6 +3918,10 @@ class DOMUtils extends ElementHandler {
     }
 }
 const domUtils = new DOMUtils();
+domUtils.emit(document, "test");
+domUtils.emit(document, "click");
+domUtils.emit(document, ["test", "click"]);
+domUtils.emit(document, ["test", "click"], true);
 
 export { domUtils as default };
 //# sourceMappingURL=index.esm.js.map