bhd-components 0.10.38 → 0.10.40

package/es2017/customerService/contactsList.js

@@ -4,7 +4,7 @@ import styles from "./index.module.less";
 import { Tooltip } from "antd";
 import { CustomAiIcon, CustomRetract } from "../icons";
 import { CloseOutlined } from "@ant-design/icons";
-import { getByteLen, formatDate } from "./function"; //录音使用文件
+import { getByteLen, formatDate, replaceThinkAndYaml } from "./function"; //录音使用文件
 const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
     let { type, roomId, userData, http, urllocation, onClose, switchChatRoom, contactsList } = props;
     //删除聊天室
@@ -40,7 +40,7 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                                 }),
                                 /*#__PURE__*/ _jsx("p", {
                                     className: styles.con,
-                                    children: contactsList.length > 0 && contactsList[0].lastMsg
+                                    children: contactsList.length > 0 && replaceThinkAndYaml(contactsList[0].lastMsg)
                                 })
                             ]
                         })
@@ -84,7 +84,7 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                                         }),
                                         /*#__PURE__*/ _jsx("p", {
                                             className: styles.con,
-                                            children: item.lastMsg
+                                            children: replaceThinkAndYaml(item.lastMsg)
                                         })
                                     ]
                                 })

package/es2017/customerService/function.d.ts

@@ -24,4 +24,5 @@ declare const urlToBase64: (url: string) => Promise<unknown>;
 declare const toHashString: (str: string) => string;
 declare const removeMermaidBlockComments: (markdownContent: any) => any;
 declare const handleRenderSyntaxBlock: (markdownContent: any, flag: boolean) => any;
-export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image, formatDate, urlToBase64, toHashString, removeMermaidBlockComments, handleRenderSyntaxBlock, };
+declare const replaceThinkAndYaml: (text?: string) => string;
+export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image, formatDate, urlToBase64, toHashString, removeMermaidBlockComments, handleRenderSyntaxBlock, replaceThinkAndYaml };

package/es2017/customerService/function.js

@@ -227,4 +227,8 @@ const handleRenderSyntaxBlock = (markdownContent, flag)=>{
         return markdownContent;
     }
 };
-export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image, formatDate, urlToBase64, toHashString, removeMermaidBlockComments, handleRenderSyntaxBlock };
+// 去掉think
+const replaceThinkAndYaml = (text = "")=>{
+    return text.replace(/```(\s)?yaml(?:.|\n)*?```/ig, "").replace(/<thinking>([\s\S]*?)<\/thinking>/g, "").replace(RegExp('<div\\s+class="think-block">.*?<\\/div>', "gs"), '').replace(/^[ \n]+/g, '');
+};
+export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image, formatDate, urlToBase64, toHashString, removeMermaidBlockComments, handleRenderSyntaxBlock, replaceThinkAndYaml };

package/es2017/customerService/index.js

@@ -31,10 +31,11 @@ const { TextArea } = Input;
 // import './html2canvas.test.js';
 import knowledge_icon from "./images/knowledge_icon.png";
 // import { useMediaRecorder } from "./useMediaRecorder"; //录音使用文件
-import { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, urlToBase64, toHashString, removeMermaidBlockComments, handleRenderSyntaxBlock } from "./function"; //一些方法
+import { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, urlToBase64, toHashString, removeMermaidBlockComments, handleRenderSyntaxBlock, replaceThinkAndYaml } from "./function"; //一些方法
 // import html2canvas from "html2canvas";
 // const screenShot = require('./screenShotPlugin.esm')
 import ScreenShot from "./js-screen-shot/main";
