bhd-components 0.9.10 → 0.9.12

package/es2017/bhdAppLayout/components/BhdTableSimple/index.js

@@ -20,15 +20,20 @@ import i18Conversion from "../../../i18n";
     let { className, locale, borderBottom = false, rowSelection, ajaxErr, dataSource, kind = "simple", loading, notDataText = i18Conversion("noData") } = props;
     const tableRef = useRef(null);
     const renderTableText = ()=>{
-        let minHeight = props.scroll.y.replace(/\)/, "");
-        minHeight = minHeight + " - 42px)";
+        let minHeight = tableRef.current ? tableRef.current.offsetHeight - 42 - 32 : 0;
+        if (props.scroll && props.scroll.y) {
+            if (String(props.scroll.y).includes("calc")) {
+                minHeight = props.scroll.y.replace(/\)/, "");
+                minHeight = minHeight + " - 42px)";
+            }
+        }
         let width = tableRef.current ? tableRef.current.offsetWidth - 42 : 0;
         if (ajaxErr) {
             return /*#__PURE__*/ _jsxs("div", {
                 className: "app_BhdTableSimple_errorTable",
                 style: {
                     minHeight: minHeight,
-                    width: width + 'px'
+                    width: width + "px"
                 },
                 children: [
                     /*#__PURE__*/ _jsx("img", {
@@ -46,7 +51,7 @@ import i18Conversion from "../../../i18n";
                 className: "app_BhdTableSimple_noTable app_BhdTableSimple_noTable_loadingTable",
                 style: {
                     minHeight: minHeight,
-                    width: width + 'px'
+                    width: width + "px"
                 },
                 children: [
                     /*#__PURE__*/ _jsx("img", {
@@ -66,7 +71,7 @@ import i18Conversion from "../../../i18n";
         return /*#__PURE__*/ _jsxs("div", {
             className: "app_BhdTableSimple_noTable",
             style: {
-                width: width + 'px',
+                width: width + "px",
                 minHeight: minHeight
             },
             children: [

package/es2017/bhdAppLayout/index.module.less

@@ -81,7 +81,7 @@
         }
     }
     .bhd_app_layout_footer {
-        width: calc(100% - 60px);
+        width: 100%;
         height: 56px;
         position: absolute;
         z-index: 10;

package/es2017/bhdSelect/index.js

@@ -170,7 +170,7 @@ const BhdSelect = (props)=>{
                             value: filterValue
                         })
                     }),
-                    menu
+                    dropdownRender ? dropdownRender(menu) : menu
                 ]
             });
         } else {

package/es2017/customerService/index.js

@@ -31,6 +31,25 @@ import { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, re
 // import html2canvas from "html2canvas";
 // const screenShot = require('./screenShotPlugin.esm') 
 import ScreenShot from "./js-screen-shot/main";
+/* 
+自定义remarkable的text解析规则
+ */ const HTML_ESCAPE_TEST_RE = /[&<>"]/;
+const HTML_ESCAPE_REPLACE_RE = /[&<>"]/g;
+const HTML_REPLACEMENTS = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;'
+};
+function replaceUnsafeChar(ch) {
+    return HTML_REPLACEMENTS[ch];
+}
+function escapeHtml(str) {
+    if (HTML_ESCAPE_TEST_RE.test(str)) {
+        return str.replace(HTML_ESCAPE_REPLACE_RE, replaceUnsafeChar);
+    }
+    return str;
+}
 const CustomerService = (props)=>{
     let { userData, http, urllocation, onCancel, serverName, fetchEventSource, initShowType, onEvent, stepIds, stepId, screenshotAreaId, config } = props;
     // const { bese64String, startRecord, stopRecord } = useMediaRecorder(); //语音转文字
@@ -86,6 +105,7 @@ const CustomerService = (props)=>{
     let newHotQuestionsList = useRef([]); //视频热门问题
     let newShowType = useRef(false);
     const mid = props.userData.mid;
+    const renderAiAnswerTimer = useRef(null);
     const remarkable = new Remarkable({
         highlight: function(str, lang) {
             if (lang && hljs.getLanguage(lang)) {
@@ -99,6 +119,26 @@ const CustomerService = (props)=>{
             return ""; // use external default escaping
         }
     });
+    const remarkReplaceKey = (message, keyWordProblem)=>{
+        let newRemarkable = new Remarkable({
+            highlight: function(str, lang) {
+                if (lang && hljs.getLanguage(lang)) {
+                    try {
+                        return hljs.highlight(lang, str).value;
+                    } catch (err) {}
+                }
+                try {
+                    return hljs.highlightAuto(str).value;
+                } catch (err) {}
+                return ""; // use external default escaping
+            }
+        });
+        newRemarkable.renderer.rules.text = (tokens, idx)=>{
+            let text = escapeHtml(tokens[idx].content);
+            return text.replace(keyWordProblem, `<span class="${styles.sign}">${keyWordProblem}</span>`);
+        };
+        return newRemarkable.render(message);
+    };
     const [screenShotType, setScreenShotType] = useState(0) //1是 screenShotPlugin   2是html2canvas
     ;
     const screenShotPlugin = useRef();
@@ -345,6 +385,7 @@ const CustomerService = (props)=>{
             clearTimeout(timer.current);
             clearTimeout(roomMessage.current);
             clearTimeout(chatRoomList.current);
+            clearTimeout(renderAiAnswerTimer.current);
         };
     }, []);
     useEffect(()=>{
@@ -1101,11 +1142,14 @@ const CustomerService = (props)=>{
             },
             onmessage (event) {
                 //识别的内容
-                console.log("eventSource msg: ", event.data);
+                // console.log("eventSource msg: ", event.data);
                 let msg = JSON.parse(event.data);
                 if (msg.message) {
                     content = content + msg.message;
-                    renderAiAnswer(msg, id, type);
+                    // isPosition.current = true;
+                    renderAiAnswerTimer.current = setTimeout(()=>{
+                        renderAiAnswer(msg, id, type);
+                    }, 100);
                 }
                 if (msg.finished) {
                     setFinished(true); //发送结束
@@ -1133,11 +1177,7 @@ const CustomerService = (props)=>{
     };
     //渲染AI回答
     const renderAiAnswer = (msg, message_id, type)=>{
-        console.log('renderAiAnswer', {
-            msg,
-            message_id,
-            type
-        });
+        // console.log('renderAiAnswer',{msg,message_id,type})
         // console.log(pageNumHistory,5555555);
         // console.log(aiSendQuestions().abort(),'slkdsdsdsd')
         if (pageNumHistory > 1) return;
@@ -1158,10 +1198,7 @@ const CustomerService = (props)=>{
             let list = prevHistoryMessageList.filter((item)=>{
                 return item.id == id;
             });
-            console.log('renderAiAnswer', {
-                list1,
-                list
-            });
+            // console.log('renderAiAnswer',{list1,list})
             let message = "";
             if (list.length == 0) {
                 message = obj.message;
@@ -1210,10 +1247,15 @@ const CustomerService = (props)=>{
                 return newHistoryMessageList2;
             }
         });
-        console.log('historyMessageList', historyMessageList);
-        if (isPosition.current) {
-            scrollToBottom();
+        const container = document.getElementById(showType == 1 || showType == 3 ? "chat_content" : "chat_content_modal");
+        if (container) {
+            container.scrollTop = container.scrollHeight;
         }
+    // console.log('historyMessageList',historyMessageList)
+    // if(isPosition.current){
+    //   console.log('mmmmmmmmmmmmm打印一下',)
+    //   scrollToBottom();
+    // }
     };
     //问题记录到实验报告中
     const testLabQuestion = (title, content, teachId)=>{
@@ -1712,8 +1754,11 @@ const CustomerService = (props)=>{
     const scrollToBottom = ()=>{
         setTimeout(()=>{
             const container = document.getElementById(showType == 1 || showType == 3 ? "chat_content" : "chat_content_modal");
+            console.log('滚到底部', container, showType);
             if (container) {
+                console.log('最好的最好的最好的', container.scrollHeight);
                 container.scrollTop = container.scrollHeight;
+            //container.scrollTop = new Date().getTime()
             }
         }, 100);
     };
@@ -2016,15 +2061,15 @@ const CustomerService = (props)=>{
                 // console.log(code,888888888);
                 if (lastId == item.id && keyWordProblem != '') {
                     //点击历史记录时，找到关键字，防止关键字和标签名重复
-                    let key_sign = 'sign_' + new Date().getTime();
-                    +'sign';
-                    message = message.replaceAll(keyWordProblem, (e)=>{
-                        return key_sign;
-                    });
-                    message = remarkable.render(message);
-                    message = message.replaceAll(key_sign, (e)=>{
-                        return `<span class=${styles.sign}>${keyWordProblem}</span>`;
-                    });
+                    // let key_sign = 'sign_'+new Date().getTime();+'sign';
+                    // message = message.replaceAll(keyWordProblem, (e:any) => {
+                    //   return key_sign;
+                    // });
+                    // message = remarkable.render(message);
+                    // message = message.replaceAll(key_sign, (e:any) => {
+                    //   return `<span class=${styles.sign}>${keyWordProblem}</span>`;
+                    // });
+                    message = remarkReplaceKey(message, keyWordProblem);
                 } else {
                     message = remarkable.render(message);
                 }
@@ -2425,7 +2470,9 @@ const CustomerService = (props)=>{
                         ]
                     });
                 }
-                return li;
+                return /*#__PURE__*/ _jsx(React.Fragment, {
+                    children: li
+                }, item.id);
             })
         });
     // } else {

package/es2017/customerService/index.module.less

@@ -2103,4 +2103,8 @@
       }
     }
   }
+}
+
+strong {
+  font-weight: bold !important;
 }

package/es2017/customerService/index2.module.less

@@ -2085,4 +2085,7 @@
       }
     }
   }
+}
+strong {
+  font-weight: bold !important;
 }

package/esm/bhdAppLayout/components/BhdTableSimple/index.js

@@ -20,8 +20,13 @@ import i18Conversion from "../../../i18n";
     var className = props.className, locale = props.locale, _props_borderBottom = props.borderBottom, borderBottom = _props_borderBottom === void 0 ? false : _props_borderBottom, rowSelection = props.rowSelection, ajaxErr = props.ajaxErr, dataSource = props.dataSource, _props_kind = props.kind, kind = _props_kind === void 0 ? "simple" : _props_kind, loading = props.loading, _props_notDataText = props.notDataText, notDataText = _props_notDataText === void 0 ? i18Conversion("noData") : _props_notDataText;
     var tableRef = useRef(null);
     var renderTableText = function() {
-        var minHeight = props.scroll.y.replace(/\)/, "");
-        minHeight = minHeight + " - 42px)";
+        var minHeight = tableRef.current ? tableRef.current.offsetHeight - 42 - 32 : 0;
+        if (props.scroll && props.scroll.y) {
+            if (String(props.scroll.y).includes("calc")) {
+                minHeight = props.scroll.y.replace(/\)/, "");
+                minHeight = minHeight + " - 42px)";
+            }
+        }
         var width = tableRef.current ? tableRef.current.offsetWidth - 42 : 0;
         if (ajaxErr) {
             return /*#__PURE__*/ _jsxs("div", {

package/esm/bhdAppLayout/index.module.less

@@ -81,7 +81,7 @@
         }
     }
     .bhd_app_layout_footer {
-        width: calc(100% - 60px);
+        width: 100%;
         height: 56px;
         position: absolute;
         z-index: 10;

package/esm/bhdSelect/index.js

@@ -174,7 +174,7 @@ var BhdSelect = function(props) {
                             value: filterValue
                         })
                     }),
