@whitesev/domutils 1.9.6 → 1.9.9

package/dist/index.amd.js

@@ -1,6 +1,6 @@
 define((function () { 'use strict';
 
-  const version = "1.9.6";
+  const version = "1.9.9";
 
   class WindowApi {
       /** 默认的配置 */
@@ -537,7 +537,6 @@ define((function () { 'use strict';
                   "is",
                   "jquery",
                   "keydown",
-                  "keypress",
                   "keyup",
                   "last",
                   "load",
@@ -590,10 +589,7 @@ define((function () { 'use strict';
                   "slideDown",
                   "slideToggle",
                   "slideUp",
-                  "sort",
-                  "splice",
                   "text",
-                  "toArray",
                   "toggle",
                   "toggleClass",
                   "trigger",
@@ -1627,16 +1623,6 @@ define((function () { 'use strict';
               // 这是存在selector的情况
               listenerOption = getOption(args, 4, listenerOption);
           }
-          // 是否移除所有事件
-          let isRemoveAll = false;
-          if (args.length === 2) {
-              // 目标函数、事件名
-              isRemoveAll = true;
-          }
-          else if ((args.length === 3 && typeof args[2] === "string") || Array.isArray(args[2])) {
-              // 目标函数、事件名、子元素选择器
-              isRemoveAll = true;
-          }
           if (args.length === 5 && typeof args[4] === "function" && typeof filter !== "function") {
               // 目标函数、事件名、回调函数、事件配置、过滤函数
               filter = option;
@@ -1666,7 +1652,7 @@ define((function () { 'use strict';
                           // 事件的配置项不同
                           flag = false;
                       }
-                      if (flag || isRemoveAll) {
+                      if (flag) {
                           $elItem.removeEventListener(eventName, handler.handlerCallBack, handler.option);
                           const findIndex = handlers.findIndex((item) => item === handler);
                           if (findIndex !== -1) {
@@ -1859,35 +1845,43 @@ define((function () { 'use strict';
           else {
               $elList.push(element);
           }
+          /**
+           * 主动添加属性
+           */
+          const addExtraProp = (event, obj) => {
+              if (event instanceof Event && typeof obj === "object" && obj != null && !Array.isArray(obj)) {
+                  const detailKeys = Object.keys(obj);
+                  detailKeys.forEach((keyName) => {
+                      const value = Reflect.get(obj, keyName);
+                      // 在event上添加属性
+                      Reflect.set(event, keyName, value);
+                  });
+              }
+          };
           let eventTypeList = [];
+          /**
+           * 主动传递的事件
+           */
+          let __event__ = null;
           if (Array.isArray(eventType)) {
               eventTypeList = eventType.filter((it) => typeof it === "string" && it.trim() !== "");
           }
           else if (typeof eventType === "string") {
               eventTypeList = eventType.split(" ");
           }
+          else if (eventType instanceof Event) {
+              __event__ = eventType;
+              addExtraProp(__event__, extraDetails);
+          }
           $elList.forEach(($elItem) => {
               /* 获取对象上的事件 */
               const elementEvents = Reflect.get($elItem, GlobalData.domEventSymbol) || {};
-              eventTypeList.forEach((eventTypeItem) => {
-                  let event = null;
-                  if (extraDetails && extraDetails instanceof Event) {
-                      event = extraDetails;
-                  }
-                  else {
-                      // 构造事件
-                      event = new Event(eventTypeItem);
-                      if (typeof extraDetails === "object" && extraDetails != null) {
-                          const detailKeys = Object.keys(extraDetails);
-                          detailKeys.forEach((keyName) => {
-                              const value = Reflect.get(extraDetails, keyName);
-                              // 在event上添加属性
-                              Reflect.set(event, keyName, value);
-                          });
-                      }
-                  }
+              /**
+               * 触发事件
+               */
+              const dispatchEvent = (event, eventTypeItem) => {
                   if (useDispatchToTriggerEvent == false && eventTypeItem in elementEvents) {
-                      // 直接调用监听的事件
+                      // 直接调用.on监听的事件
                       elementEvents[eventTypeItem].forEach((eventsItem) => {
                           eventsItem.handlerCallBack(event);
                       });
@@ -1895,7 +1889,21 @@ define((function () { 'use strict';
                   else {
                       $elItem.dispatchEvent(event);
                   }
-              });
+              };
+              if (__event__) {
+                  // 使用主动传递的事件直接触发
+                  const event = __event__;
+                  const eventTypeItem = event.type;
+                  dispatchEvent(event, eventTypeItem);
+              }
+              else {
+                  eventTypeList.forEach((eventTypeItem) => {
+                      // 构造事件
+                      const event = new Event(eventTypeItem);
+                      addExtraProp(event, extraDetails);
+                      dispatchEvent(event, eventTypeItem);
+                  });
+              }
           });
       }
       /**
@@ -2200,49 +2208,6 @@ define((function () { 'use strict';
           }
           return that.on(element, "keydown", null, handler, option);
       }
-      /**
-       * 当按键按下时触发事件
-       * keydown - > keypress - > keyup
-       * @param element 目标
-       * @param handler 事件处理函数
-       * @param option 配置
-       * @example
-       * // 监听a.xx元素的按键按下
-       * DOMUtils.keypress(document.querySelector("a.xx"),()=>{
-       *   console.log("按键按下");
-       * })
-       * DOMUtils.keypress("a.xx",()=>{
-       *   console.log("按键按下");
-       * })
-       */
-      onKeypress(element, handler, option) {
-          const that = this;
-          if (element == null) {
-              return;
-          }
-          if (typeof element === "string") {
-              element = that.selectorAll(element);
-          }
-          if (CommonUtils.isNodeList(element)) {
-              // 设置
-              const listenerList = [];
-              element.forEach(($ele) => {
-                  const listener = that.onKeypress($ele, handler, option);
-                  listenerList.push(listener);
-              });
-              return {
-                  off() {
-                      listenerList.forEach((listener) => {
-                          if (!listener) {
-                              return;
-                          }
-                          listener.off();
-                      });
-                  },
-              };
-          }
-          return that.on(element, "keypress", null, handler, option);
-      }
       /**
        * 监听某个元素键盘按键事件或window全局按键事件
        * 按下有值的键时触发，按下Ctrl\Alt\Shift\Meta是无值键。按下先触发keydown事件，再触发keypress事件。
@@ -2306,7 +2271,7 @@ define((function () { 'use strict';
            搜索		170
            收藏		171
         **/
-      onKeyboard(element, eventName = "keypress", handler, options) {
+      onKeyboard(element, eventName = "keydown", handler, options) {
           const that = this;
           if (typeof element === "string") {
               element = that.selectorAll(element);
@@ -2484,7 +2449,8 @@ define((function () { 'use strict';
                   eventNameList = [eventNameList];
               }
               let option = void 0;
-              if (typeof args[2] === "string" || Array.isArray(args[2])) {
+              if (args.length === 2) ;
+              else if (typeof args[2] === "string" || Array.isArray(args[2])) {
                   // selector
                   selector = args[2];
                   if (typeof args[3] === "object" && args[3] != null) {