bhd-components 0.6.2 → 0.6.3

package/es2017/bhdSelect/index.d.ts

@@ -22,6 +22,9 @@ interface BhdSelectProps extends SelectProps {
     useType?: string;
     listHeight?: number;
     popupMatchSelectWidth?: number;
+    dropdownStyle?: {
+        width: number;
+    };
 }
 declare const BhdSelect: {
     (props: BhdSelectProps): React.JSX.Element;

package/es2017/bhdSelect/index.js

@@ -26,7 +26,7 @@ const BhdSelect = (props)=>{
     const [optionHei, setOptionHei] = useState(0); //option的宽度
     const [filterValue, setFilterValue] = useState(""); //下拉搜索的内容
     const [filterChildren, setfilterChildren] = useState([]);
-    // const [selectWidth,setSelectWidth] = useState(0);//下拉框的宽度
+    const [selectWidth, setSelectWidth] = useState(0); //下拉框的宽度
     const renderSuffixIcon = ()=>{
         switch(arrowType){
             case "table":
@@ -197,11 +197,11 @@ const BhdSelect = (props)=>{
     };
     useEffect(()=>{
         // console.log(34343434,props);
-        // if(props.popupMatchSelectWidth){
-        //   setSelectWidth(props.popupMatchSelectWidth);
-        // }else{
-        //   // console.log(bhdSelectRef.current.getBoundingClientRect(),555555555);
-        // }
+        if (props.popupMatchSelectWidth) {
+            setSelectWidth(props.popupMatchSelectWidth);
+        } else {
+        // console.log(bhdSelectRef.current.getBoundingClientRect(),555555555);
+        }
         filterOption();
         window.addEventListener("resize", initHeight);
         return ()=>{
@@ -217,7 +217,11 @@ const BhdSelect = (props)=>{
         let config = _object_spread_props(_object_spread({}, props), {
             listHeight: optionHei,
             popupClassName: `${styles.bhdSelect_option} ${popupClassName || ""} `,
-            suffixIcon: suffixIcon ? suffixIcon : renderSuffixIcon()
+            suffixIcon: suffixIcon ? suffixIcon : renderSuffixIcon(),
+            popupMatchSelectWidth: selectWidth,
+            dropdownStyle: _object_spread_props(_object_spread({}, props.dropdownStyle), {
+                width: selectWidth
+            })
         });
         delete config.mask;
         delete config.className;
@@ -262,12 +266,13 @@ const BhdSelect = (props)=>{
                 }
                 //表格中使用下拉列表，定义下拉列表宽度
                 // console.log(props.dropdownStyle,'sdsddfdfdf');
-                // if(props.dropdownStyle != undefined && props.dropdownStyle.width != undefined){
-                //   setSelectWidth(props.dropdownStyle.width)
-                // }else if( (props.dropdownStyle == undefined || props.dropdownStyle.width == undefined) && useType === 'table'){
-                //   console.log(bhdSelectRef.current.parentNode.getBoundingClientRect().width-4,33333);
-                //   setSelectWidth(bhdSelectRef.current.parentNode.getBoundingClientRect().width-4)
-                // }
+                if (props.dropdownStyle != undefined && props.dropdownStyle.width != undefined) {
+                    setSelectWidth(props.dropdownStyle.width);
+                } else if ((props.dropdownStyle == undefined || props.dropdownStyle.width == undefined) && useType === 'table') {
+                    try {
+                        setSelectWidth(bhdSelectRef.current.parentNode.getBoundingClientRect().width + 14);
+                    } catch (error) {}
+                }
                 props.onMouseEnter && props.onMouseEnter(e);
             },
             children: filterChildren

package/es2017/bhdSelect/index.module.less

@@ -105,10 +105,13 @@
             width: 14px;
             .bhd-btn {
               border: none;
-              height: 10px;
+              height: 16px;
               line-height: 16px;
               width: 14px;
             }
+            .bhd-btn-default{
+              box-shadow: none !important;
+            }
           }
           
         }

package/es2017/customerService/{contactsList/index.js → contactsList.js}

@@ -1,36 +1,32 @@
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { jsx as _jsx, jsxs as _jsxs } from "@ice/jsx-runtime/jsx-runtime";
 import React, { useEffect, useState, useRef, useImperativeHandle, forwardRef } from "react";
 import styles from "./index.module.less";
-import { CustomAiIcon, CustomRetract } from "../../icons/index";
+import { Tooltip } from "antd";
+import { CustomAiIcon, CustomRetract } from "../icons/index";
 import { CloseOutlined } from "@ant-design/icons";
-import { getDataTime } from "../function"; //录音使用文件
+import { getDataTime, getByteLen } from "./function"; //录音使用文件
 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 [type,setType] = useState(0);
     let timer = useRef(null); //文本框输入时
     //获取聊天室列表
     useEffect(()=>{
         roomsListTimer();
-        if (roomId != '') {
-            setNewRoomId(roomId);
-        }
         return ()=>{
             clearTimeout(timer.current);
         };
     }, []);
+    //  //获取聊天室列表
+    //  useEffect(() => {
+    //   roomsListTimer();
+    // }, [contactsList]);
     useImperativeHandle(ref, ()=>({
             roomsListTimer: ()=>{
                 return roomsListTimer();
             }
         }));
-    // useEffect(()=>{
-    //   //重新调用接口
-    //   console.log(44444444,contactsList)
-    //   roomsListTimer();
-    // },[type])
     const roomsListTimer = ()=>{
         if (timer != null) clearTimeout(timer.current);
         timer.current = setTimeout(()=>roomsListTimer(), 60000);
@@ -46,7 +42,6 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
         }).then((res)=>{
             if (res.data) {
                 let list = res.data.contacts;
-                // let newMessage = false;
                 setContactsList((contactsList)=>{
                     list = list.map((item, index)=>{
                         let c_list = contactsList.filter((e)=>e.sender == item.sender);
@@ -59,42 +54,22 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                     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);
             }
         });
     };
     //删除聊天室
     const deleteRoom = (roomId)=>{
+        let contactsList;
+        setContactsList((list)=>{
+            contactsList = list.filter((e)=>e.roomId != roomId);
+            //切换到AI聊天窗口
+            if (roomId == props.roomId) {
+                switchChatRoom(contactsList[0].roomId, "");
+            }
+            saveContactsList(contactsList);
+            return contactsList;
+        });
         http.delete(`${urllocation}/chat-service/public/v1.0/rooms/${roomId}`, {
             headers: {
                 "x-module-id": userData.modules.find((ele)=>ele.short == "IntelligentCustomerService").id,
@@ -102,22 +77,12 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
             }
         }).then((res)=>{
             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 = (list)=>{
         list.map((item, i)=>{
-            if (!item.name && !item.headImg && item.sender != 'AI') {
+            if (!item.name && !item.headImg && item.sender != "AI") {
                 getUserName(item.sender).then((res)=>{
                     if (res.data) {
                         let list;
@@ -150,16 +115,15 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
     };
     return type == 2 || type == 4 ? //联系人展开
     /*#__PURE__*/ _jsxs("div", {
-        className: styles.teacher_layout_modal,
+        className: `${styles.teacher_layout_modal} ${type == 4 ? styles.teacher_layout_modal_newlabo : ""}`,
         children: [
             /*#__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 || contactsList.length == 0 ? 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();
+                    // roomsListTimer();
                     },
                     children: [
                         /*#__PURE__*/ _jsx(CustomAiIcon, {}),
@@ -172,7 +136,7 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                                         "AI助手",
                                         /*#__PURE__*/ _jsx("span", {
                                             className: styles.time,
-                                            children: contactsList.length > 0 && getDataTime(contactsList[0].createdAt)
+                                            children: contactsList.length > 0 && contactsList[0].createdAt != undefined && getDataTime(contactsList[0].createdAt)
                                         })
                                     ]
                                 }),
@@ -189,12 +153,37 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                 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 : ""}`,
+                            className: `${styles.ai} ${item.roomId != undefined && roomId != "" && item.roomId == roomId ? styles.active : ""}`,
                             onClick: ()=>{
-                                setNewRoomId(item.roomId);
                                 switchChatRoom(item.roomId, "");
-                                roomsListTimer();
+                                // roomsListTimer();
+                                let newList = [];
+                                setContactsList((list)=>{
+                                    newList = list;
+                                    newList = newList.map((v)=>{
+                                        if (v.roomId == item.roomId) {
+                                            return _object_spread_props(_object_spread({}, v), {
+                                                unreadCount: 0
+                                            });
+                                        } else {
+                                            return v;
+                                        }
+                                    });
+                                    return newList;
+                                });
+                                // console.log(newList,9999999999)
+                                setTimeout(()=>{
+                                    saveContactsList(newList);
+                                }, 100);
                             },
                             children: [
                                 /*#__PURE__*/ _jsx("img", {
@@ -206,10 +195,15 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                                         /*#__PURE__*/ _jsxs("p", {
                                             className: styles.message,
                                             children: [
-                                                item.name,
-                                                item.unreadCount != undefined && item.unreadCount > 0 && !(item.roomId != undefined && roomId != '' && item.roomId == roomId) && /*#__PURE__*/ _jsx("span", {
+                                                item.name != undefined && getByteLen(item.name) >= 20 ? /*#__PURE__*/ _jsx(Tooltip, {
+                                                    overlayClassName: `${styles.popover_main_content_name}`,
+                                                    title: item.name,
+                                                    placement: "top",
+                                                    children: item.name
+                                                }) : item.name,
+                                                item.unreadCount != undefined && item.unreadCount > 0 && !(item.roomId != undefined && roomId != "" && item.roomId == roomId) && /*#__PURE__*/ _jsx("span", {
                                                     className: styles.num,
-                                                    children: item.unreadCount > 99 ? '99+' : item.unreadCount
+                                                    children: item.unreadCount > 99 ? "99+" : item.unreadCount
                                                 }),
                                                 /*#__PURE__*/ _jsx("span", {
                                                     className: styles.time,
@@ -229,7 +223,7 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                         return null;
                     }
                 })
-            }) : ''
+            }) : ""
         ]
     }) : /*#__PURE__*/ _jsxs("div", {
         className: `${styles.teacher_layout} ${type == 3 ? styles.teacher_layout_newlabo : ""}`,
@@ -249,18 +243,17 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                             /*#__PURE__*/ _jsx(CustomRetract, {}),
                             /*#__PURE__*/ _jsx("p", {
                                 style: {
-                                    marginTop: '8px'
+                                    marginTop: "8px"
                                 },
                                 children: "收起"
                             })
                         ]
                     }),
                     /*#__PURE__*/ _jsxs("div", {
-                        className: `${styles.ai} ${contactsList.length > 0 && contactsList[0].roomId != undefined && roomId != '' && contactsList[0].roomId == roomId || contactsList.length == 0 ? 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();
+                        // roomsListTimer();
                         },
                         children: [
                             /*#__PURE__*/ _jsx(CustomAiIcon, {}),
@@ -276,22 +269,45 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                 children: contactsList.map((item, index)=>{
                     if (index != 0) {
                         return /*#__PURE__*/ _jsxs("div", {
-                            className: `${styles.ai} ${item.roomId != undefined && roomId != '' && item.roomId == roomId ? styles.active : ""}`,
+                            className: `${styles.ai} ${item.roomId != undefined && roomId != "" && item.roomId == roomId ? styles.active : ""}`,
                             onClick: ()=>{
-                                setNewRoomId(item.roomId);
                                 switchChatRoom(item.roomId, "");
-                                roomsListTimer();
+                                // roomsListTimer();
+                                //消息更改为已读
+                                let newList = [];
+                                setContactsList((list)=>{
+                                    newList = list;
+                                    newList = newList.map((v)=>{
+                                        if (v.roomId == item.roomId) {
+                                            return _object_spread_props(_object_spread({}, v), {
+                                                unreadCount: 0
+                                            });
+                                        } else {
+                                            return v;
+                                        }
+                                    });
+                                    return newList;
+                                });
+                                // console.log(newList,9999999999)
+                                setTimeout(()=>{
+                                    saveContactsList(newList);
+                                }, 100);
                             },
                             children: [
                                 /*#__PURE__*/ _jsx("img", {
                                     src: item.headImg
                                 }),
                                 /*#__PURE__*/ _jsx("p", {
-                                    children: item.name
+                                    children: item.name != undefined && getByteLen(item.name) >= 10 ? /*#__PURE__*/ _jsx(Tooltip, {
+                                        overlayClassName: styles.popover_main_content_name,
+                                        title: item.name,
+                                        placement: "top",
+                                        children: item.name
+                                    }) : item.name
                                 }),
-                                item.unreadCount != undefined && item.unreadCount > 0 && !(item.roomId != undefined && roomId != '' && item.roomId == roomId) && /*#__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 > 99 ? '99+' : item.unreadCount
+                                    children: item.unreadCount > 99 ? "99+" : item.unreadCount
                                 }),
                                 // 没有消息时，可点击删除
                                 !item.unreadCount && /*#__PURE__*/ _jsx("span", {

package/es2017/customerService/function.d.ts

@@ -13,5 +13,5 @@ declare const readMessage: (roomId: number | string, urllocation: any, userData:
 declare const getByteLen: (val: string) => number;
 declare const serverUrl: () => string;
 declare const copyText: (text: string) => boolean;
-declare const getDataTime: (time: string | number | Date) => string;
+declare const getDataTime: (time: string | number | Date, type?: number) => string;
 export { readMessage, getByteLen, serverUrl, copyText, getDataTime };

package/es2017/customerService/function.js

@@ -48,7 +48,9 @@ const copyText = (text)=>{
     return true;
 };
 //获取当前时间
-const getDataTime = (time)=>{
+const getDataTime = (time, type = -1)=>{
+    //type = 1 ,获取当前年月日
+    //type = 2 ,只显示十 分
     try {
         let now;
         if (time != undefined && time != -1) {
@@ -64,7 +66,13 @@ const getDataTime = (time)=>{
         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;
+        if (type == 1) {
+            return `${year}-${month}-${day}`;
+        } else if (type == 2) {
+            return `${hours}:${minutes}`;
+        } else {
+            return currentDateTime;
+        }
     } catch (error) {
         return '';
     }

package/es2017/customerService/{historyFun/index.d.ts → historyFun.d.ts}

@@ -8,7 +8,6 @@ interface data {
     urllocation: String;
     onClose: any;
     loadSpecifiedData: any;
-    roomList: any;
 }
 declare const HistoryFun: (props: data) => JSX.Element;
 export default HistoryFun;

package/es2017/customerService/{historyFun/index.js → historyFun.js}

@@ -5,46 +5,75 @@ import React, { useEffect, useState, useRef } from "react";
 import styles from "./index.module.less";
 import "highlight.js/styles/default.css";
 import { Input } from "antd";
-import { CustomClose } from "../../icons/index";
+import { CustomClose } from "../icons/index";
 import { SearchOutlined } from "@ant-design/icons";
-import { getDataTime } from "../function"; //录音使用文件
+import { getDataTime } from "./function"; //录音使用文件
 const HistoryFun = (props)=>{
-    let { type , roomId , userData , http , urllocation , onClose , loadSpecifiedData , roomList  } = props;
+    let { type , roomId , userData , http , urllocation , onClose , loadSpecifiedData  } = props;
     const [keyWordProblem, setKeyWordProblem] = useState(""); //搜索内容
     const [keyHistoryMessageList, setKeyHistoryMessageList] = useState([]); //搜索的历史记录
     const [showLoadingState, setShowLoadingState] = useState(1); //1，初始状态，2、无数据 ，3、不显示图片
+    const [pageNum, setPageNum] = useState(1);
+    const [pageCount, setPageCount] = useState(0);
     const [load, setLoad] = useState(false);
     const timer = useRef(null); //文本框输入时
     const objName = useRef([]);
+    // useEffect(() => {
+    //   function handleScroll() {
+    //     const container = document.getElementById('history_list');
+    //     const scrollTop = container.scrollTop;
+    //     const clientHeight = container.clientHeight;
+    //     const scrollHeight = container.scrollHeight;
+    //     // console.log(scrollTop,clientHeight,scrollHeight,'333dfkvmdfv')
+    //     // if((clientHeight + scrollTop + 10) >= scrollHeight && pageCount > pageNum && pageCount > 0){
+    //     //   // console.log(11111111,pageNumHistory)
+    //     //   let number = pageNum + 1;
+    //     //   console.log('到底部了22222',number)
+    //     //   setPageNum((pageNum) => {
+    //     //     return pageNum + 1;
+    //     //   });
+    //     //   getKeyHistoryMessage(keyWordProblem,number);
+    //     // }
+    //   }
+    //   const content = document.getElementById('history_list');
+    //   if (content) {
+    //     content.addEventListener("scroll", handleScroll);
+    //   }
+    //   return () => {
+    //     const content = document.getElementById('history_list');
+    //     if (content) {
+    //       content.removeEventListener("scroll", handleScroll);
+    //     }
+    //   };
+    // }, [keyHistoryMessageList]);
     useEffect(()=>{
         setKeyHistoryMessageList((list)=>{
-            console.log(objName, 4444455555);
             let newList = list.map((item)=>{
                 let name = '';
                 let nameList = objName.current.filter((a)=>a.id == item.receiver);
                 if (nameList.length > 0) {
                     name = nameList[0].name;
                 }
-                console.log(name, 77777);
                 return _object_spread_props(_object_spread({}, item), {
                     name: name
                 });
             });
-            console.log(newList, 4444444444);
             return newList;
         });
     }, [
         load
     ]);
     //获取搜索中的历史消息记录
-    const getKeyHistoryMessage = (keyWordProblem)=>{
+    const getKeyHistoryMessage = (keyWordProblem, page = 1)=>{
         if (roomId == "") return;
+        setLoad(false);
+        setKeyHistoryMessageList([]);
         return http.get(`${urllocation}/chat-service/public/v1.0/history-messages`, {
             params: {
                 roomId: "",
                 message: keyWordProblem,
-                page: 1,
-                maxPageSize: 300,
+                page: page,
+                maxPageSize: 1000,
                 direction: "desc"
             },
             headers: {
@@ -52,11 +81,16 @@ const HistoryFun = (props)=>{
                 "x-auth-jwt": window.localStorage.getItem("usertoken") || ""
             }
         }).then((res)=>{
-            console.log(res.data, 3434378);
             if (res.data.messages.length > 0) {
+                let total = res.data.total;
+                let maxPageSize = 20;
+                setPageCount(Math.ceil(total / maxPageSize));
                 setShowLoadingState(3);
                 let dataList = res.data.messages;
-                setKeyHistoryMessageList(dataList);
+                setKeyHistoryMessageList((list)=>{
+                    let newList = list.concat(dataList);
+                    return newList;
+                });
                 getUserName(dataList);
             } else {
                 // setKeyHistoryMessageList([]);
@@ -87,7 +121,7 @@ const HistoryFun = (props)=>{
         return pageNumber;
     };
     //根据index,计算历史数据在第几页
-    const calculationData = (roomId, index, id, receiver)=>{
+    const calculationData = (roomId, id, receiver)=>{
         allData(roomId).then((res)=>{
             // console.log(res.data.messages,'11111111')
             if (res.data) {
@@ -101,7 +135,10 @@ const HistoryFun = (props)=>{
                     }
                 });
                 const pageNumber = findPageNumber(30, Math.ceil(total / 30), number);
-                console.log(roomId, pageNumber, id, "第几页第几页第几页第几页第几页第几页");
+                // console.log(
+                //   roomId, pageNumber, id,
+                //   "第几页第几页第几页第几页第几页第几页"
+                // );
                 loadSpecifiedData(roomId, pageNumber, id, receiver);
                 onClose();
                 setKeyWordProblem("");
@@ -201,6 +238,7 @@ const HistoryFun = (props)=>{
                 }),
                 /*#__PURE__*/ _jsxs("div", {
                     className: styles.main_list,
+                    id: "history_list",
                     children: [
                         showLoadingState == 1 && /*#__PURE__*/ _jsxs("div", {
                             className: styles.no_data,
@@ -239,11 +277,19 @@ const HistoryFun = (props)=>{
                             } else {
                                 name = item.name;
                             }
+                            let time = '';
+                            let currentTime = getDataTime(-1, 1); //当前时间
+                            let updatedAt = getDataTime(item.updatedAt, 1);
+                            if (currentTime == updatedAt) {
+                                time = getDataTime(item.updatedAt, 2);
+                            } else {
+                                time = getDataTime(item.updatedAt);
+                            }
                             return /*#__PURE__*/ _jsxs("div", {
                                 className: styles.list,
                                 onClick: ()=>{
-                                    let id = item.receiver == userData.mid ? item.sender : item.receiver;
-                                    calculationData(item.roomId, item.messageIdWithinRoom, id, item.receiver);
+                                    let id = item.receiver; // == userData.mid ? item.sender : item.receiver
+                                    calculationData(item.roomId, item.id, id);
                                 },
                                 children: [
                                     /*#__PURE__*/ _jsxs("div", {
@@ -254,7 +300,7 @@ const HistoryFun = (props)=>{
                                             }),
                                             /*#__PURE__*/ _jsx("span", {
                                                 className: styles.time,
-                                                children: getDataTime(item.updatedAt)
+                                                children: time
                                             })
                                         ]
                                     }),

package/es2017/customerService/index.d.ts

@@ -7,9 +7,9 @@ interface Service {
     onCancel?: () => {};
     serverName?: string;
     fetchEventSource?: any;
-    initShowType?: string | number;
-    stepIds: string;
-    stepId: string | number;
+    initShowType?: number;
+    stepIds?: string;
+    stepId?: string | number;
     onEvent: (a: string, b: string, c: string) => {};
 }
 declare const CustomerService: (props: Service) => JSX.Element;