+import { guidGenerator } from "../utils/number";
 /*
 自定义remarkable的text解析规则
  */ const HTML_ESCAPE_TEST_RE = /[&<>"]/;
@@ -56,10 +57,6 @@ function escapeHtml(str) {
 }
 const pattern = /!\[.*?\]\((.*?)\)/;
 const exactRegex = /class\s*=\s*["']think-block["']/;
-// 去掉think
-const replaceThinkAndYaml = (text = "")=>{
-    return text.replace(/```(\s)?yaml(?:.|\n)*?```/ig, "").replace(/<thinking>([\s\S]*?)<\/thinking>/g, "").replace(RegExp('<div\\s+class="think-block">.*?<\\/div>', "gs"), '');
-};
 mermaid.initialize({
     startOnLoad: false,
     theme: 'default',
@@ -1270,6 +1267,7 @@ const CustomerService = (props)=>{
             videoPageQuestiionsList(3);
         }
         let hasYamlStarted = false;
+        const tempMessageId = guidGenerator();
         //使用fetchEventSource接收数据
         const eventSource = fetchEventSource(`${urllocation}/chat-service/public/v1.0/chat-with-ai/messages`, {
             method: "POST",
@@ -1366,10 +1364,12 @@ const CustomerService = (props)=>{
                 //识别的内容
                 // console.log("eventSource msg: ", event.data);
                 let msg = JSON.parse(event.data);
+                console.log('tempMessageId', tempMessageId);
+                msg.tempMessageId = tempMessageId;
                 if (msg.message) {
-                    if (!hasYamlStarted && msg.message && /```\s*yaml/.test(content)) {
-                        hasYamlStarted = true;
-                    }
+                    // if (!hasYamlStarted && msg.message && /```\s*yaml/.test(content)) {
+                    //   hasYamlStarted = true;
+                    // }
                     msg.message = msg.message.replace(/<thinking>/g, '<div class="think-block">').replace(/<\/thinking>/g, '</div>\n');
                 }
                 finishedRef.current = false;
@@ -1419,8 +1419,7 @@ const CustomerService = (props)=>{
         // console.log(aiSendQuestions().abort(),'slkdsdsdsd')
         if (pageNumHistory > 1) return;
         let obj = msg;
-        let tempId = "ai thought process";
-        let id = tempId; // 原：let id = msg.messageId;  备注：解决思考过程返回的messageId和下边回复的内容值不同问题，新：改成临时固定相同id，finished完成时替换为实际返回的messageId值
+        let id = msg.tempMessageId;
         setHistoryMessageList((prevHistoryMessageList)=>{
             let list1 = prevHistoryMessageList;
             //删除临时数据
@@ -1445,6 +1444,7 @@ const CustomerService = (props)=>{
                     recevier: mid,
                     message: message,
                     id: id,
+                    messageId: msg.messageId,
                     upvoted: false,
                     downvoted: false,
                     createdAt: getDataTime(-1),
@@ -1475,6 +1475,7 @@ const CustomerService = (props)=>{
                     if (item.id == id) {
                         return _object_spread_props(_object_spread({}, item), {
                             message: message,
+                            messageId: msg.messageId,
                             extraInfo: extraInfo == null ? item.extraInfo : JSON.stringify(extraInfo)
                         });
                     } else {
@@ -1487,17 +1488,6 @@ const CustomerService = (props)=>{
         console.log("isPosition", isPosition.current);
         scrollToBottom();
         if (msg.finished) {
-            setHistoryMessageList((prevHistoryMessageList)=>{
-                return prevHistoryMessageList.map((item)=>{
-                    if (item.id === tempId) {
-                        return _object_spread_props(_object_spread({}, item), {
-                            id: msg.messageId
-                        });
-                    } else {
-                        return item;
-                    }
-                });
-            });
             console.log('返回完成', msg, msgStreamingCountRef.current);
             //发送结束
             finishedRef.current = true;
@@ -1606,7 +1596,9 @@ const CustomerService = (props)=>{
                     if (ele.message.includes("<thinking>") && !ele.message.includes("</thinking>")) {
                         ele.message = ele.message + "</thinking>";
                     }
-                    return ele;
+                    return _object_spread_props(_object_spread({}, ele), {
+                        messageId: ele.id
+                    });
                 });
                 setPageCount(Math.ceil(total / maxPageSize));
                 setFirstItemIndex(total - maxPageSize * (page - 1));
@@ -1712,7 +1704,9 @@ const CustomerService = (props)=>{
         }).then((res)=>{
             let newHistoryMessageList = [];
             if (res.data.messages.length > 0) {
-                let dataList = res.data.messages.reverse();
+                let dataList = res.data.messages.reverse().map((x)=>_object_spread_props(_object_spread({}, x), {
+                        messageId: x.id
+                    }));
                 let originList = 0;
                 let newList = 0;
                 setHistoryMessageList((historyMessageList)=>{
@@ -1791,7 +1785,7 @@ const CustomerService = (props)=>{
         } catch (error) {}
     };
     //点赞消息
-    const likeMessage = (id, state)=>{
+    const likeMessage = (messageId, state, id)=>{
         let url = "";
         //点赞状态
         if (!state) {
@@ -1800,7 +1794,7 @@ const CustomerService = (props)=>{
             url = `${urllocation}/chat-service/public/v1.0/history-messages:cancelUpvote`;
         }
         http.post(url, {
-            messageId: id
+            messageId: messageId
         }).then((res)=>{
             setHistoryMessageList((historyMessageList)=>{
                 let list = historyMessageList;
@@ -1815,7 +1809,7 @@ const CustomerService = (props)=>{
         });
     };
     //踩
-    const disagreeMessage = (id, state)=>{
+    const disagreeMessage = (messageId, state, id)=>{
         let url = "";
         //点赞状态
         if (!state) {
@@ -1824,7 +1818,7 @@ const CustomerService = (props)=>{
             url = `${urllocation}/chat-service/public/v1.0/history-messages:cancelDownvote`;
         }
         http.post(url, {
-            messageId: id
+            messageId: messageId
         }).then((res)=>{
             setHistoryMessageList((historyMessageList)=>{
                 let list = historyMessageList;
@@ -2497,9 +2491,8 @@ const CustomerService = (props)=>{
                                                                     className: "yinyong_quote1",
                                                                     onClick: ()=>{
                                                                         // 问题的引用
-                                                                        item.message = replaceThinkAndYaml(item.message);
                                                                         setCitationContent({
-                                                                            content: item.message,
+                                                                            content: replaceThinkAndYaml(item.message),
                                                                             id: item.id,
                                                                             imageUrl: !item.quotedMessage && item.extraInfo && JSON.parse(item.extraInfo).length > 0 && JSON.parse(item.extraInfo)[0].key == "imageUrl" ? JSON.parse(item.extraInfo)[0].value : ""
                                                                         });
@@ -2514,7 +2507,7 @@ const CustomerService = (props)=>{
                                                                 }) : /*#__PURE__*/ _jsx("i", {
                                                                     className: "fuzhi21",
                                                                     onClick: ()=>{
-                                                                        let bol = copyText(item.message);
+                                                                        let bol = copyText(replaceThinkAndYaml(item.message));
                                                                         if (bol) {
                                                                             let obj = copyTextOBJ;
                                                                             obj = obj.filter((list)=>list != item.id);
@@ -2911,11 +2904,7 @@ const CustomerService = (props)=>{
                 style: {
                     height: '100%'
                 },
-                initialTopMostItemIndex: !finished && isPositionState ? undefined : {
-                    index: "LAST",
-                    align: "end",
-                    offset: showType === 3 ? 58 : showType === 4 ? 144 : 58
-                },
+                // initialTopMostItemIndex={!finished&&isPositionState?undefined:{ index: "LAST", align: "end",offset:showType===3?58:showType===4?144:58 }}
                 initialItemCount: 10,
                 itemsRendered: ()=>{
                     renderMermaid();
@@ -3069,9 +3058,8 @@ const CustomerService = (props)=>{
                     className: "yinyong_quote1",
                     onClick: ()=>{
                         // 答案的引用
-                        item.message = replaceThinkAndYaml(item.message);
                         setCitationContent({
-                            content: item.message,
+                            content: replaceThinkAndYaml(item.message),
                             imageUrl: item.extraInfo && JSON.parse(extraInfo).length > 0 && JSON.parse(extraInfo)[0].key == "imageUrl" && JSON.parse(extraInfo)[0].value,
                             id: item.id
                         });
@@ -3086,7 +3074,7 @@ const CustomerService = (props)=>{
                 }) : /*#__PURE__*/ _jsx("i", {
                     className: "fuzhi21",
                     onClick: ()=>{
-                        let bol = copyText(item.message);
+                        let bol = copyText(replaceThinkAndYaml(item.message));
                         if (bol) {
                             let obj = copyTextOBJ;
                             obj = obj.filter((list)=>list != item.id);
@@ -3108,7 +3096,7 @@ const CustomerService = (props)=>{
                 /*#__PURE__*/ _jsx("i", {
                     className: `Frame427319094 ${item.upvoted ? styles.active : ""}`,
                     onClick: ()=>{
-                        likeMessage(item.id, item.upvoted);
+                        likeMessage(item.messageId, item.upvoted, item.id);
                         //老师的聊天窗口中不需要点赞和踩消息
                         if (!isAiChatWindow) return;
                         //只有最后一条回答，支持发送点赞或踩
@@ -3116,7 +3104,7 @@ const CustomerService = (props)=>{
                             if (!item.extraInfo && item.sender == "AI") {
                                 aiSendQuestions(1, {
                                     roomId: roomId,
-                                    message: "你给出的答案我非常满意，赞！",
+                                    message: "\u0003\u0003\u0003你给出的答案我非常满意，赞！\u0003\u0003\u0003",
                                     quotedMessage: "",
                                     regenerate: false,
                                     generateUpvoteOrDownvoteMessage: true
@@ -3131,7 +3119,7 @@ const CustomerService = (props)=>{
                 /*#__PURE__*/ _jsx("i", {
                     className: `Frame427319095 ${item.downvoted ? styles.active : ""}`,
                     onClick: ()=>{
-                        disagreeMessage(item.id, item.downvoted);
+                        disagreeMessage(item.messageId, item.downvoted, item.id);
                         //老师的聊天窗口中不需要点赞和踩消息
                         if (!isAiChatWindow) return;
                         //只有最后一条回答，支持发送点赞或踩
@@ -3139,7 +3127,7 @@ const CustomerService = (props)=>{
                             if (!item.extraInfo && item.sender == "AI") {
                                 aiSendQuestions(1, {
                                     roomId: roomId,
-                                    message: "你给出的答案很糟糕，我不满意，踩！",
+                                    message: "\u0003\u0003\u0003你给出的答案很糟糕，我不满意，踩！\u0003\u0003\u0003",
                                     quotedMessage: "",
                                     regenerate: false,
                                     generateUpvoteOrDownvoteMessage: true
@@ -3266,11 +3254,10 @@ const CustomerService = (props)=>{
                         /*#__PURE__*/ _jsx("i", {
                             className: "yinyong_quote1",
                             onClick: ()=>{
-                                item.message = replaceThinkAndYaml(item.message);
                                 setCitationContent({
-                                    content: item.message,
+                                    content: replaceThinkAndYaml(item.message),
                                     imageUrl: item.extraInfo && JSON.parse(extraInfo).length > 0 && JSON.parse(extraInfo)[0].key == "imageUrl" && JSON.parse(extraInfo)[0].value,
-                                    id: item.id
+                                    id: item.messageId
                                 });
                                 resettingBottomHei();
                                 onEvent(serverName + serverUrl(), "click_智能问答_引用", "提交");
@@ -3283,7 +3270,7 @@ const CustomerService = (props)=>{
                         }) : /*#__PURE__*/ _jsx("i", {
                             className: "fuzhi21",
                             onClick: ()=>{
-                                let bol = copyText(item.message);
+                                let bol = copyText(replaceThinkAndYaml(item.message));
                                 if (bol) {
                                     let obj = copyTextOBJ;
                                     obj = obj.filter((list)=>list != item.id);
@@ -3305,7 +3292,7 @@ const CustomerService = (props)=>{
                         /*#__PURE__*/ _jsx("i", {
                             className: `Frame427319094 ${item.upvoted ? styles.active : ""}`,
                             onClick: ()=>{
-                                likeMessage(item.id, item.upvoted);
+                                likeMessage(item.messageId, item.upvoted, item.id);
                                 //老师的聊天窗口中不需要点赞和踩消息
                                 if (!isAiChatWindow) return;
                                 //只有最后一条回答，支持发送点赞或踩
@@ -3314,7 +3301,7 @@ const CustomerService = (props)=>{
                                     if (!item.extraInfo && item.sender == "AI") {
                                         aiSendQuestions(1, {
                                             roomId: roomId,
-                                            message: "你给出的答案我非常满意，赞！",
+                                            message: "\u0003\u0003\u0003你给出的答案我非常满意，赞！\u0003\u0003\u0003",
                                             quotedMessage: "",
                                             regenerate: false,
                                             generateUpvoteOrDownvoteMessage: true
@@ -3330,7 +3317,7 @@ const CustomerService = (props)=>{
                         /*#__PURE__*/ _jsx("i", {
                             className: `Frame427319095 ${item.downvoted ? styles.active : ""}`,
                             onClick: ()=>{
-                                disagreeMessage(item.id, item.downvoted);
+                                disagreeMessage(item.messageId, item.downvoted, item.id);
                                 //老师的聊天窗口中不需要点赞和踩消息
                                 if (!isAiChatWindow) return;
                                 //只有最后一条回答，支持发送点赞或踩
@@ -3341,7 +3328,7 @@ const CustomerService = (props)=>{
                                         //AI回答
                                         aiSendQuestions(1, {
                                             roomId: roomId,
-                                            message: "你给出的答案很糟糕，我不满意，踩！",
+                                            message: "\u0003\u0003\u0003你给出的答案很糟糕，我不满意，踩！\u0003\u0003\u0003",
                                             quotedMessage: "",
                                             regenerate: false,
                                             generateUpvoteOrDownvoteMessage: true

package/esm/customerService/contactsList.js

@@ -4,7 +4,7 @@ import styles from "./index.module.less";
 import { Tooltip } from "antd";
 import { CustomAiIcon, CustomRetract } from "../icons";
 import { CloseOutlined } from "@ant-design/icons";
-import { getByteLen, formatDate } from "./function"; //录音使用文件
+import { getByteLen, formatDate, replaceThinkAndYaml } from "./function"; //录音使用文件
 var ContactsList = /*#__PURE__*/ forwardRef(function(props, ref) {
     var type = props.type, roomId = props.roomId, userData = props.userData, http = props.http, urllocation = props.urllocation, onClose = props.onClose, switchChatRoom = props.switchChatRoom, contactsList = props.contactsList;
     //删除聊天室
@@ -44,7 +44,7 @@ var ContactsList = /*#__PURE__*/ forwardRef(function(props, ref) {
                                 }),
                                 /*#__PURE__*/ _jsx("p", {
                                     className: styles.con,
-                                    children: contactsList.length > 0 && contactsList[0].lastMsg
+                                    children: contactsList.length > 0 && replaceThinkAndYaml(contactsList[0].lastMsg)
                                 })
                             ]
                         })
@@ -90,7 +90,7 @@ var ContactsList = /*#__PURE__*/ forwardRef(function(props, ref) {
                                         }),
                                         /*#__PURE__*/ _jsx("p", {
                                             className: styles.con,
-                                            children: item.lastMsg
+                                            children: replaceThinkAndYaml(item.lastMsg)
                                         })
                                     ]
                                 })

package/esm/customerService/function.d.ts

@@ -24,4 +24,5 @@ declare const urlToBase64: (url: string) => Promise<unknown>;
 declare const toHashString: (str: string) => string;
 declare const removeMermaidBlockComments: (markdownContent: any) => any;
 declare const handleRenderSyntaxBlock: (markdownContent: any, flag: boolean) => any;
-export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image, formatDate, urlToBase64, toHashString, removeMermaidBlockComments, handleRenderSyntaxBlock, };
+declare const replaceThinkAndYaml: (text?: string) => string;
+export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image, formatDate, urlToBase64, toHashString, removeMermaidBlockComments, handleRenderSyntaxBlock, replaceThinkAndYaml };

package/esm/customerService/function.js

@@ -233,4 +233,9 @@ var handleRenderSyntaxBlock = function(markdownContent, flag) {
         return markdownContent;
     }
 };
-export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image, formatDate, urlToBase64, toHashString, removeMermaidBlockComments, handleRenderSyntaxBlock };
+// 去掉think
+var replaceThinkAndYaml = function() {
+    var text = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : "";
+    return text.replace(/```(\s)?yaml(?:.|\n)*?```/ig, "").replace(/<thinking>([\s\S]*?)<\/thinking>/g, "").replace(RegExp('<div\\s+class="think-block">.*?<\\/div>', "gs"), "").replace(/^[ \n]+/g, "");
+};
+export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image, formatDate, urlToBase64, toHashString, removeMermaidBlockComments, handleRenderSyntaxBlock, replaceThinkAndYaml };