bhd-components 0.10.37 → 0.10.39

package/esm/customerService/index.js

@@ -39,6 +39,7 @@ import { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, re
 // import html2canvas from "html2canvas";
 // const screenShot = require('./screenShotPlugin.esm')
 import ScreenShot from "./js-screen-shot/main";
+import { guidGenerator } from "../utils/number";
 /*
 自定义remarkable的text解析规则
  */ var HTML_ESCAPE_TEST_RE = /[&<>"]/;
@@ -58,6 +59,13 @@ function escapeHtml(str) {
     }
     return str;
 }
+var pattern = /!\[.*?\]\((.*?)\)/;
+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"), "").replace(/^[ \n]+/g, "");
+};
 mermaid.initialize({
     startOnLoad: false,
     theme: "default",
@@ -140,6 +148,7 @@ var CustomerService = function(props) {
     var getLisyFlagRef = useRef(0);
     var _useState36 = _sliced_to_array(useState(false), 2), showMemaid = _useState36[0], setShowMemaid = _useState36[1]; //是否显示mermaid弹窗
     var _useState37 = _sliced_to_array(useState(""), 2), memaidContent = _useState37[0], setMemaidContent = _useState37[1]; //mermaid内容
+    var shouqiTimer = useRef(null);
     var remarkable = new Remarkable({
         html: true,
         highlight: function highlight(str, lang) {
@@ -226,6 +235,7 @@ var CustomerService = function(props) {
         //   //获取热门推荐
         //   videoPageQuestiionsList(1);
         // }
+        console.log("initShowType", initShowType);
         setShowType(initShowType);
     }, [
         initShowType
@@ -1395,6 +1405,8 @@ var CustomerService = function(props) {
             //先请求问题列表
             videoPageQuestiionsList(3);
         }
+        var hasYamlStarted = false;
+        var tempMessageId = guidGenerator();
         //使用fetchEventSource接收数据
         var eventSource = fetchEventSource("".concat(urllocation, "/chat-service/public/v1.0/chat-with-ai/messages"), {
             method: "POST",
@@ -1504,7 +1516,13 @@ var CustomerService = function(props) {
                 //识别的内容
                 // console.log("eventSource msg: ", event.data);
                 var msg = JSON.parse(event.data);
-                if (msg.message) {}
+                msg.tempMessageId = tempMessageId;
+                if (msg.message) {
+                    // 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;
                 setFinished(false);
                 msgStreamingCountRef.current = msgStreamingCountRef.current + 1;
@@ -1521,6 +1539,20 @@ var CustomerService = function(props) {
                         videoPageQuestiionsList(2);
                     }
                     testLabQuestion(JSON.parse(data).message, content, "");
+                    if (shouqiTimer.current) {
+                        clearTimeout(shouqiTimer.current);
+                    }
+                    shouqiTimer.current = setTimeout(function() {
+                        if ($(".think-block").last().css("display") === "block") {
+                            clearTimeout(shouqiTimer.current);
+                            $(".think-block").last().parent().find(".think-block").css({
+                                display: "none"
+                            });
+                            $(".think-block").last().parent().parent().find("i").css({
+                                transform: "rotate(180deg)"
+                            });
+                        }
+                    }, 1000);
                 } else {}
             },
             onclose: function onclose() {
@@ -1540,7 +1572,7 @@ var CustomerService = function(props) {
         // console.log(aiSendQuestions().abort(),'slkdsdsdsd')
         if (pageNumHistory > 1) return;
         var obj = msg;
-        var id = msg.messageId;
+        var id = msg.tempMessageId;
         setHistoryMessageList(function(prevHistoryMessageList) {
             var list1 = prevHistoryMessageList;
             //删除临时数据
@@ -1565,6 +1597,7 @@ var CustomerService = function(props) {
                     recevier: mid,
                     message: message,
                     id: id,
+                    messageId: msg.messageId,
                     upvoted: false,
                     downvoted: false,
                     createdAt: getDataTime(-1),
@@ -1595,6 +1628,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 {
@@ -1714,6 +1748,14 @@ var CustomerService = function(props) {
                 //     getHistoryMessage(page-1,5,'1',dataList);
                 //     return;
                 // }
+                dataList = dataList.map(function(ele, index) {
+                    if (ele.message.includes("<thinking>") && !ele.message.includes("</thinking>")) {
+                        ele.message = ele.message + "</thinking>";
+                    }
+                    return _object_spread_props(_object_spread({}, ele), {
+                        messageId: ele.id
+                    });
+                });
                 setPageCount(Math.ceil(total / maxPageSize));
                 setFirstItemIndex(total - maxPageSize * (page - 1));
                 var newHistoryMessageList = [];
@@ -1905,7 +1947,7 @@ var CustomerService = function(props) {
         } catch (error) {}
     };
     //点赞消息
-    var likeMessage = function(id, state) {
+    var likeMessage = function(messageId, state, id) {
         var url = "";
         //点赞状态
         if (!state) {
@@ -1914,7 +1956,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;
@@ -1929,7 +1971,7 @@ var CustomerService = function(props) {
         });
     };
     //踩
-    var disagreeMessage = function(id, state) {
+    var disagreeMessage = function(messageId, state, id) {
         var url = "";
         //点赞状态
         if (!state) {
@@ -1938,7 +1980,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;
@@ -2546,6 +2588,9 @@ var CustomerService = function(props) {
                 message = removeMermaidBlockComments(message);
             }
             message = handleRenderSyntaxBlock(message, finishedRef.current || i != historyMessageList.length - 1);
+            message = message.replace(/<thinking>([\s\S]*?)<\/thinking>/g, '<div class="think-block">$1</div>\n');
+            message = message.replace(/```(\s)?yaml(?:.|\n)*?```/ig, "");
+            message = message.replace(/```\s*yaml[\s\S]*/, "");
             if (lastId == item.id && keyWordProblem != "") {
                 //点击历史记录时，找到关键字，防止关键字和标签名重复
                 // let key_sign = 'sign_'+new Date().getTime();+'sign';
@@ -2594,8 +2639,9 @@ var CustomerService = function(props) {
                                                                 /*#__PURE__*/ _jsx("i", {
                                                                     className: "yinyong_quote1",
                                                                     onClick: function() {
+                                                                        // 问题的引用
                                                                         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 : ""
                                                                         });
@@ -2612,7 +2658,7 @@ var CustomerService = function(props) {
                                                                 }) : /*#__PURE__*/ _jsx("i", {
                                                                     className: "fuzhi21",
                                                                     onClick: function() {
-                                                                        var bol = copyText(item.message);
+                                                                        var bol = copyText(replaceThinkAndYaml(item.message));
                                                                         if (bol) {
                                                                             var obj = copyTextOBJ;
                                                                             obj = obj.filter(function(list) {
@@ -2675,14 +2721,14 @@ var CustomerService = function(props) {
                                             item.quotedMessage && /*#__PURE__*/ _jsxs("div", {
                                                 className: styles.citation_content,
                                                 children: [
-                                                    getByteLen(item.quotedMessage) > 120 ? /*#__PURE__*/ _jsx(Tooltip, {
+                                                    getByteLen(replaceThinkAndYaml(item.quotedMessage)) > 120 ? /*#__PURE__*/ _jsx(Tooltip, {
                                                         overlayClassName: styles.popover_main_content,
-                                                        title: item.quotedMessage,
+                                                        title: replaceThinkAndYaml(item.quotedMessage),
                                                         placement: "leftTop",
                                                         children: /*#__PURE__*/ _jsxs("p", {
                                                             className: styles.text_exceed,
                                                             children: [
-                                                                item.quotedMessage,
+                                                                replaceThinkAndYaml(item.quotedMessage),
                                                                 /*#__PURE__*/ _jsx(RightOutlined, {})
                                                             ]
                                                         })
@@ -2840,6 +2886,35 @@ var CustomerService = function(props) {
                                                 /*#__PURE__*/ _jsxs("div", {
                                                     className: styles.content,
                                                     children: [
+                                                        !exactRegex.test(message) ? null : /*#__PURE__*/ _jsxs("div", {
+                                                            id: "click_" + i,
+                                                            onClick: function() {
+                                                                if ($("#click_".concat(i, " + p .think-block")).css("display") === "inline-block" || $("#click_".concat(i, " + p .think-block")).css("display") === "block") {
+                                                                    $("#click_".concat(i, " + p .think-block")).css({
+                                                                        display: "none"
+                                                                    });
+                                                                    $("#click_".concat(i, " i")).css({
+                                                                        transform: "rotate(180deg)"
+                                                                    });
+                                                                } else {
+                                                                    $("#click_".concat(i, " + p .think-block")).css({
+                                                                        display: "block"
+                                                                    });
+                                                                    $("#click_".concat(i, " i")).css({
+                                                                        transform: "rotate(0deg)"
+                                                                    });
+                                                                }
+                                                            },
+                                                            className: styles.content_put,
+                                                            children: [
+                                                                /*#__PURE__*/ _jsx("span", {
+                                                                    children: "思考过程"
+                                                                }),
+                                                                /*#__PURE__*/ _jsx("i", {
+                                                                    className: "iconfont iconfangxiang-xiaxiao"
+                                                                })
+                                                            ]
+                                                        }),
                                                         item.message != "AI助手繁忙，请稍后再提问或" && /*#__PURE__*/ _jsx("p", {
                                                             dangerouslySetInnerHTML: {
                                                                 __html: message
@@ -2924,14 +2999,14 @@ var CustomerService = function(props) {
                                                 item.quotedMessage && /*#__PURE__*/ _jsxs("div", {
                                                     className: styles.citation_content,
                                                     children: [
-                                                        getByteLen(item.quotedMessage) > 120 ? /*#__PURE__*/ _jsx(Tooltip, {
+                                                        getByteLen(replaceThinkAndYaml(item.quotedMessage)) > 120 ? /*#__PURE__*/ _jsx(Tooltip, {
                                                             overlayClassName: styles.popover_main_content,
-                                                            title: item.quotedMessage,
+                                                            title: replaceThinkAndYaml(item.quotedMessage),
                                                             placement: "rightTop",
                                                             children: /*#__PURE__*/ _jsxs("p", {
                                                                 className: styles.text_exceed,
                                                                 children: [
-                                                                    item.quotedMessage,
+                                                                    replaceThinkAndYaml(item.quotedMessage),
                                                                     /*#__PURE__*/ _jsx(RightOutlined, {})
                                                                 ]
                                                             })
@@ -3000,11 +3075,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();
@@ -3159,8 +3230,9 @@ var CustomerService = function(props) {
                 /*#__PURE__*/ _jsx("i", {
                     className: "yinyong_quote1",
                     onClick: function() {
+                        // 答案的引用
                         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
                         });
@@ -3177,7 +3249,7 @@ var CustomerService = function(props) {
                 }) : /*#__PURE__*/ _jsx("i", {
                     className: "fuzhi21",
                     onClick: function() {
-                        var bol = copyText(item.message);
+                        var bol = copyText(replaceThinkAndYaml(item.message));
                         if (bol) {
                             var obj = copyTextOBJ;
                             obj = obj.filter(function(list) {
@@ -3203,7 +3275,7 @@ var CustomerService = function(props) {
                 /*#__PURE__*/ _jsx("i", {
                     className: "Frame427319094 ".concat(item.upvoted ? styles.active : ""),
                     onClick: function() {
-                        likeMessage(item.id, item.upvoted);
+                        likeMessage(item.id, item.upvoted, item.id);
                         //老师的聊天窗口中不需要点赞和踩消息
                         if (!isAiChatWindow) return;
                         //只有最后一条回答，支持发送点赞或踩
@@ -3211,7 +3283,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
@@ -3226,7 +3298,7 @@ var CustomerService = function(props) {
                 /*#__PURE__*/ _jsx("i", {
                     className: "Frame427319095 ".concat(item.downvoted ? styles.active : ""),
                     onClick: function() {
-                        disagreeMessage(item.id, item.downvoted);
+                        disagreeMessage(item.id, item.downvoted, item.id);
                         //老师的聊天窗口中不需要点赞和踩消息
                         if (!isAiChatWindow) return;
                         //只有最后一条回答，支持发送点赞或踩
@@ -3234,7 +3306,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
@@ -3368,9 +3440,9 @@ var CustomerService = function(props) {
                             className: "yinyong_quote1",
                             onClick: function() {
                                 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_智能问答_引用", "提交");
@@ -3385,7 +3457,7 @@ var CustomerService = function(props) {
                         }) : /*#__PURE__*/ _jsx("i", {
                             className: "fuzhi21",
                             onClick: function() {
-                                var bol = copyText(item.message);
+                                var bol = copyText(replaceThinkAndYaml(item.message));
                                 if (bol) {
                                     var obj = copyTextOBJ;
                                     obj = obj.filter(function(list) {
@@ -3411,7 +3483,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;
                                 //只有最后一条回答，支持发送点赞或踩
@@ -3420,7 +3492,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
@@ -3436,7 +3508,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;
                                 //只有最后一条回答，支持发送点赞或踩
@@ -3447,7 +3519,7 @@ var CustomerService = function(props) {
                                         //AI回答
                                         aiSendQuestions(1, {
                                             roomId: roomId,
-                                            message: "你给出的答案很糟糕，我不满意，踩！",
+                                            message: "\x03\x03\x03你给出的答案很糟糕，我不满意，踩！\x03\x03\x03",
                                             quotedMessage: "",
                                             regenerate: false,
                                             generateUpvoteOrDownvoteMessage: true

package/esm/customerService/index.module.less

@@ -369,6 +369,42 @@
               .content_child {
                 padding: 0;
                 line-height: 1;
+                img {
+                  width: 100%;
+                }
+                :global {
+                  .think-block {
+                    padding: 12px;
+                    border-left: 1px solid rgba(0, 0, 0, 0.15);
+                    background: rgba(0, 0, 0, 0.04);
+                    // display: inline-block;
+                    margin-bottom: 8px;
+                    width: 100%;
+                    font-weight: 400;
+                    font-size: 12px;
+                    line-height: 1.5;
+                    color: rgba(0, 0, 0, 0.45);
+                    * {
+                      color: rgba(0, 0, 0, 0.45);
+                      font-weight: 400;
+                      font-size: 12px;
+                      line-height: 150%;
+                    }
+                    &:not(:first-of-type, :last-of-type){
+                      padding-top:0;
+                      padding-bottom: 0;
+                    }
+                    &:first-of-type{
+                      padding-top: 12px !important;
+                    }
+                    &:last-of-type{
+                      padding-bottom: 12px !important;
+                    }
+                    &+.think-block{
+                      margin-top: -8px;
+                    }
+                  }
+                }
 
                 p{
                   word-break: break-all;
@@ -441,7 +477,7 @@
                 // > ul + *, > ol + * {
                 //   margin-top:16px;
                 // }
-                > *:not(pre){
+                > *:not(pre):not(:global(.think-block)){
                   word-break: break-all;
                   padding-top: 8px;
                   padding-bottom: 8px;
@@ -2279,4 +2315,24 @@ strong {
     padding: 10px;
   }
   
+}
+
+.content_put {
+  display: flex;
+  padding: 4px 16px;
+  margin-bottom: 8px;
+  border-radius: 100px;
+  background: rgba(0, 0, 0, 0.04);
+  width: max-content;
+  align-items: center;
+  cursor: pointer;
+  span {
+    color: rgba(0, 0, 0, 0.65);
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 150%;
+  }
+  i {
+    margin-left: 8px;
+  }
 }

package/esm/customerService/index2.module.less

@@ -365,6 +365,43 @@
               .content_child {
                 padding: 0;
                 line-height: 1;
+                img {
+                  width: 100%;
+                }
+                :global {
+                  .think-block {
+                    padding: 12px;
+                    padding-top: 12px !important;
+                    border-left: 1px solid rgba(0, 0, 0, 0.15);
+                    background: rgba(0, 0, 0, 0.04);
+                    // display: inline-block;
+                    margin-bottom: 8px;
+                    width: 100%;
+                    font-weight: 400;
+                    font-size: 12px;
+                    line-height: 1.5;
+                    color: rgba(0, 0, 0, 0.45);
+                    * {
+                      color: rgba(0, 0, 0, 0.45);
+                      font-weight: 400;
+                      font-size: 12px;
+                      line-height: 150%;
+                    }
+                    &:not(:first-of-type, :last-of-type){
+                      padding-top:0;
+                      padding-bottom: 0;
+                    }
+                    &:first-of-type{
+                      padding-top: 12px !important;
+                    }
+                    &:last-of-type{
+                      padding-bottom: 12px !important;
+                    }
+                    &+.think-block{
+                      margin-top: -8px;
+                    }
+                  }
+                }
                 p{
                   word-break: break-all;
                   white-space: break-spaces;
@@ -436,7 +473,7 @@
                 // > ul + *, > ol + * {
                 //   margin-top:16px;
                 // }
-                > *:not(pre){
+                > *:not(pre):not(:global(.think-block)){
                   word-break: break-all;
                   padding-top: 8px;
                   padding-bottom: 8px;
@@ -2217,3 +2254,23 @@
 strong {
   font-weight: bold !important;
 }
+
+.content_put {
+  display: flex;
+  padding: 4px 16px;
+  margin-bottom: 8px;
+  border-radius: 100px;
+  background: rgba(0, 0, 0, 0.04);
+  width: max-content;
+  align-items: center;
+  cursor: pointer;
+  span {
+    color: rgba(0, 0, 0, 0.65);
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 150%;
+  }
+  i {
+    margin-left: 8px;
+  }
+}

package/package.json

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