From 2b97b7aea72d6b899970ff6618855f24c13464bd Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 19 Mar 2024 15:16:17 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/ConversationsList.jsx          | 12 +++++-
 .../Components/Input/Template.jsx             | 39 ++++++++++---------
 .../Components/MessagesWrapper.jsx            |  2 +-
 src/views/Conversations/Conversations.css     |  3 ++
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/views/Conversations/Components/ConversationsList.jsx b/src/views/Conversations/Components/ConversationsList.jsx
index 83c0736..0631632 100644
--- a/src/views/Conversations/Components/ConversationsList.jsx
+++ b/src/views/Conversations/Components/ConversationsList.jsx
@@ -18,8 +18,7 @@ const Conversations = ({ mobile }) => {
   const navigate = useNavigate();
   const userId = useAuthStore((state) => state.loginUser.userId);
   const initialState = useConversationStore((state) => state.initialState);
-  const activeConversations = useConversationStore((state) => state.activeConversations);
-  const [currentConversation, setCurrentConversation, updateCurrentConversation] = useConversationStore((state) => [state.currentConversation, state.setCurrentConversation, state.updateCurrentConversation]);
+  const [currentConversation, setCurrentConversation] = useConversationStore((state) => [state.currentConversation, state.setCurrentConversation]);
   const conversationsList = useConversationStore((state) => state.conversationsList);
   const addToConversationList = useConversationStore((state) => state.addToConversationList);
   const delConversationitem = useConversationStore((state) => state.delConversationitem);
@@ -27,6 +26,15 @@ const Conversations = ({ mobile }) => {
   const [tabSelectedConversation, setTabSelectedConversation] = useState({});
   const [tabCnt, setTabCnt] = useState(-1);
 
+  useEffect(() => {
+    if (mobile !== undefined) {
+      setCurrentConversation({});
+    }
+
+    return () => {};
+  }, [])
+
+
   const [dataSource, setDataSource] = useState(conversationsList);
   useEffect(() => {
     setDataSource(conversationsList);
diff --git a/src/views/Conversations/Components/Input/Template.jsx b/src/views/Conversations/Components/Input/Template.jsx
index acf417c..18fc013 100644
--- a/src/views/Conversations/Components/Input/Template.jsx
+++ b/src/views/Conversations/Components/Input/Template.jsx
@@ -126,23 +126,26 @@ const InputTemplate = ({ mobile, disabled = false, invokeSendMessage }) => {
   return (
     <>
       <Popover
-        overlayClassName={[mobile === undefined ? 'w-3/5' : 'w-full'].join(' ')}
+        overlayClassName={[mobile === undefined ? 'w-3/5' : 'w-full max-h-full'].join(' ')}
         fresh
         forceRender
         destroyTooltipOnHide={true}
         content={
           <>
-            <Input.Search
-              ref={searchInputRef}
-              onSearch={handleSearchTemplates}
-              allowClear
-              value={searchContent}
-              onChange={(e) => {
-                setSearchContent(e.target.value);
-                handleSearchTemplates(e.target.value);
-              }}
-              placeholder='搜索名称'
-            />
+            <div className='flex justify-between mt-2 gap-4 content-center'>
+              <Input.Search prefix={'🙋'}
+                ref={searchInputRef}
+                onSearch={handleSearchTemplates}
+                allowClear
+                value={searchContent}
+                onChange={(e) => {
+                  setSearchContent(e.target.value);
+                  handleSearchTemplates(e.target.value);
+                }}
+                placeholder='搜索名称'
+              />
+              <Button size='small' onClick={() => setOpenTemplates(false)}>&times;</Button>
+            </div>
             <List
               className='h-4/6 overflow-y-auto text-slate-900'
               itemLayout='horizontal'
@@ -163,7 +166,7 @@ const InputTemplate = ({ mobile, disabled = false, invokeSendMessage }) => {
                     }
                     description={
                       <>
-                        <div className=' max-h-40 overflow-y-auto divide-dashed divide-x-0 divide-y divide-gray-300'>
+                        <div className=' max-h-32 overflow-y-auto divide-dashed divide-x-0 divide-y divide-gray-300'>
                           <div className='text-slate-500'>{renderForm({ tempItem: item })}</div>
                           {item.components?.footer?.[0] ? <div className=''>{item.components.footer[0].text || ''}</div> : null}
                         </div>
@@ -175,11 +178,11 @@ const InputTemplate = ({ mobile, disabled = false, invokeSendMessage }) => {
             />
           </>
         }
-        title={
-          <div className='flex justify-between mt-2 '>
-            <div>🙋打招呼</div>
-            <Button size='small' onClick={() => setOpenTemplates(false)}>&times;</Button>
-          </div>}
+        // title={
+        //   <div className='flex justify-between mt-2 '>
+        //     <div>🙋打招呼</div>
+        //     <Button size='small' onClick={() => setOpenTemplates(false)}>&times;</Button>
+        //   </div>}
         trigger='click'
         open={openTemplates}
         onOpenChange={setOpenTemplates}>
diff --git a/src/views/Conversations/Components/MessagesWrapper.jsx b/src/views/Conversations/Components/MessagesWrapper.jsx
index fc217e4..cc2157e 100644
--- a/src/views/Conversations/Components/MessagesWrapper.jsx
+++ b/src/views/Conversations/Components/MessagesWrapper.jsx
@@ -39,7 +39,7 @@ const MessagesWrapper = () => {
     updateCurrentConversation({ lasttime: thisLastTime, loadNextPage });
 
     return () => {};
-  }, [activeMessages, currentConversation.sn]);
+  }, [currentConversation.sn]);
 
 
   const getFirstPageMessages = async (item) => {
diff --git a/src/views/Conversations/Conversations.css b/src/views/Conversations/Conversations.css
index 6961c4b..9805296 100644
--- a/src/views/Conversations/Conversations.css
+++ b/src/views/Conversations/Conversations.css
@@ -178,6 +178,9 @@
 .chatwindow-wrapper .rce-mbox .rce-mbox-reply {
     background-color: rgba(236, 236, 236, 0.7);
 }
+.chatwindow-wrapper.epr-main.EmojiPickerReact{
+    border: none;
+}
 .chatwindow-wrapper .rce-mbox .epr-emoji-img,
 .chatwindow-wrapper .rce-mbox .epr-emoji-native
 {