-                    menu
+                    dropdownRender ? dropdownRender(menu) : menu
                 ]
             });
         } else {

package/esm/customerService/index.js

@@ -35,6 +35,25 @@ import { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, re
 // import html2canvas from "html2canvas";
 // const screenShot = require('./screenShotPlugin.esm') 
 import ScreenShot from "./js-screen-shot/main";
+/* 
+自定义remarkable的text解析规则
+ */ var HTML_ESCAPE_TEST_RE = /[&<>"]/;
+var HTML_ESCAPE_REPLACE_RE = /[&<>"]/g;
+var HTML_REPLACEMENTS = {
+    "&": "&amp;",
+    "<": "&lt;",
+    ">": "&gt;",
+    '"': "&quot;"
+};
+function replaceUnsafeChar(ch) {
+    return HTML_REPLACEMENTS[ch];
+}
+function escapeHtml(str) {
+    if (HTML_ESCAPE_TEST_RE.test(str)) {
+        return str.replace(HTML_ESCAPE_REPLACE_RE, replaceUnsafeChar);
+    }
+    return str;
+}
 var CustomerService = function(props) {
     var userData = props.userData, http = props.http, urllocation = props.urllocation, onCancel = props.onCancel, serverName = props.serverName, fetchEventSource = props.fetchEventSource, initShowType = props.initShowType, onEvent = props.onEvent, stepIds = props.stepIds, stepId = props.stepId, screenshotAreaId = props.screenshotAreaId, config = props.config;
     // const { bese64String, startRecord, stopRecord } = useMediaRecorder(); //语音转文字
@@ -90,6 +109,7 @@ var CustomerService = function(props) {
     var newHotQuestionsList = useRef([]); //视频热门问题
     var newShowType = useRef(false);
     var mid = props.userData.mid;
+    var renderAiAnswerTimer = useRef(null);
     var remarkable = new Remarkable({
         highlight: function highlight(str, lang) {
             if (lang && hljs.getLanguage(lang)) {
@@ -103,6 +123,26 @@ var CustomerService = function(props) {
             return ""; // use external default escaping
         }
     });
+    var remarkReplaceKey = function(message, keyWordProblem) {
+        var newRemarkable = new Remarkable({
+            highlight: function highlight(str, lang) {
+                if (lang && hljs.getLanguage(lang)) {
+                    try {
+                        return hljs.highlight(lang, str).value;
+                    } catch (err) {}
+                }
+                try {
+                    return hljs.highlightAuto(str).value;
+                } catch (err) {}
+                return ""; // use external default escaping
+            }
+        });
+        newRemarkable.renderer.rules.text = function(tokens, idx) {
+            var text = escapeHtml(tokens[idx].content);
+            return text.replace(keyWordProblem, '<span class="'.concat(styles.sign, '">').concat(keyWordProblem, "</span>"));
+        };
+        return newRemarkable.render(message);
+    };
     var _useState33 //1是 screenShotPlugin   2是html2canvas
      = _sliced_to_array(useState(0), 2), screenShotType = _useState33[0], setScreenShotType = _useState33[1];
     var screenShotPlugin = useRef();
@@ -350,6 +390,7 @@ var CustomerService = function(props) {
             clearTimeout(timer.current);
             clearTimeout(roomMessage.current);
             clearTimeout(chatRoomList.current);
+            clearTimeout(renderAiAnswerTimer.current);
         };
     }, []);
     useEffect(function() {
@@ -1147,11 +1188,14 @@ var CustomerService = function(props) {
             },
             onmessage: function onmessage(event) {
                 //识别的内容
-                console.log("eventSource msg: ", event.data);
+                // console.log("eventSource msg: ", event.data);
                 var msg = JSON.parse(event.data);
                 if (msg.message) {
                     content = content + msg.message;
-                    renderAiAnswer(msg, id, type);
+                    // isPosition.current = true;
+                    renderAiAnswerTimer.current = setTimeout(function() {
+                        renderAiAnswer(msg, id, type);
+                    }, 100);
                 }
                 if (msg.finished) {
                     setFinished(true); //发送结束
@@ -1181,11 +1225,7 @@ var CustomerService = function(props) {
     };
     //渲染AI回答
     var renderAiAnswer = function(msg, message_id, type) {
-        console.log("renderAiAnswer", {
-            msg: msg,
-            message_id: message_id,
-            type: type
-        });
+        // console.log('renderAiAnswer',{msg,message_id,type})
         // console.log(pageNumHistory,5555555);
         // console.log(aiSendQuestions().abort(),'slkdsdsdsd')
         if (pageNumHistory > 1) return;
@@ -1206,10 +1246,7 @@ var CustomerService = function(props) {
             var list = prevHistoryMessageList.filter(function(item) {
                 return item.id == id;
             });
-            console.log("renderAiAnswer", {
-                list1: list1,
-                list: list
-            });
+            // console.log('renderAiAnswer',{list1,list})
             var message = "";
             if (list.length == 0) {
                 message = obj.message;
@@ -1258,10 +1295,15 @@ var CustomerService = function(props) {
                 return newHistoryMessageList2;
             }
         });
-        console.log("historyMessageList", historyMessageList);
-        if (isPosition.current) {
-            scrollToBottom();
+        var container = document.getElementById(showType == 1 || showType == 3 ? "chat_content" : "chat_content_modal");
+        if (container) {
+            container.scrollTop = container.scrollHeight;
         }
+    // console.log('historyMessageList',historyMessageList)
+    // if(isPosition.current){
+    //   console.log('mmmmmmmmmmmmm打印一下',)
+    //   scrollToBottom();
+    // }
     };
     //问题记录到实验报告中
     var testLabQuestion = function(title, content, teachId) {
@@ -1778,8 +1820,11 @@ var CustomerService = function(props) {
     var scrollToBottom = function() {
         setTimeout(function() {
             var container = document.getElementById(showType == 1 || showType == 3 ? "chat_content" : "chat_content_modal");
+            console.log("滚到底部", container, showType);
             if (container) {
+                console.log("最好的最好的最好的", container.scrollHeight);
                 container.scrollTop = container.scrollHeight;
+            //container.scrollTop = new Date().getTime()
             }
         }, 100);
     };
@@ -2090,15 +2135,15 @@ var CustomerService = function(props) {
                 // console.log(code,888888888);
                 if (lastId == item.id && keyWordProblem != "") {
                     //点击历史记录时，找到关键字，防止关键字和标签名重复
-                    var key_sign = "sign_" + new Date().getTime();
-                    +"sign";
-                    message = message.replaceAll(keyWordProblem, function(e) {
-                        return key_sign;
-                    });
-                    message = remarkable.render(message);
-                    message = message.replaceAll(key_sign, function(e) {
-                        return "<span class=".concat(styles.sign, ">").concat(keyWordProblem, "</span>");
-                    });
+                    // let key_sign = 'sign_'+new Date().getTime();+'sign';
+                    // message = message.replaceAll(keyWordProblem, (e:any) => {
+                    //   return key_sign;
+                    // });
+                    // message = remarkable.render(message);
+                    // message = message.replaceAll(key_sign, (e:any) => {
+                    //   return `<span class=${styles.sign}>${keyWordProblem}</span>`;
+                    // });
+                    message = remarkReplaceKey(message, keyWordProblem);
                 } else {
                     message = remarkable.render(message);
                 }
@@ -2474,7 +2519,9 @@ var CustomerService = function(props) {
                         ]
                     });
                 }
-                return li;
+                return /*#__PURE__*/ _jsx(React.Fragment, {
+                    children: li
+                }, item.id);
             })
         });
     // } else {

package/esm/customerService/index.module.less

@@ -2103,4 +2103,8 @@
       }
     }
   }
+}
+
+strong {
+  font-weight: bold !important;
 }

package/esm/customerService/index2.module.less

@@ -2085,4 +2085,7 @@
       }
     }
   }
+}
+strong {
+  font-weight: bold !important;
 }

package/package.json

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