bhd-components 0.10.34 → 0.10.36

package/es2017/customerService/function.js

@@ -199,7 +199,7 @@ const removeMermaidBlockComments = (markdownContent)=>{
     return markdownContent.replace(mermaidBlockRegex, (match, prefix, content, suffix)=>{
         // 清理块内注释的正则（同之前逻辑，优先保留字符串）
         const commentRegex = /(".*?"|'.*?')|(\/\*[\s\S]*?\*\/)|(\/\/.*?$)/gm;
-        const cleanContent = content.replace(commentRegex, (m, stringPart)=>stringPart || '');
+        const cleanContent = content.replace(commentRegex, (m, stringPart)=>stringPart || '').replace(/<br>/g, '').replace(/\\n/g, '');
         // 拼接回完整代码块（保留 ```mermaid 和 ``` 标识）
         return `${prefix}${cleanContent}${suffix}`;
     });

package/es2017/customerService/index.js

@@ -433,38 +433,44 @@ const CustomerService = (props)=>{
             setVisible(true);
         }
         function openViewMemaid(id) {
-            var _document_querySelector, _svgDomClone;
-            console.log('openViewMemaid');
-            const svgDomClone = (_document_querySelector = document.querySelector(`#${id} svg`)) === null || _document_querySelector === void 0 ? void 0 : _document_querySelector.cloneNode(true);
-            if (!svgDomClone) {
-                return;
+            try {
+                var _document_querySelector, _svgDomClone;
+                console.log('openViewMemaid');
+                const svgDomClone = (_document_querySelector = document.querySelector(`#${id} svg`)) === null || _document_querySelector === void 0 ? void 0 : _document_querySelector.cloneNode(true);
+                if (!svgDomClone) {
+                    return;
+                }
+                svgDomClone.style.backgroundColor = '#fafafa';
+                svgDomClone.style.width = "auto";
+                svgDomClone.style.height = "auto";
+                const viewBox = svgDomClone.getAttribute('viewBox');
+                let [x, y, width, height] = viewBox ? viewBox.split(' ').map(Number) : [
+                    0,
+                    0,
+                    0,
+                    0
+                ];
+                x -= 10;
+                y -= 10;
+                width += 20;
+                height += 20;
+                svgDomClone.setAttribute('viewBox', `${x} ${y} ${width} ${height}`);
+                let svgString = ((_svgDomClone = svgDomClone) === null || _svgDomClone === void 0 ? void 0 : _svgDomClone.outerHTML.toString()) || "";
+                const blob = new Blob([
+                    svgString
+                ], {
+                    type: 'image/svg+xml;charset=utf-8'
+                });
+                console.log('blob', blob);
+                const blobUrl = URL.createObjectURL(blob);
+                console.log('blobUrl', blobUrl);
+                setViewBase64(blobUrl);
+                setVisible(true);
+            // setMemaidContent(id);
+            // setShowMemaid(true);
+            } catch (error) {
+                console.log('error', error);
             }
-            svgDomClone.style.backgroundColor = '#fafafa';
-            svgDomClone.style.width = "auto";
-            svgDomClone.style.height = "auto";
-            const viewBox = svgDomClone.getAttribute('viewBox');
-            let [x, y, width, height] = viewBox ? viewBox.split(' ').map(Number) : [
-                0,
-                0,
-                0,
-                0
-            ];
-            x -= 10;
-            y -= 10;
-            width += 20;
-            height += 20;
-            svgDomClone.setAttribute('viewBox', `${x} ${y} ${width} ${height}`);
-            const svgString = ((_svgDomClone = svgDomClone) === null || _svgDomClone === void 0 ? void 0 : _svgDomClone.outerHTML.toString()) || "";
-            const blob = new Blob([
-                svgString
-            ], {
-                type: 'image/svg+xml;charset=utf-8'
-            });
-            const blobUrl = URL.createObjectURL(blob);
-            setViewBase64(blobUrl);
-            setVisible(true);
-        // setMemaidContent(id);
-        // setShowMemaid(true);
         }
         window.openViewBase64 = openViewBase64;
         window.openViewMemaid = openViewMemaid;
@@ -2319,8 +2325,10 @@ const CustomerService = (props)=>{
             // let code = message.split("```");
             // code = code[1];
             // console.log(code,888888888);
-            message = removeMermaidBlockComments(message);
-            message = handleRenderSyntaxBlock(message, finishedRef.current);
+            if (finishedRef.current || i != historyMessageList.length - 1) {
+                message = removeMermaidBlockComments(message);
+            }
+            message = handleRenderSyntaxBlock(message, finishedRef.current || i != historyMessageList.length - 1);
             if (lastId == item.id && keyWordProblem != "") {
                 //点击历史记录时，找到关键字，防止关键字和标签名重复
                 // let key_sign = 'sign_'+new Date().getTime();+'sign';

package/esm/customerService/function.js

@@ -205,7 +205,7 @@ var removeMermaidBlockComments = function(markdownContent) {
         var commentRegex = /(".*?"|'.*?')|(\/\*[\s\S]*?\*\/)|(\/\/.*?$)/gm;
         var cleanContent = content.replace(commentRegex, function(m, stringPart) {
             return stringPart || "";
-        });
+        }).replace(/<br>/g, "").replace(/\\n/g, "");
         // 拼接回完整代码块（保留 ```mermaid 和 ``` 标识）
         return "".concat(prefix).concat(cleanContent).concat(suffix);
     });

package/esm/customerService/index.js

@@ -425,38 +425,44 @@ var CustomerService = function(props) {
             setVisible(true);
         };
         var openViewMemaid = function openViewMemaid(id) {
-            var _document_querySelector, _svgDomClone;
-            console.log("openViewMemaid");
-            var svgDomClone = (_document_querySelector = document.querySelector("#".concat(id, " svg"))) === null || _document_querySelector === void 0 ? void 0 : _document_querySelector.cloneNode(true);
-            if (!svgDomClone) {
-                return;
+            try {
+                var _document_querySelector, _svgDomClone;
+                console.log("openViewMemaid");
+                var svgDomClone = (_document_querySelector = document.querySelector("#".concat(id, " svg"))) === null || _document_querySelector === void 0 ? void 0 : _document_querySelector.cloneNode(true);
+                if (!svgDomClone) {
+                    return;
+                }
+                svgDomClone.style.backgroundColor = "#fafafa";
+                svgDomClone.style.width = "auto";
+                svgDomClone.style.height = "auto";
+                var viewBox = svgDomClone.getAttribute("viewBox");
+                var _ref = _sliced_to_array(viewBox ? viewBox.split(" ").map(Number) : [
+                    0,
+                    0,
+                    0,
+                    0
+                ], 4), x = _ref[0], y = _ref[1], width = _ref[2], height = _ref[3];
+                x -= 10;
+                y -= 10;
+                width += 20;
+                height += 20;
+                svgDomClone.setAttribute("viewBox", "".concat(x, " ").concat(y, " ").concat(width, " ").concat(height));
+                var svgString = ((_svgDomClone = svgDomClone) === null || _svgDomClone === void 0 ? void 0 : _svgDomClone.outerHTML.toString()) || "";
+                var blob = new Blob([
+                    svgString
+                ], {
+                    type: "image/svg+xml;charset=utf-8"
+                });
+                console.log("blob", blob);
+                var blobUrl = URL.createObjectURL(blob);
+                console.log("blobUrl", blobUrl);
+                setViewBase64(blobUrl);
+                setVisible(true);
+            // setMemaidContent(id);
+            // setShowMemaid(true);
+            } catch (error) {
+                console.log("error", error);
             }
-            svgDomClone.style.backgroundColor = "#fafafa";
-            svgDomClone.style.width = "auto";
-            svgDomClone.style.height = "auto";
-            var viewBox = svgDomClone.getAttribute("viewBox");
-            var _ref = _sliced_to_array(viewBox ? viewBox.split(" ").map(Number) : [
-                0,
-                0,
-                0,
-                0
-            ], 4), x = _ref[0], y = _ref[1], width = _ref[2], height = _ref[3];
-            x -= 10;
-            y -= 10;
-            width += 20;
-            height += 20;
-            svgDomClone.setAttribute("viewBox", "".concat(x, " ").concat(y, " ").concat(width, " ").concat(height));
-            var svgString = ((_svgDomClone = svgDomClone) === null || _svgDomClone === void 0 ? void 0 : _svgDomClone.outerHTML.toString()) || "";
-            var blob = new Blob([
-                svgString
-            ], {
-                type: "image/svg+xml;charset=utf-8"
-            });
-            var blobUrl = URL.createObjectURL(blob);
-            setViewBase64(blobUrl);
-            setVisible(true);
-        // setMemaidContent(id);
-        // setShowMemaid(true);
         };
         //|| showScreenshot
         if (showType == 5 || showScreenshot) {
@@ -2440,8 +2446,10 @@ var CustomerService = function(props) {
             // let code = message.split("```");
             // code = code[1];
             // console.log(code,888888888);
-            message = removeMermaidBlockComments(message);
-            message = handleRenderSyntaxBlock(message, finishedRef.current);
+            if (finishedRef.current || i != historyMessageList.length - 1) {
+                message = removeMermaidBlockComments(message);
+            }
+            message = handleRenderSyntaxBlock(message, finishedRef.current || i != historyMessageList.length - 1);
             if (lastId == item.id && keyWordProblem != "") {
                 //点击历史记录时，找到关键字，防止关键字和标签名重复
                 // let key_sign = 'sign_'+new Date().getTime();+'sign';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bhd-components",
-  "version": "0.10.34",
+  "version": "0.10.36",
   "description": "组件功能描述",
   "config": {
     "commitizen": {