bhd-components 0.10.38 → 0.10.40

package/dist/index.esm.es5.development.js

@@ -2965,6 +2965,11 @@ var handleRenderSyntaxBlock = function(markdownContent, flag) {
         return markdownContent;
     }
 };
+// 去掉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, "");
+};
 
 var HistoryFun = function(props) {
     var type = props.type; props.roomId; var userData = props.userData, http = props.http, urllocation = props.urllocation, onClose = props.onClose, loadSpecifiedData = props.loadSpecifiedData;
@@ -3514,7 +3519,7 @@ var ContactsList = /*#__PURE__*/ forwardRef(function(props, ref) {
                                 }),
                                 /*#__PURE__*/ jsx("p", {
                                     className: modules_63b47c51$f.con,
-                                    children: contactsList.length > 0 && contactsList[0].lastMsg
+                                    children: contactsList.length > 0 && replaceThinkAndYaml(contactsList[0].lastMsg)
                                 })
                             ]
                         })
@@ -3560,7 +3565,7 @@ var ContactsList = /*#__PURE__*/ forwardRef(function(props, ref) {
                                         }),
                                         /*#__PURE__*/ jsx("p", {
                                             className: modules_63b47c51$f.con,
-                                            children: item.lastMsg
+                                            children: replaceThinkAndYaml(item.lastMsg)
                                         })
                                     ]
                                 })
@@ -8184,6 +8189,16 @@ var ScreenShot = /*#__PURE__*/ function() {
     return ScreenShot;
 }();
 
