@whitesev/domutils 2.0.4 → 2.0.6

package/dist/index.system.js

@@ -3,7 +3,7 @@ System.register('DOMUtils', [], (function (exports) {
   return {
     execute: (function () {
 
-      const version = "2.0.4";
+      const version = "2.0.6";
 
       class WindowApi {
           /** 默认的配置 */
@@ -110,15 +110,15 @@ System.register('DOMUtils', [], (function (exports) {
            * @param $el
            */
           forceShow($el) {
-              const dupNode = $el.cloneNode(true);
-              dupNode.setAttribute("style", "visibility: hidden !important;display:block !important;");
-              this.windowApi.document.documentElement.appendChild(dupNode);
+              const $clone = $el.cloneNode(true);
+              $clone.setAttribute("style", "visibility: hidden !important;display:block !important;");
+              this.windowApi.document.documentElement.appendChild($clone);
               return {
                   /**
                    * 恢复修改的style
                    */
                   recovery() {
-                      dupNode.remove();
+                      $clone.remove();
                   },
               };
           },
@@ -151,37 +151,37 @@ System.register('DOMUtils', [], (function (exports) {
           },
           /**
            * 判断是否是window，例如window、self、globalThis
-           * @param target
+           * @param obj
            */
-          isWin(target) {
-              if (typeof target !== "object") {
+          isWin(obj) {
+              if (typeof obj !== "object") {
                   return false;
               }
-              if (target instanceof Node) {
+              if (obj instanceof Node) {
                   return false;
               }
-              if (target === globalThis) {
+              if (obj === globalThis) {
                   return true;
               }
-              if (target === window) {
+              if (obj === window) {
                   return true;
               }
-              if (target === self) {
+              if (obj === self) {
                   return true;
               }
-              if (target === globalThis) {
+              if (obj === globalThis) {
                   return true;
               }
-              if (target === window) {
+              if (obj === window) {
                   return true;
               }
-              if (target === self) {
+              if (obj === self) {
                   return true;
               }
-              if (typeof unsafeWindow !== "undefined" && target === unsafeWindow) {
+              if (typeof unsafeWindow !== "undefined" && obj === unsafeWindow) {
                   return true;
               }
-              if (target?.Math?.toString() !== "[object Math]") {
+              if (obj?.Math?.toString() !== "[object Math]") {
                   return false;
               }
               return true;
@@ -201,23 +201,23 @@ System.register('DOMUtils', [], (function (exports) {
           },
           /**
            * 删除对象上的属性
-           * @param target
+           * @param obj
            * @param propName
            */
-          delete(target, propName) {
+          delete(obj, propName) {
               if (typeof Reflect === "object" && Reflect != null && Reflect.deleteProperty) {
-                  return Reflect.deleteProperty(target, propName);
+                  return Reflect.deleteProperty(obj, propName);
               }
               else {
-                  delete target[propName];
+                  delete obj[propName];
               }
           },
           /**
            * 判断是否是元素列表
-           * @param $ele
+           * @param $el
            */
-          isNodeList($ele) {
-              return Array.isArray($ele) || $ele instanceof NodeList;
+          isNodeList($el) {
+              return Array.isArray($el) || $el instanceof NodeList;
           },
           /** 获取 animationend 在各个浏览器的兼容名 */
           getAnimationEndNameList() {
@@ -1359,6 +1359,7 @@ System.register('DOMUtils', [], (function (exports) {
       const OriginPrototype = {
           Object: {
               defineProperty: Object.defineProperty,
+              defineProperties: Object.defineProperties,
           },
       };
 
@@ -1394,20 +1395,12 @@ System.register('DOMUtils', [], (function (exports) {
                           option.passive = args[startIndex + 2];
                       }
                   }
-                  else if (currentParam &&
-                      typeof currentParam === "object" &&
-                      ("capture" in currentParam ||
-                          "once" in currentParam ||
-                          "passive" in currentParam ||
-                          "isComposedPath" in currentParam ||
-                          "overrideTarget" in currentParam ||
-                          "isPreventEvent" in currentParam)) {
-                      option.capture = currentParam.capture;
-                      option.once = currentParam.once;
-                      option.passive = currentParam.passive;
-                      option.isComposedPath = currentParam.isComposedPath;
-                      option.overrideTarget = currentParam.overrideTarget;
-                      option.isPreventEvent = currentParam.isPreventEvent;
+                  else if (currentParam && typeof currentParam === "object") {
+                      for (const key in option) {
+                          if (Reflect.has(currentParam, key)) {
+                              Reflect.set(option, key, currentParam[key]);
+                          }
+                      }
                   }
                   return option;
               };
@@ -1527,16 +1520,16 @@ System.register('DOMUtils', [], (function (exports) {
                                       // 这里尝试使用defineProperty修改event的target值
                                       try {
                                           const originTarget = event.target;
-                                          OriginPrototype.Object.defineProperty(event, "target", {
-                                              value: $target,
-                                              get() {
-                                                  return $target;
+                                          OriginPrototype.Object.defineProperties(event, {
+                                              target: {
+                                                  get() {
+                                                      return $target;
+                                                  },
                                               },
-                                          });
-                                          OriginPrototype.Object.defineProperty(event, "originTarget", {
-                                              value: $target,
-                                              get() {
-                                                  return originTarget;
+                                              originTarget: {
+                                                  get() {
+                                                      return originTarget;
+                                                  },
                                               },
                                           });
                                           // oxlint-disable-next-line no-empty
@@ -1608,10 +1601,7 @@ System.register('DOMUtils', [], (function (exports) {
                   if (typeof currentParam === "boolean") {
                       option.capture = currentParam;
                   }
-                  else if (currentParam &&
-                      typeof currentParam === "object" &&
-                      currentParam != null &&
-                      "capture" in currentParam) {
+                  else if (currentParam && typeof currentParam === "object" && "capture" in currentParam) {
                       option.capture = currentParam.capture;
                   }
                   return option;
@@ -3326,7 +3316,7 @@ System.register('DOMUtils', [], (function (exports) {
               handler($el, $fragment);
           }
           /**
-           * 移除元素
+           * 移除元素（包括它和内部使用.on添加的监听事件）
            * @param $el 目标元素，可以是数组、单个元素、NodeList、元素选择器
            * @example
            * DOMUtils.remove(document.querySelector("a.xx"))
@@ -3335,19 +3325,23 @@ System.register('DOMUtils', [], (function (exports) {
            * DOMUtils.remove([a.xxx, div.xxx, span.xxx])
            * */
           remove($el) {
-              const that = this;
               if (typeof $el === "string") {
-                  $el = that.selectorAll($el);
+                  $el = this.selectorAll($el);
               }
               if ($el == null) {
                   return;
               }
               if (CommonUtils.isNodeList($el)) {
                   $el.forEach(($elItem) => {
-                      that.remove($elItem);
+                      this.remove($elItem);
                   });
                   return;
               }
+              // 移除事件
+              $el.querySelectorAll("*").forEach(($elItem) => {
+                  this.offAll($elItem);
+              });
+              this.offAll($el);
               if (typeof $el.remove === "function") {
                   $el.remove();
               }
@@ -3382,7 +3376,7 @@ System.register('DOMUtils', [], (function (exports) {
                   return;
               }
               if ($el.innerHTML) {
-                  $el.innerHTML = "";
+                  CommonUtils.setSafeHTML($el, "");
               }
               else if ($el.textContent) {
                   $el.textContent = "";
@@ -3580,7 +3574,7 @@ System.register('DOMUtils', [], (function (exports) {
               }
               else {
                   that.after($el, $newEl);
-                  $el.remove();
+                  this.remove($el);
               }
           }
           /**