bhd-components 0.7.20 → 0.7.22

package/es2017/customerService/contactsList.js

@@ -4,19 +4,12 @@ import styles from "./index.module.less";
 import { Tooltip } from "antd";
 import { CustomAiIcon, CustomRetract } from "../icons/index";
 import { CloseOutlined } from "@ant-design/icons";
-import { getDataTime, getByteLen } from "./function"; //录音使用文件
+import { getByteLen, formatDate } from "./function"; //录音使用文件
 const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
     let { type , roomId , userData , http , urllocation , onClose , switchChatRoom , contactsList  } = props;
-    // useImperativeHandle(ref, () => ({
-    //   roomsListTimer: () => {
-    //     return roomsListTimer();
-    //   },
-    //   roomsList:contactsList,
-    // }),[contactsList]);
     //删除聊天室
     const deleteRoom = (roomId)=>{
-        http.delete(`${urllocation}/chat-service/public/v1.0/rooms/${roomId}`, {
-        }).then((res)=>{
+        http.delete(`${urllocation}/chat-service/public/v1.0/rooms/${roomId}`, {}).then((res)=>{
             // roomsListTimer();
             switchChatRoom(roomId, '1');
         });
@@ -41,7 +34,7 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                                         userData.modules.some((ele)=>ele.short == "AIservice") ? "AI助手" : "智能问答",
                                         /*#__PURE__*/ _jsx("span", {
                                             className: styles.time,
-                                            children: contactsList.length > 0 && contactsList[0].createdAt != undefined && getDataTime(contactsList[0].createdAt)
+                                            children: contactsList.length > 0 && contactsList[0].createdAt != undefined && formatDate(contactsList[0].createdAt)
                                         })
                                     ]
                                 }),
@@ -54,18 +47,10 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                     ]
                 })
             }),
-            userData.modules.some((item)=>item.short == "TeacherAnswer") ? /*#__PURE__*/ _jsx("div", {
+            userData.modules.some((item)=>item.short == "TeacherAnswer") && /*#__PURE__*/ _jsx("div", {
                 className: styles.bottom,
                 children: contactsList.map((item, index)=>{
                     if (index != 0) {
-                        let time = '';
-                        let currentTime = getDataTime(-1, 1); //当前时间
-                        let updatedAt = getDataTime(item.createdAt, 1);
-                        if (currentTime == updatedAt) {
-                            time = getDataTime(item.createdAt, 2);
-                        } else {
-                            time = getDataTime(item.createdAt);
-                        }
                         return /*#__PURE__*/ _jsxs("div", {
                             className: `${styles.ai} ${item.roomId != undefined && roomId != "" && item.roomId == roomId ? styles.active : ""}`,
                             onClick: ()=>{
@@ -93,7 +78,7 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                                                 }),
                                                 /*#__PURE__*/ _jsx("span", {
                                                     className: styles.time,
-                                                    children: getDataTime(item.createdAt)
+                                                    children: formatDate(item.createdAt)
                                                 })
                                             ]
                                         }),
@@ -109,7 +94,7 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                         return null;
                     }
                 })
-            }) : ""
+            })
         ]
     }) : /*#__PURE__*/ _jsxs("div", {
         className: `${styles.teacher_layout} ${type == 3 ? styles.teacher_layout_newlabo : ""}`,

package/es2017/customerService/function.d.ts

@@ -19,4 +19,6 @@ declare const getQuery: (name: string) => string;
 declare const findParent: (e: any, className: string) => any;
 declare const delegate: (element: any, eventType: string, selector: string, callback: any) => void;
 declare const getBase64Image: (src: any) => Promise<unknown>;
-export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image };
+declare const formatDate: (dateStr: any) => any;
+declare const urlToBase64: (url: string) => Promise<unknown>;
+export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image, formatDate, urlToBase64 };

package/es2017/customerService/function.js

@@ -133,4 +133,48 @@ const getBase64Image = (src)=>{
         };
     });
 };
-export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image };
+const formatDate = (dateStr)=>{
+    const today = new Date();
+    const date = new Date(dateStr);
+    const dayDiff = Math.ceil((today - date) / (1000 * 60 * 60 * 24)); // 计算天数差
+    // console.log(dayDiff,'dayDiffdayDiff',today,'___',date);
+    if (dayDiff === 0 || dayDiff === 1) {
+        // 今天
+        return date.toLocaleTimeString('zh-CN', {
+            hour12: false
+        }).substring(0, 5);
+    } else if (dayDiff <= 7) {
+        // 一周内
+        return date.toLocaleString('zh-CN', {
+            weekday: 'short'
+        }).replace('周', '星期');
+    } else {
+        // 超过一周
+        return date.toLocaleDateString('zh-CN');
+    }
+};
+const urlToBase64 = (url)=>{
+    return new Promise((resolve)=>{
+        const image = new Image();
+        // 先设置图片跨域属性
+        image.crossOrigin = 'Anonymous';
+        // 再给image赋值src属性，先后顺序不能颠倒
+        image.src = url;
+        image.onload = function() {
+            const canvas = document.createElement('CANVAS');
+            // 设置canvas宽高等于图片实际宽高
+            canvas.width = image.width;
+            canvas.height = image.height;
+            canvas.getContext('2d').drawImage(image, 0, 0);
+            // toDataUrl可以接收2个参数，参数一：图片类型，参数二： 图片质量0-1（不传默认为0.92）
+            const dataURL = canvas.toDataURL('image/jpeg');
+            resolve(dataURL);
+        };
+        image.onerror = ()=>{
+            resolve({
+                message: '相片处理失败'
+            });
+        };
+    });
+};
+export { readMessage, getByteLen, serverUrl, copyText, getDataTime, getQuery, resetStyles, findParent, delegate, getBase64Image, formatDate, urlToBase64 };

