From 868a6441c99934105ef3a867116e8102c7d7db8b Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 15 May 2025 10:22:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=82=AE=E4=BB=B6=E5=88=97=E8=A1=A8;?=
 =?UTF-8?q?=20=E5=9C=A8=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Online/Components/EmailListDrawer.jsx         |  4 ++--
 .../Conversations/Online/MessagesWrapper.jsx      | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/views/Conversations/Online/Components/EmailListDrawer.jsx b/src/views/Conversations/Online/Components/EmailListDrawer.jsx
index beb7609..20eef2b 100644
--- a/src/views/Conversations/Online/Components/EmailListDrawer.jsx
+++ b/src/views/Conversations/Online/Components/EmailListDrawer.jsx
@@ -55,7 +55,7 @@ const EmailListDrawer = ({ showExpandBtn=true, title, list: otherEmailList, curr
       onClickEmailItem(clickItem)
       setOpen(true);
       const itemIndex = dataSource.findIndex((ele) => ele.MAI_SN === clickItem.MAI_SN);
-      const page = Math.ceil(itemIndex / 8) || 1;
+      const page = Math.ceil((itemIndex+1) / 8) || 1;
       setPageCurrent(page);
     }
 
@@ -77,7 +77,7 @@ const EmailListDrawer = ({ showExpandBtn=true, title, list: otherEmailList, curr
       <Drawer
         zIndex={3}
         mask={false}
-        width={900}
+        width={1000}
         styles={{ header: {} }}
         title={
           <>
diff --git a/src/views/Conversations/Online/MessagesWrapper.jsx b/src/views/Conversations/Online/MessagesWrapper.jsx
index b8a37a7..ea975ab 100644
--- a/src/views/Conversations/Online/MessagesWrapper.jsx
+++ b/src/views/Conversations/Online/MessagesWrapper.jsx
@@ -13,6 +13,7 @@ import EmailDetail from './Components/EmailDetail';
 import { useOrderStore, } from "@/stores/OrderStore";
 import { isEmpty } from '@/utils/commons';
 import useStyleStore from '@/stores/StyleStore';
+import EmailListDrawer from './Components/EmailListDrawer';
 
 const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
   const userId = useAuthStore((state) => state.loginUser.userId);
@@ -209,12 +210,21 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
   const [emailDetail, setEmailDetail] = useState({});
   const [initialPosition, setInitialPosition] = useState({})
   const [initialSize, setInitialSize] = useState({})
+  const [emailItem, setEmailItem] = useState({});
 
   const onOpenEmail = (emailMsg) => {
-    setOpenEmailDetail(true);
-    setEmailDetail({...emailMsg, order_opi: Number(orderDetail?.opi_sn || userId)});
+    // setOpenEmailDetail(true);
+    // setEmailDetail({...emailMsg, order_opi: Number(orderDetail?.opi_sn || userId)});
+    setEmailItem({ MAI_SN: emailMsg.msgtext?.email?.mai_sn, MAI_Subject: emailMsg.msgtext?.email?.subject, SenderReceiver: '', MAI_SendDate: '' })
   }
 
+  const [emailList, setEmailList] = useState([]);
+  useEffect(() => {
+    const _emailList = longList.filter(item => item.msg_source === 'email').map(ele => ({...ele, MAI_SN: ele.msgtext?.email?.mai_sn, MAI_Subject: ele.msgtext?.email?.subject, SenderReceiver: ele.from, MAI_SendDate: ele.msgtime, Direction: ele.msg_direction === 'inbound' ? '收' : '发' })).reverse();
+    setEmailList(_emailList);
+    setEmailItem({});
+  }, [longList]);
+
   return (
     <>
       <MessagesList key={`${currentConversationSN}_${currentConversationColiSN}`}
@@ -277,6 +287,7 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
         key={`email-msg-reply-top-popup_${ReferEmailMsg.id}`}
       />
       <EmailDetail open={openEmailDetail} setOpen={setOpenEmailDetail} emailMsg={emailDetail} key={`email-detail-${emailDetail.id}`} {...{initialPosition, initialSize, setInitialPosition, setInitialSize}} />
+      <EmailListDrawer showExpandBtn={false} list={emailList} emailItem={emailItem} currentConversationID={currentConversation.sn} oid={currentConversation.coli_sn} opi_sn={currentConversation.opi_sn} />
     </>
   )
 };