@pixui-dev/pixui-richtext-helper 0.2.6-test.1 → 0.2.6

package/dist/richtext/RichTextCore.js

@@ -148,7 +148,10 @@ var RichTextCore = /** @class */ (function () {
         // 重置全局状态
         RichTextCore.linkNodes = [];
         RichTextCore.hrefIdCnt = 0;
-        var $1 = cheerio.load(str, null, false);
+        var preEncodedStr = str.replace(/href="([^"]*?)"/g, function (_match, hrefVal) {
+            return "href=\"".concat(encodeURIComponent(hrefVal), "\"");
+        });
+        var $1 = cheerio.load(preEncodedStr, null, false);
         //检查html，如果有text节点，说明是转换过的，直接返回
         if ($1("text").length > 0) {
             return str;
@@ -171,9 +174,38 @@ var RichTextCore = /** @class */ (function () {
         // 直接查询统一的 class
         setTimeout(function () {
             var elements = Array.from(document.querySelectorAll(".".concat(RichTextCore.LINK_NODE_CLASS)));
+            // HTML 实体解码工具函数（纯算法实现，避免依赖 textarea 节点）
+            var decodeHtmlEntities = function (str) {
+                if (!str)
+                    return str;
+                var named = {
+                    quot: '"',
+                    amp: "&",
+                    lt: "<",
+                    gt: ">",
+                    apos: "'",
+                };
+                return str.replace(/&(#(?:x[0-9a-fA-F]+|\d+)|[a-zA-Z]+);/g, function (_, ent) {
+                    if (ent[0] === "#") {
+                        // 数字实体
+                        var isHex = ent[1].toLowerCase() === "x";
+                        var numStr = isHex ? ent.slice(2) : ent.slice(1);
+                        var codePoint = parseInt(numStr, isHex ? 16 : 10);
+                        if (!isNaN(codePoint)) {
+                            return String.fromCodePoint(codePoint);
+                        }
+                        return _; // 解析失败，原样返回
+                    }
+                    // 命名实体
+                    if (named.hasOwnProperty(ent))
+                        return named[ent];
+                    return _; // 未知实体，原样返回
+                });
+            };
             elements.forEach(function (el) {
                 var hrefEncoded = el.getAttribute("data-link-href") || "";
-                var href = decodeURIComponent(hrefEncoded);
+                // 先 URI 解码，再做 HTML 实体解码
+                var href = decodeHtmlEntities(decodeURIComponent(hrefEncoded));
                 var typeStr = el.getAttribute("data-link-type");
                 var type = typeStr === LinkNodeType.IMG ? LinkNodeType.IMG : LinkNodeType.DIV;
                 // 避免重复绑定
@@ -257,8 +289,12 @@ var RichTextCore = /** @class */ (function () {
                 if (tagName === "div" || tagName === "text") {
                     return []; // 丢弃空 div / text
                 }
+                else if (tagName === "img") {
+                    // img标签直接返回，不包装在div中
+                    return [$.html(node)];
+                }
                 else {
-                    // 其它空标签保留（img...）
+                    // 其它空标签保留
                     return [wrapNode($elem, "")];
                 }
             }
@@ -523,7 +559,7 @@ var RichTextCore = /** @class */ (function () {
                     mergedStyles.push(innerStyle);
             });
             var finalStyle = mergeStyles.apply(void 0, __spreadArray([originalStyle], mergedStyles, false));
-            var encodedHref = href ? encodeURIComponent(href) : "";
+            var encodedHref = href || ""; // 已在预处理阶段编码，避免二次编码
             if (href) {
                 self.linkNodes.push({ type: LinkNodeType.DIV, href: href, id: id });
             }
@@ -610,7 +646,7 @@ var RichTextCore = /** @class */ (function () {
                 self.linkNodes.push({ type: LinkNodeType.IMG, href: href, id: id });
             }
             // 将链接信息以转义形式保存在 data- 属性中，避免默认跳转
-            var encodedHref = href ? encodeURIComponent(href) : "";
+            var encodedHref = href || ""; // 已在预处理阶段编码，避免二次编码
             $(this).attr("data-link-type", "img");
             $(this).attr("data-link-href", encodedHref);
             $(this).attr("href", "");
@@ -698,7 +734,8 @@ var RichTextCore = /** @class */ (function () {
                 var attribs = ($(node).get(0) || {}).attribs || {};
                 for (var _i = 0, _a = Object.entries(attribs); _i < _a.length; _i++) {
                     var _b = _a[_i], k = _b[0], v = _b[1];
-                    if (k !== "style" && k !== "id") {
+                    // 跳过style、id和href属性，避免重复处理或错误处理
+                    if (k !== "style" && k !== "id" && k !== "href") {
                         customAttrs += " ".concat(k, "=\"").concat(v, "\"");
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pixui-dev/pixui-richtext-helper",
-    "version": "0.2.6-test.1",
+    "version": "0.2.6",
     "description": "pixui richtext helper",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",