+var guidGenerator = function() {
+    var d = new Date().getTime();
+    var uuid = "xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx".replace(/[xy]/g, function(c) {
+        var r = (d + Math.random() * 16) % 16 | 0;
+        d = Math.floor(d / 16);
+        return (c == "x" ? r : r & 3 | 8).toString(16);
+    });
+    return uuid;
+};
+
 var styles = modules_63b47c51$f;
 var TextArea$1 = BhdEnterInput.TextArea;
 /*
@@ -8206,11 +8221,6 @@ function escapeHtml(str) {
     return str;
 }
 var exactRegex = /class\s*=\s*["']think-block["']/;
-// 去掉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"), "");
-};
 r.initialize({
     startOnLoad: false,
     theme: "default",
@@ -8277,7 +8287,7 @@ var CustomerService = function(props) {
     var ctrl = useRef(); //停止生成ai回答时使用
     var childRef = useRef(null); //获取子组件方法
     useRef(0);
-    var _useState33 = _sliced_to_array(useState(true), 2), isPositionState = _useState33[0], setIsPositionState = _useState33[1];
+    var _useState33 = _sliced_to_array(useState(true), 2); _useState33[0]; var setIsPositionState = _useState33[1];
     var isPosition = useRef(true);
     var recommendeQuestionID = useRef([]); //推荐问题id
     var videoHotQuestionsList = useRef([]); //视频热门问题
@@ -9550,7 +9560,7 @@ var CustomerService = function(props) {
             //先请求问题列表
             videoPageQuestiionsList(3);
         }
-        var hasYamlStarted = false;
+        var tempMessageId = guidGenerator();
         //使用fetchEventSource接收数据
         fetchEventSource("".concat(urllocation, "/chat-service/public/v1.0/chat-with-ai/messages"), {
             method: "POST",
@@ -9658,10 +9668,12 @@ var CustomerService = function(props) {
                 //识别的内容
                 // console.log("eventSource msg: ", event.data);
                 var 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;
@@ -9713,8 +9725,7 @@ var CustomerService = function(props) {
         // console.log(aiSendQuestions().abort(),'slkdsdsdsd')
         if (pageNumHistory > 1) return;
         var obj = msg;
-        var tempId = "ai thought process";
-        var id = tempId; // 原：let id = msg.messageId;  备注：解决思考过程返回的messageId和下边回复的内容值不同问题，新：改成临时固定相同id，finished完成时替换为实际返回的messageId值
+        var id = msg.tempMessageId;
         setHistoryMessageList(function(prevHistoryMessageList) {
             var list1 = prevHistoryMessageList;
             //删除临时数据
@@ -9739,6 +9750,7 @@ var CustomerService = function(props) {
                     recevier: mid,
                     message: message,
                     id: id,
+                    messageId: msg.messageId,
                     upvoted: false,
                     downvoted: false,
                     createdAt: getDataTime(-1),
@@ -9769,6 +9781,7 @@ var CustomerService = function(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 {
@@ -9781,17 +9794,6 @@ var CustomerService = function(props) {
         console.log("isPosition", isPosition.current);
         scrollToBottom();
         if (msg.finished) {
-            setHistoryMessageList(function(prevHistoryMessageList) {
-                return prevHistoryMessageList.map(function(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;
@@ -9903,7 +9905,9 @@ var CustomerService = function(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));
@@ -10013,7 +10017,11 @@ var CustomerService = function(props) {
         }).then(function(res) {
             var newHistoryMessageList = [];
             if (res.data.messages.length > 0) {
-                var dataList = res.data.messages.reverse();
+                var dataList = res.data.messages.reverse().map(function(x) {
+                    return _object_spread_props(_object_spread({}, x), {
+                        messageId: x.id
+                    });
+                });
                 var originList = 0;
                 var newList = 0;
                 setHistoryMessageList(function(historyMessageList) {
@@ -10096,7 +10104,7 @@ var CustomerService = function(props) {
         } catch (error) {}
     };
     //点赞消息
-    var likeMessage = function(id, state) {
+    var likeMessage = function(messageId, state, id) {
         var url = "";
         //点赞状态
         if (!state) {
@@ -10105,7 +10113,7 @@ var CustomerService = function(props) {
             url = "".concat(urllocation, "/chat-service/public/v1.0/history-messages:cancelUpvote");
         }
         http.post(url, {
-            messageId: id
+            messageId: messageId
         }).then(function(res) {
             setHistoryMessageList(function(historyMessageList) {
                 var list = historyMessageList;
@@ -10120,7 +10128,7 @@ var CustomerService = function(props) {
         });
     };
     //踩
-    var disagreeMessage = function(id, state) {
+    var disagreeMessage = function(messageId, state, id) {
         var url = "";
         //点赞状态
         if (!state) {
@@ -10129,7 +10137,7 @@ var CustomerService = function(props) {
             url = "".concat(urllocation, "/chat-service/public/v1.0/history-messages:cancelDownvote");
         }
         http.post(url, {
-            messageId: id
+            messageId: messageId
         }).then(function(res) {
             setHistoryMessageList(function(historyMessageList) {
                 var list = historyMessageList;
@@ -10789,9 +10797,8 @@ var CustomerService = function(props) {
                                                                     className: "yinyong_quote1",
                                                                     onClick: function() {
                                                                         // 问题的引用
-                                                                        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 : ""
                                                                         });
@@ -10808,7 +10815,7 @@ var CustomerService = function(props) {
                                                                 }) : /*#__PURE__*/ jsx("i", {
                                                                     className: "fuzhi21",
                                                                     onClick: function() {
-                                                                        copyText(item.message);
+                                                                        copyText(replaceThinkAndYaml(item.message));
                                                                         {
                                                                             var obj = copyTextOBJ;
                                                                             obj = obj.filter(function(list) {
@@ -11221,11 +11228,7 @@ var CustomerService = function(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: function() {
                     renderMermaid();
@@ -11381,9 +11384,8 @@ var CustomerService = function(props) {
                     className: "yinyong_quote1",
                     onClick: function() {
                         // 答案的引用
-                        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
                         });
@@ -11400,7 +11402,7 @@ var CustomerService = function(props) {
                 }) : /*#__PURE__*/ jsx("i", {
                     className: "fuzhi21",
                     onClick: function() {
-                        copyText(item.message);
+                        copyText(replaceThinkAndYaml(item.message));
                         {
                             var obj = copyTextOBJ;
                             obj = obj.filter(function(list) {
@@ -11426,7 +11428,7 @@ var CustomerService = function(props) {
                 /*#__PURE__*/ jsx("i", {
                     className: "Frame427319094 ".concat(item.upvoted ? styles.active : ""),
                     onClick: function() {
-                        likeMessage(item.id, item.upvoted);
+                        likeMessage(item.messageId, item.upvoted, item.id);
                         //老师的聊天窗口中不需要点赞和踩消息
                         if (!isAiChatWindow) return;
                         //只有最后一条回答，支持发送点赞或踩
@@ -11434,7 +11436,7 @@ var CustomerService = function(props) {
                             if (!item.extraInfo && item.sender == "AI") {
                                 aiSendQuestions(1, {
                                     roomId: roomId,
-                                    message: "你给出的答案我非常满意，赞！",
+                                    message: "\x03\x03\x03你给出的答案我非常满意，赞！\x03\x03\x03",
                                     quotedMessage: "",
                                     regenerate: false,
                                     generateUpvoteOrDownvoteMessage: true
@@ -11449,7 +11451,7 @@ var CustomerService = function(props) {
                 /*#__PURE__*/ jsx("i", {
                     className: "Frame427319095 ".concat(item.downvoted ? styles.active : ""),
                     onClick: function() {
-                        disagreeMessage(item.id, item.downvoted);
+                        disagreeMessage(item.messageId, item.downvoted, item.id);
                         //老师的聊天窗口中不需要点赞和踩消息
                         if (!isAiChatWindow) return;
                         //只有最后一条回答，支持发送点赞或踩
@@ -11457,7 +11459,7 @@ var CustomerService = function(props) {
                             if (!item.extraInfo && item.sender == "AI") {
                                 aiSendQuestions(1, {
                                     roomId: roomId,
-                                    message: "你给出的答案很糟糕，我不满意，踩！",
+                                    message: "\x03\x03\x03你给出的答案很糟糕，我不满意，踩！\x03\x03\x03",
                                     quotedMessage: "",
                                     regenerate: false,
                                     generateUpvoteOrDownvoteMessage: true
@@ -11588,11 +11590,10 @@ var CustomerService = function(props) {
                         /*#__PURE__*/ jsx("i", {
                             className: "yinyong_quote1",
                             onClick: function() {
-                                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_智能问答_引用", "提交");
@@ -11607,7 +11608,7 @@ var CustomerService = function(props) {
                         }) : /*#__PURE__*/ jsx("i", {
                             className: "fuzhi21",
                             onClick: function() {
-                                copyText(item.message);
+                                copyText(replaceThinkAndYaml(item.message));
                                 {
                                     var obj = copyTextOBJ;
                                     obj = obj.filter(function(list) {
@@ -11633,7 +11634,7 @@ var CustomerService = function(props) {
                         /*#__PURE__*/ jsx("i", {
                             className: "Frame427319094 ".concat(item.upvoted ? styles.active : ""),
                             onClick: function() {
-                                likeMessage(item.id, item.upvoted);
+                                likeMessage(item.messageId, item.upvoted, item.id);
                                 //老师的聊天窗口中不需要点赞和踩消息
                                 if (!isAiChatWindow) return;
                                 //只有最后一条回答，支持发送点赞或踩
@@ -11642,7 +11643,7 @@ var CustomerService = function(props) {
                                     if (!item.extraInfo && item.sender == "AI") {
                                         aiSendQuestions(1, {
                                             roomId: roomId,
-                                            message: "你给出的答案我非常满意，赞！",
+                                            message: "\x03\x03\x03你给出的答案我非常满意，赞！\x03\x03\x03",
                                             quotedMessage: "",
                                             regenerate: false,
                                             generateUpvoteOrDownvoteMessage: true
@@ -11658,7 +11659,7 @@ var CustomerService = function(props) {
                         /*#__PURE__*/ jsx("i", {
                             className: "Frame427319095 ".concat(item.downvoted ? styles.active : ""),
                             onClick: function() {
-                                disagreeMessage(item.id, item.downvoted);
+                                disagreeMessage(item.messageId, item.downvoted, item.id);
                                 //老师的聊天窗口中不需要点赞和踩消息
                                 if (!isAiChatWindow) return;
                                 //只有最后一条回答，支持发送点赞或踩
@@ -11669,7 +11670,7 @@ var CustomerService = function(props) {
                                         //AI回答
                                         aiSendQuestions(1, {
                                             roomId: roomId,
-                                            message: "你给出的答案很糟糕，我不满意，踩！",
+                                            message: "\x03\x03\x03你给出的答案很糟糕，我不满意，踩！\x03\x03\x03",
                                             quotedMessage: "",
                                             regenerate: false,
                                             generateUpvoteOrDownvoteMessage: true
@@ -15644,16 +15645,6 @@ var UploadFileBtn = SendBtn;
 
 var modules_63b47c51$1 = {"footer-fileList-wrapper":"index_module_footerFileListWrapper__e818c28d","footer-fileList-list":"index_module_footerFileListList__e818c28d","footer-fileList-listItem":"index_module_footerFileListListItem__e818c28d","footer-fileList-listItem-icon":"index_module_footerFileListListItemIcon__e818c28d","footer-fileList-listItem-text":"index_module_footerFileListListItemText__e818c28d","footer-fileList-listItem-status":"index_module_footerFileListListItemStatus__e818c28d","footer-fileList-listItem-delete":"index_module_footerFileListListItemDelete__e818c28d","footer-fileList-pre":"index_module_footerFileListPre__e818c28d","footer-fileList-next":"index_module_footerFileListNext__e818c28d"};
 
-var guidGenerator = function() {
-    var d = new Date().getTime();
-    var uuid = "xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx".replace(/[xy]/g, function(c) {
-        var r = (d + Math.random() * 16) % 16 | 0;
-        d = Math.floor(d / 16);
-        return (c == "x" ? r : r & 3 | 8).toString(16);
-    });
-    return uuid;
-};
-
 // 通过文件名 获取文件后缀
 var getSuffix = function(fileName) {
     return fileName.split(".").pop().toLowerCase();