package/es2017/customerService/historyFun.js

@@ -7,7 +7,7 @@ import "highlight.js/styles/default.css";
 import { Input } from "antd";
 import { CustomClose, CustomExpand, CustomAiIcon } from "../icons/index";
 import { SearchOutlined } from "@ant-design/icons";
-import { getDataTime } from "./function"; //录音使用文件
+import { formatDate } from "./function"; //录音使用文件
 const HistoryFun = (props)=>{
     let { type , roomId , userData , http , urllocation , onClose , loadSpecifiedData  } = props;
     const [keyWordProblem, setKeyWordProblem] = useState(""); //搜索内容
@@ -55,13 +55,11 @@ const HistoryFun = (props)=>{
                 maxPageSize: maxPageSize
             }
         }).then((res)=>{
-            console.log(res, 7777779999);
             let data = res.data;
             if (data.total > 0) {
                 setShowLoadingState(3);
                 let list = data.messageHistories;
                 setPageCount(Math.ceil(data.total / maxPageSize));
-                // setTotalData(totalData.concat(list));
                 setTotalData((list1)=>{
                     let new_list = list1;
                     new_list = new_list.concat(list);
@@ -350,25 +348,23 @@ const HistoryFun = (props)=>{
                                 let span = "";
                                 let time = "";
                                 if (item.count == 1) {
+                                    let message = item.message;
+                                    let position_i = message.indexOf(keyWordProblem);
+                                    if (position_i > 30) {
+                                        message = message.substring(position_i - 15);
+                                    }
                                     let reg = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
                                     //搜索内容是否有特殊字符
                                     if (reg.test(keyWordProblem)) {
-                                        span = item.message.replaceAll(keyWordProblem, (e)=>{
+                                        span = message.replaceAll(keyWordProblem, (e)=>{
                                             return `<span class=${styles.sign}>${e}</span>`;
                                         });
                                     } else {
-                                        span = item.message.replaceAll(new RegExp(keyWordProblem, "ig"), (i)=>{
-                                            // console.log(i,'skdcnsdjk')
+                                        span = message.replaceAll(new RegExp(keyWordProblem, "ig"), (i)=>{
                                             return `<span class=${styles.sign}>${i}</span>`;
                                         });
                                     }
-                                    let currentTime = getDataTime(-1, 1); //当前时间
-                                    let createdAt = getDataTime(item.createdAt, 1);
-                                    if (currentTime == createdAt) {
-                                        time = getDataTime(item.createdAt, 2);
-                                    } else {
-                                        time = getDataTime(item.createdAt);
-                                    }
+                                    time = formatDate(item.createdAt);
                                 }
                                 return /*#__PURE__*/ _jsxs(_Fragment, {
                                     children: [
@@ -435,23 +431,21 @@ const HistoryFun = (props)=>{
                                                     } else {
                                                         name = userData.real_name;
                                                     }
-                                                    let time = "";
-                                                    let currentTime = getDataTime(-1, 1); //当前时间
-                                                    let updatedAt = getDataTime(list.updatedAt, 1);
-                                                    if (currentTime == updatedAt) {
-                                                        time = getDataTime(list.updatedAt, 2);
-                                                    } else {
-                                                        time = getDataTime(list.updatedAt);
-                                                    }
+                                                    let time = formatDate(list.updatedAt);
                                                     let reg = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@#￥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、]/im;
                                                     let span = '';
+                                                    let message = list.message;
+                                                    let position_i = message.indexOf(keyWordProblem);
+                                                    if (position_i > 30) {
+                                                        message = message.substring(position_i - 15);
+                                                    }
                                                     //搜索内容是否有特殊字符
                                                     if (reg.test(keyWordProblem)) {
-                                                        span = list.message.replaceAll(keyWordProblem, (e)=>{
+                                                        span = message.replaceAll(keyWordProblem, (e)=>{
                                                             return `<span class=${styles.sign}>${e}</span>`;
                                                         });
                                                     } else {
-                                                        span = list.message.replaceAll(new RegExp(keyWordProblem, "ig"), (i)=>{
+                                                        span = message.replaceAll(new RegExp(keyWordProblem, "ig"), (i)=>{
                                                             // console.log(i,'skdcnsdjk')
                                                             return `<span class=${styles.sign}>${i}</span>`;
                                                         });