bhd-components 0.10.11 → 0.10.13

package/es2017/AIMessageList/components/copyIcon/index.module.less

@@ -15,6 +15,7 @@
   & > i {
     color: rgba(140, 140, 140, 1);
     font-size: 16px;
+    display: flex;
   }
   &:hover {
     background-color: rgba(0, 0, 0, 0.04);

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

@@ -58,7 +58,8 @@ const Footer = /*#__PURE__*/ forwardRef((props, ref)=>{
     useImperativeHandle(ref, ()=>{
         return _object_spread({
             setTextValue,
-            sendMsg: sendMsg,
+            sendMsg,
+            refreshSendMsg,
             clearText: ()=>{
                 setTextValue("");
             },
@@ -205,22 +206,43 @@ const Footer = /*#__PURE__*/ forwardRef((props, ref)=>{
         });
         sendMsgAjax();
     };
-    const sendMsgAjax = ()=>{
+    // 重新发送消息
+    const refreshSendMsg = function(msgId, value, reference, fileList) {
+        sendMsgAjax({
+            id: msgId,
+            value: value,
+            reference: reference || null,
+            fileList: fileList || []
+        });
+    };
+    const sendMsgAjax = (recordObj)=>{
         const { url, method = "POST", headers = ()=>({}), params = ()=>"", onOpen = ()=>{}, onMessage = (ev)=>ev, onClose = ()=>{}, onError = ()=>{}, coverProps = {}, beforeSendMsg = ()=>Promise.resolve() } = sendMsgAjaxParams;
         ctrl.current = new AbortController();
         // apiRef
         console.log("apiRef", apiRef);
         let msgId = "inputing";
         let createTime = new Date().getTime();
-        apiRef.contentApi.addMsg({
-            id: msgId,
-            createTime: createTime,
-            content: "正在输入...",
-            location: "left",
-            reference: null,
-            source: null,
-            fileList: fileListRef.current.getFileList()
-        });
+        if (recordObj) {
+            apiRef.contentApi.addMsg({
+                id: msgId,
+                createTime: createTime,
+                content: "正在输入...",
+                location: "left",
+                reference: recordObj.reference || null,
+                source: null,
+                fileList: recordObj.fileList || []
+            });
+        } else {
+            apiRef.contentApi.addMsg({
+                id: msgId,
+                createTime: createTime,
+                content: "正在输入...",
+                location: "left",
+                reference: null,
+                source: null,
+                fileList: fileListRef.current.getFileList()
+            });
+        }
         let msgContent = "";
         setSending(true);
         setTextValue("");
@@ -232,6 +254,19 @@ const Footer = /*#__PURE__*/ forwardRef((props, ref)=>{
             recordRef.current.referencesSource,
             fileListRef.current ? fileListRef.current.getFileList() : []
         ];
+        if (recordObj) {
+            arg = [
+                recordObj.value,
+                recordObj.reference || null,
+                recordObj.fileList || []
+            ];
+        } else {
+            arg = [
+                recordRef.current.value,
+                recordRef.current.referencesSource,
+                fileListRef.current ? fileListRef.current.getFileList() : []
+            ];
+        }
         beforeSendMsg(...arg).then((beforeInfo)=>{
             const callback = ()=>{
                 let isClose = false;
@@ -242,8 +277,8 @@ const Footer = /*#__PURE__*/ forwardRef((props, ref)=>{
                     setSending(false);
                     if (recordMsgObj.id) {
                         apiRef.contentApi.recordMsg(recordMsgObj);
-                        apiRef.contentApi.setSendingId(recordMsgObj.id);
                     }
+                    apiRef.contentApi.setSendingId("");
                     console.log("onclose: ", recordMsgObj);
                 };
                 fetchEventSource(url, _object_spread({
@@ -267,6 +302,9 @@ const Footer = /*#__PURE__*/ forwardRef((props, ref)=>{
                     },
                     onmessage: (ev)=>{
                         let data = onMessage(ev, closeCallback);
+                        if (recordObj) {
+                            data.id = recordObj.id;
+                        }
                         msgContent += data.content;
                         let str = msgContent.replace(/\\n/g, "\n");
                         str = conversionContent(str);
@@ -281,9 +319,9 @@ const Footer = /*#__PURE__*/ forwardRef((props, ref)=>{
                         apiRef.contentApi.setSendingId(data.id);
                         apiRef.contentApi.updateMsg(msgId, recordMsgObj);
                         msgId = data.id;
-                        updateMsgRef.current = setTimeout(function() {
-                            apiRef.contentApi.scrollToBottom();
-                        }, 100);
+                        // updateMsgRef.current = setTimeout(function () {
+                        apiRef.contentApi.scrollToBottom();
+                    // }, 100);
                     },
                     onclose: ()=>{
                         closeCallback();

package/es2017/AIMessageList/components/referencesIcon/index.module.less

@@ -6,6 +6,7 @@
   & > i {
     color: rgba(140, 140, 140, 1);
     font-size: 16px;
+    display: flex;
   }
   &:hover {
     background-color: rgba(0, 0, 0, 0.04);

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

@@ -70,6 +70,7 @@ const VirtuosoList = /*#__PURE__*/ forwardRef((props, ref)=>{
         sendingId: ""
     });
     const timeRenderCache = useRef(new Map()).current;
+    const autoScrollBottom = useRef(true);
     const htmlRenderCache = useRef(new Map()).current;
     useImperativeHandle(ref, ()=>{
         return {
@@ -161,6 +162,9 @@ const VirtuosoList = /*#__PURE__*/ forwardRef((props, ref)=>{
         recordRef.current.dataSource = dataSource;
         recordRef.current.maxPage = Math.ceil(total / pageSize);
         recordRef.current.sendingId = sendingId;
+        if (!sendingId) {
+            autoScrollBottom.current = true;
+        }
     }, [
         page,
         pageSize,
@@ -197,14 +201,15 @@ const VirtuosoList = /*#__PURE__*/ forwardRef((props, ref)=>{
                 ...list
             ];
         });
-        timerRef.current.scrollTimer = setTimeout(()=>{
-            scrollToBottom();
-        }, 100);
+        // timerRef.current.scrollTimer = setTimeout(() => {
+        scrollToBottom();
+    // }, 100);
     };
     const scrollToBottom = ()=>{
-        if (!virtuosoRef.current) return;
+        if (!virtuosoRef.current || !autoScrollBottom.current) return;
         virtuosoRef.current.scrollToIndex({
             index: "LAST",
+            align: "end",
             behavior: "auto"
         });
     };
@@ -654,8 +659,10 @@ const VirtuosoList = /*#__PURE__*/ forwardRef((props, ref)=>{
             p[0].innerText = "复制代码";
         }
     };
-    const onScroll = ()=>{
-        console.log("滚动滚动");
+    const onWheel = ()=>{
+        if (recordRef.current.sendingId && recordRef.current.sendingId !== "inputing") {
+            autoScrollBottom.current = false;
+        }
     };
     return /*#__PURE__*/ _jsx("div", {
         className: `${getCls("virtuosoList-wrapper")}`,
@@ -682,7 +689,7 @@ const VirtuosoList = /*#__PURE__*/ forwardRef((props, ref)=>{
             },
             increaseViewportBy: 200,
             overscan: 10,
-            onScroll: onScroll
+            onWheel: onWheel
         })
     });
 });

package/es2017/AIMessageList/type.d.ts

@@ -160,6 +160,7 @@ export type fileStatus =
 export interface footerRefProps {
   setTextValue: (value: string) => void; // 设置输入框的值
   sendMsg: (value: string) => void; // 发送消息
+  refreshSendMsg:(msgId:string,value:string,reference?:any,fileList?:any)=>void;// 刷新消息
   clearText: () => void; // 清空输入框
   getCanSendMsg: () => boolean; //获取当前是否允许发送消息的状态
   stopMessage: () => void; //停止发送消息

package/es2017/customerService/index.js

@@ -110,6 +110,7 @@ const CustomerService = (props)=>{
     const mid = props.userData.mid;
     const renderAiAnswerTimer = useRef(null);
     const remarkable = new Remarkable({
+        html: true,
         highlight: function(str, lang) {
             if (lang && hljs.getLanguage(lang)) {
                 try {
@@ -124,6 +125,7 @@ const CustomerService = (props)=>{
     });
     const remarkReplaceKey = (message, keyWordProblem)=>{
         let newRemarkable = new Remarkable({
+            html: true,
             highlight: function(str, lang) {
                 if (lang && hljs.getLanguage(lang)) {
                     try {
@@ -1171,6 +1173,7 @@ const CustomerService = (props)=>{
                 console.log('返回中', msg);
                 content = content + msg.message;
                 // isPosition.current = true;
+                clearTimeout(renderAiAnswerTimer.current);
                 renderAiAnswerTimer.current = setTimeout(()=>{
                     if (!finishedRef.current) {
                         renderAiAnswer(msg, id, type);

package/esm/AIMessageList/components/copyIcon/index.module.less

@@ -15,6 +15,7 @@
   & > i {
     color: rgba(140, 140, 140, 1);
     font-size: 16px;
+    display: flex;
   }
   &:hover {
     background-color: rgba(0, 0, 0, 0.04);

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

@@ -63,6 +63,7 @@ var Footer = /*#__PURE__*/ forwardRef(function(props, ref) {
         return _object_spread({
             setTextValue: setTextValue,
             sendMsg: sendMsg,
+            refreshSendMsg: refreshSendMsg,
             clearText: function() {
                 setTextValue("");
             },
@@ -209,7 +210,16 @@ var Footer = /*#__PURE__*/ forwardRef(function(props, ref) {
         });
         sendMsgAjax();
     };
-    var sendMsgAjax = function() {
+    // 重新发送消息
+    var refreshSendMsg = function refreshSendMsg(msgId, value, reference, fileList) {
+        sendMsgAjax({
+            id: msgId,
+            value: value,
+            reference: reference || null,
+            fileList: fileList || []
+        });
+    };
+    var sendMsgAjax = function(recordObj) {
         var url = sendMsgAjaxParams.url, _sendMsgAjaxParams_method = sendMsgAjaxParams.method, method = _sendMsgAjaxParams_method === void 0 ? "POST" : _sendMsgAjaxParams_method, _sendMsgAjaxParams_headers = sendMsgAjaxParams.headers, headers = _sendMsgAjaxParams_headers === void 0 ? function() {
             return {};
         } : _sendMsgAjaxParams_headers, _sendMsgAjaxParams_params = sendMsgAjaxParams.params, params = _sendMsgAjaxParams_params === void 0 ? function() {
@@ -224,15 +234,27 @@ var Footer = /*#__PURE__*/ forwardRef(function(props, ref) {
         console.log("apiRef", apiRef);
         var msgId = "inputing";
         var createTime = new Date().getTime();
-        apiRef.contentApi.addMsg({
-            id: msgId,
-            createTime: createTime,
-            content: "正在输入...",
-            location: "left",
-            reference: null,
-            source: null,
-            fileList: fileListRef.current.getFileList()
-        });
+        if (recordObj) {
+            apiRef.contentApi.addMsg({
+                id: msgId,
+                createTime: createTime,
+                content: "正在输入...",
+                location: "left",
+                reference: recordObj.reference || null,
+                source: null,
+                fileList: recordObj.fileList || []
+            });
+        } else {
+            apiRef.contentApi.addMsg({
+                id: msgId,
+                createTime: createTime,
+                content: "正在输入...",
+                location: "left",
+                reference: null,
+                source: null,
+                fileList: fileListRef.current.getFileList()
+            });
+        }
         var msgContent = "";
         setSending(true);
         setTextValue("");
@@ -244,6 +266,19 @@ var Footer = /*#__PURE__*/ forwardRef(function(props, ref) {
             recordRef.current.referencesSource,
             fileListRef.current ? fileListRef.current.getFileList() : []
         ];
+        if (recordObj) {
+            arg = [
+                recordObj.value,
+                recordObj.reference || null,
+                recordObj.fileList || []
+            ];
+        } else {
+            arg = [
+                recordRef.current.value,
+                recordRef.current.referencesSource,
+                fileListRef.current ? fileListRef.current.getFileList() : []
+            ];
+        }
         beforeSendMsg.apply(void 0, _to_consumable_array(arg)).then(function(beforeInfo) {
             var callback = function() {
                 var isClose = false;
@@ -254,8 +289,8 @@ var Footer = /*#__PURE__*/ forwardRef(function(props, ref) {
                     setSending(false);
                     if (recordMsgObj.id) {
                         apiRef.contentApi.recordMsg(recordMsgObj);
-                        apiRef.contentApi.setSendingId(recordMsgObj.id);
                     }
+                    apiRef.contentApi.setSendingId("");
                     console.log("onclose: ", recordMsgObj);
                 };
                 fetchEventSource(url, _object_spread({
@@ -281,6 +316,9 @@ var Footer = /*#__PURE__*/ forwardRef(function(props, ref) {
                     },
                     onmessage: function(ev) {
                         var data = onMessage(ev, closeCallback);
+                        if (recordObj) {
+                            data.id = recordObj.id;
+                        }
                         msgContent += data.content;
                         var str = msgContent.replace(/\\n/g, "\n");
                         str = conversionContent(str);
@@ -295,9 +333,9 @@ var Footer = /*#__PURE__*/ forwardRef(function(props, ref) {
                         apiRef.contentApi.setSendingId(data.id);
                         apiRef.contentApi.updateMsg(msgId, recordMsgObj);
                         msgId = data.id;
-                        updateMsgRef.current = setTimeout(function() {
-                            apiRef.contentApi.scrollToBottom();
-                        }, 100);
+                        // updateMsgRef.current = setTimeout(function () {
+                        apiRef.contentApi.scrollToBottom();
+                    // }, 100);
                     },
                     onclose: function() {
                         closeCallback();

package/esm/AIMessageList/components/referencesIcon/index.module.less

@@ -6,6 +6,7 @@
   & > i {
     color: rgba(140, 140, 140, 1);
     font-size: 16px;
+    display: flex;
   }
   &:hover {
     background-color: rgba(0, 0, 0, 0.04);

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

@@ -74,6 +74,7 @@ var VirtuosoList = /*#__PURE__*/ forwardRef(function(props, ref) {
         sendingId: ""
     });
     var timeRenderCache = useRef(new Map()).current;
+    var autoScrollBottom = useRef(true);
     var htmlRenderCache = useRef(new Map()).current;
     useImperativeHandle(ref, function() {
         return {
@@ -167,6 +168,9 @@ var VirtuosoList = /*#__PURE__*/ forwardRef(function(props, ref) {
         recordRef.current.dataSource = dataSource;
         recordRef.current.maxPage = Math.ceil(total / pageSize);
         recordRef.current.sendingId = sendingId;
+        if (!sendingId) {
+            autoScrollBottom.current = true;
+        }
     }, [
         page,
         pageSize,
@@ -200,14 +204,15 @@ var VirtuosoList = /*#__PURE__*/ forwardRef(function(props, ref) {
         setDataSource(function(data) {
             return _to_consumable_array(data).concat(_to_consumable_array(list));
         });
-        timerRef.current.scrollTimer = setTimeout(function() {
-            scrollToBottom();
-        }, 100);
+        // timerRef.current.scrollTimer = setTimeout(() => {
+        scrollToBottom();
+    // }, 100);
     };
     var scrollToBottom = function() {
-        if (!virtuosoRef.current) return;
+        if (!virtuosoRef.current || !autoScrollBottom.current) return;
         virtuosoRef.current.scrollToIndex({
             index: "LAST",
+            align: "end",
             behavior: "auto"
         });
     };
@@ -631,8 +636,10 @@ var VirtuosoList = /*#__PURE__*/ forwardRef(function(props, ref) {
             p[0].innerText = "复制代码";
         }
     };
-    var onScroll = function() {
-        console.log("滚动滚动");
+    var onWheel = function() {
+        if (recordRef.current.sendingId && recordRef.current.sendingId !== "inputing") {
+            autoScrollBottom.current = false;
+        }
     };
     return /*#__PURE__*/ _jsx("div", {
         className: "".concat(getCls("virtuosoList-wrapper")),
@@ -659,7 +666,7 @@ var VirtuosoList = /*#__PURE__*/ forwardRef(function(props, ref) {
             },
             increaseViewportBy: 200,
             overscan: 10,
-            onScroll: onScroll
+            onWheel: onWheel
         })
     });
 });

package/esm/AIMessageList/type.d.ts

@@ -160,6 +160,7 @@ export type fileStatus =
 export interface footerRefProps {
   setTextValue: (value: string) => void; // 设置输入框的值
   sendMsg: (value: string) => void; // 发送消息
+  refreshSendMsg:(msgId:string,value:string,reference?:any,fileList?:any)=>void;// 刷新消息
   clearText: () => void; // 清空输入框
   getCanSendMsg: () => boolean; //获取当前是否允许发送消息的状态
   stopMessage: () => void; //停止发送消息

package/esm/customerService/index.js

@@ -114,6 +114,7 @@ var CustomerService = function(props) {
     var mid = props.userData.mid;
     var renderAiAnswerTimer = useRef(null);
     var remarkable = new Remarkable({
+        html: true,
         highlight: function highlight(str, lang) {
             if (lang && hljs.getLanguage(lang)) {
                 try {
@@ -128,6 +129,7 @@ var CustomerService = function(props) {
     });
     var remarkReplaceKey = function(message, keyWordProblem) {
         var newRemarkable = new Remarkable({
+            html: true,
             highlight: function highlight(str, lang) {
                 if (lang && hljs.getLanguage(lang)) {
                     try {
@@ -1262,6 +1264,7 @@ var CustomerService = function(props) {
                 console.log("返回中", msg);
                 content = content + msg.message;
                 // isPosition.current = true;
+                clearTimeout(renderAiAnswerTimer.current);
                 renderAiAnswerTimer.current = setTimeout(function() {
                     if (!finishedRef.current) {
                         renderAiAnswer(msg, id, type);

package/package.json

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