bhd-components 0.6.4 → 0.6.6

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;
@@ -261,13 +265,25 @@ 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 (useType === "table") {
+                    try {
+                        let width = bhdSelectRef.current.parentNode.getBoundingClientRect().width + 14;
+                        let minWidth = props.popupMatchSelectWidth;
+                        //设置了最小宽度
+                        if (minWidth != undefined && minWidth >= width) {
+                            setSelectWidth(minWidth);
+                        } else if (minWidth != undefined && minWidth < width) {
+                            setSelectWidth(width);
+                        } else if (minWidth == undefined && width < 60) {
+                            setSelectWidth(60);
+                        } else {
+                            setSelectWidth(width);
+                        }
+                    } catch (error) {}
+                }
                 props.onMouseEnter && props.onMouseEnter(e);
             },
             children: filterChildren

package/es2017/bhdSelect/index.module.less

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

package/es2017/customerService/contactsList.d.ts

@@ -7,7 +7,7 @@ interface data {
     urllocation: String;
     onClose: any;
     switchChatRoom: any;
-    saveContactsList: any;
+    contactsList: any;
     ref: any;
 }
 declare const ContactsList: import("react").ForwardRefExoticComponent<Omit<data, "ref"> & import("react").RefAttributes<unknown>>;

package/es2017/customerService/contactsList.js

@@ -1,116 +1,24 @@
-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 React, { forwardRef } from "react";
 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"; //录音使用文件
 const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
-    let { type , roomId , userData , http , urllocation , onClose , switchChatRoom , saveContactsList  } = props;
-    const [contactsList, setContactsList] = useState([]); //老师列表
-    let timer = useRef(null); //文本框输入时
-    //获取聊天室列表
-    useEffect(()=>{
-        roomsListTimer();
-        return ()=>{
-            clearTimeout(timer.current);
-        };
-    }, []);
-    //  //获取聊天室列表
-    //  useEffect(() => {
-    //   roomsListTimer();
-    // }, [contactsList]);
-    useImperativeHandle(ref, ()=>({
-            roomsListTimer: ()=>{
-                return roomsListTimer();
-            }
-        }));
-    const roomsListTimer = ()=>{
-        if (timer != null) clearTimeout(timer.current);
-        timer.current = setTimeout(()=>roomsListTimer(), 60000);
-        http.get(`${urllocation}/chat-service/public/v1.0/rooms`, {
-            params: {
-                page: 1,
-                maxPageSize: 100002
-            },
-            headers: {
-                "x-module-id": userData.modules.find((ele)=>ele.short == "IntelligentCustomerService").id,
-                "x-auth-jwt": window.localStorage.getItem("usertoken") || ""
-            }
-        }).then((res)=>{
-            if (res.data) {
-                let list = res.data.contacts;
-                setContactsList((contactsList)=>{
-                    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];
-                        }
-                        return _object_spread({}, obj, item);
-                    });
-                    return list;
-                });
-                getUserInfo(list);
-                saveContactsList(list);
-            }
-        });
-    };
+    let { type , roomId , userData , http , urllocation , onClose , switchChatRoom , contactsList  } = props;
+    // useImperativeHandle(ref, () => ({
+    //   roomsListTimer: () => {
+    //     return roomsListTimer();
+    //   },
+    //   roomsList:contactsList,
+    // }),[contactsList]);
     //删除聊天室
     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,
-                "x-auth-jwt": window.localStorage.getItem("usertoken") || ""
-            }
         }).then((res)=>{
-            roomsListTimer();
-        });
-    };
-    //获取老师的信息等
-    const getUserInfo = (list)=>{
-        list.map((item, i)=>{
-            if (!item.name && !item.headImg && item.sender != "AI") {
-                getUserName(item.sender).then((res)=>{
-                    if (res.data) {
-                        let list;
-                        setContactsList((contactsList)=>{
-                            list = contactsList.map((item, index)=>{
-                                if (item.sender == res.data.uid) {
-                                    return _object_spread({}, item, res.data);
-                                } else {
-                                    return item;
-                                }
-                            });
-                            return list;
-                        });
-                        saveContactsList(list);
-                    }
-                });
-            }
-        });
-    };
-    const getUserName = (uid)=>{
-        return http.get(`${urllocation}/chat-service/public/v1.0/userinfo`, {
-            params: {
-                uid: uid
-            },
-            headers: {
-                "x-module-id": userData.modules.find((ele)=>ele.short == "TeacherAnswer").id,
-                "x-auth-jwt": window.localStorage.getItem("usertoken") || ""
-            }
+            // roomsListTimer();
+            switchChatRoom(roomId, '1');
         });
     };
     return type == 2 || type == 4 ? //联系人展开
@@ -121,10 +29,7 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                 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 : ""}`,
-                    onClick: ()=>{
-                        switchChatRoom(contactsList[0].roomId, "");
-                    // roomsListTimer();
-                    },
+                    onClick: ()=>switchChatRoom(contactsList[0].roomId, ""),
                     children: [
                         /*#__PURE__*/ _jsx(CustomAiIcon, {}),
                         /*#__PURE__*/ _jsxs("div", {
@@ -165,25 +70,6 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                             className: `${styles.ai} ${item.roomId != undefined && roomId != "" && item.roomId == roomId ? styles.active : ""}`,
                             onClick: ()=>{
                                 switchChatRoom(item.roomId, "");
-                                // 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", {
@@ -272,26 +158,6 @@ const ContactsList = /*#__PURE__*/ forwardRef((props, ref)=>{
                             className: `${styles.ai} ${item.roomId != undefined && roomId != "" && item.roomId == roomId ? styles.active : ""}`,
                             onClick: ()=>{
                                 switchChatRoom(item.roomId, "");
-                                // 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", {

package/es2017/customerService/function.js

@@ -65,7 +65,7 @@ const getDataTime = (time, type = -1)=>{
         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}`;
+        const currentDateTime = `${year}-${month}-${day} ${hours}:${minutes}`;
         if (type == 1) {
             return `${year}-${month}-${day}`;
         } else if (type == 2) {