bhd-components 0.5.7 → 0.5.8

package/es2017/customerService/contactsList/index.d.ts

@@ -1,13 +1,14 @@
 /// <reference types="react" />
 interface data {
     type: number;
-    roomId: String;
+    roomId: string;
     userData: any;
     http: any;
     urllocation: String;
     onClose: any;
     switchChatRoom: any;
     saveContactsList: any;
+    ref: any;
 }
-declare const ContactsList: (props: data) => JSX.Element;
+declare const ContactsList: import("react").ForwardRefExoticComponent<Omit<data, "ref"> & import("react").RefAttributes<unknown>>;
 export default ContactsList;

package/es2017/customerService/contactsList/index.js

@@ -1,26 +1,40 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { jsx as _jsx, jsxs as _jsxs } from "@ice/jsx-runtime/jsx-runtime";
-import React, { useEffect, useState, useRef } from "react";
+import React, { useEffect, useState, useRef, useImperativeHandle, forwardRef } from "react";
 import styles from "./index.module.less";
 import { CustomAiIcon, CustomRetract } from "../../icons/index";
 import { CloseOutlined } from "@ant-design/icons";
 import { getDataTime } from "../function"; //录音使用文件
-const ContactsList = (props)=>{
+const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
     let { type , roomId , userData , http , urllocation , onClose , switchChatRoom , saveContactsList  } = props;
     const [contactsList, setContactsList] = useState([]); //老师列表
+    const [newRoomId, setNewRoomId] = useState("");
+    const [firstLoading, setFirstLoading] = useState(true);
+    // const [type,setType] = useState(0);
     let timer = useRef(null); //文本框输入时
     //获取聊天室列表
     useEffect(()=>{
-        // if (roomId != "") {
         roomsListTimer();
-        // }
+        if (roomId != '') {
+            setNewRoomId(roomId);
+        }
         return ()=>{
             clearTimeout(timer.current);
         };
     }, []);
+    useImperativeHandle(ref, ()=>({
+            roomsListTimer: ()=>{
+                return roomsListTimer();
+            }
+        }));
+    // useEffect(()=>{
+    //   //重新调用接口
+    //   console.log(44444444,contactsList)
+    //   roomsListTimer();
+    // },[type])
     const roomsListTimer = ()=>{
         if (timer != null) clearTimeout(timer.current);
-        timer.current = setTimeout(()=>roomsListTimer(), 100000);
+        timer.current = setTimeout(()=>roomsListTimer(), 60000);
         http.get(`${urllocation}/chat-service/public/v1.0/rooms`, {
             params: {
                 page: 1,
@@ -33,52 +47,49 @@ const ContactsList = (props)=>{
         }).then((res)=>{
             if (res.data) {
                 let list = res.data.contacts;
-                // let list2 = list.slice(1);
-                let list2 = list;
+                // let newMessage = false;
                 setContactsList((contactsList)=>{
-                    if (contactsList.length > 0 && roomId != '') {
-                        //查找当前聊天室的未读消息
-                        let message = 0;
-                        let messageList = contactsList.filter((item)=>item.id == roomId);
-                        if (messageList.length > 0) {
-                            // console.log(messageList,'messagemessagemessage');
-                            message = messageList[0].unreadCount;
-                        }
-                        let new_message = 0;
-                        if (list.length > 0) {
-                            let new_message_list = list.filter((item)=>item.id == roomId);
-                            if (new_message_list.length > 0) {
-                                console.log(new_message_list, "new_messagenew_messagenew_messagenew_message");
-                                new_message = new_message_list[0].unreadCount;
-                            }
-                        }
-                        // console.log(message,new_message,'lsdlcksdcmsdlkc')
-                        //存在新消息
-                        if (message != new_message) {
-                            console.log("有新消息");
-                            switchChatRoom(roomId, "renew");
+                    list = list.map((item, index)=>{
+                        let c_list = contactsList.filter((e)=>e.sender == item.sender);
+                        let obj = {};
+                        if (c_list.length > 0) {
+                            obj = c_list[0];
                         }
-                    }
-                    list2 = list2.map((item, index)=>{
-                        // if(contactsList[index] != undefined){
-                        return _object_spread({}, item, contactsList[index] || "");
-                    // }else{
-                    //   return item
-                    // }
+                        return _object_spread({}, obj, item);
                     });
-                    return list2;
-                });
-                console.log(list2, "list2list2list2list2");
-                // setAi(res.data.contacts[0]);
-                getUserInfo(list2);
-                //切换到有聊天的窗口
-                list2.forEach((ele)=>{
-                    console.log(ele);
-                    if (ele.unreadCount > 0) {
-                        switchChatRoom(ele.roomId, "");
-                        return;
-                    }
+                    return list;
                 });
+                getUserInfo(list);
+                // if(firstLoading){
+                //   setFirstLoading(false);
+                //   let isRoom = false;
+                //   for (let index = 0; index < list.length; index++) {
+                //     let count = list[index].unreadCount;
+                //     if(count > 0 && list[index].roomId == roomId){
+                //       isRoom = true;
+                //       //在当前窗口
+                //       return null;
+                //     }else if(count > 0){
+                //       isRoom = true;
+                //       switchChatRoom(list[index].roomId, "");
+                //       setContactsList((contactsList)=>{
+                //         let new_list = contactsList;
+                //         new_list = new_list.map((item)=>{
+                //           if(item.roomId == list[index].roomId){
+                //             return {
+                //               ...item,
+                //               unreadCount:0,
+                //             }
+                //           }else{
+                //             return item;
+                //           }
+                //         })
+                //         return new_list;
+                //       })
+                //       return null;
+                //     }
+                //   }
+                // }
                 saveContactsList(list);
             }
         });
@@ -91,14 +102,22 @@ const ContactsList = (props)=>{
                 "x-auth-jwt": window.localStorage.getItem("usertoken") || ""
             }
         }).then((res)=>{
-            console.log(res, "sdcsdcsdc");
-            // roomsList();
             roomsListTimer();
+        // let contactsList;
+        // setContactsList((list)=>{
+        //   contactsList = list.filter(e=>e.roomId != roomId);
+        //   //切换到AI聊天窗口
+        //   if(roomId == props.roomId){
+        //     switchChatRoom(contactsList[0].roomId, "");
+        //   }
+        //   return contactsList;
+        // })
+        // saveContactsList(contactsList);
         });
     };
     //获取老师的信息等
-    const getUserInfo = (list2)=>{
-        list2.map((item, i)=>{
+    const getUserInfo = (list)=>{
+        list.map((item, i)=>{
             if (!item.name && !item.headImg && item.sender != 'AI') {
                 getUserName(item.sender).then((res)=>{
                     if (res.data) {
@@ -130,34 +149,6 @@ const ContactsList = (props)=>{
             }
         });
     };
-    // //获取当前时间
-    // const getDataTime = (time: string | number | Date) => {
-    //   let currentDate;
-    //   if (time != undefined && time != -1) {
-    //     currentDate = new Date(time);
-    //   } else {
-    //     currentDate = new Date();
-    //   }
-    //   const currentYear = currentDate.getFullYear();
-    //   const currentMonth = currentDate.getMonth() + 1; // 月份从0开始，所以要加1
-    //   const currentDay = currentDate.getDate();
-    //   const hour = currentDate.getHours();
-    //   const minute = currentDate.getMinutes();
-    //   const second = currentDate.getSeconds();
-    //   let dataTime =
-    //     currentYear +
-    //     "-" +
-    //     currentMonth +
-    //     "-" +
-    //     currentDay +
-    //     " " +
-    //     hour +
-    //     ":" +
-    //     minute +
-    //     ":" +
-    //     second;
-    //   return dataTime;
-    // };
     return type == 2 || type == 4 ? //联系人展开
     /*#__PURE__*/ _jsxs("div", {
         className: styles.teacher_layout_modal,
@@ -165,9 +156,11 @@ const ContactsList = (props)=>{
             /*#__PURE__*/ _jsx("div", {
                 className: styles.top,
                 children: /*#__PURE__*/ _jsxs("div", {
-                    className: `${styles.ai} ${contactsList.length > 0 && contactsList[0].roomId != undefined && roomId != '' && contactsList[0].roomId == roomId ? styles.active : ""}`,
+                    className: `${styles.ai} ${contactsList.length > 0 && contactsList[0].roomId != undefined && roomId != '' && contactsList[0].roomId == roomId || contactsList.length == 0 ? styles.active : ""}`,
                     onClick: ()=>{
+                        setNewRoomId(contactsList[0].roomId);
                         switchChatRoom(contactsList[0].roomId, "");
+                        roomsListTimer();
                     },
                     children: [
                         /*#__PURE__*/ _jsx(CustomAiIcon, {}),
@@ -193,14 +186,16 @@ const ContactsList = (props)=>{
                     ]
                 })
             }),
-            /*#__PURE__*/ _jsx("div", {
+            userData.modules.some((item)=>item.short == "TeacherAnswer") ? /*#__PURE__*/ _jsx("div", {
                 className: styles.bottom,
                 children: contactsList.map((item, index)=>{
                     if (index != 0) {
                         return /*#__PURE__*/ _jsxs("div", {
                             className: `${styles.ai} ${item.roomId != undefined && roomId != '' && item.roomId == roomId ? styles.active : ""}`,
                             onClick: ()=>{
+                                setNewRoomId(item.roomId);
                                 switchChatRoom(item.roomId, "");
+                                roomsListTimer();
                             },
                             children: [
                                 /*#__PURE__*/ _jsx("img", {
@@ -213,9 +208,9 @@ const ContactsList = (props)=>{
                                             className: styles.message,
                                             children: [
                                                 item.name,
-                                                item.unreadCount != undefined && item.unreadCount > 0 && /*#__PURE__*/ _jsx("span", {
+                                                item.unreadCount != undefined && item.unreadCount > 0 && !(item.roomId != undefined && roomId != '' && item.roomId == roomId) && /*#__PURE__*/ _jsx("span", {
                                                     className: styles.num,
-                                                    children: item.unreadCount
+                                                    children: item.unreadCount > 99 ? '99+' : item.unreadCount
                                                 }),
                                                 /*#__PURE__*/ _jsx("span", {
                                                     className: styles.time,
@@ -235,7 +230,7 @@ const ContactsList = (props)=>{
                         return null;
                     }
                 })
-            })
+            }) : ''
         ]
     }) : /*#__PURE__*/ _jsxs("div", {
         className: `${styles.teacher_layout} ${type == 3 ? styles.teacher_layout_newlabo : ""}`,
@@ -254,14 +249,19 @@ const ContactsList = (props)=>{
                         children: [
                             /*#__PURE__*/ _jsx(CustomRetract, {}),
                             /*#__PURE__*/ _jsx("p", {
+                                style: {
+                                    marginTop: '8px'
+                                },
                                 children: "收起"
                             })
                         ]
                     }),
                     /*#__PURE__*/ _jsxs("div", {
-                        className: `${styles.ai}  ${contactsList.length > 0 && contactsList[0].roomId != undefined && roomId != '' && contactsList[0].roomId == roomId ? styles.active : ""}`,
+                        className: `${styles.ai} ${contactsList.length > 0 && contactsList[0].roomId != undefined && roomId != '' && contactsList[0].roomId == roomId || contactsList.length == 0 ? styles.active : ""}`,
                         onClick: ()=>{
+                            setNewRoomId(contactsList[0].roomId);
                             switchChatRoom(contactsList[0].roomId, "");
+                            roomsListTimer();
                         },
                         children: [
                             /*#__PURE__*/ _jsx(CustomAiIcon, {}),
@@ -272,14 +272,16 @@ const ContactsList = (props)=>{
                     })
                 ]
             }),
-            /*#__PURE__*/ _jsx("div", {
+            userData.modules.some((item)=>item.short == "TeacherAnswer") && /*#__PURE__*/ _jsx("div", {
                 className: styles.bottom,
                 children: contactsList.map((item, index)=>{
                     if (index != 0) {
                         return /*#__PURE__*/ _jsxs("div", {
                             className: `${styles.ai} ${item.roomId != undefined && roomId != '' && item.roomId == roomId ? styles.active : ""}`,
                             onClick: ()=>{
+                                setNewRoomId(item.roomId);
                                 switchChatRoom(item.roomId, "");
+                                roomsListTimer();
                             },
                             children: [
                                 /*#__PURE__*/ _jsx("img", {
@@ -288,11 +290,12 @@ const ContactsList = (props)=>{
                                 /*#__PURE__*/ _jsx("p", {
                                     children: item.name
                                 }),
-                                item.unreadCount != undefined && item.unreadCount > 0 && /*#__PURE__*/ _jsx("span", {
+                                item.unreadCount != undefined && item.unreadCount > 0 && !(item.roomId != undefined && roomId != '' && item.roomId == roomId) && /*#__PURE__*/ _jsx("span", {
                                     className: styles.num,
-                                    children: item.unreadCount
+                                    children: item.unreadCount > 99 ? '99+' : item.unreadCount
                                 }),
-                                /*#__PURE__*/ _jsx("span", {
+                                // 没有消息时，可点击删除
+                                !item.unreadCount && /*#__PURE__*/ _jsx("span", {
                                     className: styles.delete,
                                     onClick: (e)=>{
                                         e.stopPropagation();
@@ -309,5 +312,5 @@ const ContactsList = (props)=>{
             })
         ]
     });
-};
+});
 export default ContactsList;

package/es2017/customerService/contactsList/index.module.less

@@ -1,4 +1,6 @@
 @import "../../theme/variable.less";
+// @color-background-primary-weak-hover:@color-background-info-weak;
+
 //联系人列表
 .teacher_layout {
   position: fixed;
@@ -49,19 +51,17 @@
       border-radius: 26px;
       background-color: #f4523b;
       color: #fff;
-      padding: 2px 5px;
+      padding: 0 5px;
       border-radius: 25px;
       font-size: 12px;
       line-height: 1.2;
     }
-
     .delete {
-      font-size: 18px;
       position: absolute;
-      top: -2px;
-      right: 0;
+      top: 2px;
+      right: 2px;
       color: rgba(0, 0, 0, 0.65);
-      font-size: 14px;
+      font-size: 12px;
       display: none;
     }
   }
@@ -80,7 +80,7 @@
       padding-top: 0;
     }
     &:hover {
-      background-color: #fff;
+      background-color: #fff !important;
     }
   }
   .top .active,
@@ -114,11 +114,16 @@
 }
 .teacher_layout_newlabo {
   top: 50px;
-  right: 0;
-}
+  right: 0; 
+  .top{
+    svg{
+      transform: rotate(180deg);
+    }
+  }
+} 
 .teacher_layout_modal {
   width: 328px;
-  height: 100%;
+  height: calc(100% - 48px);
   background-color: #fff;
   position: absolute;
   border-top: 1px solid @color-border-secondary;
@@ -151,10 +156,10 @@
             border-radius: 26px;
             background-color: #f4523b;
             color: #fff;
-            padding: 2px 5px;
+            padding: 0 5px;
             border-radius: 25px;
             font-size: 12px;
-            line-height: 1.2;
+            line-height: 1;
           }
 
           .time {
@@ -175,9 +180,23 @@
       }
     }
     .active {
-      background: var(--color-background-primary-weak, #fff4f0);
+      background: @color-background-primary-weak-hover;
     }
   }
+  .bottom{
+    overflow: auto;
+    height: calc(100% - 70px);
+  }
+  .bottom::-webkit-scrollbar {
+    background-color: #eaedf1;
+    background-color: transparent;
+    width: 4px;
+    height: 4px;
+  }
+  .bottom::-webkit-scrollbar-thumb {
+    border-radius: 4px;
+    background-color: rgba(0, 0, 0, 0.25);
+  }
 
   :global {
     .anticon {

package/es2017/customerService/function.js

@@ -49,19 +49,24 @@ const copyText = (text)=>{
 };
 //获取当前时间
 const getDataTime = (time)=>{
-    let currentDate;
-    if (time != undefined && time != -1) {
-        currentDate = new Date(time);
-    } else {
-        currentDate = new Date();
+    try {
+        let now;
+        if (time != undefined && time != -1) {
+            now = new Date(time);
+        } else {
+            now = new Date();
+        }
+        // const now = new Date();
+        const year = now.getFullYear();
+        const month = String(now.getMonth() + 1).padStart(2, "0");
+        const day = String(now.getDate()).padStart(2, "0");
+        const hours = String(now.getHours()).padStart(2, "0");
+        const minutes = String(now.getMinutes()).padStart(2, "0");
+        const seconds = String(now.getSeconds()).padStart(2, "0");
+        const currentDateTime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+        return currentDateTime;
+    } catch (error) {
+        return '';
     }
-    const currentYear = currentDate.getFullYear();
-    const currentMonth = currentDate.getMonth() + 1; // 月份从0开始，所以要加1
-    const currentDay = currentDate.getDate();
-    const hour = currentDate.getHours();
-    const minute = currentDate.getMinutes();
-    const second = currentDate.getSeconds();
-    let dataTime = currentYear + "-" + currentMonth + "-" + currentDay + " " + hour + ":" + minute + ":" + second;
-    return dataTime;
 };
 export { readMessage, getByteLen, serverUrl, copyText, getDataTime };

package/es2017/customerService/historyFun/index.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import "highlight.js/styles/default.css";
 interface data {
     type: number;
     roomId: String | number;
@@ -7,7 +8,7 @@ interface data {
     urllocation: String;
     onClose: any;
     loadSpecifiedData: any;
-    roomList: [];
+    roomList: any;
 }
 declare const HistoryFun: (props: data) => JSX.Element;
 export default HistoryFun;