bhd-components 0.10.37 → 0.10.38

package/es2017/AIMessageList/components/footer/index.js

@@ -242,7 +242,7 @@ const Footer = /*#__PURE__*/ forwardRef((props, ref)=>{
             apiRef.contentApi.addMsg({
                 id: msgId,
                 createTime: createTime,
-                content: "正在输入...",
+                content: "正在思考...",
                 location: "left",
                 reference: recordObj.reference || null,
                 source: null,
@@ -252,7 +252,7 @@ const Footer = /*#__PURE__*/ forwardRef((props, ref)=>{
             apiRef.contentApi.addMsg({
                 id: msgId,
                 createTime: createTime,
-                content: "正在输入...",
+                content: "正在思考...",
                 location: "left",
                 reference: null,
                 source: null,

package/es2017/AIMessageList/components/virtuosoList/index.js

@@ -608,8 +608,17 @@ const VirtuosoList = /*#__PURE__*/ forwardRef((props, ref)=>{
                 } else {
                     // 没有跨天 判断是否相隔超过10分钟
                     if (timeObj.timestamp - beforeTimeObj.timestamp > 10 * 60 * 1000) {
-                        // 超过10分钟 显示 时分
-                        time = `${timeObj.hours}:${timeObj.minutes}`;
+                        // 超过10分钟 显示
+                        let now = new Date();
+                        // 当天的日期
+                        let nowTimeStr = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, "0")}-${String(now.getDate()).padStart(2, "0")}`;
+                        if (nowTimeStr === `${timeObj.year}-${timeObj.month}-${timeObj.day}`) {
+                            // 是当天 显示 时分
+                            time = `${timeObj.hours}:${timeObj.minutes}`;
+                        } else {
+                            // 不是当天 显示 年月日 时分
+                            time = `${timeObj.year}-${timeObj.month}-${timeObj.day} ${timeObj.hours}:${timeObj.minutes}`;
+                        }
                     }
                 }
             }

package/es2017/customerService/common.module.less

@@ -463,6 +463,9 @@
         padding: 8px;
         border-radius: 2px;
         background: #e7e7e7;
+        img {
+          width: 100%;
+        }
         p {
           color: @color-text-Secondary-Tr;
           font-size: 12px;

package/es2017/customerService/index.js

@@ -54,6 +54,12 @@ function escapeHtml(str) {
     }
     return 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',
@@ -136,6 +142,7 @@ const CustomerService = (props)=>{
     const getLisyFlagRef = useRef(0);
     const [showMemaid, setShowMemaid] = useState(false); //是否显示mermaid弹窗
     const [memaidContent, setMemaidContent] = useState(""); //mermaid内容
+    const shouqiTimer = useRef(null);
     const remarkable = new Remarkable({
         html: true,
         highlight: function(str, lang) {
@@ -222,6 +229,7 @@ const CustomerService = (props)=>{
         //   //获取热门推荐
         //   videoPageQuestiionsList(1);
         // }
+        console.log('initShowType', initShowType);
         setShowType(initShowType);
     }, [
         initShowType
@@ -1261,6 +1269,7 @@ const CustomerService = (props)=>{
             //先请求问题列表
             videoPageQuestiionsList(3);
         }
+        let hasYamlStarted = false;
         //使用fetchEventSource接收数据
         const eventSource = fetchEventSource(`${urllocation}/chat-service/public/v1.0/chat-with-ai/messages`, {
             method: "POST",
@@ -1357,7 +1366,12 @@ const CustomerService = (props)=>{
                 //识别的内容
                 // console.log("eventSource msg: ", event.data);
                 let msg = JSON.parse(event.data);
-                if (msg.message) {}
+                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;
@@ -1374,6 +1388,20 @@ const CustomerService = (props)=>{
                         videoPageQuestiionsList(2);
                     }
                     testLabQuestion(JSON.parse(data).message, content, "");
+                    if (shouqiTimer.current) {
+                        clearTimeout(shouqiTimer.current);
+                    }
+                    shouqiTimer.current = setTimeout(()=>{
+                        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 () {
@@ -1391,7 +1419,8 @@ const CustomerService = (props)=>{
         // console.log(aiSendQuestions().abort(),'slkdsdsdsd')
         if (pageNumHistory > 1) return;
         let obj = msg;
-        let id = msg.messageId;
+        let tempId = "ai thought process";
+        let id = tempId; // 原：let id = msg.messageId;  备注：解决思考过程返回的messageId和下边回复的内容值不同问题，新：改成临时固定相同id，finished完成时替换为实际返回的messageId值
         setHistoryMessageList((prevHistoryMessageList)=>{
             let list1 = prevHistoryMessageList;
             //删除临时数据
@@ -1458,6 +1487,17 @@ 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;
@@ -1562,6 +1602,12 @@ const CustomerService = (props)=>{
                 //     getHistoryMessage(page-1,5,'1',dataList);
                 //     return;
                 // }
+                dataList = dataList.map((ele, index)=>{
+                    if (ele.message.includes("<thinking>") && !ele.message.includes("</thinking>")) {
+                        ele.message = ele.message + "</thinking>";
+                    }
+                    return ele;
+                });
                 setPageCount(Math.ceil(total / maxPageSize));
                 setFirstItemIndex(total - maxPageSize * (page - 1));
                 let newHistoryMessageList = [];
@@ -2366,6 +2412,9 @@ const CustomerService = (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';
@@ -2447,6 +2496,8 @@ const CustomerService = (props)=>{
                                                                 /*#__PURE__*/ _jsx("i", {
                                                                     className: "yinyong_quote1",
                                                                     onClick: ()=>{
+                                                                        // 问题的引用
+                                                                        item.message = replaceThinkAndYaml(item.message);
                                                                         setCitationContent({
                                                                             content: item.message,
                                                                             id: item.id,
@@ -2516,14 +2567,14 @@ const CustomerService = (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, {})
                                                             ]
                                                         })
@@ -2677,6 +2728,35 @@ const CustomerService = (props)=>{
                                                 /*#__PURE__*/ _jsxs("div", {
                                                     className: styles.content,
                                                     children: [
+                                                        !exactRegex.test(message) ? null : /*#__PURE__*/ _jsxs("div", {
+                                                            id: "click_" + i,
+                                                            onClick: ()=>{
+                                                                if ($(`#click_${i} + p .think-block`).css("display") === 'inline-block' || $(`#click_${i} + p .think-block`).css("display") === 'block') {
+                                                                    $(`#click_${i} + p .think-block`).css({
+                                                                        display: "none"
+                                                                    });
+                                                                    $(`#click_${i} i`).css({
+                                                                        transform: "rotate(180deg)"
+                                                                    });
+                                                                } else {
+                                                                    $(`#click_${i} + p .think-block`).css({
+                                                                        display: "block"
+                                                                    });
+                                                                    $(`#click_${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
@@ -2755,14 +2835,14 @@ const CustomerService = (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, {})
                                                                 ]
                                                             })
@@ -2988,6 +3068,8 @@ const CustomerService = (props)=>{
                 /*#__PURE__*/ _jsx("i", {
                     className: "yinyong_quote1",
                     onClick: ()=>{
+                        // 答案的引用
+                        item.message = replaceThinkAndYaml(item.message);
                         setCitationContent({
                             content: item.message,
                             imageUrl: item.extraInfo && JSON.parse(extraInfo).length > 0 && JSON.parse(extraInfo)[0].key == "imageUrl" && JSON.parse(extraInfo)[0].value,
@@ -3184,6 +3266,7 @@ const CustomerService = (props)=>{
                         /*#__PURE__*/ _jsx("i", {
                             className: "yinyong_quote1",
                             onClick: ()=>{
+                                item.message = replaceThinkAndYaml(item.message);
                                 setCitationContent({
                                     content: item.message,
                                     imageUrl: item.extraInfo && JSON.parse(extraInfo).length > 0 && JSON.parse(extraInfo)[0].key == "imageUrl" && JSON.parse(extraInfo)[0].value,

package/es2017/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/es2017/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/esm/AIMessageList/components/footer/index.js

@@ -254,7 +254,7 @@ var Footer = /*#__PURE__*/ forwardRef(function(props, ref) {
             apiRef.contentApi.addMsg({
                 id: msgId,
                 createTime: createTime,
-                content: "正在输入...",
+                content: "正在思考...",
                 location: "left",
                 reference: recordObj.reference || null,
                 source: null,
@@ -264,7 +264,7 @@ var Footer = /*#__PURE__*/ forwardRef(function(props, ref) {
             apiRef.contentApi.addMsg({
                 id: msgId,
                 createTime: createTime,
-                content: "正在输入...",
+                content: "正在思考...",
                 location: "left",
                 reference: null,
                 source: null,

package/esm/AIMessageList/components/virtuosoList/index.js

@@ -587,8 +587,17 @@ var VirtuosoList = /*#__PURE__*/ forwardRef(function(props, ref) {
                 } else {
                     // 没有跨天 判断是否相隔超过10分钟
                     if (timeObj.timestamp - beforeTimeObj.timestamp > 10 * 60 * 1000) {
-                        // 超过10分钟 显示 时分
-                        time = "".concat(timeObj.hours, ":").concat(timeObj.minutes);
+                        // 超过10分钟 显示
+                        var now = new Date();
+                        // 当天的日期
+                        var nowTimeStr = "".concat(now.getFullYear(), "-").concat(String(now.getMonth() + 1).padStart(2, "0"), "-").concat(String(now.getDate()).padStart(2, "0"));
+                        if (nowTimeStr === "".concat(timeObj.year, "-").concat(timeObj.month, "-").concat(timeObj.day)) {
+                            // 是当天 显示 时分
+                            time = "".concat(timeObj.hours, ":").concat(timeObj.minutes);
+                        } else {
+                            // 不是当天 显示 年月日 时分
+                            time = "".concat(timeObj.year, "-").concat(timeObj.month, "-").concat(timeObj.day, " ").concat(timeObj.hours, ":").concat(timeObj.minutes);
+                        }
                     }
                 }
             }

package/esm/customerService/common.module.less

@@ -463,6 +463,9 @@
         padding: 8px;
         border-radius: 2px;
         background: #e7e7e7;
+        img {
+          width: 100%;
+        }
         p {
           color: @color-text-Secondary-Tr;
           font-size: 12px;