@whitesev/domutils 1.5.0 → 1.5.2

package/dist/index.umd.js

@@ -61,6 +61,22 @@
         isShow(element) {
             return Boolean(element.getClientRects().length);
         },
+        /**
+         * 获取安全的html
+         */
+        getSafeHTML(text) {
+            // @ts-ignore
+            if (globalThis.trustedTypes) {
+                // @ts-ignore
+                const policy = globalThis.trustedTypes.createPolicy("safe-innerHTML", {
+                    createHTML: (html) => html,
+                });
+                return policy.createHTML(text);
+            }
+            else {
+                return text;
+            }
+        },
         /**
          * 在CSP策略下设置innerHTML
          * @param $el 元素
@@ -68,22 +84,7 @@
          */
         setSafeHTML($el, text) {
             // 创建 TrustedHTML 策略（需 CSP 允许）
-            try {
-                $el.innerHTML = text;
-            }
-            catch (error) {
-                // @ts-ignore
-                if (globalThis.trustedTypes) {
-                    // @ts-ignore
-                    const policy = globalThis.trustedTypes.createPolicy("safe-innerHTML", {
-                        createHTML: (html) => html,
-                    });
-                    $el.innerHTML = policy.createHTML(text);
-                }
-                else {
-                    throw new Error("trustedTypes is not defined");
-                }
-            }
+            $el.innerHTML = this.getSafeHTML(text);
         },
         /**
          * 用于显示元素并获取它的高度宽度等其它属性
@@ -1063,7 +1064,7 @@
             super(option);
         }
         /** 版本号 */
-        version = "2025.3.2";
+        version = "2025.4.8";
         attr(element, attrName, attrValue) {
             let DOMUtilsContext = this;
             if (typeof element === "string") {
@@ -1206,6 +1207,19 @@
                 else ;
                 return;
             }
+            let setStyleProperty = (propertyName, propertyValue) => {
+                if (propertyValue === "string" && propertyValue.includes("!important")) {
+                    propertyValue = propertyValue
+                        .trim()
+                        .replace(/!important$/gi, "")
+                        .trim();
+                    element.style.setProperty(propertyName, propertyValue, "important");
+                }
+                else {
+                    propertyValue = handlePixe(propertyName, propertyValue);
+                    element.style.setProperty(propertyName, propertyValue);
+                }
+            };
             if (typeof property === "string") {
                 if (value == null) {
                     return DOMUtilsContext.windowApi.globalThis
@@ -1213,28 +1227,19 @@
                         .getPropertyValue(property);
                 }
                 else {
-                    if (value === "string" && value.includes("!important")) {
-                        element.style.setProperty(property, value, "important");
-                    }
-                    else {
-                        value = handlePixe(property, value);
-                        element.style.setProperty(property, value);
-                    }
+                    setStyleProperty(property, value);
                 }
             }
             else if (typeof property === "object") {
                 for (let prop in property) {
-                    if (typeof property[prop] === "string" &&
-                        property[prop].includes("!important")) {
-                        element.style.setProperty(prop, property[prop], "important");
-                    }
-                    else {
-                        property[prop] = handlePixe(prop, property[prop]);
-                        element.style.setProperty(prop, property[prop]);
-                    }
+                    let value = property[prop];
+                    setStyleProperty(prop, value);
                 }
             }
-            else ;
+            else {
+                // 其他情况
+                throw new TypeError("property must be string or object");
+            }
         }
         text(element, text) {
             let DOMUtilsContext = this;
@@ -1630,7 +1635,7 @@
             }
             function elementAppendChild(ele, text) {
                 if (typeof content === "string") {
-                    ele.insertAdjacentHTML("beforeend", text);
+                    ele.insertAdjacentHTML("beforeend", DOMUtilsCommonUtils.getSafeHTML(text));
                 }
                 else {
                     ele.appendChild(text);
@@ -1676,7 +1681,7 @@
                 return;
             }
             if (typeof content === "string") {
-                element.insertAdjacentHTML("afterbegin", content);
+                element.insertAdjacentHTML("afterbegin", DOMUtilsCommonUtils.getSafeHTML(content));
             }
             else {
                 let $firstChild = element.firstChild;
@@ -1713,7 +1718,7 @@
                 return;
             }
             if (typeof content === "string") {
-                element.insertAdjacentHTML("afterend", content);
+                element.insertAdjacentHTML("afterend", DOMUtilsCommonUtils.getSafeHTML(content));
             }
             else {
                 let $parent = element.parentElement;
@@ -1752,7 +1757,7 @@
                 return;
             }
             if (typeof content === "string") {
-                element.insertAdjacentHTML("beforebegin", content);
+                element.insertAdjacentHTML("beforebegin", DOMUtilsCommonUtils.getSafeHTML(content));
             }
             else {
                 let $parent = element.parentElement;