From a7d478b66729a24a692d2966357c28026a84cdb9 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 20 May 2025 14:38:26 +0800
Subject: [PATCH 001/143] =?UTF-8?q?perf(=E5=89=8D=E7=AB=AF):=20=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E8=81=8A=E5=A4=A9:=20=E2=9B=94=E4=BC=9A=E8=AF=9D?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A2=E5=8D=95=E7=AD=9B=E9=80=89;=20`=E5=B7=B2?=
 =?UTF-8?q?=E5=A4=84=E7=90=86`=E6=94=B9=E4=B8=BA`=E9=9A=90=E8=97=8F`;=20?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E5=88=97=E8=A1=A8=E6=AF=8F=E9=A1=B5100;=20?=
 =?UTF-8?q?=E4=B8=8D=E6=93=8D=E4=BD=9C`=E9=82=AE=E4=BB=B6`;=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=8A=98=E5=8F=A0`=E8=AE=A2=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF`;=20=E9=9A=90=E8=97=8F=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6;=20=E9=9A=90=E8=97=8F=E6=8A=A5=E4=BB=B7?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2;=20=E5=9C=A8=E7=BA=BF=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E5=8F=AA=E8=83=BD=E7=9C=8B=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/ConversationActions.js            |  2 +-
 src/stores/OrderStore.js                      |  4 +++-
 src/views/ChatWindow.jsx                      | 10 +++++-----
 .../Online/Components/ChatListFilter.jsx      |  8 ++++----
 .../Online/Components/ChatListItem.jsx        |  2 +-
 .../Online/Components/MessageListFilter.jsx   |  2 +-
 .../Online/ConversationsList.jsx              | 20 ++++++++++---------
 .../Conversations/Online/ReplyWrapper.jsx     |  2 +-
 .../Online/order/CustomerProfile.jsx          | 16 ++++++++-------
 9 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/actions/ConversationActions.js b/src/actions/ConversationActions.js
index b457df3..1dae387 100644
--- a/src/actions/ConversationActions.js
+++ b/src/actions/ConversationActions.js
@@ -90,7 +90,7 @@ const templatesDisplayNameMap = {
   'agent_intro_with_update_v1': 'quick_update_v1',
 };
 
-export const CONVERSATION_PAGE_SIZE = 50;
+export const CONVERSATION_PAGE_SIZE = 100;
 /**
  *
  * @param {object} params { opisn }
diff --git a/src/stores/OrderStore.js b/src/stores/OrderStore.js
index 7d8f682..524e79b 100644
--- a/src/stores/OrderStore.js
+++ b/src/stores/OrderStore.js
@@ -251,7 +251,9 @@ export const remindStatusOptions = [
   { value: 'important', label: '重点团' },
   { value: 'sendsurvey', label: '已发 travel advisor survey' },
 ];
-
+export const remindStatusOptionsMapped = remindStatusOptions.reduce((acc, cur) => {
+  return { ...acc, [String(cur.value)]: cur }
+}, {});
 
 /**
  * @param {Object} params { coli_sn, remindstate }
diff --git a/src/views/ChatWindow.jsx b/src/views/ChatWindow.jsx
index 5df73ad..1e71720 100644
--- a/src/views/ChatWindow.jsx
+++ b/src/views/ChatWindow.jsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { Layout, Spin, Button } from 'antd';
-import { RightCircleOutlined, RightOutlined, ReloadOutlined, MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons';
+import { RightCircleOutlined, RightOutlined, ReloadOutlined, MenuFoldOutlined, MenuUnfoldOutlined, VerticalRightOutlined, VerticalLeftOutlined } from '@ant-design/icons';
 // import { useParams, useNavigate } from 'react-router-dom';
 import MessagesHeader from './Conversations/Online/MessagesHeader';
 import MessagesWrapper from './Conversations/Online/MessagesWrapper';
@@ -21,7 +21,7 @@ const { Sider, Content, Header, Footer } = Layout;
 const ChatWindow = () => {
 
   const [collapsedLeft, setCollapsedLeft] = useState(false);
-  const [collapsedRight, setCollapsedRight] = useState(false);
+  const [collapsedRight, setCollapsedRight] = useState(true);
 
   return (
     <>
@@ -37,7 +37,7 @@ const ChatWindow = () => {
           collapsed={false}
           onBreakpoint={(broken) => {
             // setCollapsedLeft(broken)
-            setCollapsedRight(broken)
+            // setCollapsedRight(broken)
           }}
           trigger={null}>
           <ConversationsList />
@@ -49,7 +49,7 @@ const ChatWindow = () => {
               {/* <Button type='text' icon={collapsedLeft ? <MenuUnfoldOutlined /> : <MenuFoldOutlined />} onClick={() => setCollapsedLeft(!collapsedLeft)} className=' rounded-none rounded-l' /> */}
               <MessagesHeader />
               {/* <Button type='text' icon={<ReloadOutlined />} onClick={() => setCollapsedRight(!collapsedRight)} className='' title='最新消息记录' /> */}
-              <Button type='text' icon={collapsedRight ? <MenuFoldOutlined /> : <MenuUnfoldOutlined />} onClick={() => setCollapsedRight(!collapsedRight)} className=' rounded-none rounded-r' />
+              <Button type='text' icon={collapsedRight ? <VerticalRightOutlined /> : <VerticalLeftOutlined />} onClick={() => setCollapsedRight(!collapsedRight)} className=' rounded-none rounded-r' />
             </Header>
             <Content className="flex-grow bg-whatsapp-bg relative" >
               <MessagesWrapper />
@@ -72,7 +72,7 @@ const ChatWindow = () => {
           collapsedWidth={0}
           trigger={null}
           collapsed={collapsedRight}>
-          <CustomerProfile />
+          <CustomerProfile disabled />
         </Sider>
       </Layout>
     </>
diff --git a/src/views/Conversations/Online/Components/ChatListFilter.jsx b/src/views/Conversations/Online/Components/ChatListFilter.jsx
index 592eda4..0684ead 100644
--- a/src/views/Conversations/Online/Components/ChatListFilter.jsx
+++ b/src/views/Conversations/Online/Components/ChatListFilter.jsx
@@ -117,7 +117,7 @@ const ChatListFilter = ({ onFilterChange, activeList, ...props }) => {
   return (
     <>
       <div className='my-1 flex justify-between items-center '>
-        <Radio.Group
+        {/* <Radio.Group
           optionType={'button'}
           buttonStyle='solid'
           size='small'
@@ -126,7 +126,7 @@ const ChatListFilter = ({ onFilterChange, activeList, ...props }) => {
           onChange={(e) => {
             setFilterOtype(e.target.value)
           }}
-        />
+        /> */}
         <Popover
           destroyTooltipOnHide
           placement='bottomLeft'
@@ -152,14 +152,14 @@ const ChatListFilter = ({ onFilterChange, activeList, ...props }) => {
                 initialValues={{}}
                 onFinish={onFinish}
                 className='*:mb-2'>
-                <Form.Item label='订单'>
+                {/* <Form.Item label='订单'>
                   <Tag
                     key={selectedOType}
                     closeIcon={selectedOType !== ''}
                     onClose={() => setFilterOtype('')}>
                     {otypesMapped[selectedOType]?.label || 'All'}
                   </Tag>
-                </Form.Item>
+                </Form.Item> */}
                 <Form.Item name={'tags'} label='标签' className='*.div:gap-1'>
                   {tags.map((tag, ti) => (
                     <Tag.CheckableTag
diff --git a/src/views/Conversations/Online/Components/ChatListItem.jsx b/src/views/Conversations/Online/Components/ChatListItem.jsx
index 043ba2c..0865a7a 100644
--- a/src/views/Conversations/Online/Components/ChatListItem.jsx
+++ b/src/views/Conversations/Online/Components/ChatListItem.jsx
@@ -230,7 +230,7 @@ const ChatListItem = (({item, refreshConversationList,setListUpdateFlag,onSwitch
             { label: '编辑联系人', key: 'edit0' },
 
             { type: 'divider' },
-            { label: '移到🗂已处理', key: 'close', danger: true },
+            { label: '移到🗂隐藏列表', key: 'close', danger: true },
           ],
           triggerSubMenuAction: 'click',
           openKeys: openTags,
diff --git a/src/views/Conversations/Online/Components/MessageListFilter.jsx b/src/views/Conversations/Online/Components/MessageListFilter.jsx
index e871ea2..2307357 100644
--- a/src/views/Conversations/Online/Components/MessageListFilter.jsx
+++ b/src/views/Conversations/Online/Components/MessageListFilter.jsx
@@ -390,7 +390,7 @@ const MessageListFilter = ({ ...props }) => {
                 { key: 'video', label: '视频', children: <Videos /> },
                 { key: 'audio', label: '音频', children: <Audios /> },
                 { key: 'file', label: '文件', children: <FileList /> },
-                { key: 'email', label: '邮件', children: <EmailList /> },
+                // { key: 'email', label: '邮件', children: <EmailList /> },
               ]}
             />
           </>
diff --git a/src/views/Conversations/Online/ConversationsList.jsx b/src/views/Conversations/Online/ConversationsList.jsx
index 904cc37..f637f1d 100644
--- a/src/views/Conversations/Online/ConversationsList.jsx
+++ b/src/views/Conversations/Online/ConversationsList.jsx
@@ -318,30 +318,32 @@ const Conversations = () => {
           // enterButton={'Filter'}
         />
         {/* TODO 这个在完成搜索历史会话后去掉，待讨论查询规则 */}
-
+        </div>
+        <div className="flex gap-1 justify-between items-center shadow">
+        <div className='mr-auto'>{/* 占位 */}</div>
+        <ChatListFilter key='chat-list-filter'
+        onFilterChange={(d) => {
+          refreshConversationList()
+        }}
+        activeList={activeList}
+      />
       {conversationsListLoading ? (
           <div className='text-center py-1 px-2'>
             <LoadingOutlined className='text-orange-400 ' />
           </div>
         ) :
-        <Tooltip key={'conversation-list'} title={activeList ? '🗂已处理' : '活跃会话'}>
+        <Tooltip key={'conversation-list'} title={activeList ? '🗂已隐藏' : '活跃会话'}>
           <Button onClick={toggleClosedConversationsList} icon={activeList ? '🗂' : '📌'} type='text' />
         </Tooltip>
       }
       {mobile && (
-        <AudioTwoTone className='px-2'
+        <AudioTwoTone className='px-3'
           onClick={() => {
             navigate(`/callcenter/call`)
           }}
         />
       )}
       </div>
-      <ChatListFilter key='chat-list-filter'
-        onFilterChange={(d) => {
-          refreshConversationList()
-        }}
-        activeList={activeList}
-      />
       <div className='flex-1 overflow-x-hidden overflow-y-auto relative'>
         {/* {mobile && conversationsListLoading && dataSource.length === 0 ? ( */}
 
diff --git a/src/views/Conversations/Online/ReplyWrapper.jsx b/src/views/Conversations/Online/ReplyWrapper.jsx
index 620be4a..8346976 100644
--- a/src/views/Conversations/Online/ReplyWrapper.jsx
+++ b/src/views/Conversations/Online/ReplyWrapper.jsx
@@ -87,7 +87,7 @@ const ReplyWrapper = () => {
       icon: <WABIcon className={sessionType === 1 ? 'text-gray-500 [&_path]:fill-current' : ''} />,
       children: <InputComposer currentActive={activeChannel === 'waba'} channel={'waba'} lastWABAMsg={lastWABAMsg} />,
     },
-    { key: 'email', label: mobile ? '' : '邮件', icon: <MailOutlined className='text-indigo-500' />, children: <EmailComposer currentActive={activeChannel === 'email'} /> },
+    // { key: 'email', label: mobile ? '' : '邮件', icon: <MailOutlined className='text-indigo-500' />, children: <EmailComposer currentActive={activeChannel === 'email'} /> },
     {
       key: 'wai',
       label: mobile ? '' : 'WhatsApp',
diff --git a/src/views/Conversations/Online/order/CustomerProfile.jsx b/src/views/Conversations/Online/order/CustomerProfile.jsx
index 1d5c3f9..64627bf 100644
--- a/src/views/Conversations/Online/order/CustomerProfile.jsx
+++ b/src/views/Conversations/Online/order/CustomerProfile.jsx
@@ -7,7 +7,7 @@ import { useShallow } from 'zustand/react/shallow';
 import { copy, isEmpty } from "@/utils/commons";
 import { Conditional } from "@/components/Conditional";
 import useConversationStore from "@/stores/ConversationStore";
-import { useOrderStore, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions, fetchSetRemindStateAction } from "@/stores/OrderStore";
+import { useOrderStore, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions, fetchSetRemindStateAction, remindStatusOptionsMapped } from "@/stores/OrderStore";
 import useAuthStore from "@/stores/AuthStore";
 import QuotesHistory from "./QuotesHistory";
 import ConversationBind from "./../ConversationBind";
@@ -18,7 +18,7 @@ import { postEditConversationItemColiAction } from "@/actions/ConversationAction
 import useStyleStore from '@/stores/StyleStore';
 import SupplierEmailDrawer from "../Components/EmailListDrawer";
 
-const CustomerProfile = () => {
+const CustomerProfile = ({ disabled }) => {
   const navigate = useNavigate();
 	const { notification, message } = App.useApp();
 	const [loading, setLoading] = useState(false);
@@ -169,7 +169,7 @@ const CustomerProfile = () => {
               onChange={handleOrderSwitch}
               />}
 						actions={[
-							<Select
+							<Select disabled={disabled} className={`[&_.ant-select-selection-item]:text-gray-950`}
 								key={"orderlabel"}
 								size="small"
 								style={{
@@ -193,7 +193,7 @@ const CustomerProfile = () => {
 								value={orderDetail.tags}
 								options={orderLabelOptions}
 							/>,
-							<Select
+							<Select disabled={disabled} className={`[&_.ant-select-selection-item]:text-gray-950`}
 								key={"orderstatus"}
 								size="small"
 								style={{
@@ -269,7 +269,9 @@ const CustomerProfile = () => {
           <Divider orientation="left">
             <Typography.Text strong>催信:</Typography.Text>
           </Divider>
-          <Checkbox.Group key='substatus' className="px-2" value={[orderRemindState]} options={remindStatusOptions} onChange={handleSetRemindState} />
+          {disabled ? (<div className="px-2">✅<span>{remindStatusOptionsMapped[orderRemindState]?.label}</span></div>) : <Checkbox.Group key='substatus' className="px-2" value={[orderRemindState]} options={remindStatusOptions} onChange={handleSetRemindState} />}
+
+          {/*
 					<Divider orientation="left">
 						<Typography.Text strong>最新报价</Typography.Text>
 					</Divider>
@@ -320,11 +322,11 @@ const CustomerProfile = () => {
                   </Flex>
               </List.Item>
             )}
-          />
+          /> */}
 					<Divider orientation="left">
 						<Typography.Text strong>表单信息</Typography.Text>
             <Button className="ml-2"
-              size={"small"}
+              size={"small"} disabled={disabled}
               onClick={() => {
                 setIsModalOpen(true);
               }}>

From 1696d13c31543d3b69b08a7fb4eda84753846fe0 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 22 May 2025 09:52:08 +0800
Subject: [PATCH 002/143] =?UTF-8?q?perf:=20=E6=9B=B4=E6=96=B0=20Antd=20?=
 =?UTF-8?q?=E5=B0=8F=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 173add9..2be2392 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "@dckj/react-better-modal": "^0.1.2",
     "@lexical/react": "^0.20.0",
     "@vonage/client-sdk": "^2.0.0",
-    "antd": "^5.22.2",
+    "antd": "^5.25.2",
     "dayjs": "^1.11.13",
     "dingtalk-jsapi": "^3.0.41",
     "emoji-picker-react": "^4.12.0",

From 1f972f417b97e635e8cd1783e1e78cfb5936d41d Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 22 May 2025 09:58:25 +0800
Subject: [PATCH 003/143] =?UTF-8?q?perf=EF=BC=9A=E6=9B=B4=E6=96=B0=20route?=
 =?UTF-8?q?r=EF=BC=8Czustand=20=E5=B0=8F=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 2be2392..fb74c5c 100644
--- a/package.json
+++ b/package.json
@@ -21,10 +21,10 @@
     "react": "^18.3.1",
     "react-chat-elements": "^12.0.17",
     "react-dom": "^18.3.1",
-    "react-router-dom": "^6.28.0",
+    "react-router-dom": "^6.30.1",
     "rxjs": "^7.8.1",
     "uuid": "^9.0.1",
-    "zustand": "^4.5.5"
+    "zustand": "^4.5.7"
   },
   "devDependencies": {
     "@types/react": "^18.3.12",

From c395ea1e8d5424704e6506632086bddbd230085d Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 22 May 2025 17:01:41 +0800
Subject: [PATCH 004/143] =?UTF-8?q?perf:=20Dev=20=E4=B8=8D=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=20PageSpy=EF=BC=9B=E5=88=9D=E6=AD=A5=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E8=AE=A2=E5=8D=95=E8=B7=9F=E8=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ErrorBoundary.jsx |   4 +-
 src/views/orders/Follow.jsx      | 549 ++++++++++++++++++++++++++++---
 2 files changed, 514 insertions(+), 39 deletions(-)

diff --git a/src/components/ErrorBoundary.jsx b/src/components/ErrorBoundary.jsx
index 9072959..6258384 100644
--- a/src/components/ErrorBoundary.jsx
+++ b/src/components/ErrorBoundary.jsx
@@ -15,7 +15,9 @@ class ErrorBoundary extends PureComponent {
   componentDidCatch(error, info) {
     console.error('Sorry, Something went wrong.')
     console.error(error)
-    window.$pageSpy.triggerPlugins('onOfflineLog', 'upload');
+    if (import.meta.env.PROD && window.$pageSpy) {
+      window.$pageSpy.triggerPlugins('onOfflineLog', 'upload')
+    }
     this.setState({ hasError: true, info: error.message })
   }
 
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index e09f4a8..7da2c6e 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -4,8 +4,30 @@ import { PERM_IMPORT_EMAIL } from '@/stores/AuthStore'
 import useFormStore from '@/stores/FormStore'
 import { useOrderStore } from '@/stores/OrderStore'
 import { copy, isNotEmpty, isEmpty } from '@/utils/commons'
-import { WhatsAppOutlined, ImportOutlined } from '@ant-design/icons'
-import { App, Badge, Empty, Flex, Button, Radio, Space, Switch, Table, Tabs, Divider, Tag, Tooltip } from 'antd'
+import {
+  WhatsAppOutlined,
+  ImportOutlined,
+  FileAddOutlined,
+  BarsOutlined,
+  DownOutlined,
+  MailOutlined,
+  PhoneOutlined,
+  UserOutlined,
+  FieldNumberOutlined,
+  SaveOutlined,
+  PlusOutlined,
+  MehOutlined,
+  SmileOutlined,
+  CheckSquareTwoTone,
+  CarryOutTwoTone,
+  MailTwoTone,
+  SwitcherTwoTone,
+  FolderTwoTone,
+  CalendarTwoTone,
+  CalendarOutlined,
+  HeartTwoTone, MoneyCollectTwoTone
+} from '@ant-design/icons'
+import { App, Badge, Empty, Flex, Button, Drawer , Space, Radio, Table, Tabs, Divider, Tag, Tooltip, Row, Col, Segmented, Tree, Typography, Input, Descriptions, Checkbox } from 'antd'
 import dayjs from 'dayjs'
 import { useCallback, useEffect, useState } from 'react'
 import { Link } from 'react-router-dom'
@@ -313,6 +335,13 @@ function OrderGroupTable({ formValues }) {
 }
 
 function Follow() {
+
+  const [openMail, setOpenMail] = useState(false);
+  const [mailSubject, setSubject] = useState('');
+
+  const [openOrder, setOpenOrder] = useState(false);
+
+
   const [formValues, setFormValues] = useFormStore(useShallow((state) => [state.orderFollowForm, state.setOrderFollowForm]))
   const [advanceChecked, toggleAdvance] = useFormStore(useShallow((state) => [state.orderFollowAdvanceChecked, state.setOrderFollowAdvanceChecked]))
 
@@ -329,45 +358,489 @@ function Follow() {
 
   return (
     <>
-      <Space direction='vertical' size='large' style={{ width: '100%' }}>
-        <Flex gap='large' justify='start' align='center' horizontal='true'>
-          <Radio.Group
-            options={[
-              { label: '今日任务', value: 'today' },
-              { label: '重点订单', value: 'zhongdian' },
-              { label: '次重点客户', value: 'qianli' },
-              { label: '成行', value: 'chengxing' },
-              { label: '走团中', value: 'zoutuan' },
-              { label: '走团后一月', value: 'zoutuanhou' },
+      <Row gutter={16}>
+        <Col span={4}>
+          <Flex justify='start' align='start' vertical>
+            <Segmented className='w-full' block shape='round' options={['AH', 'CH', 'GH']} />
+            <Tree
+              showIcon
+              showLine
+              defaultExpandedKeys={['0-0', '0-1']}
+              defaultSelectedKeys={['0-0-0']}
+              treeData={[
+                {
+                  title: '今日任务',
+                  key: '0-0',
+                  icon: <CalendarTwoTone />,
+                  children: [
+                    {
+                      title: '(新订单)HXZ240913082',
+                      key: '0-0-0',
+                    },
+                    {
+                      title: '(老邮件)HXZ241017089',
+                      key: '0-0-1',
+                    },
+                  ],
+                },
+                {
+                  title: '待办任务',
+                  key: '0-1',
+                  icon: <SwitcherTwoTone />,
+                  children: [
+                    {
+                      title: '(一催)HXZ250213117',
+                      key: '0-1-0',
+                    },
+                    {
+                      title: '(二催)HXZ250213117',
+                      key: '0-1-1',
+                    },
+                    {
+                      title: '(三催)HXZ250213117',
+                      key: '0-1-2',
+                    },
+                    {
+                      title: '(余款收付)HXZ250209048',
+                      key: '0-1-3',
+                    },
+                    {
+                      title: '(入境提醒)HXZ250209048',
+                      key: '0-1-4',
+                    },
+                  ],
+                },
+                {
+                  title: '草稿',
+                  key: '0-2',
+                  icon: <MailTwoTone />,
+                },
+                {
+                  title: '收件箱',
+                  key: '0-3',
+                  icon: <FolderTwoTone />,
+                  children: [
+                    {
+                      title: '1月',
+                      key: '0-3-0',
+                      icon: <FolderTwoTone />,
+                    },
+                    {
+                      title: '2月',
+                      key: '0-3-1',
+                      icon: <FolderTwoTone />,
+                    },
+                    {
+                      title: '3月',
+                      key: '0-3-2',
+                      icon: <FolderTwoTone />,
+                    },
+                    {
+                      title: '4月',
+                      key: '0-3-3',
+                      icon: <FolderTwoTone />,
+                    },
+                    {
+                      title: '5月',
+                      key: '0-3-4',
+                      icon: <FolderTwoTone />,
+                    },
+                  ],
+                },
+                {
+                  title: '已发送',
+                  key: '0-4',
+                  icon: <CarryOutTwoTone />,
+                },
+                {
+                  title: '已处理',
+                  key: '0-5',
+                  icon: <CheckSquareTwoTone />,
+                },
+              ]}
+            />
+          </Flex>
+        </Col>
+        <Col span={14}>
+          <div className='flex gap-1 items-center'>
+            <Button onClick={() => {}} icon={<PlusOutlined />} type={'primary'} ghost shape={'circle'} size='small' />
+            <Input.Search
+              className=''
+              allowClear
+              onChange={(e) => {}}
+              onPressEnter={(e) => {
+                return false
+              }}
+              placeholder={`名称/号码/订单号`}
+            />
+          </div>
+          <Table
+          onRow={(record) => {
+    return {
+      onClick: (event) => {console.info(event)}, // 点击行
+      onDoubleClick: (event) => {},
+      onContextMenu: (event) => {},
+      onMouseEnter: (event) => {}, // 鼠标移入行
+      onMouseLeave: (event) => {},
+    };
+  }}
+            pagination={false}
+            columns={[
+              {
+                title: '收/发件人',
+                dataIndex: 'name',
+                key: 'name',
+                render: (text) => <a>{text}</a>,
+              },
+              {
+                title: '主题',
+                dataIndex: 'subject',
+                key: 'subject',
+                render: (text) => <a onClick={() => {
+                  setSubject(text)
+                  setOpenMail(true)
+                }}>{text}</a>,
+              },
+              {
+                title: '收/发日期',
+                dataIndex: 'mailDate',
+                key: '收/发日期',
+              },
+              {
+                title: '订单号',
+                key: 'orderNo',
+                dataIndex: 'orderNo',
+              },
+              {
+                title: '国籍',
+                key: 'country',
+                dataIndex: 'country',
+              },
+              {
+                title: '操作',
+                key: 'action',
+                render: (_, record) => (
+                  <Space size='middle'>
+                    <a>回复</a>
+                    <a>转发</a>
+                  </Space>
+                ),
+              },
+            ]}
+            dataSource={[
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: '【阿里云邮】弱密改密提醒 ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                name: 'Fran Grundman <frangrundman@rogers.com>',
+                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
             ]}
-            value={formValues.type}
-            onChange={({ target: { value } }) => {
-              setFormValues({
-                ...formValues,
-                type: value,
-              })
-            }}
-            optionType='button'
-            buttonStyle='solid'
-            disabled={advanceChecked}
-          />
-          <Switch
-            checkedChildren='高级查询'
-            unCheckedChildren='高级查询'
-            checked={advanceChecked}
-            onChange={() => {
-              toggleAdvance(!advanceChecked)
-            }}
           />
+{/*
+          <Divider />
+
+
+          <Descriptions title="Your Thailand Private tour by 'Asia Highlights' 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到" items={[
+  {
+    key: '1',
+    label: '发件人',
+    children: '"阿里邮箱" <no-reply@mailsupport.aliyun.com>',
+  },
+  {
+    key: '2',
+    label: '收件人',
+    children: '<liaoyijun@chinahighlights.com>',
+  },
+  {
+    key: '3',
+    label: '发送日期',
+    children: '2025-05-16 14:11',
+  },
+]} />
+          <Flex gap="small">
+            <Space.Compact>
+          <Button color="primary" variant="solid">
+            回复
+          </Button>
+          <Button color="primary" variant="outlined">
+            回复全部
+          </Button>
+          <Button color="primary" variant="outlined" >
+            转发
+          </Button>
+          </Space.Compact>
+          <Button color="cyan" variant="outlined">
+            已处理
+          </Button>
+          <Button color="cyan" variant="outlined">
+            绑定订单
+          </Button>
+          </Flex>
+<div className='border-solid border rounded border-gray-300'>
+          <div id='__preHtml__' className='whitespace-pre-wrap break-words' dangerouslySetInnerHTML={{ __html: '邮件内容。。。。。<br/>换行了。。。看看 ' }}></div>
+          </div> */}
+        </Col>
+        <Col span={6}>
+            <Flex gap={6} vertical={true} justify='space-between'>
+              <Typography.Text>
+                <FieldNumberOutlined className='pr-1' />
+                LSS250501006
+                <HeartTwoTone twoToneColor="#eb2f96"/>
+                <MoneyCollectTwoTone twoToneColor="#eb2f96" />
+              </Typography.Text>
+              <Typography.Text>
+                <UserOutlined className=' pr-1' />
+                Jorgina(R1)
+              </Typography.Text>
+              <Typography.Text>
+                <PhoneOutlined className=' pr-1' />
+                <Button type='link' size={'small'} onClick={() => {}}>
+                  6596823833
+                </Button>
+              </Typography.Text>
+              <Typography.Text>
+                <MailOutlined className=' pr-1' />
+                Jorgina@gmail.com
+              </Typography.Text>
+              <Typography.Text>
+                <WhatsAppOutlined className='pr-1' />
+                <Button type='link' size={'small'} onClick={() => {}}>
+                  6596826951
+                </Button>
+              </Typography.Text>
+              <Typography.Text>
+                <CalendarOutlined className='pr-1' />
+                <span>出发日期：</span>2025-09-18，已下计划
+              </Typography.Text>
+              <Typography.Text>
+                <span>特殊要求：</span>
+                在华城市 桂林 对酒店和房型要求 5-star
+              </Typography.Text>
+              <Typography.Text>
+                <span>外联备注：</span>
+                泰国马来水灯节
+              </Typography.Text>
+            </Flex>
+            <Divider orientation="left">
+						<Typography.Text strong>表单信息</Typography.Text>
+            <FileAddOutlined className='pl-1' />
+					</Divider>
+					<p className="p-2 overflow-auto m-0 break-words whitespace-pre-wrap" dangerouslySetInnerHTML={{ __html: 'orderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detail' }}></p>
+<Space.Compact block>
+      <Input addonBefore="附加信息" style={{ width: 'calc(100% - 200px)' }} />
+      <Button icon={<SaveOutlined />} />
+    </Space.Compact>
+          <Flex gap="small">
+          <Button color="cyan" variant="outlined" onClick={() => {
+            setOpenOrder(true)
+            }}>
+            订单状态
+          </Button>
+          <Button color="cyan" variant="outlined">
+            提醒中心
+          </Button>
+          </Flex>
+
+
+
+        </Col>
+      </Row>
+
+<Drawer
+        title={mailSubject}
+        placement="right"
+        // getContainer={false}
+        size={'large'}
+        mask={false}
+        maskClosable={true}
+        open={openMail}
+        onClose={() => setOpenMail(false)}
+        extra={
+          <Space>
+            <Button color="primary" variant="solid">
+            回复
+          </Button>
+          <Button color="primary" variant="outlined">
+            回复全部
+          </Button>
+          <Button color="primary" variant="outlined" >
+            转发
+          </Button>
+          <Button color="cyan" variant="outlined">
+            已处理
+          </Button>
+          </Space>
+        }
+        footer={
+          <Space>footer</Space>
+        }
+      >
+        <Descriptions column={1} title="Your Thailand Private tour by 'Asia Highlights' 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到" items={[
+  {
+    key: '1',
+    label: '发件人',
+    children: '"阿里邮箱" <no-reply@mailsupport.aliyun.com>',
+  },
+  {
+    key: '2',
+    label: '收件人',
+    children: '<liaoyijun@chinahighlights.com>',
+  },
+  {
+    key: '3',
+    label: '发送日期',
+    children: '2025-05-16 14:11',
+  },
+]} />
+        <p>{Math.random().toString(36).substring(2, 9)}Some contents...</p>
+        <p>Some contents...</p>
+        <p>Some contents...</p>
+      </Drawer>
+
+      <Drawer
+        title={'订单状态'}
+        placement="right"
+        // getContainer={false}
+        size={'large'}
+        mask={false}
+        maskClosable={true}
+        open={openOrder}
+        onClose={() => setOpenOrder(false)}
+      >
+        <Divider orientation="left">
+						<Typography.Text strong>是否重要</Typography.Text>
+					</Divider>
+            <Radio.Group options={[
+  { label: '重点', value: '1' },
+  { label: '次重点', value: '2' },
+  { label: '一般', value: '3' },
+]} />
+
+        <Divider orientation="left">
+						<Typography.Text strong>状态</Typography.Text>
+					</Divider>
+            <Radio.Group options={[
+  { label: '新订单', value: '4' },
+  { label: '报价中', value: '5' },
+  { label: '以后联系', value: '6' },
+  { label: '等待付订金', value: '7' },
+  { label: '成行', value: '8' },
+  { label: '丢失', value: '9' },
+  { label: '取消', value: '10' },
+  { label: '未报价', value: '11' },
+]}  />
+
+
+        <Divider orientation="left">
+						<Typography.Text strong> 催信</Typography.Text>
+					</Divider>
+<Checkbox.Group options={[
+  { label: '一催', value: 'Apple', className: 'label-1' },
+  { label: '二催', value: 'Pear', className: 'label-2' },
+  { label: '三催', value: 'Orange', className: 'label-3' },
+  { label: '重点团', value: '2233342', className: 'label-3' },
+  { label: '已发 travel advisor survey', value: '43535', className: 'label-3' },
+]} defaultValue={['Apple']}  />
+      </Drawer>
 
-          <Conditional
-            condition={isPermitted(PERM_IMPORT_EMAIL)}
-            whenTrue={<Button type='default' shape='round' icon={<ImportOutlined />} size='small' onClick={handleImportEmail}/>}
-          />
-        </Flex>
-        <Conditional condition={advanceChecked} whenTrue={<AdvanceSearchForm onSubmit={handleSubmit} initialValues={formValues} />} />
-        <OrderGroupTable formValues={formValues} />
-      </Space>
     </>
   )
 }

From 96daa64eb182b5fbe380b625d534958164aad892 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 22 May 2025 17:04:09 +0800
Subject: [PATCH 005/143] =?UTF-8?q?perf:=20=E4=BC=9A=E8=AF=9D=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=20=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ChatWindow.jsx                            |  4 ++--
 .../Online/Components/ChatListFilter.jsx            | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/views/ChatWindow.jsx b/src/views/ChatWindow.jsx
index 1e71720..0c5a150 100644
--- a/src/views/ChatWindow.jsx
+++ b/src/views/ChatWindow.jsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { Layout, Spin, Button } from 'antd';
-import { RightCircleOutlined, RightOutlined, ReloadOutlined, MenuFoldOutlined, MenuUnfoldOutlined, VerticalRightOutlined, VerticalLeftOutlined } from '@ant-design/icons';
+import { RightCircleOutlined, RightOutlined, ReloadOutlined, MenuFoldOutlined, MenuUnfoldOutlined,  LeftOutlined } from '@ant-design/icons';
 // import { useParams, useNavigate } from 'react-router-dom';
 import MessagesHeader from './Conversations/Online/MessagesHeader';
 import MessagesWrapper from './Conversations/Online/MessagesWrapper';
@@ -49,7 +49,7 @@ const ChatWindow = () => {
               {/* <Button type='text' icon={collapsedLeft ? <MenuUnfoldOutlined /> : <MenuFoldOutlined />} onClick={() => setCollapsedLeft(!collapsedLeft)} className=' rounded-none rounded-l' /> */}
               <MessagesHeader />
               {/* <Button type='text' icon={<ReloadOutlined />} onClick={() => setCollapsedRight(!collapsedRight)} className='' title='最新消息记录' /> */}
-              <Button type='text' icon={collapsedRight ? <VerticalRightOutlined /> : <VerticalLeftOutlined />} onClick={() => setCollapsedRight(!collapsedRight)} className=' rounded-none rounded-r' />
+              <Button type='text' icon={collapsedRight ? <RightOutlined /> : <LeftOutlined />} onClick={() => setCollapsedRight(!collapsedRight)} className=' rounded-none rounded-r' />
             </Header>
             <Content className="flex-grow bg-whatsapp-bg relative" >
               <MessagesWrapper />
diff --git a/src/views/Conversations/Online/Components/ChatListFilter.jsx b/src/views/Conversations/Online/Components/ChatListFilter.jsx
index 0684ead..3d42efb 100644
--- a/src/views/Conversations/Online/Components/ChatListFilter.jsx
+++ b/src/views/Conversations/Online/Components/ChatListFilter.jsx
@@ -127,6 +127,19 @@ const ChatListFilter = ({ onFilterChange, activeList, ...props }) => {
             setFilterOtype(e.target.value)
           }}
         /> */}
+        {tags.slice(0, 2).map((tag, ti) => (
+          <Tag.CheckableTag
+            className='mb-1'
+            key={tag.key}
+            checked={selectedTags.includes(tag.key)}
+            onChange={(checked) => handleTagsChange(tag, checked)}
+            style={TagColorStyle(
+              tag.label,
+              selectedTags.includes(tag.key),
+            )}>
+            {tag.label}
+          </Tag.CheckableTag>
+        ))}
         <Popover
           destroyTooltipOnHide
           placement='bottomLeft'

From 3e8cda67007999b80d351195997b18107ad887df Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 23 May 2025 14:33:32 +0800
Subject: [PATCH 006/143] =?UTF-8?q?feat:=20=E7=BC=96=E8=BE=91=E5=99=A8:=20?=
 =?UTF-8?q?=E5=AD=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LexicalEditor/plugins/ToolbarPlugin.jsx   | 24 +++++++++++++++----
 src/components/LexicalEditor/styles.css       |  2 +-
 src/components/LexicalEditor/ui/DropDown.tsx  |  5 ++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx b/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
index c44e44e..a258eff 100644
--- a/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
+++ b/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
@@ -70,16 +70,19 @@ const FONT_FAMILY_OPTIONS = [
 
 const FONT_SIZE_OPTIONS = [
   ['10px', '10px'],
-  ['11px', '11px'],
+  // ['11px', '11px'],
   ['12px', '12px'],
   ['13px', '13px'],
   ['14px', '14px'],
-  ['15px', '15px'],
+  // ['15px', '15px'],
   ['16px', '16px'],
-  ['17px', '17px'],
+  // ['17px', '17px'],
   ['18px', '18px'],
-  ['19px', '19px'],
+  // ['19px', '19px'],
   ['20px', '20px'],
+  ['24px', '24px'],
+  ['32px', '32px'],
+  // ['48px', '48px'],
 ];
 
 const ELEMENT_FORMAT_OPTIONS = {
@@ -492,12 +495,13 @@ function FontDropDown({ editor, value, style, disabled = false }) {
     <DropDown
       disabled={disabled}
       buttonClassName={'toolbar-item ' + style}
-      // buttonLabel={value}
+      buttonLabel={value}
       buttonIconClassName={style === 'font-family' ? 'icon block-type font-family' : ''}
       buttonAriaLabel={buttonAriaLabel}>
       {(style === 'font-family' ? FONT_FAMILY_OPTIONS : FONT_SIZE_OPTIONS).map(([option, text]) => (
         <DropDownItem
           className={`item font-m-${option.replace(/\s+/g, '_')} ${dropDownActiveClass(value === option)} ${style === 'font-size' ? 'fontsize-item' : ''}`}
+          style={{ fontFamily: style === 'font-family' ? option : undefined, fontSize: style === 'font-size' ? option : undefined }}
           onClick={() => handleClick(option)}
           key={option}>
           <span className='text'>{text}</span>
@@ -605,6 +609,7 @@ export default function ToolbarPlugin() {
   const [isStrikethrough, setIsStrikethrough] = useState(false);
   const [isCode, setIsCode] = useState(false);
   const [fontFamily, setFontFamily] = useState('Arial');
+  const [fontSize, setFontSize] = useState('16px');
   const [fontColor, setFontColor] = useState('#000');
   const [bgColor, setBgColor] = useState('#fff');
   const [elementFormat, setElementFormat] = useState('left');
@@ -692,6 +697,9 @@ export default function ToolbarPlugin() {
       setFontFamily(
         $getSelectionStyleValueForProperty(selection, 'font-family', 'Arial'),
       );
+      setFontSize(
+        $getSelectionStyleValueForProperty(selection, 'font-size', '16px'),
+      );
       let matchingParent;
       if ($isLinkNode(parent)) {
         // If node is a link, we need to fetch the parent paragraph node to set format
@@ -814,6 +822,12 @@ export default function ToolbarPlugin() {
           value={fontFamily}
           editor={editor}
         />
+        <FontDropDown
+          disabled={!isEditable}
+          style={'font-size'}
+          value={fontSize}
+          editor={editor}
+        />
         <Divider />
           <button type='button'
             onClick={() => {
diff --git a/src/components/LexicalEditor/styles.css b/src/components/LexicalEditor/styles.css
index 7b8ac4b..173bd1a 100644
--- a/src/components/LexicalEditor/styles.css
+++ b/src/components/LexicalEditor/styles.css
@@ -80,7 +80,7 @@
 .editor-input {
   min-height: 150px;
   resize: none;
-  font-size: 15px;
+  font-size: 16px;
   caret-color: rgb(5, 5, 5);
   position: relative;
   tab-size: 1;
diff --git a/src/components/LexicalEditor/ui/DropDown.tsx b/src/components/LexicalEditor/ui/DropDown.tsx
index 012d467..8dabe5c 100644
--- a/src/components/LexicalEditor/ui/DropDown.tsx
+++ b/src/components/LexicalEditor/ui/DropDown.tsx
@@ -29,12 +29,13 @@ export function DropDownItem({
   children,
   className,
   onClick,
-  title,
+  title, style
 }: {
   children: React.ReactNode;
   className: string;
   onClick: (event: React.MouseEvent<HTMLButtonElement>) => void;
   title?: string;
+  style?: React.CSSProperties;
 }) {
   const ref = useRef<HTMLButtonElement>(null);
 
@@ -53,7 +54,7 @@ export function DropDownItem({
   }, [ref, registerItem]);
 
   return (
-    <button
+    <button style={style}
       className={className}
       onClick={onClick}
       ref={ref}

From 0d9dd3ad8c80bd68779891f2eaf3e5783a7acb3c Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 26 May 2025 15:16:22 +0800
Subject: [PATCH 007/143] =?UTF-8?q?feat:=20=E7=BC=96=E8=BE=91=E5=99=A8:=20?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/icons/paint-brush-line.svg      |   1 +
 src/assets/icons/paint-brush-line.svg         |   1 +
 src/components/LexicalEditor/index.jsx        |   3 +
 .../FormatPaint/FormatPainterCommands.ts      |  27 ++
 .../FormatPainterToolbarButton.tsx            |  84 ++++++
 .../plugins/FormatPaint/index.tsx             | 267 ++++++++++++++++++
 .../LexicalEditor/plugins/ToolbarPlugin.jsx   |   2 +
 src/components/LexicalEditor/styles.css       |  10 +-
 8 files changed, 393 insertions(+), 2 deletions(-)
 create mode 100644 public/images/icons/paint-brush-line.svg
 create mode 100644 src/assets/icons/paint-brush-line.svg
 create mode 100644 src/components/LexicalEditor/plugins/FormatPaint/FormatPainterCommands.ts
 create mode 100644 src/components/LexicalEditor/plugins/FormatPaint/FormatPainterToolbarButton.tsx
 create mode 100644 src/components/LexicalEditor/plugins/FormatPaint/index.tsx

diff --git a/public/images/icons/paint-brush-line.svg b/public/images/icons/paint-brush-line.svg
new file mode 100644
index 0000000..b0471c2
--- /dev/null
+++ b/public/images/icons/paint-brush-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M5 4.9967V7.9967H19V4.9967H5ZM4 2.9967H20C20.5523 2.9967 21 3.44442 21 3.9967V8.9967C21 9.54899 20.5523 9.9967 20 9.9967H4C3.44772 9.9967 3 9.54899 3 8.9967V3.9967C3 3.44442 3.44772 2.9967 4 2.9967ZM6 11.9967H12C12.5523 11.9967 13 12.4444 13 12.9967V15.9967H14V21.9967H10V15.9967H11V13.9967H5C4.44772 13.9967 4 13.549 4 12.9967V10.9967H6V11.9967ZM17.7322 13.7289L19.5 11.9612L21.2678 13.7289C22.2441 14.7052 22.2441 16.2882 21.2678 17.2645C20.2915 18.2408 18.7085 18.2408 17.7322 17.2645C16.7559 16.2882 16.7559 14.7052 17.7322 13.7289Z"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/paint-brush-line.svg b/src/assets/icons/paint-brush-line.svg
new file mode 100644
index 0000000..b0471c2
--- /dev/null
+++ b/src/assets/icons/paint-brush-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M5 4.9967V7.9967H19V4.9967H5ZM4 2.9967H20C20.5523 2.9967 21 3.44442 21 3.9967V8.9967C21 9.54899 20.5523 9.9967 20 9.9967H4C3.44772 9.9967 3 9.54899 3 8.9967V3.9967C3 3.44442 3.44772 2.9967 4 2.9967ZM6 11.9967H12C12.5523 11.9967 13 12.4444 13 12.9967V15.9967H14V21.9967H10V15.9967H11V13.9967H5C4.44772 13.9967 4 13.549 4 12.9967V10.9967H6V11.9967ZM17.7322 13.7289L19.5 11.9612L21.2678 13.7289C22.2441 14.7052 22.2441 16.2882 21.2678 17.2645C20.2915 18.2408 18.7085 18.2408 17.7322 17.2645C16.7559 16.2882 16.7559 14.7052 17.7322 13.7289Z"></path></svg>
\ No newline at end of file
diff --git a/src/components/LexicalEditor/index.jsx b/src/components/LexicalEditor/index.jsx
index 60434cf..0b14f8d 100644
--- a/src/components/LexicalEditor/index.jsx
+++ b/src/components/LexicalEditor/index.jsx
@@ -45,6 +45,8 @@ import TableCellResizer from './plugins/TableCellResizer';
 
 // import {useLexicalEditable} from '@lexical/react/useLexicalEditable';
 
+import FormatPaintPlugin from './plugins/FormatPaint';
+
 
 import { TextNode, $getRoot, $getSelection, $createParagraphNode } from 'lexical';
 import { $generateHtmlFromNodes, $generateNodesFromDOM, } from '@lexical/html';
@@ -203,6 +205,7 @@ export default function Editor({ isRichText, isDebug, editorRef, onChange, defau
           <EditorRefPlugin editorRef={editorRef} />
           <ImagesPlugin />
           <InlineImagePlugin />
+          <FormatPaintPlugin />
           <MyOnChangePlugin onChange={onChange}/>
         </div>
       </div>
diff --git a/src/components/LexicalEditor/plugins/FormatPaint/FormatPainterCommands.ts b/src/components/LexicalEditor/plugins/FormatPaint/FormatPainterCommands.ts
new file mode 100644
index 0000000..0853a9e
--- /dev/null
+++ b/src/components/LexicalEditor/plugins/FormatPaint/FormatPainterCommands.ts
@@ -0,0 +1,27 @@
+import { LexicalCommand, createCommand, TextFormatType } from 'lexical';
+
+export interface CopiedFormat {
+  textFormatFlags: number; // 从node.getFormat()
+  style: string;           // 从node.getStyle()
+  // todo: p 标签的样式
+}
+
+export interface ActivateFormatPainterPayload {
+  sticky: boolean;
+}
+
+// activate the format painter and copy the current selection's format
+export const ACTIVATE_FORMAT_PAINTER_COMMAND: LexicalCommand<ActivateFormatPainterPayload> =
+  createCommand('ACTIVATE_FORMAT_PAINTER_COMMAND');
+
+// deactivate the format painter
+export const DEACTIVATE_FORMAT_PAINTER_COMMAND: LexicalCommand<void> =
+  createCommand('DEACTIVATE_FORMAT_PAINTER_COMMAND');
+
+// dispatched by the plugin to inform UI about state changes
+export interface FormatPainterState {
+  isActive: boolean;
+  isSticky: boolean;
+}
+export const FORMAT_PAINTER_STATE_UPDATE_COMMAND: LexicalCommand<FormatPainterState> =
+  createCommand('FORMAT_PAINTER_STATE_UPDATE_COMMAND');
diff --git a/src/components/LexicalEditor/plugins/FormatPaint/FormatPainterToolbarButton.tsx b/src/components/LexicalEditor/plugins/FormatPaint/FormatPainterToolbarButton.tsx
new file mode 100644
index 0000000..fe3bc07
--- /dev/null
+++ b/src/components/LexicalEditor/plugins/FormatPaint/FormatPainterToolbarButton.tsx
@@ -0,0 +1,84 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
+import { $getSelection, $isRangeSelection, LexicalEditor, COMMAND_PRIORITY_NORMAL } from 'lexical';
+import {
+  ACTIVATE_FORMAT_PAINTER_COMMAND,
+  DEACTIVATE_FORMAT_PAINTER_COMMAND,
+  FORMAT_PAINTER_STATE_UPDATE_COMMAND,
+  FormatPainterState,
+} from './FormatPainterCommands';
+
+const PaintBrushIcon = () => <i className='format painter' />;
+
+export function FormatPainterToolbarButton() {
+  const [editor] = useLexicalComposerContext();
+  const [isActive, setIsActive] = useState(false);
+  const [isSticky, setIsSticky] = useState(false);
+  const [canCopy, setCanCopy] = useState(false);
+
+  // 插件状态
+  useEffect(() => {
+    return editor.registerCommand<FormatPainterState>(
+      FORMAT_PAINTER_STATE_UPDATE_COMMAND,
+      (payload) => {
+        setIsActive(payload.isActive);
+        setIsSticky(payload.isSticky);
+        return true;
+      },
+      COMMAND_PRIORITY_NORMAL,
+    );
+  }, [editor]);
+
+  // 选区状态
+  useEffect(() => {
+    return editor.registerUpdateListener(({ editorState }) => {
+      editorState.read(() => {
+        const selection = $getSelection();
+        if ($isRangeSelection(selection) && !selection.isCollapsed()) {
+          setCanCopy(true);
+        } else {
+          setCanCopy(false);
+        }
+      });
+    });
+  }, [editor]);
+
+  const handleClick = () => {
+    if (isActive) {
+      editor.dispatchCommand(DEACTIVATE_FORMAT_PAINTER_COMMAND, undefined);
+    } else if (canCopy) {
+      editor.dispatchCommand(ACTIVATE_FORMAT_PAINTER_COMMAND, { sticky: false });
+    }
+    // * !isActive and !canCopy 什么也不做
+  };
+
+  // 双击 保持激活
+  const handleDoubleClick = () => {
+    if (isActive && isSticky) {
+      editor.dispatchCommand(DEACTIVATE_FORMAT_PAINTER_COMMAND, undefined);
+    } else if (canCopy) {
+      editor.dispatchCommand(ACTIVATE_FORMAT_PAINTER_COMMAND, { sticky: true });
+    }
+  };
+
+  return (
+    <button
+      type="button"
+      onClick={handleClick}
+      onDoubleClick={handleDoubleClick}
+      className={`toolbar-item spaced ${isActive ? 'active' : ''}`}
+      title={isActive ? (isSticky ? 'Format Painter (Sticky)' : 'Format Painter (Active)') : 'Format Painter'}
+      aria-label={isActive ? (isSticky ? 'Deactivate Format Painter (Sticky)' : 'Deactivate Format Painter (Active)') : 'Activate Format Painter'}
+      disabled={!isActive && !canCopy}
+    >
+      <PaintBrushIcon />
+    </button>
+  );
+}
+
+{/* <button type='button'
+className={'toolbar-item spaced ' + (isActive ? 'active' : '')}
+aria-label='Format Painter'>
+<i className='format painter' />
+</button> */}
+export default FormatPainterToolbarButton;
diff --git a/src/components/LexicalEditor/plugins/FormatPaint/index.tsx b/src/components/LexicalEditor/plugins/FormatPaint/index.tsx
new file mode 100644
index 0000000..d9d373d
--- /dev/null
+++ b/src/components/LexicalEditor/plugins/FormatPaint/index.tsx
@@ -0,0 +1,267 @@
+import React, { useEffect, useState, useCallback, useRef } from 'react';
+import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
+import {
+  $getSelection,
+  $isRangeSelection,
+  $isTextNode,
+  TextFormatType,
+  LexicalEditor,
+  COMMAND_PRIORITY_NORMAL,
+  COMMAND_PRIORITY_LOW,
+} from 'lexical';
+import { $patchStyleText, } from '@lexical/selection';
+// $patchStyleText is more efficient for merging styles.
+
+import {
+  CopiedFormat,
+  ACTIVATE_FORMAT_PAINTER_COMMAND,
+  DEACTIVATE_FORMAT_PAINTER_COMMAND,
+  FORMAT_PAINTER_STATE_UPDATE_COMMAND,
+  ActivateFormatPainterPayload,
+  FormatPainterState,
+} from './FormatPainterCommands';
+
+// parse style string to object for $patchStyleText
+function parseStyleText(style: string): Record<string, string> {
+  const styleObj: Record<string, string> = {};
+  style.split(';').forEach((rule) => {
+    const [key, value] = rule.split(':');
+    if (key && value && key.trim() && value.trim()) {
+      styleObj[key.trim()] = value.trim();
+    }
+  });
+  return styleObj;
+}
+
+// map format flags to TextFormatType
+const textFormatTypeMap: { flag: number; type: TextFormatType }[] = [
+  { flag: 1, type: 'bold' },
+  { flag: 2, type: 'italic' },
+  { flag: 4, type: 'strikethrough' },
+  { flag: 8, type: 'underline' },
+  { flag: 16, type: 'code' },
+  { flag: 32, type: 'subscript' },
+  { flag: 64, type: 'superscript' },
+];
+
+export function FormatPainterPlugin(): null {
+  const [editor] = useLexicalComposerContext();
+
+  const [copiedFormat, setCopiedFormat] = useState<CopiedFormat | null>(null);
+  const [isActive, setIsActive] = useState(false);
+  const [isSticky, setIsSticky] = useState(false);
+
+  // 避免多次复制
+  const isPickingUpRef = useRef(false);
+
+  const broadcastState = useCallback(() => {
+    editor.dispatchCommand(FORMAT_PAINTER_STATE_UPDATE_COMMAND, {
+      isActive,
+      isSticky,
+    });
+  }, [editor, isActive, isSticky]);
+
+  // Update broadcast whenever state changes
+  useEffect(() => {
+    broadcastState();
+  }, [isActive, isSticky, broadcastState]);
+
+
+  // Activate Format Painter (Copy Format)
+  useEffect(() => {
+    return editor.registerCommand<ActivateFormatPainterPayload>(
+      ACTIVATE_FORMAT_PAINTER_COMMAND,
+      (payload) => {
+        isPickingUpRef.current = true;
+        editor.update(() => {
+          const selection = $getSelection();
+          if ($isRangeSelection(selection) && !selection.isCollapsed()) {
+            const anchorNode = selection.anchor.getNode();
+            let formatToCopy: CopiedFormat | null = null;
+
+            if ($isTextNode(anchorNode)) {
+              formatToCopy = {
+                textFormatFlags: anchorNode.getFormat(),
+                style: anchorNode.getStyle(),
+              };
+            } else {
+              // ? todo: 从第一个字符获取格式
+              const nodes = selection.getNodes();
+              for (const node of nodes) {
+                if ($isTextNode(node)) {
+                  formatToCopy = {
+                    textFormatFlags: node.getFormat(),
+                    style: node.getStyle(),
+                  };
+                  break;
+                }
+              }
+            }
+
+            if (formatToCopy) {
+              setCopiedFormat(formatToCopy);
+              setIsActive(true);
+              setIsSticky(payload.sticky);
+            //   console.log('Format Painter Activated. Sticky:', payload.sticky, 'Format:', formatToCopy);
+            }
+          }
+        });
+        // 鼠标抬起
+        setTimeout(() => { isPickingUpRef.current = false; }, 50);
+        return true;
+      },
+      COMMAND_PRIORITY_NORMAL,
+    );
+  }, [editor]);
+
+  // Deactivate Format Painter
+  useEffect(() => {
+    return editor.registerCommand<void>(
+      DEACTIVATE_FORMAT_PAINTER_COMMAND,
+      () => {
+        if (!isActive) return false;
+        setIsActive(false);
+        setIsSticky(false);
+        // 不保留
+        setCopiedFormat(null);
+        // console.log('Format Painter Deactivated.');
+        return true;
+      },
+      COMMAND_PRIORITY_NORMAL,
+    );
+  }, [editor, isActive]);
+
+
+    // 应用复制的格式
+  const applyFormat = useCallback(() => {
+    if (!isActive || !copiedFormat || isPickingUpRef.current) {
+      return false;
+    }
+
+    editor.update(() => {
+      const selection = $getSelection();
+      if ($isRangeSelection(selection) && copiedFormat) {
+        // console.log('copiedFormat:', copiedFormat, '\ntextFormatTypeMap:', textFormatTypeMap);
+        // TextNode (bold, italic, ...)
+        textFormatTypeMap.forEach(fmt => {
+            if (copiedFormat.textFormatFlags & fmt.flag) {
+                selection.formatText(fmt.type);
+            } else {
+                const currentSelection = $getSelection();
+                if ($isRangeSelection(currentSelection)) {
+                   textFormatTypeMap.forEach(fmt => {
+                       const shouldHaveFormat = (copiedFormat.textFormatFlags & fmt.flag) > 0;
+                       if (currentSelection.hasFormat(fmt.type) !== shouldHaveFormat) {
+                           currentSelection.formatText(fmt.type);
+                       }
+                   });
+                }
+            }
+        });
+        // ensure applied
+        let newSelection = $getSelection();
+        if ($isRangeSelection(newSelection)) {
+            textFormatTypeMap.forEach(fmt => {
+                if (copiedFormat.textFormatFlags & fmt.flag) {
+                    if (!newSelection!.hasFormat(fmt.type)) newSelection!.formatText(fmt.type);
+                } else {
+                    if (newSelection!.hasFormat(fmt.type)) newSelection!.formatText(fmt.type);
+                }
+            });
+        }
+
+        // inline styles (font-family, color, font-size, ...)
+        const stylesToApply = parseStyleText(copiedFormat.style);
+        // console.log('inline style', stylesToApply);
+        if (Object.keys(stylesToApply).length > 0) {
+            newSelection = $getSelection();
+            if ($isRangeSelection(newSelection)) {
+                $patchStyleText(newSelection as any, stylesToApply);
+            }
+        } else {
+            // 清除格式
+            const selectedNodes = newSelection.getNodes();
+            selectedNodes.forEach(node => {
+              if ($isTextNode(node)) {
+                if (node.getStyle() !== "") {
+                  node.setStyle(""); // 清除
+                }
+              }
+              // todo: <p> node
+            });
+        }
+
+        // console.log('Format Applied. Sticky:', isSticky);
+
+        if (!isSticky) {
+          setIsActive(false);
+        }
+      }
+    });
+    return true;
+  }, [editor, isActive, isSticky, copiedFormat]);
+
+
+  // 鼠标抬起
+  useEffect(() => {
+    if (!isActive || !copiedFormat) return;
+
+    const editorElement = editor.getRootElement();
+    if (!editorElement) return;
+
+    const handleMouseUp = (event: MouseEvent) => {
+      if (isPickingUpRef.current) return;
+
+      if (editorElement.contains(event.target as Node)) {
+        // todo: 改为在下一帧更新
+        setTimeout(() => {
+          const selection = editor.getEditorState().read($getSelection);
+          if ($isRangeSelection(selection) && !selection.isCollapsed()) {
+            applyFormat();
+          } else if ($isRangeSelection(selection) && selection.isCollapsed()) {
+            // 折叠的选区, 也应用
+            // applyFormat();
+          }
+        }, 0);
+      }
+    };
+
+    document.addEventListener('mouseup', handleMouseUp);
+    return () => {
+      document.removeEventListener('mouseup', handleMouseUp);
+    };
+  }, [editor, isActive, copiedFormat, applyFormat]);
+
+
+  // 按 esc 键取消格式
+  useEffect(() => {
+    if (!isActive) return;
+
+    const handleKeyDown = (event: KeyboardEvent) => {
+      if (event.key === 'Escape') {
+        editor.dispatchCommand(DEACTIVATE_FORMAT_PAINTER_COMMAND, undefined);
+      }
+    };
+
+    document.addEventListener('keydown', handleKeyDown);
+    return () => {
+      document.removeEventListener('keydown', handleKeyDown);
+    };
+  }, [editor, isActive]);
+
+  // 鼠标样式
+  useEffect(() => {
+    const editorElement = editor.getRootElement();
+    if (editorElement) {
+      editorElement.style.cursor = isActive ? 'copy' : 'auto';
+    }
+    return () => {
+      if (editorElement) {
+        editorElement.style.cursor = 'auto';
+      }
+    };
+  }, [editor, isActive]);
+
+  return null;
+}
+export default FormatPainterPlugin;
diff --git a/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx b/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
index a258eff..ae436b0 100644
--- a/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
+++ b/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
@@ -39,6 +39,7 @@ import {
   // InsertImagePayload,
 } from './ImagesPlugin';
 import {InsertInlineImageDialog} from './InlineImagePlugin';
+import FormatPainterToolbarButton from './FormatPaint/FormatPainterToolbarButton';
 
 import useModal from './../hooks/useModal';
 
@@ -793,6 +794,7 @@ export default function ToolbarPlugin() {
         aria-label='Redo'>
         <i className='format redo' />
       </button>
+      <FormatPainterToolbarButton />
       <Divider />
       {supportedBlockTypes.has(blockType) && (
         <>
diff --git a/src/components/LexicalEditor/styles.css b/src/components/LexicalEditor/styles.css
index 173bd1a..f065d4d 100644
--- a/src/components/LexicalEditor/styles.css
+++ b/src/components/LexicalEditor/styles.css
@@ -430,7 +430,8 @@ pre::-webkit-scrollbar-thumb {
 }
 
 .toolbar button.toolbar-item.active {
-  background-color: rgba(223, 232, 250, 0.3);
+  /* background-color: rgba(223, 232, 250, 0.8); */
+  background-color: #eef2ff;
 }
 
 .toolbar button.toolbar-item.active i {
@@ -604,7 +605,8 @@ i.chevron-down {
   background-size: contain;
 }
 button.item.dropdown-item-active {
-    background-color: #dfe8fa4d;
+    /* background-color: #dfe8fa4d; */
+    background-color: #eef2ff;
 }
 
 .dropdown .item:first-child {
@@ -836,6 +838,10 @@ i.outdent {
     background-image: url("data:image/svg+xml,%3csvg%20xmlns='http://www.w3.org/2000/svg'%20width='16'%20height='16'%20fill='currentColor'%20class='bi%20bi-text-indent-right'%3e%3cpath%20d='M2%203.5a.5.5%200%200%201%20.5-.5h11a.5.5%200%200%201%200%201h-11a.5.5%200%200%201-.5-.5zm10.646%202.146a.5.5%200%200%201%20.708.708L11.707%208l1.647%201.646a.5.5%200%200%201-.708.708l-2-2a.5.5%200%200%201%200-.708l2-2zM2%206.5a.5.5%200%200%201%20.5-.5h6a.5.5%200%200%201%200%201h-6a.5.5%200%200%201-.5-.5zm0%203a.5.5%200%200%201%20.5-.5h6a.5.5%200%200%201%200%201h-6a.5.5%200%200%201-.5-.5zm0%203a.5.5%200%200%201%20.5-.5h11a.5.5%200%200%201%200%201h-11a.5.5%200%200%201-.5-.5z'/%3e%3c/svg%3e")
 }
 
+i.painter {
+  background-image: url(/images/icons/paint-brush-line.svg);
+}
+
 i.bold {
   background-image: url(/images/icons/type-bold.svg);
 }

From 7b0bb05e891524241936f88318a189d9846cd469 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 26 May 2025 15:30:55 +0800
Subject: [PATCH 008/143] =?UTF-8?q?test:=20=E7=BC=96=E8=BE=91=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	src/utils/commons.js
---
 src/components/DnDModal.jsx                   |   2 +-
 src/main.jsx                                  |   3 +
 src/stores/ConversationStore.js               |  54 +-
 src/views/ChatWindow.jsx                      |   2 +
 .../Online/Components/EmailContent.jsx        |   2 +-
 .../Online/Components/EmailDetail.jsx         |   6 +-
 .../Online/Components/EmailDetailInline.jsx   |  25 +-
 .../Online/Components/EmailListDrawer.jsx     |  16 +-
 .../Online/Components/EmailQuotation.jsx      |   4 +-
 .../Online/Input/EmailComposer.jsx            |   4 +-
 .../Online/Input/EmailEditorPopup.jsx         | 121 +++-
 .../Conversations/Online/MessagesWrapper.jsx  |  44 +-
 src/views/NewEmail.jsx                        | 639 ++++++++++++++++++
 13 files changed, 859 insertions(+), 63 deletions(-)
 create mode 100644 src/views/NewEmail.jsx

diff --git a/src/components/DnDModal.jsx b/src/components/DnDModal.jsx
index b53da9c..9ee7714 100644
--- a/src/components/DnDModal.jsx
+++ b/src/components/DnDModal.jsx
@@ -46,7 +46,7 @@ const DnDModal = ({ children, open, setOpen, onCancel, onMove, onResize, initial
       maskClosable={false}
       // theme='dark'
       // className={'!border !border-solid !border-indigo-500 rounded !p-2' }
-      titleBarClassName='!bg-neutral-100 !rounded !rounded-b-none !border-none !p-3 !font-bold !text-slate-600'
+      titleBarClassName={`!bg-neutral-100 !rounded !rounded-b-none !border-none !p-3 !font-bold !text-slate-600 ${props.titleClassName}`}
       contentClassName='!p-2'
       footerClassName='!p-2'
       className={`!rounded-t !rounded-b-none !border !border-solid !shadow-heavy ${props.rootClassName}`}
diff --git a/src/main.jsx b/src/main.jsx
index ca5dd95..3b95ab8 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -31,6 +31,7 @@ import useAuthStore from '@/stores/AuthStore'
 import '@/assets/index.css'
 
 import CustomerRelation from '@/views/customer_relation/index'
+import NewEmail from './views/NewEmail'
 
 useAuthStore.getState().loadUserSession()
 
@@ -86,6 +87,8 @@ const router = createBrowserRouter([
               { path: 'customer_relation/index', element: <CustomerRelation /> },
             ],
           },
+          { path: 'email/:action/:quoteid', element: <NewEmail />},
+          { path: 'email/new', element: <NewEmail />},
         ],
   },
   {
diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js
index 6e0c479..3c9b289 100644
--- a/src/stores/ConversationStore.js
+++ b/src/stores/ConversationStore.js
@@ -557,11 +557,63 @@ const messageSlice = (set, get) => ({
  */
 const emailSlice = (set, get) => ({
   emailMsg: { id: -1, conversationid: '', actionId: '', order_opi: '', coli_sn: '', msgOrigin: {} },
-  setEmailMsg: (emailMsg) => set({ emailMsg }),
+  setEmailMsg: (emailMsg) => {
+    const { editorOpen } = get();
+    return editorOpen ? false : set({ emailMsg }); // 已经打开的不更新
+  },
   detailPopupOpen: false,
   setDetailOpen: (v) => set({ detailPopupOpen: v }),
   openDetail: () => set(() => ({ detailPopupOpen: true })),
   closeDetail: () => set(() => ({ detailPopupOpen: false })),
+  editorOpen: false,
+  setEditorOpen: (v) => set({ editorOpen: v }),
+  openEditor: () => set(() => ({ editorOpen: true })),
+  closeEditor: () => set(() => ({ editorOpen: false })),
+
+  // EmailEditorPopup 组件的 props
+  // @property {string} fromEmail - 发件人邮箱
+  // @property {string} fromUser - 发件人用户
+  // @property {string} fromOrder - 发件订单
+  // @property {string} toEmail - 收件人邮箱
+  // @property {string} conversationid - 会话ID
+  // @property {string} quoteid - 引用邮件ID
+  // @property {object} draft - 草稿
+  // @property {string} action - reply / forward / new / edit
+  // @property {string} oid - coli_sn
+  // @property {object} mailData - 邮件内容
+  // @property {string} receiverName - 收件人称呼
+  emailEdiorProps: new Map(),
+  setEditorProps: (v) => {
+    const { emailEdiorProps } = get();
+    const uniqueKey = v.quoteid || Date.now().toString(32);
+    const currentEditValue = {...v, key: `${v.action}-${uniqueKey}`};
+    const news = new Map(emailEdiorProps).set(currentEditValue.key, currentEditValue);
+    for (const [key, value] of news.entries()) {
+      console.log(value);
+    }
+    return set((state) => ({ emailEdiorProps: news, currentEditKey: currentEditValue.key, currentEditValue }))
+    // return set((state) => ({ emailEdiorProps: { ...state.emailEdiorProps, ...v } }))
+  },
+  closeEditor1: (key) => {
+    const { emailEdiorProps } = get();
+    const newProps = new Map(emailEdiorProps);
+    newProps.delete(key);
+    return set(() => ({ emailEdiorProps: newProps }))
+  },
+  clearEditor: () => {
+    return set(() => ({ emailEdiorProps: new Map() }))
+  },
+  currentEditKey: '',
+  setCurrentEditKey: (key) => {
+    const { emailEdiorProps, setCurrentEditValue } = get();
+    const value = emailEdiorProps.get(key);
+    setCurrentEditValue(value);
+    return set(() => ({ currentEditKey: key }))
+  },
+  currentEditValue: {},
+  setCurrentEditValue: (v) => {
+    return set(() => ({ currentEditValue: v }))
+  }
 })
 
 export const useConversationStore = create(
diff --git a/src/views/ChatWindow.jsx b/src/views/ChatWindow.jsx
index 0c5a150..2f6d47d 100644
--- a/src/views/ChatWindow.jsx
+++ b/src/views/ChatWindow.jsx
@@ -12,6 +12,7 @@ import CustomerProfile from './Conversations/Online/order/CustomerProfile';
 import ReplyWrapper from './Conversations/Online/ReplyWrapper';
 
 import './Conversations/Conversations.css';
+import EmailEditorPopup from './Conversations/Online/Input/EmailEditorPopup';
 
 const { Sider, Content, Header, Footer } = Layout;
 
@@ -75,6 +76,7 @@ const ChatWindow = () => {
           <CustomerProfile disabled />
         </Sider>
       </Layout>
+      <EmailEditorPopup key='email-editor-online' />
     </>
   );
 };
diff --git a/src/views/Conversations/Online/Components/EmailContent.jsx b/src/views/Conversations/Online/Components/EmailContent.jsx
index 0d0344b..d56ff88 100644
--- a/src/views/Conversations/Online/Components/EmailContent.jsx
+++ b/src/views/Conversations/Online/Components/EmailContent.jsx
@@ -72,7 +72,7 @@ const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
     } catch (error) {
       console.error('Error calculating height:', error)
     }
-    setIframeHeight(200)
+    // setIframeHeight(200)
   }
 
   useEffect(() => {
diff --git a/src/views/Conversations/Online/Components/EmailDetail.jsx b/src/views/Conversations/Online/Components/EmailDetail.jsx
index 1203c47..e0eeb8f 100644
--- a/src/views/Conversations/Online/Components/EmailDetail.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetail.jsx
@@ -149,7 +149,7 @@ const EmailDetail = ({ open, setOpen, emailMsg={}, disabled=false, ...props }) =
         footer={<ActionBtns className='w-full !justify-start' />}>
           <EmailDetailInline { ...{ mailData, emailMsg, loading, mailID } } />
       </DnDModal>
-      <EmailEditorPopup
+      {/* <EmailEditorPopup
         open={openEmailEditor}
         setOpen={setOpenEmailEditor}
         fromEmail={fromEmail}
@@ -163,8 +163,8 @@ const EmailDetail = ({ open, setOpen, emailMsg={}, disabled=false, ...props }) =
         initial={{ ...props.initialPosition, ...props.initialSize }}
         mailData={mailData}
         action={action}
-        key={`email-detail-inner-${action}-popup_${mailID}`}
-      />
+        key={`email-detail-inner-${action}_${mailID}`}
+      /> */}
     </>
   )
 }
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 20bc068..53f5c76 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -49,12 +49,19 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, ...props }
     return () => {}
   }, [mailID])
 
-  const onOpenEditor = (msgOrigin, action) => {
-    const { from, to } = msgOrigin
-    setOpenEmailEditor(true)
-    setFromEmail(action === 'edit' ? from : to)
-    setAction(action)
-    // setOpen(false)
+  const onOpenEditor = (msgOrigin, action='reply') => {
+    window.open(`/email/${action}/${msgOrigin.email.mai_sn || 0}`, `${action}-${msgOrigin.email.mai_sn || 0}`,'left=20,width=1000')
+    console.log('first000', emailMsg)
+    console.log('first', msgOrigin)
+    if (typeof props.onOpenEditor === 'function') {
+      props.onOpenEditor(msgOrigin, action);
+    } else {
+      const { from, to } = msgOrigin
+      setOpenEmailEditor(true)
+      setFromEmail(action === 'edit' ? from : to)
+      setAction(action)
+      // // setOpen(false)
+    }
   }
 
   const { loading, mailData, orderDetail, postEmailResend } = useEmailDetail(mailID)
@@ -219,7 +226,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, ...props }
           </Flex>
         </div>
       </div>
-      <EmailEditorPopup
+      {/* <EmailEditorPopup
         open={openEmailEditor}
         setOpen={setOpenEmailEditor}
         fromEmail={fromEmail}
@@ -233,8 +240,8 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, ...props }
         // initial={{ ...initialPosition, ...initialSize }}
         mailData={void 0}
         action={action}
-        key={`email-detail-inner-${action}-inline_${mailID}`}
-      />
+        key={`email-detail-inline-${action}_${mailID}`}
+      /> */}
     </>
   )
 }
diff --git a/src/views/Conversations/Online/Components/EmailListDrawer.jsx b/src/views/Conversations/Online/Components/EmailListDrawer.jsx
index a1b68e1..9849138 100644
--- a/src/views/Conversations/Online/Components/EmailListDrawer.jsx
+++ b/src/views/Conversations/Online/Components/EmailListDrawer.jsx
@@ -5,8 +5,12 @@ import dayjs from 'dayjs'
 import { InboxIcon, SendPlaneFillIcon, ExpandIcon } from '@/components/Icons'
 import EmailDetailInline from './EmailDetailInline'
 import { debounce, isEmpty } from '@/utils/commons'
+import useConversationStore from '@/stores/ConversationStore';
+
+const EmailListDrawer = ({ showExpandBtn=true, title, list: otherEmailList, currentConversationID, opi_sn, oid, emailItem: clickItem, onOpenEditor, ...props }) => {
+
+  const [, setEmailMsg] = useConversationStore((state) => [state.emailMsg, state.setEmailMsg]);
 
-const EmailListDrawer = ({ showExpandBtn=true, title, list: otherEmailList, currentConversationID, opi_sn, oid, emailItem: clickItem, ...props }) => {
   const [open, setOpen] = useState(false)
   const [selectedEmail, setSelectedEmail] = useState({})
   const searchInputRef = useRef(null)
@@ -38,11 +42,15 @@ const EmailListDrawer = ({ showExpandBtn=true, title, list: otherEmailList, curr
       msgOrigin: {
         from: '',
         to: '',
+        ...(emailItem?.msgOrigin || {}),
         id: emailItem.MAI_SN,
         email: { mai_sn: emailItem.MAI_SN, subject: emailItem.MAI_Subject, id: emailItem.MAI_SN },
+        subject: emailItem.MAI_Subject,
       },
     }
+    console.log('emailItem', emailItem);
     setSelectedEmail(emailMsg)
+    setEmailMsg(emailMsg);
   };
 
   const [pageCurrent, setPageCurrent] = useState(1);
@@ -52,11 +60,11 @@ const EmailListDrawer = ({ showExpandBtn=true, title, list: otherEmailList, curr
 
   useEffect(() => {
     if (!isEmpty(clickItem)) {
-      onClickEmailItem(clickItem)
-      setOpen(true);
       const itemIndex = dataSource.findIndex((ele) => ele.MAI_SN === clickItem.MAI_SN);
       const page = Math.ceil((itemIndex+1) / 8) || 1;
       setPageCurrent(page);
+      onClickEmailItem({...clickItem, ...dataSource[itemIndex]});
+      setOpen(true);
     }
 
     return () => {}
@@ -129,7 +137,7 @@ const EmailListDrawer = ({ showExpandBtn=true, title, list: otherEmailList, curr
           setOpen(false)
         }}
         open={open}>
-        <EmailDetailInline {...{ mailID: selectedEmail.MAI_SN, emailMsg: selectedEmail }} />
+        <EmailDetailInline {...{ mailID: selectedEmail.MAI_SN, emailMsg: selectedEmail, onOpenEditor }} />
       </Drawer>
     </>
   )
diff --git a/src/views/Conversations/Online/Components/EmailQuotation.jsx b/src/views/Conversations/Online/Components/EmailQuotation.jsx
index 58f3d25..b959128 100644
--- a/src/views/Conversations/Online/Components/EmailQuotation.jsx
+++ b/src/views/Conversations/Online/Components/EmailQuotation.jsx
@@ -69,7 +69,7 @@ const EmailQuotation = ({ sfi_sn, ...props }) => {
         邮件
       </Button>
 
-      <EmailEditorPopup
+      {/* <EmailEditorPopup
         open={editorOpen}
         setOpen={setEditorOpen}
         fromEmail={pickEmail.key}
@@ -86,7 +86,7 @@ const EmailQuotation = ({ sfi_sn, ...props }) => {
         // customerDetail={customerDetail}
         action={'new'}
         key={`email-quotation-new-popup_${currentConversation.sn}`}
-      />
+      /> */}
     </>
   )
 }
diff --git a/src/views/Conversations/Online/Input/EmailComposer.jsx b/src/views/Conversations/Online/Input/EmailComposer.jsx
index caa9833..62f3626 100644
--- a/src/views/Conversations/Online/Input/EmailComposer.jsx
+++ b/src/views/Conversations/Online/Input/EmailComposer.jsx
@@ -258,7 +258,7 @@ const EmailComposer = ({ ...props }) => {
         <Alert message="账户没有配置邮箱地址" description='请 重新登录 获取最新配置' type="warning" showIcon className=' absolute top-0 left-0 right-0 bottom-0' />
       }
 
-        <EmailEditorPopup
+        {/* <EmailEditorPopup
           {...{ open, setOpen }}
           fromEmail={fromEmail}
           fromUser={fromUser}
@@ -270,7 +270,7 @@ const EmailComposer = ({ ...props }) => {
           customerDetail={customerDetail}
           action='new'
           key={'email-new-editor-popup'}
-        />
+        /> */}
     </ConfigProvider>
   )
 }
diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
index 9af4298..6582c33 100644
--- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
+++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
@@ -1,5 +1,5 @@
-import {  useEffect, useState } from 'react';
-import { App, ConfigProvider, Button, Form, Input, Flex, Checkbox,  Popconfirm, Select, Space, Upload, Divider, Modal } from 'antd';
+import {  useEffect, useState, useRef, useCallback } from 'react';
+import { App, ConfigProvider, Button, Form, Input, Flex, Checkbox,  Popconfirm, Select, Space, Upload, Divider, Modal, Tabs } from 'antd';
 import { UploadOutlined, LoadingOutlined } from '@ant-design/icons';
 import '@dckj/react-better-modal/dist/index.css';
 import DnDModal from '@/components/DnDModal';
@@ -10,7 +10,7 @@ import useAuthStore from '@/stores/AuthStore';
 import LexicalEditor from '@/components/LexicalEditor';
 
 import { v4 as uuid } from 'uuid';
-import { cloneDeep, isEmpty, } from '@/utils/commons';
+import { cloneDeep, debounce, isEmpty, writeIndexDB, } from '@/utils/commons';
 import './EmailEditor.css';
 import { postSendEmail } from '@/actions/EmailActions';
 import { sentMsgTypeMapped,   } from '@/channel/bubbleMsgUtils';
@@ -60,10 +60,9 @@ const generateMailContent = (mailData) => `<br><br><p>${mailData.content}</p>`
  * @property {string} quoteid - 引用邮件ID
  * @property {object} draft - 草稿
  */
-const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid, toEmail, conversationid, quoteid, initial = {}, mailData: _mailData, action = 'reply', draft = {}, customerDetail={}, ...props }) => {
+const EmailEditorPopup = () => {
 	const { notification, message } = App.useApp();
   const [form] = Form.useForm();
-
   const [mobile] = useStyleStore((state) => [state.mobile]);
   const [userId, username, emailList] = useAuthStore((state) => [state.loginUser.userId, state.loginUser.username, state.loginUser.emailList]);
   const emailListOption = emailList?.map(ele => ({ ...ele, label: ele.email, key: ele.email, value: ele.email })) || [];
@@ -72,8 +71,35 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
   const emailListMatMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.mat_sn]: v }), {});
   // console.log('emailListMapped', emailListOption, emailListAddrMapped);
 
-  const mai_sn = quoteid;
-  const { loading: getLoading, mailData } = useEmailDetail(mai_sn, _mailData)
+  const emailEdiorProps = useConversationStore((state) => state.emailEdiorProps);
+  const [open, setOpen, closeEditor1, currentEditKey, setCurrentEditKey] = useConversationStore((state) => [state.editorOpen, state.setEditorOpen, state.closeEditor1, state.currentEditKey, state.setCurrentEditKey]);
+
+  const propsKeysArr = Array.from(emailEdiorProps.keys());
+  const propsArr = Array.from(emailEdiorProps.values());
+
+  const [activeEdit, setActiveEdit] = useState(emailEdiorProps.get(currentEditKey) || {});
+  // const { fromEmail, fromUser, fromOrder, oid, toEmail, conversationid, quoteid, initial = {}, mailData: _mailData, action = 'reply', draft = {}, receiverName, ...props } = emailEdiorProps.get(currentEditKey) || {};
+
+  const onChangeActiveEditor = (key) => {
+    setCurrentEditKey(key);
+    const _find = emailEdiorProps.get(key) || {};
+    setActiveEdit(_find);
+  };
+
+  const onEditTab = (targetKey, action) => {
+    if (action === 'add') {
+      //
+    } else {
+      if (propsKeysArr.length === 1) {
+        setOpen(false);
+      }
+      closeEditor1(targetKey);
+    }
+  };
+
+
+  const mai_sn = activeEdit.quoteid;
+  const { loading: getLoading, mailData } = useEmailDetail(mai_sn, activeEdit.mailData)
 
 
   const [stickToProps, setStickToProps] = useState({});
@@ -99,24 +125,24 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
   // 存储: 会话ID,
   // 这个窗口没有模态, 即使不是focus, 还是需要保持会话ID
   // 否则, 会话列表切换之后, 会话ID更新, 导致消息关联错误
-  const [stickToCid, setStickToCid] = useState(conversationid);
+  const [stickToCid, setStickToCid] = useState(activeEdit.conversationid);
   useEffect(() => {
-    const propsObj = { open, setOpen, fromEmail, fromUser, fromOrder, oid, toEmail, conversationid, quoteid, mai: _mailData?.info?.MAI_MAT_SN, action, draft }
+    const propsObj = { ...activeEdit, mai: activeEdit.mailData?.info?.MAI_MAT_SN, }
 
-    setContentPrefix(oid ? `<p>Dear Mr./Ms. ${customerDetail.name || ''}</p><p>Reference Number: ${oid}</p>` : '');
+    setContentPrefix(activeEdit.oid ? `<p>Dear Mr./Ms. ${activeEdit.receiverName || ''}</p><p>Reference Number: ${activeEdit.oid}</p>` : '');
 
     // 没有引用邮件
-    if (isEmpty(quoteid)) {
+    if (isEmpty(activeEdit.quoteid)) {
       setStickToProps(propsObj)
       setPropsSerialize(JSON.stringify(propsObj))
 
-      setStickToCid(conversationid)
-      setEmailOrder(fromOrder)
-      setEmailOPI(fromUser)
-      setNewFromEmail(fromEmail)
-      setNewToEmail(toEmail)
+      setStickToCid(activeEdit.conversationid)
+      setEmailOrder(activeEdit.fromOrder)
+      setEmailOPI(activeEdit.fromUser)
+      setNewFromEmail(activeEdit.fromEmail)
+      setNewToEmail(activeEdit.toEmail)
 
-      const _findMat = emailListAddrMapped?.[fromEmail]?.mat_sn
+      const _findMat = emailListAddrMapped?.[activeEdit.fromEmail]?.mat_sn
       setEmailMat(_findMat)
 
       // if (open !== true) {
@@ -129,7 +155,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
       const reEmailUser = mailData.info?.MAI_OPI_SN
       const reEmailUserMat = mailData.info?.MAI_MAT_SN
 
-      setEmailOrder((prev) => reEmailO || prev || fromOrder)
+      setEmailOrder((prev) => reEmailO || prev || activeEdit.fromOrder)
       setEmailOPI((prev) => reEmailUser || prev)
       setEmailMat((prev) => reEmailUserMat || prev)
 
@@ -178,6 +204,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
     setTextContent(textContent);
     form.setFieldValue('content', htmlContent);
     form.setFieldValue('abstract', getAbstract(textContent));
+    debouncedSave({htmlContent});
   };
 
   const [initialForm, setInitialForm] = useState({});
@@ -189,7 +216,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
   useEffect(() => {
     // console.log('quoteid', quoteid, isEmpty(quoteid), isEmpty(mailData.info));
 
-    if (isEmpty(quoteid) && action !== 'new') {
+    if (isEmpty(activeEdit.quoteid) && activeEdit.action !== 'new') {
       return () => {}
     }
     const { info } = mailData
@@ -201,7 +228,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
 
     // const _initialContent = isEmpty(mailData.info) ? signatureBody : signatureBody+preQuoteBody
 
-    if (!isEmpty(mailData.info) && action !== 'edit') {
+    if (!isEmpty(mailData.info) && activeEdit.action !== 'edit') {
       setInitialContent(contentPrefix + signatureBody)
     }
 
@@ -212,14 +239,14 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
       subject: `Re: ${info.MAI_Subject || ''}`,
     }
     const forwardValues = { from: newFromEmail, subject: `Fw: ${info.MAI_Subject || ''}` }
-    if (action === 'reply') {
+    if (activeEdit.action === 'reply') {
       form.setFieldsValue(_formValues)
       setInitialForm(_formValues)
-    } else if (action === 'forward') {
+    } else if (activeEdit.action === 'forward') {
       setStickToCid('0')
       form.setFieldsValue(forwardValues)
       setInitialForm(forwardValues)
-    } else if (action === 'edit') {
+    } else if (activeEdit.action === 'edit') {
       const thisFormValues = {
         to: info?.MAI_To || '',
         cc: info?.MAI_CS || '',
@@ -231,11 +258,11 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
       // console.log('thisBody', thisBody);
 
       setInitialContent(thisBody)
-    } else if (action === 'new') {
-      const newEmail = { to: newToEmail, subject: draft?.subject || '' }
+    } else if (activeEdit.action === 'new') {
+      const newEmail = { to: newToEmail, subject: activeEdit.draft?.subject || '' }
       form.setFieldsValue(newEmail)
       setInitialForm(newEmail)
-      setInitialContent((draft?.content || contentPrefix || '') + signatureBody)
+      setInitialContent((activeEdit.draft?.content || contentPrefix || '') + signatureBody)
     }
 
     return () => {}
@@ -391,7 +418,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
     body.coli_sn = emailOrder || '';
     // console.log('body', body, '\n', emailOrder);
     const values = await form.validateFields();
-    const preQuoteBody = quoteid ? (quoteContent ? quoteContent : generateQuoteContent(mailData, isRichText)) : '';
+    const preQuoteBody = activeEdit.quoteid ? (quoteContent ? quoteContent : generateQuoteContent(mailData, isRichText)) : '';
     body.mailcontent = isRichText ? EmailBuilder({ subject: values.subject, content: htmlContent+preQuoteBody }) : textContent+preQuoteBody
     body.cc = values.cc || '';
     body.bcc = values.bcc || '';
@@ -450,6 +477,32 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
   const [openDrawerSnippet] = useSnippetStore((state) => [state.openDrawer])
   const [openPaymentDrawer] = useOrderStore((state) => [state.openDrawer])
 
+  const [bakData, setBakData] = useState({});
+  const idleCallbackId = useRef(null);
+  const debouncedSave = useCallback(
+    debounce((data) => {
+      idleCallbackId.current = window.requestIdleCallback(() => {
+        console.log('Saving data (idle, debounced):', data);
+        if (currentEditKey) writeIndexDB({ ...data, key: currentEditKey }, 'draft', 'EmailEditor')
+      });
+    }, 1500), //  1.5s
+    []
+  );
+  const onEditChange = (changedValues, allValues) => {
+    console.log('onEditChange', changedValues,'\n', allValues)
+    // const { name, value } = e.target;
+    // setBakData(prevData => ({ ...prevData, [name]: value }));
+    // debouncedSave(bakData);
+  };
+
+  useEffect(() => {
+    return () => {
+      if (idleCallbackId.current && window.cancelIdleCallback) {
+        window.cancelIdleCallback(idleCallbackId.current);
+      }
+    };
+  }, [debouncedSave]);
+
   return (
     <>
       <ConfigProvider theme={{ token: { colorPrimary: '#6366f1' } }}>
@@ -457,15 +510,19 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
           rootClassName='email-editor-wrapper  !border-indigo-300 '
           open={open}
           setOpen={setOpen}
-          initial={{ width: window.innerWidth - 600, height: window.innerHeight - 40, left: 300 + 24, top: 20 }}
+          // 300 + 24
+          // window.innerWidth - 600
+          initial={{ width: 880, height: window.innerHeight - 40, left: 20, top: 20 }}
           onCancel={() => {
             form.resetFields()
             stateReset()
           }}
+          titleClassName={`!pl-0 !pt-0 !pb-0`}
           title={
             <>
-              {getLoading ? <LoadingOutlined className='mr-1' /> : null}
-              {initialForm.subject || `${!isEmpty(quoteid) ? '回复: ' : '写邮件: '} ${newFromEmail || ''}`}
+            {/* {getLoading ? <LoadingOutlined className='mr-1' /> : null} */}
+            {/* {initialForm.subject || `${!isEmpty(quoteid) ? '回复: ' : '写邮件: '} ${newFromEmail || ''}`} */}
+            <Tabs editable type={'editable-card'} activeKey={currentEditKey} onChange={onChangeActiveEditor} className='[&_.ant-tabs-nav]:mb-0' items={propsArr.map(ele=>({...ele, label: (!isEmpty(activeEdit.quoteid) ? '回复: ' : '新邮件: ')+ele.subject}))} onEdit={onEditTab} hideAdd />
             </>
           }
           footer={
@@ -486,7 +543,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
             </div>
           }>
           <Form
-            form={form}
+            form={form} onValuesChange={onEditChange}
             preserve={false}
             name={`email_max_form-${Date.now().toString(32)}`}
             size='small'
@@ -573,7 +630,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, oid,
             </Form.Item>
           </Form>
           <LexicalEditor {...{ isRichText }} onChange={handleEditorChange} defaultValue={initialContent} />
-          {quoteid && !showQuoteContent && (
+          {activeEdit.quoteid && !showQuoteContent && (
             <div className='flex justify-start items-center ml-2'>
               <Button className='flex gap-2 ' type='link' onClick={() => setShowQuoteContent(!showQuoteContent)}>
                 显示引用内容 ↓
diff --git a/src/views/Conversations/Online/MessagesWrapper.jsx b/src/views/Conversations/Online/MessagesWrapper.jsx
index ea975ab..4ff8fc2 100644
--- a/src/views/Conversations/Online/MessagesWrapper.jsx
+++ b/src/views/Conversations/Online/MessagesWrapper.jsx
@@ -192,18 +192,35 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
   const handleContactClick = (data) => {
     return data.length > 1 ? handleContactListClick(data) : handleContactItemClick(data[0]);
   }
+
   // EmailEditor
+  const [setEditorOpen, setEditorProps] = useConversationStore((state) => [state.setEditorOpen, state.setEditorProps]);
 
   const [openEmailEditor, setOpenEmailEditor] = useState(false);
   const [fromEmail, setFromEmail] = useState('');
   const [ReferEmailMsg, setReferEmailMsg] = useState('');
-  const onOpenEditor = (emailMsgContent) => {
+  const [action, setAction] = useState('')
+  const onOpenEditor = (emailMsgContent, action='reply') => {
     const { from, to } = emailMsgContent; // msgtext
-    // console.log('emailMsgContent', emailMsgContent);
+    console.log('emailMsgContent', emailMsgContent);
 
     setOpenEmailEditor(true);
-    setFromEmail(to);
+    // setFromEmail(to);
+    setFromEmail(action === 'edit' ? from : to)
     setReferEmailMsg({...emailMsgContent, order_opi: Number(orderDetail?.opi_sn || userId)});
+    setAction(action)
+    setEditorProps({
+      action,
+      fromEmail: action === 'edit' ? from : to,
+      fromUser: Number(orderDetail?.opi_sn || userId),
+      fromOrder: currentConversation.coli_sn,
+      oid: orderDetail?.order_no || emailMsgContent?.coli_id,
+      receiverName: customerDetail.name,
+      quoteid: emailMsgContent.mai_sn || emailMsgContent.id,
+      conversationid: currentConversation.sn,
+      subject: emailMsgContent.subject,
+    });
+    // setEditorOpen(true);
   };
 
   const [openEmailDetail, setOpenEmailDetail] = useState(false);
@@ -220,7 +237,17 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
 
   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();
+    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]);
@@ -274,7 +301,7 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
         onCancel={() => setNewChatModalVisible(false)}
       />
       {/* <EmailEditor open ={openEmailEditor} setOpen={setOpenEmailEditor} reference={ReferEmailMsg} setRefernce={setReferEmailMsg} {...{ fromEmail, }} key={'email-editor-reply'} /> */}
-      <EmailEditorPopup
+      {/* <EmailEditorPopup
         open={openEmailEditor}
         setOpen={setOpenEmailEditor}
         fromEmail={fromEmail}
@@ -284,10 +311,11 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
         customerDetail={customerDetail}
         quoteid={ReferEmailMsg.mai_sn || ReferEmailMsg.id}
         conversationid={currentConversation.sn}
-        key={`email-msg-reply-top-popup_${ReferEmailMsg.id}`}
-      />
+        key={`email-msg-reply-online_${ReferEmailMsg.id}`}
+        action={action}
+      /> */}
       <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} />
+      <EmailListDrawer showExpandBtn={false} list={emailList} emailItem={emailItem} currentConversationID={currentConversation.sn} oid={currentConversation.coli_sn} opi_sn={currentConversation.opi_sn} {...{onOpenEditor}} />
     </>
   )
 };
diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
new file mode 100644
index 0000000..0da5924
--- /dev/null
+++ b/src/views/NewEmail.jsx
@@ -0,0 +1,639 @@
+import { useEffect, useState, useRef, useCallback } from 'react'
+import { useParams, useNavigate, useLocation } from 'react-router-dom';
+import { App, ConfigProvider, Button, Form, Input, Flex, Checkbox, Popconfirm, Select, Space, Upload, Divider, Modal, Tabs } from 'antd'
+import { UploadOutlined, LoadingOutlined } from '@ant-design/icons'
+import '@dckj/react-better-modal/dist/index.css'
+import DnDModal from '@/components/DnDModal'
+import useStyleStore from '@/stores/StyleStore'
+import useConversationStore from '@/stores/ConversationStore'
+import useAuthStore from '@/stores/AuthStore'
+
+import LexicalEditor from '@/components/LexicalEditor'
+
+import { v4 as uuid } from 'uuid'
+import { cloneDeep, debounce, isEmpty, writeIndexDB } from '@/utils/commons'
+import '@/views/Conversations/Online/Input/EmailEditor.css'
+import { postSendEmail } from '@/actions/EmailActions'
+import { sentMsgTypeMapped } from '@/channel/bubbleMsgUtils'
+import { EmailBuilder, useEmailDetail, useEmailSignature } from '@/hooks/useEmail'
+import useSnippetStore from '@/stores/SnippetStore'
+import { useOrderStore } from '@/stores/OrderStore'
+import PaymentlinkBtn from '@/views/Conversations/Online/Input/PaymentlinkBtn'
+
+// 禁止上传的附件类型
+// .application, .exe, .app
+const disallowedAttachmentTypes = [
+  '.ps1',
+  '.msi',
+  'application/x-msdownload',
+  'application/x-ms-dos-executable',
+  'application/x-ms-wmd',
+  'application/x-ms-wmz',
+  'application/x-ms-xbap',
+  'application/x-msaccess',
+]
+
+const getAbstract = (longtext) => {
+  const lines = longtext.split('\n')
+  const firstLine = lines[0]
+  const abstract = firstLine.substring(0, 20)
+  return abstract
+}
+const parseHTMLText = (html) => {
+  const parser = new DOMParser()
+  const dom = parser.parseFromString(html, 'text/html')
+  // Replace <br> and <p> with line breaks
+  Array.from(dom.body.querySelectorAll('br, p')).forEach((el) => {
+    el.textContent = '\n' + el.textContent
+  })
+  // Replace <hr> with a line of dashes
+  Array.from(dom.body.querySelectorAll('hr')).forEach((el) => {
+    el.textContent = '\n------------------------------------------------------------------\n'
+  })
+  return dom.body.textContent || ''
+}
+
+const generateQuoteContent = (mailData, isRichText = true) => {
+  const html = `<br><br><hr><p class="font-sans"><b><strong >From: </strong></b><span >${(mailData.info?.MAI_From || '')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')} </span></p><p  class="font-sans"><b><strong >Sent: </strong></b><span >${
+    mailData.info?.MAI_SendDate || ''
+  }</span></p><p  class="font-sans"><b><strong >To: </strong></b><span >${(mailData.info?.MAI_To || '')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')}</span></p><p  class="font-sans"><b><strong >Subject: </strong></b><span >${mailData.info?.MAI_Subject || ''}</span></p><p>${
+    mailData.info?.MAI_ContentType === 'text/html' ? mailData.content : mailData.content.replace(/\r\n/g, '<br>')
+  }</p>`
+  return isRichText ? html : parseHTMLText(html)
+}
+
+const generateMailContent = (mailData) => `<br><br><p>${mailData.content}</p>`
+
+/**
+ * ! 无状态管理
+ */
+const NewEmail = ({ ...props }) => {
+  const pageParam = useParams();
+  const editorKey = `${pageParam.action}-${pageParam.quoteid}`
+
+  const { notification, message } = App.useApp()
+  const [form] = Form.useForm()
+  const [mobile] = useStyleStore((state) => [state.mobile])
+  const [userId, username, emailList] = useAuthStore((state) => [state.loginUser.userId, state.loginUser.username, state.loginUser.emailList])
+  const emailListOption = emailList?.map((ele) => ({ ...ele, label: ele.email, key: ele.email, value: ele.email })) || []
+  // const emailListMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.opi_sn]: v }), {});
+  const emailListAddrMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.email]: v }), {})
+  const emailListMatMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.mat_sn]: v }), {})
+  // console.log('emailListMapped', emailListOption, emailListAddrMapped);
+
+  const emailEdiorProps = useConversationStore((state) => state.emailEdiorProps)
+  const [open, setOpen, closeEditor1, currentEditKey, setCurrentEditKey] = useConversationStore((state) => [
+    state.editorOpen,
+    state.setEditorOpen,
+    state.closeEditor1,
+    state.currentEditKey,
+    state.setCurrentEditKey,
+  ])
+
+  const propsKeysArr = Array.from(emailEdiorProps.keys())
+  const propsArr = Array.from(emailEdiorProps.values())
+
+  const [activeEdit, setActiveEdit] = useState(emailEdiorProps.get(editorKey) || {})
+  // const { fromEmail, fromUser, fromOrder, oid, toEmail, conversationid, quoteid, initial = {}, mailData: _mailData, action = 'reply', draft = {}, receiverName, ...props } = emailEdiorProps.get(currentEditKey) || {};
+
+  const onChangeActiveEditor = (key) => {
+    setCurrentEditKey(key)
+    const _find = emailEdiorProps.get(key) || {}
+    setActiveEdit(_find)
+  }
+
+  const onEditTab = (targetKey, action) => {
+    if (action === 'add') {
+      //
+    } else {
+      if (propsKeysArr.length === 1) {
+        setOpen(false)
+      }
+      closeEditor1(targetKey)
+    }
+  }
+
+  const mai_sn = pageParam.quoteid // activeEdit.quoteid
+  const { loading: getLoading, mailData } = useEmailDetail(mai_sn, activeEdit.mailData)
+
+  const [stickToProps, setStickToProps] = useState({})
+  const [propsSerialize, setPropsSerialize] = useState('')
+
+  const [newFromEmail, setNewFromEmail] = useState('')
+  const [newToEmail, setNewToEmail] = useState('')
+  const [emailOPI, setEmailOPI] = useState('')
+  const [emailOrder, setEmailOrder] = useState('')
+  const [emailMat, setEmailMat] = useState('')
+
+  const stateReset = () => {
+    setStickToProps({})
+    setStickToCid('')
+    setEmailOrder('')
+    setEmailOPI('')
+    setNewFromEmail('')
+    setNewToEmail('')
+  }
+
+  const [contentPrefix, setContentPrefix] = useState('')
+
+  // 存储: 会话ID,
+  // 这个窗口没有模态, 即使不是focus, 还是需要保持会话ID
+  // 否则, 会话列表切换之后, 会话ID更新, 导致消息关联错误
+  const [stickToCid, setStickToCid] = useState(activeEdit.conversationid)
+  useEffect(() => {
+    console.log('useeffect', mailData.info);
+    setTimeout(() => {
+      document.title = mailData.info?.MAI_Subject || 'New Email-'
+    }, 1500);
+    const propsObj = { ...activeEdit, mai: activeEdit.mailData?.info?.MAI_MAT_SN }
+
+    setContentPrefix(activeEdit.oid ? `<p>Dear Mr./Ms. ${activeEdit.receiverName || ''}</p><p>Reference Number: ${activeEdit.oid}</p>` : '')
+
+    // 没有引用邮件
+    if (isEmpty(activeEdit.quoteid)) {
+      setStickToProps(propsObj)
+      setPropsSerialize(JSON.stringify(propsObj))
+
+      setStickToCid(activeEdit.conversationid)
+      setEmailOrder(activeEdit.fromOrder)
+      setEmailOPI(activeEdit.fromUser)
+      setNewFromEmail(activeEdit.fromEmail)
+      setNewToEmail(activeEdit.toEmail)
+
+      const _findMat = emailListAddrMapped?.[activeEdit.fromEmail]?.mat_sn
+      setEmailMat(_findMat)
+
+      // if (open !== true) {
+      // form.resetFields()
+      // }
+    }
+    // 转发/回复时, 使用详情的账户信息
+    if (mailData.info?.MAI_MAT_SN) {
+      const reEmailO = mailData.info?.MAI_COLI_SN
+      const reEmailUser = mailData.info?.MAI_OPI_SN
+      const reEmailUserMat = mailData.info?.MAI_MAT_SN
+
+      setEmailOrder((prev) => reEmailO || prev || activeEdit.fromOrder)
+      setEmailOPI((prev) => reEmailUser || prev)
+      setEmailMat((prev) => reEmailUserMat || prev)
+
+      const _findMatOld = emailListMatMapped?.[reEmailUserMat]
+      if (_findMatOld) {
+        setNewFromEmail(_findMatOld.email)
+        setEmailOPI(_findMatOld.opi_sn)
+        setEmailMat(_findMatOld.mat_sn)
+      }
+    }
+    setShowQuoteContent(false)
+    setMergeQuote(true)
+    setQuoteContent('')
+
+    return () => {}
+  }, [open, mailData])
+
+  const handleSwitchEmail = (labelValue) => {
+    const { value } = labelValue
+    setNewFromEmail(value)
+    const _findMat = emailListAddrMapped?.[value]
+    setEmailMat(_findMat?.mat_sn)
+    setEmailOPI(_findMat?.opi_sn)
+  }
+
+  const { signature } = useEmailSignature(emailOPI)
+
+  const [isRichText, setIsRichText] = useState(mobile === false)
+  // const [isRichText, setIsRichText] = useState(false); // 默认纯文本
+  const [htmlContent, setHtmlContent] = useState('')
+  const [textContent, setTextContent] = useState('')
+
+  const [showCc, setShowCc] = useState(true)
+  const [showBcc, setShowBcc] = useState(false)
+  const handleShowCc = () => {
+    setShowCc(true)
+  }
+  const handleShowBcc = () => {
+    setShowBcc(true)
+  }
+
+  const handleEditorChange = ({ editorStateJSON, htmlContent, textContent }) => {
+    // console.log('textContent', textContent);
+    // console.log('html', html);
+    setHtmlContent(htmlContent)
+    setTextContent(textContent)
+    form.setFieldValue('content', htmlContent)
+    form.setFieldValue('abstract', getAbstract(textContent))
+    debouncedSave({ htmlContent })
+  }
+
+  const [initialForm, setInitialForm] = useState({})
+  const [initialContent, setInitialContent] = useState('')
+  const [showQuoteContent, setShowQuoteContent] = useState(false)
+  const [mergeQuote, setMergeQuote] = useState(true)
+  const [quoteContent, setQuoteContent] = useState('')
+
+  useEffect(() => {
+    // console.log('quoteid', quoteid, isEmpty(quoteid), isEmpty(mailData.info));
+
+    if (isEmpty(pageParam.quoteid) && pageParam.action !== 'new') {
+      return () => {}
+    }
+    const { info } = mailData
+    // setShowCc(!isEmpty(mailData.info?.MAI_CS));
+
+    const signatureBody = generateMailContent({ content: signature })
+
+    // const preQuoteBody = generateQuoteContent(mailData)
+
+    // const _initialContent = isEmpty(mailData.info) ? signatureBody : signatureBody+preQuoteBody
+
+    if (!isEmpty(mailData.info) && pageParam.action !== 'edit') {
+      setInitialContent(contentPrefix + signatureBody)
+    }
+
+    const _formValues = {
+      to: info?.replyToAll || newFromEmail,
+      cc: info?.MAI_CS || '',
+      // bcc: quote.bcc || '',
+      subject: `Re: ${info.MAI_Subject || ''}`,
+    }
+    const forwardValues = { from: newFromEmail, subject: `Fw: ${info.MAI_Subject || ''}` }
+    if (pageParam.action === 'reply') {
+      form.setFieldsValue(_formValues)
+      setInitialForm(_formValues)
+    } else if (pageParam.action === 'forward') {
+      setStickToCid('0')
+      form.setFieldsValue(forwardValues)
+      setInitialForm(forwardValues)
+    } else if (pageParam.action === 'edit') {
+      const thisFormValues = {
+        to: info?.MAI_To || '',
+        cc: info?.MAI_CS || '',
+        subject: info?.MAI_Subject || '',
+      }
+      form.setFieldsValue(thisFormValues)
+      setInitialForm(thisFormValues)
+      const thisBody = generateMailContent(mailData)
+      // console.log('thisBody', thisBody);
+
+      setInitialContent(thisBody)
+    } else if (pageParam.action === 'new') {
+      const newEmail = { to: newToEmail, subject: pageParam.draft?.subject || '' }
+      form.setFieldsValue(newEmail)
+      setInitialForm(newEmail)
+      setInitialContent((pageParam.draft?.content || contentPrefix || '') + signatureBody)
+    }
+
+    return () => {}
+  }, [propsSerialize, mailData.info, signature, newToEmail, newFromEmail])
+
+  const [openPlainTextConfirm, setOpenPlainTextConfirm] = useState(false)
+  const handlePlainTextOpenChange = ({ target }) => {
+    const { checked: newChecked } = target
+    if (!newChecked) {
+      setIsRichText(true)
+      setOpenPlainTextConfirm(false)
+      return
+    }
+    setOpenPlainTextConfirm(true)
+  }
+  const confirmPlainText = () => {
+    setIsRichText(false)
+    setOpenPlainTextConfirm(false)
+  }
+
+  // 附件:
+  // 1. ~直接上传返回地址~
+  // 2. 发送文件信息
+  const [fileList, setFileList] = useState([])
+  const handleChange = (info) => {
+    let newFileList = [...info.fileList]
+    // 2. Read from response and show file link
+    newFileList = newFileList.map((file) => {
+      if (file.response) {
+        // Component will show file.url as link
+        file.url = file.response.url
+      }
+      return file
+    })
+    setFileList(newFileList)
+  }
+  const normFile = (e) => {
+    // console.log('Upload event:', e);
+    if (Array.isArray(e)) {
+      return e
+    }
+    return e?.fileList
+  }
+  const uploadProps = {
+    // action: 'https://660d2bd96ddfa2943b33731c.mockapi.io/api/upload',
+    // onChange: handleChange,
+    multiple: true,
+    fileList,
+    beforeUpload: (file) => {
+      // console.log('beforeUpload', file);
+      const lastDotIndex = file.name.lastIndexOf('.')
+      const extension = file.name.slice(lastDotIndex).toLocaleLowerCase()
+      if (disallowedAttachmentTypes.includes(file.type) || disallowedAttachmentTypes.includes(extension)) {
+        message.warning('不支持的文件格式: ' + extension)
+        return false
+      }
+
+      setFileList((prev) => [...prev, file])
+      return false // 阻止默认上传, 附件不上传阿里云
+    },
+    onRemove: (file) => {
+      const index = fileList.indexOf(file)
+      const newFileList = fileList.slice()
+      newFileList.splice(index, 1)
+      setFileList(newFileList)
+    },
+    onPreview: (file) => {
+      // console.log('pn preview', file);
+      return new Promise((resolve, reject) => {
+        const reader = new FileReader()
+        reader.onloadend = (e) => {
+          if (file.size > 1.5 * 1024 * 1024) {
+            message.info('附件太大，无法预览')
+            // message.info('附件太大，无法预览, 请下载后查看')
+            // var downloadLink = document.createElement('a');
+            // downloadLink.href = e.target.result;
+            // downloadLink.download = file.name;
+            // downloadLink.click();
+            resolve(e.target.result)
+            return
+          }
+          var win = window.open('', '_blank')
+          win.document.body.style.margin = '0'
+          if (file.type.startsWith('image/')) {
+            win.document.write("<img src='" + e.target.result + '\' style="max-width: 100%;" />')
+          } else if (file.type.startsWith('text/') || file.type === 'application/html' || file.type === 'application/xhtml+xml') {
+            var iframe = win.document.createElement('iframe')
+            iframe.srcdoc = e.target.result
+            iframe.style.width = '100%'
+            iframe.style.height = '100%'
+            iframe.style.border = 'none'
+            win.document.body.appendChild(iframe)
+            win.document.body.style.margin = '0'
+          } else if (file.type === 'application/pdf') {
+            // win.document.write("<iframe src='" + e.target.result + "' width='100%' height='100%' frameborder=\"0\"></iframe>");
+            win.document.write("<embed  src='" + e.target.result + "' width='100%' height='100%' style=\"border:none\"></embed>")
+            win.document.body.style.margin = '0'
+          } else if (file.type.startsWith('audio/')) {
+            win.document.write("<audio controls src='" + e.target.result + '\' style="max-width: 100%;"></audio>')
+          } else if (file.type.startsWith('video/')) {
+            win.document.write("<video controls src='" + e.target.result + '\' style="max-width: 100%;"></video>')
+          } else {
+            win.document.write('<h2>Preview not available for this file type</h2>')
+          }
+          // win.document.write("<iframe src='" + dataURL + "' width='100%' height='100%' style=\"border:none\"></iframe>");
+          resolve(reader.result)
+        }
+        if (file.type.startsWith('text/') || file.type === 'application/html' || file.type === 'application/xhtml+xml') {
+          reader.readAsText(file)
+        } else {
+          reader.readAsDataURL(file)
+        }
+        // reader.readAsDataURL(file);
+        reader.onerror = (error) => reject(error)
+      })
+    },
+  }
+
+  /**
+   * 保存成功, 推一个气泡
+   * 再从异步通知更新消息发送状态
+   */
+  const sentOrReceivedNewMessage = useConversationStore((state) => state.sentOrReceivedNewMessage)
+  const invokeEmailMessage = (msgObj) => {
+    const msgObjMerge = {
+      sender: 'me',
+      senderName: 'me',
+      // to: currentConversation.whatsapp_phone_number,
+      date: new Date(),
+      status: 'waiting', // accepted
+      ...msgObj,
+      // id: `${currentConversation.sn}.${msgObj.id}`,
+      // id: `${stickToCid}.${msgObj.id}`,
+      conversationid: stickToCid,
+      msg_source: 'email',
+    }
+    // olog('invoke upload', msgObjMerge)
+    const contentToRender = sentMsgTypeMapped[msgObjMerge.type].contentToRender(msgObjMerge)
+    // console.log(contentToRender, 'contentToRender  sendMessage------------------');
+    sentOrReceivedNewMessage(contentToRender.conversationid, contentToRender)
+  }
+
+  const [sendLoading, setSendLoading] = useState(false)
+
+  const onHandleSend = async () => {
+    // console.log('onSend callback', '\nisRichText', isRichText);
+    // console.log(form.getFieldsValue());
+    const body = structuredClone(form.getFieldsValue())
+    body.from = newFromEmail
+    body.attaList = fileList
+    body.opi_sn = emailOPI
+    body.mat_sn = emailMat
+    body.coli_sn = emailOrder || ''
+    // console.log('body', body, '\n', emailOrder);
+    const values = await form.validateFields()
+    const preQuoteBody = activeEdit.quoteid ? (quoteContent ? quoteContent : generateQuoteContent(mailData, isRichText)) : ''
+    body.mailcontent = isRichText ? EmailBuilder({ subject: values.subject, content: htmlContent + preQuoteBody }) : textContent + preQuoteBody
+    body.cc = values.cc || ''
+    body.bcc = values.bcc || ''
+    const msgObj = {
+      type: 'email',
+      id: uuid(),
+      from: body.from,
+      to: values.to,
+      cc: values.cc || '',
+      bcc: values.bcc || '',
+      subject: values.subject,
+      content: body.mailcontent,
+      email: {
+        subject: values.subject,
+        content: body.mailcontent,
+      },
+      coli_id: stickToProps.oid || (emailOrder ? `{${emailOrder}}` : ''),
+    }
+    setSendLoading(true)
+    body.externalID = stickToCid
+    body.actionID = `${stickToCid}.${msgObj.id}`
+    body.contenttype = isRichText ? 'text/html' : 'text/plain'
+    try {
+      const bubbleMsg = cloneDeep(msgObj)
+      bubbleMsg.id = `${stickToCid}.${msgObj.id}`
+      // bubbleMsg.email.mai_sn = '';
+      bubbleMsg.content = undefined
+      // invokeEmailMessage(bubbleMsg);
+
+      // console.log('postSendEmail', body, '\n', msgObj);
+      // return;
+      const result = await postSendEmail(body)
+      const mailSavedId = result.id || ''
+      bubbleMsg.email.mai_sn = mailSavedId
+      // console.log('invokeEmailMessage', bubbleMsg);
+
+      invokeEmailMessage(bubbleMsg)
+
+      // setSendLoading(false);
+
+      setOpen(false)
+    } catch (error) {
+      notification.error({
+        message: '邮件保存失败',
+        description: error.message,
+        placement: 'top',
+        duration: 3,
+      })
+    } finally {
+      setSendLoading(false)
+    }
+  }
+
+  const [openDrawerSnippet] = useSnippetStore((state) => [state.openDrawer])
+  const [openPaymentDrawer] = useOrderStore((state) => [state.openDrawer])
+
+  const [bakData, setBakData] = useState({})
+  const idleCallbackId = useRef(null)
+  const debouncedSave = useCallback(
+    debounce((data) => {
+      idleCallbackId.current = window.requestIdleCallback(() => {
+        console.log('Saving data (idle, debounced):', data)
+        writeIndexDB({ ...data, key: currentEditKey }, 'draft', 'EmailEditor')
+      })
+    }, 1500), //  1.5s
+    [],
+  )
+  const onEditChange = (changedValues, allValues) => {
+    console.log('onEditChange', changedValues, '\n', allValues)
+    // const { name, value } = e.target;
+    // setBakData(prevData => ({ ...prevData, [name]: value }));
+    // debouncedSave(bakData);
+  }
+
+  useEffect(() => {
+    return () => {
+      if (idleCallbackId.current && window.cancelIdleCallback) {
+        window.cancelIdleCallback(idleCallbackId.current)
+      }
+    }
+  }, [debouncedSave])
+
+  return (
+    <>
+      <ConfigProvider theme={{ token: { colorPrimary: '#6366f1' } }}>
+        <Form
+          form={form}
+          onValuesChange={onEditChange}
+          preserve={false}
+          name={`email_max_form-${Date.now().toString(32)}`}
+          size='small'
+          layout={'inline'}
+          variant={'borderless'}
+          // initialValues={{}}
+          // onFinish={() => {}}
+          className='email-editor-wrapper *:mb-2 *:border-b *:border-t-0 *:border-x-0 *:border-indigo-100 *:border-solid '
+          requiredMark={false}
+          // labelCol={{ span: 3 }}
+        >
+          <Form.Item className='w-full'>
+            <Space.Compact className='w-full'>
+              <Form.Item name={'to'} label='收件人' rules={[{ required: true }]} className='!flex-1'>
+                <Input className='w-full' />
+              </Form.Item>
+              <Flex gap={4}>
+                {!showCc && (
+                  <Button type='text' onClick={handleShowCc}>
+                    Cc
+                  </Button>
+                )}
+                {!showBcc && (
+                  <Button type='text' hidden={showBcc} onClick={handleShowBcc}>
+                    Bcc
+                  </Button>
+                )}
+              </Flex>
+            </Space.Compact>
+            {/* <Input
+              addonAfter={
+                <Flex gap={4}>
+                  {!showCc && (
+                    <Button type='text' onClick={handleShowCc}>
+                      Cc
+                    </Button>
+                  )}
+                  {!showBcc && (
+                    <Button type='text' hidden={showBcc} onClick={handleShowBcc}>
+                      Bcc
+                    </Button>
+                  )}
+                </Flex>
+              }
+            /> */}
+          </Form.Item>
+          <Form.Item label='抄&nbsp;&nbsp;&nbsp;&nbsp;送' name={'cc'} hidden={!showCc} className='w-full pt-1'>
+            <Input />
+          </Form.Item>
+          <Form.Item label='密&nbsp;&nbsp;&nbsp;&nbsp;送' name={'bcc'} hidden={!showBcc} className='w-full pt-1'>
+            <Input />
+          </Form.Item>
+          <Form.Item label='主&nbsp;&nbsp;&nbsp;&nbsp;题' name={'subject'} rules={[{ required: true }]} className='w-full pt-1'>
+            <Input />
+          </Form.Item>
+          <Form.Item name='atta' label='' className='w-full py-1 border-b-0' valuePropName='fileList' getValueFromEvent={normFile}>
+            <Flex justify='space-between'>
+              <Upload {...uploadProps} name='file' className='w-full'>
+                <Button icon={<UploadOutlined />}>附件</Button>
+              </Upload>
+              <Flex align={'center'} className='absolute right-0'>
+                <Divider type='vertical' />
+                <Button type={'link'} onClick={() => openDrawerSnippet()}>
+                  图文集
+                </Button>
+                <PaymentlinkBtn type={'link'} />
+                {/* 更多工具 */}
+                {/* <Popover
+                    content={
+                      <div className='flex flex-col gap-2'>
+                        <Button type={'link'}>??</Button>
+                      </div>
+                    }
+                    trigger='click'
+                  ><MoreOutlined /></Popover> */}
+              </Flex>
+            </Flex>
+          </Form.Item>
+          <Form.Item name='content' hidden>
+            <Input />
+          </Form.Item>
+          <Form.Item name='abstract' hidden>
+            <Input />
+          </Form.Item>
+        </Form>
+        <LexicalEditor {...{ isRichText }} onChange={handleEditorChange} defaultValue={initialContent} />
+        {activeEdit.quoteid && !showQuoteContent && (
+          <div className='flex justify-start items-center ml-2'>
+            <Button className='flex gap-2 ' type='link' onClick={() => setShowQuoteContent(!showQuoteContent)}>
+              显示引用内容 ↓
+            </Button>
+            {/* <Button className='flex gap-2 ' type='link' danger onClick={() => {setMergeQuote(false);setShowQuoteContent(false)}}>
+                删除引用内容
+              </Button> */}
+          </div>
+        )}
+        {showQuoteContent && (
+          <blockquote
+            contentEditable
+            className='border-0 outline-none'
+            onBlur={(e) => setQuoteContent(`<blockquote>${e.target.innerHTML}</blockquote>`)}
+            dangerouslySetInnerHTML={{ __html: generateQuoteContent(mailData) }}></blockquote>
+        )}
+      </ConfigProvider>
+    </>
+  )
+}
+export default NewEmail

From d1fff21159c9f204666fe4e09d3f0ecc23f60cdf Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 26 May 2025 16:28:13 +0800
Subject: [PATCH 009/143] =?UTF-8?q?perf(=E5=89=8D=E7=AB=AF):=20=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3=E5=85=A8=E5=B1=80=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AuthApp.jsx    | 7 +++++--
 src/views/DesktopApp.jsx | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/AuthApp.jsx b/src/views/AuthApp.jsx
index 792da33..07d3028 100644
--- a/src/views/AuthApp.jsx
+++ b/src/views/AuthApp.jsx
@@ -11,11 +11,11 @@ import {
   FloatButton,
   theme,
 } from 'antd'
-import { BugOutlined, CustomerServiceOutlined } from '@ant-design/icons'
+import { AudioOutlined, AudioTwoTone, BugOutlined, CustomerServiceOutlined } from '@ant-design/icons'
 import zhLocale from 'antd/locale/zh_CN'
 import 'dayjs/locale/zh-cn'
 import { useEffect } from 'react'
-import { Outlet, useHref, useNavigate } from 'react-router-dom'
+import { Link, NavLink, Outlet, useHref, useNavigate } from 'react-router-dom'
 import { appendRequestHeader } from '@/utils/request'
 import { loadPageSpy } from '@/utils/pagespy'
 
@@ -149,13 +149,16 @@ function AuthApp() {
         <ErrorBoundary>
           <FloatButton.Group
             shape='square'
+            placement={'left'}
             trigger={floatTrigger}
             style={{
               insetInlineEnd: floatButtonLineEnd,
               insetBlockEnd: floatButtonLineEnd,
+              flexDirection: 'row',
             }}
             icon={<CustomerServiceOutlined />}
           >
+            <FloatButton icon={<AudioTwoTone />} tooltip={<div>语音通话</div>} onClick={() => navigate('/callcenter/call')} />
             <EmailFetch />
             <FloatButton icon={<BugOutlined />} tooltip={<div>上传日志给研发部</div>} onClick={() => uploadLog()} />
             <FloatButton.BackTop />
diff --git a/src/views/DesktopApp.jsx b/src/views/DesktopApp.jsx
index 2aa2da7..d096b87 100644
--- a/src/views/DesktopApp.jsx
+++ b/src/views/DesktopApp.jsx
@@ -173,10 +173,10 @@ function DesktopApp() {
                     </Link>
                   ),
                 },
-                {
-                  key: '/callcenter/call',
-                  label: <Link to='/callcenter/call'>语音通话</Link>,
-                },
+                // {
+                //   key: '/callcenter/call',
+                //   label: <Link to='/callcenter/call'>语音通话</Link>,
+                // },
                 {
                   key: '/chat/history',
                   label: <Link to='/chat/history'>聊天记录</Link>,

From c2f94e3e8109c27afb8e94ebe01662497bd86846 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 26 May 2025 16:44:39 +0800
Subject: [PATCH 010/143] perf: add Icon: new mail

---
 src/assets/icons/mail-add-fill.svg | 1 +
 src/assets/icons/mail-add-line.svg | 1 +
 src/components/Icons.jsx           | 2 ++
 3 files changed, 4 insertions(+)
 create mode 100644 src/assets/icons/mail-add-fill.svg
 create mode 100644 src/assets/icons/mail-add-line.svg

diff --git a/src/assets/icons/mail-add-fill.svg b/src/assets/icons/mail-add-fill.svg
new file mode 100644
index 0000000..5e89802
--- /dev/null
+++ b/src/assets/icons/mail-add-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M22 13.3414C21.3744 13.1203 20.7013 13 20 13C16.6863 13 14 15.6863 14 19C14 19.7013 14.1203 20.3744 14.3414 21H3C2.44772 21 2 20.5523 2 20V4C2 3.44772 2.44772 3 3 3H21C21.5523 3 22 3.44772 22 4V13.3414ZM12.0606 11.6829L5.64722 6.2377L4.35278 7.7623L12.0731 14.3171L19.6544 7.75616L18.3456 6.24384L12.0606 11.6829ZM21 18H24V20H21V23H19V20H16V18H19V15H21V18Z"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/mail-add-line.svg b/src/assets/icons/mail-add-line.svg
new file mode 100644
index 0000000..10a24fa
--- /dev/null
+++ b/src/assets/icons/mail-add-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M22 13H20V7.23792L12.0718 14.338L4 7.21594V19H14V21H3C2.44772 21 2 20.5523 2 20V4C2 3.44772 2.44772 3 3 3H21C21.5523 3 22 3.44772 22 4V13ZM4.51146 5L12.0619 11.662L19.501 5H4.51146ZM21 18H24V20H21V23H19V20H16V18H19V15H21V18Z"></path></svg>
\ No newline at end of file
diff --git a/src/components/Icons.jsx b/src/components/Icons.jsx
index 7385336..94a7bc2 100644
--- a/src/components/Icons.jsx
+++ b/src/components/Icons.jsx
@@ -13,6 +13,7 @@ import SendPlaneLineSVG from '@/assets/icons/send-plane-line.svg?react';
 import ResendLineSVG from '@/assets/icons/reset-left-line.svg?react';
 import EditLineSVG from '@/assets/icons/quill-pen-line.svg?react';
 import MailDownloadLineSVG from '@/assets/icons/mail-download-line.svg?react';
+import MailAddLineSVG from '@/assets/icons/mail-add-line.svg?react';
 
 
 export const ReplyIcon = (props) => <Icon component={ReplyLineSVG} {...props} />;
@@ -27,6 +28,7 @@ export const SendPlaneLineIcon = (props) => <Icon component={SendPlaneLineSVG} {
 export const ResendIcon = (props) => <Icon component={ResendLineSVG} {...props} />;
 export const EditIcon = (props) => <Icon component={EditLineSVG} {...props} />;
 export const MailDownloadIcon = (props) => <Icon component={MailDownloadLineSVG} {...props} />;
+export const MailAddloadIcon = (props) => <Icon component={MailAddLineSVG} {...props} />;
 
 const WABSvg = () => (
   <svg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg' width='16' height='16'>

From 7449ad9e44c8cdeffff74ff21be4176d44a9dba6 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 23 May 2025 15:46:28 +0800
Subject: [PATCH 011/143] =?UTF-8?q?perf:=20=E4=BD=BF=E7=94=A8=20Layout=20?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 103 ++++++++++++++++++++++++------------
 1 file changed, 70 insertions(+), 33 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 7da2c6e..0bfe599 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -27,7 +27,7 @@ import {
   CalendarOutlined,
   HeartTwoTone, MoneyCollectTwoTone
 } from '@ant-design/icons'
-import { App, Badge, Empty, Flex, Button, Drawer , Space, Radio, Table, Tabs, Divider, Tag, Tooltip, Row, Col, Segmented, Tree, Typography, Input, Descriptions, Checkbox } from 'antd'
+import { App, Badge, Empty, Flex, Button, Drawer , Space, Radio, Table, Tabs, Divider, Tag, Tooltip, Row, Col, Segmented, Tree, Typography, Input, Descriptions, Checkbox, Layout,    } from 'antd'
 import dayjs from 'dayjs'
 import { useCallback, useEffect, useState } from 'react'
 import { Link } from 'react-router-dom'
@@ -358,9 +358,11 @@ function Follow() {
 
   return (
     <>
-      <Row gutter={16}>
-        <Col span={4}>
-          <Flex justify='start' align='start' vertical>
+  <Layout>
+    <Layout.Sider width='300' style={{
+  backgroundColor: '#fff',
+}}>
+      <Flex justify='start' align='start' vertical>
             <Segmented className='w-full' block shape='round' options={['AH', 'CH', 'GH']} />
             <Tree
               showIcon
@@ -444,6 +446,28 @@ function Follow() {
                       title: '5月',
                       key: '0-3-4',
                       icon: <FolderTwoTone />,
+                      children: [
+                        {
+                          title: 'Albee240422193452',
+                          key: 'Albee240422193452',
+                        },
+                        {
+                          title: 'Albee240422193285',
+                          key: 'Albee240422193285',
+                        },
+                        {
+                          title: 'Albee240422193752',
+                          key: 'Albee240422193752',
+                        },
+                        {
+                          title: 'Albee2404221934583',
+                          key: 'Albee2404221934583',
+                        },
+                        {
+                          title: 'Albee2404221937836',
+                          key: 'Albee2404221937836',
+                        },
+                      ],
                     },
                   ],
                 },
@@ -459,11 +483,13 @@ function Follow() {
                 },
               ]}
             />
-          </Flex>
-        </Col>
-        <Col span={14}>
-          <div className='flex gap-1 items-center'>
-            <Button onClick={() => {}} icon={<PlusOutlined />} type={'primary'} ghost shape={'circle'} size='small' />
+          </Flex></Layout.Sider>
+    <Layout.Content>
+
+      <Layout>
+  <Layout.Header className='bg-white h-auto px-1 flex gap-1 items-center'>
+
+            <Button onClick={() => {}} icon={<PlusOutlined />} type={'primary'}>新邮件</Button>
             <Input.Search
               className=''
               allowClear
@@ -473,7 +499,12 @@ function Follow() {
               }}
               placeholder={`名称/号码/订单号`}
             />
-          </div>
+            <Button onClick={() => {}} >高级搜索</Button>
+            <Button onClick={() => {}} >多选</Button>
+</Layout.Header>
+  <Layout>
+    <Layout.Content>
+
           <Table
           onRow={(record) => {
     return {
@@ -485,40 +516,48 @@ function Follow() {
     };
   }}
             pagination={false}
+    sticky={{ offsetHeader: 64 }}
             columns={[
-              {
-                title: '收/发件人',
-                dataIndex: 'name',
-                key: 'name',
-                render: (text) => <a>{text}</a>,
-              },
               {
                 title: '主题',
                 dataIndex: 'subject',
                 key: 'subject',
+                width: 500,
                 render: (text) => <a onClick={() => {
                   setSubject(text)
                   setOpenMail(true)
                 }}>{text}</a>,
               },
+              {
+                title: '收/发件人',
+                dataIndex: 'name',
+                key: 'name',
+                width: 380,
+                minWidth: 180,
+                render: (text) => <a>{text}</a>,
+              },
               {
                 title: '收/发日期',
                 dataIndex: 'mailDate',
                 key: '收/发日期',
+                width: 180,
               },
               {
                 title: '订单号',
                 key: 'orderNo',
                 dataIndex: 'orderNo',
+                width: 140,
               },
               {
                 title: '国籍',
                 key: 'country',
                 dataIndex: 'country',
+                width: 120,
               },
               {
                 title: '操作',
                 key: 'action',
+                width: 120,
                 render: (_, record) => (
                   <Space size='middle'>
                     <a>回复</a>
@@ -539,7 +578,7 @@ function Follow() {
               {
                 key: Math.random().toString(36).substring(2, 9),
                 name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: '【阿里云邮】弱密改密提醒 ' + Math.random().toString(36).substring(2, 9),
+                subject: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到' + Math.random().toString(36).substring(2, 9),
                 mailDate: '2025-05-01 19:21:00',
                 orderNo: 'LSS250501006',
                 country: 'Thailand',
@@ -634,9 +673,9 @@ function Follow() {
               },
             ]}
           />
-{/*
-          <Divider />
-
+</Layout.Content>
+  </Layout>
+  <Layout.Footer className='p-1 border-solid border rounded border-gray-300'>
 
           <Descriptions title="Your Thailand Private tour by 'Asia Highlights' 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到" items={[
   {
@@ -674,12 +713,14 @@ function Follow() {
             绑定订单
           </Button>
           </Flex>
-<div className='border-solid border rounded border-gray-300'>
           <div id='__preHtml__' className='whitespace-pre-wrap break-words' dangerouslySetInnerHTML={{ __html: '邮件内容。。。。。<br/>换行了。。。看看 ' }}></div>
-          </div> */}
-        </Col>
-        <Col span={6}>
-            <Flex gap={6} vertical={true} justify='space-between'>
+          </Layout.Footer>
+</Layout>
+    </Layout.Content>
+    <Layout.Sider  width='400' style={{
+  backgroundColor: '#fff',
+}}>
+      <Flex gap={6} vertical={true} justify='space-between'>
               <Typography.Text>
                 <FieldNumberOutlined className='pr-1' />
                 LSS250501006
@@ -737,12 +778,8 @@ function Follow() {
           <Button color="cyan" variant="outlined">
             提醒中心
           </Button>
-          </Flex>
-
-
-
-        </Col>
-      </Row>
+          </Flex></Layout.Sider>
+  </Layout>
 
 <Drawer
         title={mailSubject}
@@ -791,8 +828,8 @@ function Follow() {
   },
 ]} />
         <p>{Math.random().toString(36).substring(2, 9)}Some contents...</p>
-        <p>Some contents...</p>
-        <p>Some contents...</p>
+        <p>Some {Math.random().toString(36).substring(2, 9)}contents...</p>
+        <p>Some contents...{Math.random().toString(36).substring(2, 9)}</p>
       </Drawer>
 
       <Drawer

From b6efb24a87b2f1dba0869ec74341d6332dad9722 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Mon, 26 May 2025 15:32:41 +0800
Subject: [PATCH 012/143] =?UTF-8?q?perf:=20=E4=BD=BF=E7=94=A8=E5=9B=9B?=
 =?UTF-8?q?=E5=88=97=E5=B8=83=E5=B1=80=E8=AE=A2=E5=8D=95=E8=B7=9F=E8=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 219 ++++++++++++++++++++++++++++++++++--
 1 file changed, 209 insertions(+), 10 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 0bfe599..8a1584f 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -17,7 +17,7 @@ import {
   SaveOutlined,
   PlusOutlined,
   MehOutlined,
-  SmileOutlined,
+  CompassOutlined,
   CheckSquareTwoTone,
   CarryOutTwoTone,
   MailTwoTone,
@@ -27,7 +27,7 @@ import {
   CalendarOutlined,
   HeartTwoTone, MoneyCollectTwoTone
 } from '@ant-design/icons'
-import { App, Badge, Empty, Flex, Button, Drawer , Space, Radio, Table, Tabs, Divider, Tag, Tooltip, Row, Col, Segmented, Tree, Typography, Input, Descriptions, Checkbox, Layout,    } from 'antd'
+import { App, Badge, Empty, Flex, Button, Drawer , Space, Radio, Table, Tabs, Divider, Tag, Tooltip, List, Dropdown , Segmented, Tree, Typography, Input, Descriptions, Checkbox, Layout,  Row, Col  } from 'antd'
 import dayjs from 'dayjs'
 import { useCallback, useEffect, useState } from 'react'
 import { Link } from 'react-router-dom'
@@ -340,7 +340,7 @@ function Follow() {
   const [mailSubject, setSubject] = useState('');
 
   const [openOrder, setOpenOrder] = useState(false);
-
+const [collapsed, setCollapsed] = useState(false)
 
   const [formValues, setFormValues] = useFormStore(useShallow((state) => [state.orderFollowForm, state.setOrderFollowForm]))
   const [advanceChecked, toggleAdvance] = useFormStore(useShallow((state) => [state.orderFollowAdvanceChecked, state.setOrderFollowAdvanceChecked]))
@@ -490,6 +490,30 @@ function Follow() {
   <Layout.Header className='bg-white h-auto px-1 flex gap-1 items-center'>
 
             <Button onClick={() => {}} icon={<PlusOutlined />} type={'primary'}>新邮件</Button>
+
+<Dropdown menu={{ items: [
+  {
+    key: '1',
+    label: '一催：模板一',
+  },
+  {
+    key: '2',
+    label: '一催：模板二',
+  },
+  {
+    key: '3',
+    label: '一催：模板三',
+  },
+]}} trigger={['click']}>
+
+    <Button>
+        <Space>
+          使用模板
+          <DownOutlined />
+        </Space>
+      </Button>
+  </Dropdown>
+            <Button onClick={() => {}} >多选</Button>
             <Input.Search
               className=''
               allowClear
@@ -500,12 +524,183 @@ function Follow() {
               placeholder={`名称/号码/订单号`}
             />
             <Button onClick={() => {}} >高级搜索</Button>
-            <Button onClick={() => {}} >多选</Button>
 </Layout.Header>
   <Layout>
     <Layout.Content>
 
-          <Table
+<Row>
+      <Col className='bg-white' span={16} style={{height: 'calc(100vh - 196px)', overflowY: 'auto'}}>
+<List
+    itemLayout="vertical"
+    size="small"
+    pagination={false}
+    dataSource={[
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Personal information',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Your Future Trip with Asia Highlights',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Greeting from Asia Highlights Alisa',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Have you made any decisions about your Japan trip',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Sri Lanka tour',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: How do you like the itinerary 3',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Re: Re: Final cost',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Reference Number: LSS240628079',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Personal information and Hiroshima tour for 2 people',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Asia Travel Tips /LSS250429038',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+            ]}
+    renderItem={item => (
+      <List.Item
+        key={item.title}
+        // actions={[
+        //   <a key="list-vertical-star-o">回复</a>,
+        //   <a key="list-vertical-refor">转发</a>,
+        // ]}
+      >
+        <List.Item.Meta
+          title={<a href={item.href} onClick={() => setSubject(item.title)}>{item.title}</a>}
+          description={item.description + ' ' + item.mailDate}
+        />
+        {item.content}LSS250501006, Thailand
+      </List.Item>
+    )}
+  /></Col>
+      <Col span={8}>
+
+  <div>
+    <Flex gap="small">
+            <Space.Compact>
+          <Button color="primary" variant="solid">
+            回复
+          </Button>
+          <Button color="primary" variant="outlined">
+            回复全部
+          </Button>
+          <Button color="primary" variant="outlined" >
+            转发
+          </Button>
+          </Space.Compact>
+          <Button color="cyan" variant="outlined">
+            已处理
+          </Button>
+          <Button color="cyan" variant="outlined">
+            绑定订单
+          </Button>
+          </Flex>
+     <Descriptions column={2} title={mailSubject} items={[
+  {
+    key: '1',
+    label: '发件人',
+    children: '"阿里邮箱" <no-reply@mailsupport.aliyun.com>',
+  },
+  {
+    key: '2',
+    label: '收件人',
+    children: '<liaoyijun@chinahighlights.com>',
+  },
+  {
+    key: '3',
+    label: '发送日期',
+    children: '2025-05-16 14:11',
+  },
+]} />
+        <p>{Math.random().toString(36).substring(2, 9)}Some contents...</p>
+        <p>Some {Math.random().toString(36).substring(2, 9)}contents...</p>
+        <p>Some contents...{Math.random().toString(36).substring(2, 9)}</p>
+  </div></Col>
+    </Row>
+          {/* <Table
           onRow={(record) => {
     return {
       onClick: (event) => {console.info(event)}, // 点击行
@@ -672,10 +867,10 @@ function Follow() {
                 country: 'Thailand',
               },
             ]}
-          />
+          /> */}
 </Layout.Content>
   </Layout>
-  <Layout.Footer className='p-1 border-solid border rounded border-gray-300'>
+  {/* <Layout.Footer className='p-1 border-solid border rounded border-gray-300'>
 
           <Descriptions title="Your Thailand Private tour by 'Asia Highlights' 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到" items={[
   {
@@ -714,12 +909,12 @@ function Follow() {
           </Button>
           </Flex>
           <div id='__preHtml__' className='whitespace-pre-wrap break-words' dangerouslySetInnerHTML={{ __html: '邮件内容。。。。。<br/>换行了。。。看看 ' }}></div>
-          </Layout.Footer>
+          </Layout.Footer> */}
 </Layout>
     </Layout.Content>
-    <Layout.Sider  width='400' style={{
+    <Layout.Sider  width='350' style={{
   backgroundColor: '#fff',
-}}>
+}} collapsible collapsed={collapsed} onCollapse={value => setCollapsed(value)} collapsedWidth={0} reverseArrow={true}>
       <Flex gap={6} vertical={true} justify='space-between'>
               <Typography.Text>
                 <FieldNumberOutlined className='pr-1' />
@@ -731,6 +926,10 @@ function Follow() {
                 <UserOutlined className=' pr-1' />
                 Jorgina(R1)
               </Typography.Text>
+              <Typography.Text>
+                <CompassOutlined className=' pr-1' />
+                Thailand
+              </Typography.Text>
               <Typography.Text>
                 <PhoneOutlined className=' pr-1' />
                 <Button type='link' size={'small'} onClick={() => {}}>

From 2b6b0f99610cbabe01fb149f454fe965220cbb34 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Mon, 26 May 2025 15:52:14 +0800
Subject: [PATCH 013/143] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=9B=9E=E5=A4=8D=E9=82=AE=E4=BB=B6=E4=BE=8B?=
 =?UTF-8?q?=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 8a1584f..b9ee081 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -661,13 +661,19 @@ const [collapsed, setCollapsed] = useState(false)
   <div>
     <Flex gap="small">
             <Space.Compact>
-          <Button color="primary" variant="solid">
+          <Button color="primary" variant="solid" onClick={() => {
+            window.open(`/email/${1}/${0}`, `${1}-${0}`,'left=20,width=1000')
+          }}>
             回复
           </Button>
-          <Button color="primary" variant="outlined">
+          <Button color="primary" variant="outlined" onClick={() => {
+            window.open(`/email/${2}/${0}`, `${2}-${0}`,'left=20,width=1000')
+          }}>
             回复全部
           </Button>
-          <Button color="primary" variant="outlined" >
+          <Button color="primary" variant="outlined"  onClick={() => {
+            window.open(`/email/${3}/${0}`, `${3}-${0}`,'left=20,width=1000')
+          }}>
             转发
           </Button>
           </Space.Compact>
@@ -912,7 +918,7 @@ const [collapsed, setCollapsed] = useState(false)
           </Layout.Footer> */}
 </Layout>
     </Layout.Content>
-    <Layout.Sider  width='350' style={{
+    <Layout.Sider zeroWidthTriggerStyle={{top: '30px'}} width='280' style={{
   backgroundColor: '#fff',
 }} collapsible collapsed={collapsed} onCollapse={value => setCollapsed(value)} collapsedWidth={0} reverseArrow={true}>
       <Flex gap={6} vertical={true} justify='space-between'>
@@ -965,7 +971,7 @@ const [collapsed, setCollapsed] = useState(false)
 					</Divider>
 					<p className="p-2 overflow-auto m-0 break-words whitespace-pre-wrap" dangerouslySetInnerHTML={{ __html: 'orderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detail' }}></p>
 <Space.Compact block>
-      <Input addonBefore="附加信息" style={{ width: 'calc(100% - 200px)' }} />
+      <Input addonBefore="附加信息" />
       <Button icon={<SaveOutlined />} />
     </Space.Compact>
           <Flex gap="small">

From b61c2baf9f4ca18dcdee48a6fcfaff66285989be Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Mon, 26 May 2025 17:09:33 +0800
Subject: [PATCH 014/143] =?UTF-8?q?perf:=20=E5=88=A0=E9=99=A4=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index b9ee081..2525def 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -662,17 +662,17 @@ const [collapsed, setCollapsed] = useState(false)
     <Flex gap="small">
             <Space.Compact>
           <Button color="primary" variant="solid" onClick={() => {
-            window.open(`/email/${1}/${0}`, `${1}-${0}`,'left=20,width=1000')
+            window.open(`/email/reply/5190495`, `${1}-${0}`,'left=20,width=1000')
           }}>
             回复
           </Button>
           <Button color="primary" variant="outlined" onClick={() => {
-            window.open(`/email/${2}/${0}`, `${2}-${0}`,'left=20,width=1000')
+            window.open(`/email/reply/5220965`, `${2}-${0}`,'left=20,width=1000')
           }}>
             回复全部
           </Button>
           <Button color="primary" variant="outlined"  onClick={() => {
-            window.open(`/email/${3}/${0}`, `${3}-${0}`,'left=20,width=1000')
+            window.open(`/email/forward/5128754`, `${3}-${0}`,'left=20,width=1000')
           }}>
             转发
           </Button>
@@ -980,9 +980,6 @@ const [collapsed, setCollapsed] = useState(false)
             }}>
             订单状态
           </Button>
-          <Button color="cyan" variant="outlined">
-            提醒中心
-          </Button>
           </Flex></Layout.Sider>
   </Layout>
 

From ba6e017ffda5ae82478ba6da8a4a60f89d4de52b Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 27 May 2025 09:27:45 +0800
Subject: [PATCH 015/143] =?UTF-8?q?feat:=20=E7=BC=96=E8=BE=91=E5=99=A8:=20?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/icons/eraser-line.svg           |  1 +
 src/assets/icons/eraser-fill.svg              |  1 +
 src/assets/icons/eraser-line.svg              |  1 +
 src/assets/icons/format-clear.svg             |  1 +
 .../LexicalEditor/plugins/ToolbarPlugin.jsx   | 70 ++++++++++++++++++-
 src/components/LexicalEditor/styles.css       |  7 +-
 6 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 public/images/icons/eraser-line.svg
 create mode 100644 src/assets/icons/eraser-fill.svg
 create mode 100644 src/assets/icons/eraser-line.svg
 create mode 100644 src/assets/icons/format-clear.svg

diff --git a/public/images/icons/eraser-line.svg b/public/images/icons/eraser-line.svg
new file mode 100644
index 0000000..c9b7239
--- /dev/null
+++ b/public/images/icons/eraser-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8.58564 8.85449L3.63589 13.8042L8.83021 18.9985L9.99985 18.9978V18.9966H11.1714L14.9496 15.2184L8.58564 8.85449ZM9.99985 7.44027L16.3638 13.8042L19.1922 10.9758L12.8283 4.61185L9.99985 7.44027ZM13.9999 18.9966H20.9999V20.9966H11.9999L8.00229 20.9991L1.51457 14.5113C1.12405 14.1208 1.12405 13.4877 1.51457 13.0971L12.1212 2.49053C12.5117 2.1 13.1449 2.1 13.5354 2.49053L21.3136 10.2687C21.7041 10.6592 21.7041 11.2924 21.3136 11.6829L13.9999 18.9966Z"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/eraser-fill.svg b/src/assets/icons/eraser-fill.svg
new file mode 100644
index 0000000..ac16771
--- /dev/null
+++ b/src/assets/icons/eraser-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M13.9999 18.9966H20.9999V20.9966H11.9999L8.00229 20.9991L1.51457 14.5113C1.12405 14.1208 1.12405 13.4877 1.51457 13.0971L12.1212 2.49053C12.5117 2.1 13.1449 2.1 13.5354 2.49053L21.3136 10.2687C21.7041 10.6592 21.7041 11.2924 21.3136 11.6829L13.9999 18.9966ZM15.6567 14.5113L19.1922 10.9758L12.8283 4.61185L9.29275 8.14738L15.6567 14.5113Z"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/eraser-line.svg b/src/assets/icons/eraser-line.svg
new file mode 100644
index 0000000..c9b7239
--- /dev/null
+++ b/src/assets/icons/eraser-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8.58564 8.85449L3.63589 13.8042L8.83021 18.9985L9.99985 18.9978V18.9966H11.1714L14.9496 15.2184L8.58564 8.85449ZM9.99985 7.44027L16.3638 13.8042L19.1922 10.9758L12.8283 4.61185L9.99985 7.44027ZM13.9999 18.9966H20.9999V20.9966H11.9999L8.00229 20.9991L1.51457 14.5113C1.12405 14.1208 1.12405 13.4877 1.51457 13.0971L12.1212 2.49053C12.5117 2.1 13.1449 2.1 13.5354 2.49053L21.3136 10.2687C21.7041 10.6592 21.7041 11.2924 21.3136 11.6829L13.9999 18.9966Z"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/format-clear.svg b/src/assets/icons/format-clear.svg
new file mode 100644
index 0000000..cf5822f
--- /dev/null
+++ b/src/assets/icons/format-clear.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M12.6512 14.0654L11.6047 20H9.57389L10.9247 12.339L3.51465 4.92892L4.92886 3.51471L20.4852 19.0711L19.071 20.4853L12.6512 14.0654ZM11.7727 7.53009L12.0425 5.99999H10.2426L8.24257 3.99999H19.9999V5.99999H14.0733L13.4991 9.25652L11.7727 7.53009Z"></path></svg>
\ No newline at end of file
diff --git a/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx b/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
index ae436b0..b74d45f 100644
--- a/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
+++ b/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
@@ -15,6 +15,7 @@ import {
   $isRangeSelection,
   $createParagraphNode,
   $getNodeByKey,
+  $isTextNode,
 } from 'lexical';
 import { $isLinkNode, $toggleLink, TOGGLE_LINK_COMMAND } from '@lexical/link';
 import {
@@ -25,12 +26,14 @@ import {
   // $wrapNodes,
   $isAtNodeEnd,
 } from '@lexical/selection';
-import { $findMatchingParent, $getNearestNodeOfType, mergeRegister } from '@lexical/utils';
+import { $findMatchingParent, $getNearestNodeOfType, $getNearestBlockElementAncestorOrThrow, mergeRegister } from '@lexical/utils';
 import { INSERT_ORDERED_LIST_COMMAND, INSERT_UNORDERED_LIST_COMMAND, REMOVE_LIST_COMMAND, $isListNode, ListNode } from '@lexical/list';
 import { createPortal } from 'react-dom';
-import { $createHeadingNode, $createQuoteNode, $isHeadingNode } from '@lexical/rich-text';
+import { $createHeadingNode, $createQuoteNode, $isHeadingNode, $isQuoteNode } from '@lexical/rich-text';
 import { $createCodeNode, $isCodeNode, getDefaultCodeLanguage, getCodeLanguages } from '@lexical/code';
 import { INSERT_HORIZONTAL_RULE_COMMAND } from '@lexical/react/LexicalHorizontalRuleNode';
+import {$isDecoratorBlockNode} from '@lexical/react/LexicalDecoratorBlockNode';
+import {$isTableSelection} from '@lexical/table';
 import DropDown, { DropDownItem } from './../ui/DropDown';
 import DropdownColorPicker from '../ui/DropdownColorPicker';
 import {
@@ -95,6 +98,62 @@ const ELEMENT_FORMAT_OPTIONS = {
   start: { icon: 'left-align', iconRTL: 'right-align', name: 'Start Align' },
 };
 
+// toolbar utils
+const clearFormatting = (editor) => {
+  editor.update(() => {
+    const selection = $getSelection();
+    if ($isRangeSelection(selection) || $isTableSelection(selection)) {
+      const anchor = selection.anchor;
+      const focus = selection.focus;
+      const nodes = selection.getNodes();
+      const extractedNodes = selection.extract();
+
+      if (anchor.key === focus.key && anchor.offset === focus.offset) {
+        return;
+      }
+
+      nodes.forEach((node, idx) => {
+        // We split the first and last node by the selection
+        // So that we don't format unselected text inside those nodes
+        if ($isTextNode(node)) {
+          // Use a separate variable to ensure TS does not lose the refinement
+          let textNode = node;
+          if (idx === 0 && anchor.offset !== 0) {
+            textNode = textNode.splitText(anchor.offset)[1] || textNode;
+          }
+          if (idx === nodes.length - 1) {
+            textNode = textNode.splitText(focus.offset)[0] || textNode;
+          }
+          /**
+           * If the selected text has one format applied
+           * selecting a portion of the text, could
+           * clear the format to the wrong portion of the text.
+           *
+           * The cleared text is based on the length of the selected text.
+           */
+          // We need this in case the selected text only has one format
+          const extractedTextNode = extractedNodes[0];
+          if (nodes.length === 1 && $isTextNode(extractedTextNode)) {
+            textNode = extractedTextNode;
+          }
+
+          if (textNode.__style !== '') {
+            textNode.setStyle('');
+          }
+          if (textNode.__format !== 0) {
+            textNode.setFormat(0);
+            $getNearestBlockElementAncestorOrThrow(textNode).setFormat('');
+          }
+          node = textNode;
+        } else if ($isHeadingNode(node) || $isQuoteNode(node)) {
+          node.replace($createParagraphNode(), true);
+        } else if ($isDecoratorBlockNode(node)) {
+          node.setFormat('');
+        }
+      });
+    }
+  });
+};
 function dropDownActiveClass(active) {
   if (active) {
     return 'active dropdown-item-active';
@@ -795,6 +854,13 @@ export default function ToolbarPlugin() {
         <i className='format redo' />
       </button>
       <FormatPainterToolbarButton />
+      <button type='button'
+        onClick={() => clearFormatting(activeEditor)}
+        className='toolbar-item'
+        title="Clear text formatting"
+        aria-label='Clear'>
+        <i className='format clear' />
+      </button>
       <Divider />
       {supportedBlockTypes.has(blockType) && (
         <>
diff --git a/src/components/LexicalEditor/styles.css b/src/components/LexicalEditor/styles.css
index f065d4d..cb13fe9 100644
--- a/src/components/LexicalEditor/styles.css
+++ b/src/components/LexicalEditor/styles.css
@@ -476,12 +476,12 @@ pre::-webkit-scrollbar-thumb {
 .toolbar .toolbar-item .text {
   display: flex;
   line-height: 20px;
-  width: 200px;
+  /* width: 200px; */
   vertical-align: middle;
   font-size: 14px;
   color: #777;
   text-overflow: ellipsis;
-  width: 70px;
+  width: 3rem;
   overflow: hidden;
   height: 20px;
   text-align: left;
@@ -763,6 +763,9 @@ i.undo {
 i.redo {
   background-image: url(/images/icons/arrow-clockwise.svg);
 }
+i.clear{
+    background-image: url(/images/icons/eraser-line.svg);
+}
 
 .icon.paragraph {
   background-image: url(/images/icons/text-paragraph.svg);

From c021cd162b2448b14285f816a8c13d15d39751ac Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 27 May 2025 09:54:24 +0800
Subject: [PATCH 016/143] #

---
 src/utils/commons.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/commons.js b/src/utils/commons.js
index 202e6bb..1032e2f 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -700,7 +700,7 @@ export const writeIndexDB = (row, table, database) => {
     var db = open.result
     // 数据库是否存在
     if (!db.objectStoreNames.contains(table)) {
-      var store = db.createObjectStore(table, { keyPath: 'id', autoIncrement: true })
+      var store = db.createObjectStore(table, { keyPath: 'key' })
       store.createIndex('timestamp', 'timestamp', { unique: false })
     } else {
       const objectStore = open.transaction.objectStore(table)

From df89722804cab483cc66fe0478bdbe845d0fabd8 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 27 May 2025 14:01:40 +0800
Subject: [PATCH 017/143] =?UTF-8?q?perf:=20=E6=94=AF=E4=BB=98=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5:=20=E5=88=A0=E9=99=A4=E9=80=9A=E7=9F=A5=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/accounts/GeneratePayment.jsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/views/accounts/GeneratePayment.jsx b/src/views/accounts/GeneratePayment.jsx
index c4a24e1..25ef3c9 100644
--- a/src/views/accounts/GeneratePayment.jsx
+++ b/src/views/accounts/GeneratePayment.jsx
@@ -45,7 +45,7 @@ function GeneratePayment() {
           const orderNumber = result.orderDetail.order_no
           const travelAdvisor = loginUser.accountList.length > 0 ? (loginUser.accountList[0]?.OPI_NameEN || '') : ''
           generateForm.setFieldsValue({
-            notifyEmail: getPrimaryEmail(),
+            // notifyEmail: getPrimaryEmail(),
             orderNumber: orderNumber,
             description: 'Tracking Code: ' + orderNumber + '\r\nTravel Advisor: ' + travelAdvisor + '\r\nContent: \r\n',
             langauge: 'US',
@@ -60,7 +60,7 @@ function GeneratePayment() {
         // })
     } else {
       generateForm.setFieldsValue({
-        notifyEmail: getPrimaryEmail(),
+        // notifyEmail: getPrimaryEmail(),
         description: 'Tracking Code: \r\nTravel Advisor: \r\nContent: \r\n',
         langauge: 'US',
         orderType: '227001',
@@ -170,9 +170,6 @@ function GeneratePayment() {
             <Form.Item label='描述' name='description'>
               <Input.TextArea rows={4} />
             </Form.Item>
-            <Form.Item label='通知邮箱' name='notifyEmail'>
-              <Input />
-            </Form.Item>
           </Form>
           <Flex gap='middle' justify='center'>
             <Button type='primary' loading={isHtmlLoading} onClick={handleGenerate}>

From 2ac04974a02db750c44b8124c38f66d12916ac90 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 27 May 2025 14:16:58 +0800
Subject: [PATCH 018/143] =?UTF-8?q?perf:=20=E5=9B=BE=E6=96=87=E9=9B=86;=20?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AuthApp.jsx                         |  4 ++++
 .../Components/GenerateAutoDocDrawer.jsx      | 14 +++++++++++++
 .../Online/Input/PaymentlinkBtn.jsx           |  2 +-
 src/views/DesktopApp.jsx                      | 21 -------------------
 4 files changed, 19 insertions(+), 22 deletions(-)
 create mode 100644 src/views/Conversations/Online/Components/GenerateAutoDocDrawer.jsx

diff --git a/src/views/AuthApp.jsx b/src/views/AuthApp.jsx
index 07d3028..efa4fe5 100644
--- a/src/views/AuthApp.jsx
+++ b/src/views/AuthApp.jsx
@@ -26,6 +26,8 @@ import EmailFetch from './Conversations/Online/Components/EmailFetch'
 import FetchEmailWorker from './../workers/fetchEmailWorker?worker&url'
 import { clearWebsocketLog, readWebsocketLog } from '@/utils/commons'
 import { useGlobalNotify } from '@/hooks/useGlobalNotify'
+import GeneratePaymentDrawer from './Conversations/Online/Components/GeneratePaymentDrawer'
+import GenerateAutoDocDrawer from './Conversations/Online/Components/GenerateAutoDocDrawer'
 
 // const fetchEmailWorkerURL = new URL('/src/workers/fetchEmailWorker.js', import.meta.url);
 const fetchEmailWorker = new Worker(FetchEmailWorker, { type: 'module' });
@@ -188,6 +190,8 @@ function AuthApp() {
               </button>
             </form>
           </dialog>
+          <GeneratePaymentDrawer />
+          <GenerateAutoDocDrawer />
         </ErrorBoundary>
       </AntApp>
     </ConfigProvider>
diff --git a/src/views/Conversations/Online/Components/GenerateAutoDocDrawer.jsx b/src/views/Conversations/Online/Components/GenerateAutoDocDrawer.jsx
new file mode 100644
index 0000000..d49c269
--- /dev/null
+++ b/src/views/Conversations/Online/Components/GenerateAutoDocDrawer.jsx
@@ -0,0 +1,14 @@
+import { createContext, useEffect, useState } from 'react'
+import { Drawer } from 'antd'
+import SnippetList from '@/views/accounts/SnippetList'
+import useSnippetStore from '@/stores/SnippetStore'
+
+const GenerateAutoDocDrawer = ({ ...props }) => {
+  const [openSnippetDrawer, closeSnippetDrawer, snippetDrawerOpen] = useSnippetStore((state) => [state.openDrawer, state.closeDrawer, state.drawerOpen])
+  return (
+    <Drawer title='图文集' placement={'top'} size={'large'} onClose={() => closeSnippetDrawer()} open={snippetDrawerOpen}>
+      <SnippetList></SnippetList>
+    </Drawer>
+  )
+}
+export default GenerateAutoDocDrawer
diff --git a/src/views/Conversations/Online/Input/PaymentlinkBtn.jsx b/src/views/Conversations/Online/Input/PaymentlinkBtn.jsx
index 8649e2a..80c3b11 100644
--- a/src/views/Conversations/Online/Input/PaymentlinkBtn.jsx
+++ b/src/views/Conversations/Online/Input/PaymentlinkBtn.jsx
@@ -8,7 +8,7 @@ const PaymentlinkBtn = ({ type, ...props }) => {
 
   return (
     <>
-      <GeneratePaymentDrawer />
+      {/* <GeneratePaymentDrawer /> */}
       <Tooltip title='支付链接'>
         {/* <Button type='text' onClick={() => openPaymentDrawer()} icon={<DollarOutlined className='text-orange-500' />} size={'middle'} /> */}
 
diff --git a/src/views/DesktopApp.jsx b/src/views/DesktopApp.jsx
index d096b87..64e264f 100644
--- a/src/views/DesktopApp.jsx
+++ b/src/views/DesktopApp.jsx
@@ -27,9 +27,6 @@ import 'react-chat-elements/dist/main.css'
 import ReloadPrompt from './ReloadPrompt'
 import ClearCache from './ClearCache'
 
-import SnippetList from '@/views/accounts/SnippetList'
-import GeneratePayment from '@/views/accounts/GeneratePayment'
-
 import { BUILD_VERSION, BUILD_DATE } from '@/config'
 
 const { Header, Footer, Content } = Layout
@@ -125,24 +122,6 @@ function DesktopApp() {
           width: '100%',
           background: 'white',
         }}>
-        <Drawer
-          title='图文集'
-          placement={'top'}
-          size={'large'}
-          onClose={() => closeSnippetDrawer()}
-          open={snippetDrawerOpen}
-          >
-          <SnippetList></SnippetList>
-        </Drawer>
-        <Drawer
-          title='支付链接'
-          placement={'top'}
-          size={'large'}
-          onClose={() => closePaymentDrawer()}
-          open={paymentDrawerOpen}
-          >
-          <GeneratePayment></GeneratePayment>
-        </Drawer>
         <Row gutter={{ md: 24 }} align='middle'>
           <Col flex='220px'>
             <NavLink to='/'>

From 8d7d5e32f424ca28645a0529f30959cd075341cf Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 27 May 2025 15:29:30 +0800
Subject: [PATCH 019/143] =?UTF-8?q?perf:=20=E5=88=A0=E9=99=A4=E9=9D=9E?=
 =?UTF-8?q?=E5=BF=85=E8=A6=81=E5=AD=97=E6=AE=B5=20wlemail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/OrderStore.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/OrderStore.js b/src/stores/OrderStore.js
index 524e79b..82d0afa 100644
--- a/src/stores/OrderStore.js
+++ b/src/stores/OrderStore.js
@@ -103,7 +103,6 @@ export const useOrderStore = create(devtools((set, get) => ({
     formData.append('lgc', formValues.langauge)
     formData.append('amount', formValues.amount)
     formData.append('coli_id', formValues.orderNumber)
-    formData.append('wlemail', formValues.notifyEmail)
     formData.append('ordertype', formValues.orderType)
     formData.append('opisn', formValues.userId)
     formData.append('paytype', 'SYT')

From fc87029d7a85c93f46692985b2c9ea1d29198700 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 27 May 2025 16:29:40 +0800
Subject: [PATCH 020/143] =?UTF-8?q?perf:=20=E6=B6=88=E6=81=AF=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E5=A4=B1=E8=B4=A5=E7=9A=84=20=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/channel/bubbleMsgUtils.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/channel/bubbleMsgUtils.js b/src/channel/bubbleMsgUtils.js
index 13d4156..8f88159 100644
--- a/src/channel/bubbleMsgUtils.js
+++ b/src/channel/bubbleMsgUtils.js
@@ -860,14 +860,14 @@ export const parseRenderMessageList = (messages) => {
     msgContent.template = msg.msgtype === 'template' ? { ...msgContent.template, ...template } : {};
     // const parseMethod = msgContent.bizType === 'whatsapp' ? cloneDeep(whatsappMsgTypeMapped) : {};
     let waCode, waError = '';
-    if ((msgContent?.status || 'accepted') === 'failed' && msgContent.errorMessage && msg.msg_direction === 'outbound') {
-      (waCode = msgContent.errorMessage.match(/\(#(\d+)\)/));
-      (waError = (whatsappError?.[waCode?.[1]] || whatsappError?.[msgContent.errorCode] || msgContent.errorMessage));
+    if ((msgContent?.status || 'accepted') === 'failed' && (msgContent.errorMessage || msg.errors_code) && msg.msg_direction === 'outbound') {
+      (waCode = (msgContent.errorMessage || msg.errors_code).match(/\(#(\d+)\)/));
+      (waError = (whatsappError?.[waCode?.[1]] || whatsappError?.[msgContent.errorCode] || msgContent.errorMessage || whatsappError?.[msg.errors_code]));
       if (!isEmpty(msgContent.whatsappApiError)) {
         waError = whatsappError?.[msgContent.whatsappApiError.code] || msgContent.whatsappApiError.message;
         // waError += `\n[${msgContent.errorCode}] ${whatsappError?.[msgContent.errorCode] || msgContent.errorMessage}`;
       }
-      if (msgContent.errorMessage.includes('Invalid E.146 phone number')) {
+      if ((msgContent.errorMessage || msg.errors_code).includes('Invalid E.146 phone number')) {
         waError = whatsappError.INVALID_PHONE_NUMBER;
       }
     }
@@ -947,7 +947,7 @@ export const whatsappError = {
   '100': '参数错误, 请联系技术组',
   'FORBIDDEN': '[FORBIDDEN] ',
   '4': '[4] 无法连接WhatsApp.\n请稍后重试', // (#4) Application request limit reached
-  '131026': '[131026] 消息无法投递(未同意WhatsApp 的隐私政策).\n请使用邮件联系',
+  '131026': '[131026] 消息无法投递(未同意WhatsApp 的隐私政策).\n请使用 邮件/个人WhatsApp 联系',
   '131047': '[131047] 会话未激活. \n请使用模板消息💬发送',
   '131053': '[131053] 文件上传失败.',
   '131048': '[131048] 账户被风控.', // 消息发送太多, 达到垃圾数量限制

From 63ec5c0a286ba0cd79d40783d43e220630f2107f Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 27 May 2025 17:02:59 +0800
Subject: [PATCH 021/143] =?UTF-8?q?perf:=20=E9=82=AE=E4=BB=B6=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/NewEmail.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index 0da5924..87d2749 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -366,7 +366,7 @@ const NewEmail = ({ ...props }) => {
             resolve(e.target.result)
             return
           }
-          var win = window.open('', '_blank')
+          var win = window.open('', file.uid, 'width=1000,height=800,left=20,top=20')
           win.document.body.style.margin = '0'
           if (file.type.startsWith('image/')) {
             win.document.write("<img src='" + e.target.result + '\' style="max-width: 100%;" />')

From ce8494fe26c0563e635dc898864c709c43bfa239 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 28 May 2025 12:00:22 +0800
Subject: [PATCH 022/143] =?UTF-8?q?perf(=E5=89=8D=E7=AB=AF):=20=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E8=81=8A=E5=A4=A9:=20=E2=9B=94=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E9=82=AE=E4=BB=B6;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Online/order/CustomerProfile.jsx          | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/Conversations/Online/order/CustomerProfile.jsx b/src/views/Conversations/Online/order/CustomerProfile.jsx
index e7d3a29..32fd9f3 100644
--- a/src/views/Conversations/Online/order/CustomerProfile.jsx
+++ b/src/views/Conversations/Online/order/CustomerProfile.jsx
@@ -94,19 +94,19 @@ const CustomerProfile = ({ disabled }) => {
 				});
 
 
-      fetchOtherEmail(currentOrder)
-        .then(result => {
-          // console.info(result)
-        })
-        .finally(() => setLoading(false))
-        .catch(reason => {
-          notification.error({
-            message: "查询供应商邮件出错",
-            description: reason.message,
-            placement: "top",
-            duration: 60,
-          });
-        });
+      // fetchOtherEmail(currentOrder)
+      //   .then(result => {
+      //     // console.info(result)
+      //   })
+      //   .finally(() => setLoading(false))
+      //   .catch(reason => {
+      //     notification.error({
+      //       message: "查询供应商邮件出错",
+      //       description: reason.message,
+      //       placement: "top",
+      //       duration: 60,
+      //     });
+      //   });
 		} else if (isEmpty(currentOrder)) {
       resetOrderStore();
     }
@@ -293,8 +293,8 @@ const CustomerProfile = ({ disabled }) => {
 								</>
 							}
 						/>
-					</Flex>
-
+					</Flex>*/}
+          {/*
           <Divider orientation="left">
             <Typography.Text strong>供应商邮件</Typography.Text>
             <Badge count={otherEmailList.length} className='ml-2' color="oklch(62.3% 0.214 259.815)" />

From 92e5cab823c37634061f080dbdaf548c3f1539ae Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 28 May 2025 14:53:30 +0800
Subject: [PATCH 023/143] =?UTF-8?q?perf(=E5=89=8D=E7=AB=AF):=20=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95:=20=E6=9F=A5=E8=AF=A2`=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6`=E6=B8=A0=E9=81=93;=20=E2=9B=94=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Conversations/History/SearchForm.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/Conversations/History/SearchForm.jsx b/src/views/Conversations/History/SearchForm.jsx
index a90d12b..6bef0c6 100644
--- a/src/views/Conversations/History/SearchForm.jsx
+++ b/src/views/Conversations/History/SearchForm.jsx
@@ -46,7 +46,7 @@ const SearchForm = memo(function ({ initialValues, onSubmit, onReset }) {
                 { key: 'whatsapp', label: 'WhatsApp', value: 'whatsapp' },
                 ]} className='w-8' />
           </Form.Item>
-          <Form.Item label='消息类型' name='mtype' className='w-44'>
+          {/* <Form.Item label='消息类型' name='mtype' className='w-44'>
             <Select mode='multiple' maxTagCount={0} allowClear options={[
                 { key: 'image', label: '图片', value: 'image' },
                 { key: 'video', label: '视频', value: 'video' },
@@ -54,10 +54,10 @@ const SearchForm = memo(function ({ initialValues, onSubmit, onReset }) {
                 { key: 'file', label: '文件', value: 'file' },
                 { key: 'email', label: '邮件', value: 'email' },
                 ]} className='w-8' />
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item label='日期' name='msgDateRange'>
             <RangePicker format={'YYYY-MM-DD'} />
-            
+
           </Form.Item>
         </Flex>
         <div style={{ flex: '0 1 64px' }} className='flex justify-between'>

From b1efa2f4f37c84e606b1dc8793706c72e8d45cea Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 29 May 2025 13:55:15 +0800
Subject: [PATCH 024/143] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 327 +++++++++---------------------------
 1 file changed, 76 insertions(+), 251 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 2525def..9dd8dcb 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -8,19 +8,23 @@ import {
   WhatsAppOutlined,
   ImportOutlined,
   FileAddOutlined,
-  BarsOutlined,
-  DownOutlined,
+  StarTwoTone,
+  StarOutlined,
   MailOutlined,
   PhoneOutlined,
   UserOutlined,
   FieldNumberOutlined,
   SaveOutlined,
   PlusOutlined,
-  MehOutlined,
+  SearchOutlined,
+  ReloadOutlined,ReadOutlined,
   CompassOutlined,
   CheckSquareTwoTone,
   CarryOutTwoTone,
+  CheckSquareOutlined,
   MailTwoTone,
+  BookTwoTone,
+  RightSquareTwoTone,
   SwitcherTwoTone,
   FolderTwoTone,
   CalendarTwoTone,
@@ -367,13 +371,16 @@ const [collapsed, setCollapsed] = useState(false)
             <Tree
               showIcon
               showLine
-              defaultExpandedKeys={['0-0', '0-1']}
+              onSelect={(selectedKeys, e) => {
+                console.info('selectedKeys: ', selectedKeys)
+              }}
+              defaultExpandedKeys={['0-0-today-task', '0-1-todo-task']}
               defaultSelectedKeys={['0-0-0']}
               treeData={[
                 {
                   title: '今日任务',
-                  key: '0-0',
-                  icon: <CalendarTwoTone />,
+                  key: '0-0-today-task',
+                  icon: <StarTwoTone />,
                   children: [
                     {
                       title: '(新订单)HXZ240913082',
@@ -387,8 +394,8 @@ const [collapsed, setCollapsed] = useState(false)
                 },
                 {
                   title: '待办任务',
-                  key: '0-1',
-                  icon: <SwitcherTwoTone />,
+                  key: '0-1-todo-task',
+                  icon: <CalendarTwoTone />,
                   children: [
                     {
                       title: '(一催)HXZ250213117',
@@ -414,13 +421,13 @@ const [collapsed, setCollapsed] = useState(false)
                 },
                 {
                   title: '草稿',
-                  key: '0-2',
-                  icon: <MailTwoTone />,
+                  key: '0-2-draft',
+                  icon: <BookTwoTone />,
                 },
                 {
                   title: '收件箱',
-                  key: '0-3',
-                  icon: <FolderTwoTone />,
+                  key: '0-3-inbox',
+                  icon: <MailTwoTone />,
                   children: [
                     {
                       title: '1月',
@@ -473,12 +480,12 @@ const [collapsed, setCollapsed] = useState(false)
                 },
                 {
                   title: '已发送',
-                  key: '0-4',
-                  icon: <CarryOutTwoTone />,
+                  key: '0-4-sent',
+                  icon: <RightSquareTwoTone />,
                 },
                 {
                   title: '已处理',
-                  key: '0-5',
+                  key: '0-5-completed',
                   icon: <CheckSquareTwoTone />,
                 },
               ]}
@@ -486,34 +493,42 @@ const [collapsed, setCollapsed] = useState(false)
           </Flex></Layout.Sider>
     <Layout.Content>
 
-      <Layout>
-  <Layout.Header className='bg-white h-auto px-1 flex gap-1 items-center'>
 
-            <Button onClick={() => {}} icon={<PlusOutlined />} type={'primary'}>新邮件</Button>
+<Row>
+      <Col className='bg-white' span={16}>
+
+      <div className='bg-white h-auto px-1 flex gap-1 items-center'>
 
-<Dropdown menu={{ items: [
+  <Dropdown.Button className='w-auto' placement="bottom" arrow type={'primary'} menu={{
+  items: [
   {
     key: '1',
-    label: '一催：模板一',
+    label: '一催模板一，询问客人是否收到报价信',
   },
   {
     key: '2',
-    label: '一催：模板二',
+    label: '一催模板二，询问客人是否修改行程',
+  },{
+    type: 'divider',
   },
   {
     key: '3',
-    label: '一催：模板三',
+    label: '二催模板一，询问客人对行程的看法',
   },
-]}} trigger={['click']}>
-
-    <Button>
-        <Space>
-          使用模板
-          <DownOutlined />
-        </Space>
-      </Button>
-  </Dropdown>
-            <Button onClick={() => {}} >多选</Button>
+  {
+    key: '4',
+    label: '二催模板二，表达服务的意识',
+  },{
+    type: 'divider',
+  },
+  {
+    key: '5',
+    label: '三催模板三，强调价格有效期',
+  }],
+  onClick: (item)=> {console.info('menu', item)},
+}} onClick={()  => {console.info('新邮件')}}>
+      新邮件
+    </Dropdown.Button>
             <Input.Search
               className=''
               allowClear
@@ -521,18 +536,30 @@ const [collapsed, setCollapsed] = useState(false)
               onPressEnter={(e) => {
                 return false
               }}
-              placeholder={`名称/号码/订单号`}
+              placeholder={`邮件主题`}
             />
             <Button onClick={() => {}} >高级搜索</Button>
-</Layout.Header>
-  <Layout>
-    <Layout.Content>
-
-<Row>
-      <Col className='bg-white' span={16} style={{height: 'calc(100vh - 196px)', overflowY: 'auto'}}>
+            </div>
+            <div  className='bg-white overflow-y-auto'
+ style={{height: 'calc(100vh - 198px)'}}>
 <List
+    // header={null}
+    header={ <Flex wrap gap="small">
+          <Tooltip title="选择">
+      <Checkbox></Checkbox>
+      </Tooltip>
+          <Tooltip title="标记已读">
+            <Button shape="circle" type="text" size='small' icon={<ReadOutlined />} />
+          </Tooltip>
+          <Tooltip title="已处理">
+            <Button shape="circle" type="text" size='small' icon={<CheckSquareOutlined />} />
+          </Tooltip>
+          <Tooltip title="刷新">
+            <Button shape="circle" type="text" size='small' icon={<ReloadOutlined />} />
+          </Tooltip>
+        </Flex>}
     itemLayout="vertical"
-    size="small"
+    size="large"
     pagination={false}
     dataSource={[
               {
@@ -647,15 +674,23 @@ const [collapsed, setCollapsed] = useState(false)
         //   <a key="list-vertical-star-o">回复</a>,
         //   <a key="list-vertical-refor">转发</a>,
         // ]}
+        extra={
+          <Checkbox></Checkbox>
+        }
+
       >
         <List.Item.Meta
+          className='cursor-pointer'
+        onClick={() => console.info('item: ', item)}
           title={<a href={item.href} onClick={() => setSubject(item.title)}>{item.title}</a>}
           description={item.description + ' ' + item.mailDate}
         />
         {item.content}LSS250501006, Thailand
       </List.Item>
     )}
-  /></Col>
+  />
+  </div>
+  </Col>
       <Col span={8}>
 
   <div>
@@ -706,217 +741,7 @@ const [collapsed, setCollapsed] = useState(false)
         <p>Some contents...{Math.random().toString(36).substring(2, 9)}</p>
   </div></Col>
     </Row>
-          {/* <Table
-          onRow={(record) => {
-    return {
-      onClick: (event) => {console.info(event)}, // 点击行
-      onDoubleClick: (event) => {},
-      onContextMenu: (event) => {},
-      onMouseEnter: (event) => {}, // 鼠标移入行
-      onMouseLeave: (event) => {},
-    };
-  }}
-            pagination={false}
-    sticky={{ offsetHeader: 64 }}
-            columns={[
-              {
-                title: '主题',
-                dataIndex: 'subject',
-                key: 'subject',
-                width: 500,
-                render: (text) => <a onClick={() => {
-                  setSubject(text)
-                  setOpenMail(true)
-                }}>{text}</a>,
-              },
-              {
-                title: '收/发件人',
-                dataIndex: 'name',
-                key: 'name',
-                width: 380,
-                minWidth: 180,
-                render: (text) => <a>{text}</a>,
-              },
-              {
-                title: '收/发日期',
-                dataIndex: 'mailDate',
-                key: '收/发日期',
-                width: 180,
-              },
-              {
-                title: '订单号',
-                key: 'orderNo',
-                dataIndex: 'orderNo',
-                width: 140,
-              },
-              {
-                title: '国籍',
-                key: 'country',
-                dataIndex: 'country',
-                width: 120,
-              },
-              {
-                title: '操作',
-                key: 'action',
-                width: 120,
-                render: (_, record) => (
-                  <Space size='middle'>
-                    <a>回复</a>
-                    <a>转发</a>
-                  </Space>
-                ),
-              },
-            ]}
-            dataSource={[
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                name: 'Fran Grundman <frangrundman@rogers.com>',
-                subject: 'Your Thailand Private tour by "Asia Highlights" ' + Math.random().toString(36).substring(2, 9),
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-            ]}
-          /> */}
-</Layout.Content>
-  </Layout>
-  {/* <Layout.Footer className='p-1 border-solid border rounded border-gray-300'>
 
-          <Descriptions title="Your Thailand Private tour by 'Asia Highlights' 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到" items={[
-  {
-    key: '1',
-    label: '发件人',
-    children: '"阿里邮箱" <no-reply@mailsupport.aliyun.com>',
-  },
-  {
-    key: '2',
-    label: '收件人',
-    children: '<liaoyijun@chinahighlights.com>',
-  },
-  {
-    key: '3',
-    label: '发送日期',
-    children: '2025-05-16 14:11',
-  },
-]} />
-          <Flex gap="small">
-            <Space.Compact>
-          <Button color="primary" variant="solid">
-            回复
-          </Button>
-          <Button color="primary" variant="outlined">
-            回复全部
-          </Button>
-          <Button color="primary" variant="outlined" >
-            转发
-          </Button>
-          </Space.Compact>
-          <Button color="cyan" variant="outlined">
-            已处理
-          </Button>
-          <Button color="cyan" variant="outlined">
-            绑定订单
-          </Button>
-          </Flex>
-          <div id='__preHtml__' className='whitespace-pre-wrap break-words' dangerouslySetInnerHTML={{ __html: '邮件内容。。。。。<br/>换行了。。。看看 ' }}></div>
-          </Layout.Footer> */}
-</Layout>
     </Layout.Content>
     <Layout.Sider zeroWidthTriggerStyle={{top: '30px'}} width='280' style={{
   backgroundColor: '#fff',

From ab36a85b22f086f6332cd350a0339616faca6f88 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 29 May 2025 16:00:49 +0800
Subject: [PATCH 025/143] =?UTF-8?q?perf=EF=BC=9A=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=8E=9F=E6=9C=89=E8=A1=A8=E6=A0=BC=E5=92=8C=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 265 +-----------------------------------
 1 file changed, 2 insertions(+), 263 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 9dd8dcb..117528c 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -40,189 +40,7 @@ import { UNREAD_MARK } from '@/actions/ConversationActions'
 import AdvanceSearchForm from './AdvanceSearchForm'
 
 function OrderGroupTable({ formValues }) {
-  const handleImportEmail = useCallback((order) => {
-    importEmailMessage({ orderId: order.COLI_SN, orderNumber: order.COLI_ID })
-      .then((r) => {
-        console.info(r)
-        notification.info({
-          message: 'Notification',
-          description: '订单：' + order.COLI_ID + ' 导入' + r.result.length + '条邮件消息',
-          placement: 'top',
-        })
-      })
-      .catch((ex) =>
-        notification.error({
-          message: 'Notification',
-          description: ex.message,
-          placement: 'top',
-          duration: 4,
-        }),
-      )
-  }, [])
-
-  const orderColumns = [
-    {
-      title: '订单号',
-      dataIndex: 'COLI_ID',
-      width: 222,
-      render: (text, record) => {
-        let tagIcon = ''
-
-        if (record.COLI_LineGrade === 240003) tagIcon = <Tag color='red'>重点</Tag>
-        else if (record.COLI_LineGrade === 240002) tagIcon = <Tag color='green'>次重点</Tag>
-        else if (record.COLI_LineGrade === 240001) tagIcon = <Tag color='blue'>一般</Tag>
-
-        return (
-          <Space>
-            <Conditional
-              condition={isPermitted(PERM_IMPORT_EMAIL)}
-              whenTrue={<Button type='default' shape='round' icon={<ImportOutlined />} size='small' onClick={() => handleImportEmail(record)} />}
-            />
-            <Link to={`/order/chat/${record.COLI_SN}`} state={record}>
-              {text}
-            </Link>
-            {tagIcon}
-          </Space>
-        )
-      },
-    },
-    {
-      title: '客人姓名',
-      dataIndex: 'coli_guest',
-      render: (text, record) => {
-        let regularText = ''
-        if (record.buytime > 0) regularText = '(R' + record.buytime + ')'
-        return (
-          <Space>
-            <Conditional
-              condition={isPermitted(record.coli_guest_WhatsApp)}
-              whenTrue={
-                <Tooltip title={record.coli_guest_WhatsApp}>
-                  <WhatsAppOutlined className={['pl-1', record.last_received_time ? 'text-whatsapp' : 'text-neutral-500']} />
-                </Tooltip>
-              }
-            />
-            {text + regularText}
-            <Badge
-              count={record.unread_msg >= UNREAD_MARK ? ' ' : record.unread_msg}
-              style={{
-                backgroundColor: '#52c41a',
-              }}
-            />
-          </Space>
-        )
-      },
-    },
-    {
-      title: '订单状态',
-      dataIndex: 'COLI_State',
-      width: 140,
-      render: (text, record) => {
-        let extra = ''
-        if (record.coli_ordertype === 3 || record.coli_ordertype === 4 || record.coli_ordertype === 5) {
-          extra = '(' + (record.coli_ordertype - 2) + '催)'
-        }
-
-        return (
-          <Space>
-            {extra}
-            {text}
-          </Space>
-        )
-      },
-    },
-    {
-      title: '报价 Title',
-      dataIndex: 'lettertitle',
-      ellipsis: true,
-      hidden: false,
-    },
-    {
-      title: '出发日期',
-      dataIndex: 'COLI_OrderStartDate',
-      width: 120,
-      hidden: false,
-      sortDirections: ['ascend', 'descend'],
-      sorter: (a, b) => {
-        const datejsA = isEmpty(a.COLI_OrderStartDate) ? 0 : new dayjs(a.COLI_OrderStartDate).valueOf()
-        const datejsB = isEmpty(b.COLI_OrderStartDate) ? 0 : new dayjs(b.COLI_OrderStartDate).valueOf()
-        return datejsA - datejsB
-      },
-    },
-    {
-      title: '客人最后一次回复时间',
-      dataIndex: 'last_received_time',
-      width: 180,
-      render: (text, record) => {
-        if (record.last_received_time) {
-          return new dayjs(record.last_received_time).format('YYYY-MM-DD HH:mm:ss')
-        }
-      },
-    },
-    {
-      title: '附加信息',
-      ellipsis: true,
-      dataIndex: 'COLI_Introduction',
-    },
-  ]
 
-  const { notification } = App.useApp()
-  const [loading, setLoading] = useState(false)
-  const orderList = useOrderStore((state) => state.orderList)
-  const fetchOrderList = useOrderStore((state) => state.fetchOrderList)
-  const importEmailMessage = useOrderStore((state) => state.importEmailMessage)
-  const [loginUser, isPermitted] = useAuthStore((state) => [state.loginUser, state.isPermitted])
-
-  useEffect(() => {
-    let canSearch = true
-
-    if (formValues.type === 'advance') {
-      const copyObject = copy(formValues)
-      delete copyObject.type
-      const allEmpty = Object.values(copyObject).every((val) => {
-        return val === null || val === '' || val === undefined
-      })
-      if (allEmpty) {
-        canSearch = false
-        notification.warning({
-          message: '温馨提示',
-          description: '请输入至少一个条件',
-          placement: 'top',
-          duration: 60,
-        })
-      }
-    }
-
-    if (canSearch) {
-      setLoading(true)
-      fetchOrderList(formValues, loginUser)
-        .finally(() => setLoading(false))
-        .catch((reason) => {
-          notification.error({
-            message: '查询出错',
-            description: reason.message,
-            placement: 'top',
-            duration: 60,
-          })
-        })
-    }
-  }, [formValues])
-
-  const paginationProps = {
-    showQuickJumper: true,
-    showLessItems: true,
-    showSizeChanger: true,
-    showTotal: (total) => {
-      return `总数：${total}`
-    },
-  }
-
-  function groupByParam(array, param) {
-    return array.reduce((result, item) => {
-      ;(result[item[param]] = result[item[param]] || []).push(item)
-      return result
-    }, {})
-  }
 
   const deptMap = new Map([
     ['1', 'CH直销组'],
@@ -257,85 +75,6 @@ function OrderGroupTable({ formValues }) {
     ['35', 'newsletter营销'],
   ])
 
-  const groupOrderData = groupByParam(orderList, 'OPI_DEI_SN')
-  const deptKeys = Object.keys(groupOrderData)
-  const deptItems = []
-
-  deptKeys.forEach((deptNo, index) => {
-    const deptOrderList = groupOrderData[deptNo]
-    // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
-    const newOrderList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 1
-    })
-    const newMsgList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 2 || o.coli_ordertype === 6
-    })
-    const followUpList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 3 || o.coli_ordertype === 4 || o.coli_ordertype === 5
-    })
-    const entryList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 7
-    })
-    const paymentList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 8
-    })
-    if (formValues.type === 'today') {
-      deptItems.push({
-        key: index,
-        label: deptMap.get(deptNo),
-        children: (
-          <>
-            <Divider orientation='left'>新订单</Divider>
-            <Conditional
-              condition={newOrderList.length > 0}
-              whenTrue={<Table key={'newOrderTable' + deptNo} loading={loading} dataSource={newOrderList} columns={orderColumns} pagination={newOrderList.length <= 10 ? false : paginationProps} />}
-              whenFalse={<Empty />}
-            />
-
-            <Divider orientation='left'>新消息/老邮件</Divider>
-            <Conditional
-              condition={newMsgList.length > 0}
-              whenTrue={<Table key={'newMsgTable' + deptNo} loading={loading} dataSource={newMsgList} columns={orderColumns} pagination={newMsgList.length <= 10 ? false : paginationProps} />}
-              whenFalse={<Empty />}
-            />
-
-            <Divider orientation='left'>催信</Divider>
-            <Conditional
-              condition={followUpList.length > 0}
-              whenTrue={<Table key={'followUpTable' + deptNo} loading={loading} dataSource={followUpList} columns={orderColumns} pagination={followUpList.length <= 10 ? false : paginationProps} />}
-              whenFalse={<Empty />}
-            />
-
-            <Divider orientation='left'>余款收付</Divider>
-            <Conditional
-              condition={paymentList.length > 0}
-              whenTrue={<Table key={'paymentTable' + deptNo} loading={loading} dataSource={paymentList} columns={orderColumns} pagination={paymentList.length <= 10 ? false : paginationProps} />}
-              whenFalse={<Empty />}
-            />
-
-            <Divider orientation='left'>入境提醒</Divider>
-            <Conditional
-              condition={entryList.length > 0}
-              whenTrue={<Table key={'entryTable' + deptNo} loading={loading} dataSource={entryList} columns={orderColumns} pagination={entryList.length <= 10 ? false : paginationProps} />}
-              whenFalse={<Empty />}
-            />
-          </>
-        ),
-      })
-    } else {
-      deptItems.push({
-        key: index,
-        label: deptMap.get(deptNo),
-        children: (
-          <>
-            <Table key={'advanceOrderTable' + deptNo} loading={loading} dataSource={deptOrderList} columns={orderColumns} pagination={deptOrderList.length <= 10 ? false : paginationProps} />
-          </>
-        ),
-      })
-    }
-  })
-
-  return <Conditional condition={orderList.length > 0} whenTrue={<Tabs defaultActiveKey={0} items={deptItems} />} whenFalse={<Empty />} />
 }
 
 function Follow() {
@@ -374,7 +113,7 @@ const [collapsed, setCollapsed] = useState(false)
               onSelect={(selectedKeys, e) => {
                 console.info('selectedKeys: ', selectedKeys)
               }}
-              defaultExpandedKeys={['0-0-today-task', '0-1-todo-task']}
+              defaultExpandedKeys={['0-0-today-task', '0-1-todo-list']}
               defaultSelectedKeys={['0-0-0']}
               treeData={[
                 {
@@ -394,7 +133,7 @@ const [collapsed, setCollapsed] = useState(false)
                 },
                 {
                   title: '待办任务',
-                  key: '0-1-todo-task',
+                  key: '0-1-todo-list',
                   icon: <CalendarTwoTone />,
                   children: [
                     {

From 41948fed6f3d0d7ea3ec776ebe708de3c7aaba3c Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 29 May 2025 16:03:56 +0800
Subject: [PATCH 026/143] =?UTF-8?q?=E2=8F=B3=E6=96=B0=E7=AA=97=E5=8F=A3:?=
 =?UTF-8?q?=20=E9=82=AE=E4=BB=B6=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                   |   3 +-
 src/assets/icons/text.svg                     |   1 +
 src/components/Icons.jsx                      |   5 +-
 src/config.js                                 |   2 +
 src/hooks/useEmail.js                         |  54 ++--
 src/utils/commons.js                          |  10 +-
 .../Conversations/History/MessagesList.jsx    |   4 +-
 .../Online/Components/EmailContent.jsx        |   1 +
 .../Online/Components/EmailDetailInline.jsx   |  11 +-
 .../Conversations/Online/MessagesWrapper.jsx  |   3 +-
 src/views/NewEmail.jsx                        | 261 +++++++++---------
 11 files changed, 182 insertions(+), 173 deletions(-)
 create mode 100644 src/assets/icons/text.svg

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index aaf09b8..a2cbfaf 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -19,7 +19,8 @@ export const getSalesSignatureAction = async (params) => {
   try {
     const { result } = await fetchJSON(`${EMAIL_HOST}/email_sign`, params)
     const { SignContent: html } = result
-    return parseHTMLString(html);
+    const bodyContent = parseHTMLString(html);
+    return bodyContent;
   } catch (error) {
     return '';
   }
diff --git a/src/assets/icons/text.svg b/src/assets/icons/text.svg
new file mode 100644
index 0000000..027b1ee
--- /dev/null
+++ b/src/assets/icons/text.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M13 6V21H11V6H5V4H19V6H13Z"></path></svg>
\ No newline at end of file
diff --git a/src/components/Icons.jsx b/src/components/Icons.jsx
index 94a7bc2..3209606 100644
--- a/src/components/Icons.jsx
+++ b/src/components/Icons.jsx
@@ -1,7 +1,7 @@
 import Icon from '@ant-design/icons';
 
 import ReplyLineSVG from '@/assets/icons/reply-line.svg?react';
-import ReplyAllLineSVG from '@/assets/icons/reply-all-line.svg?react';
+import ReplyAllLineSVG from '@/assets/icons/reply-all-fill.svg?react';
 import AttachmentLineSVG from '@/assets/icons/attachment-line.svg?react';
 import AttachmentFillSVG from '@/assets/icons/attachment-fill.svg?react';
 // import ShareForwardFillSVG from '@/assets/icons/share-forward-fill.svg?react';
@@ -14,6 +14,7 @@ import ResendLineSVG from '@/assets/icons/reset-left-line.svg?react';
 import EditLineSVG from '@/assets/icons/quill-pen-line.svg?react';
 import MailDownloadLineSVG from '@/assets/icons/mail-download-line.svg?react';
 import MailAddLineSVG from '@/assets/icons/mail-add-line.svg?react';
+import TextSVG from '@/assets/icons/text.svg?react';
 
 
 export const ReplyIcon = (props) => <Icon component={ReplyLineSVG} {...props} />;
@@ -29,6 +30,8 @@ export const ResendIcon = (props) => <Icon component={ResendLineSVG} {...props}
 export const EditIcon = (props) => <Icon component={EditLineSVG} {...props} />;
 export const MailDownloadIcon = (props) => <Icon component={MailDownloadLineSVG} {...props} />;
 export const MailAddloadIcon = (props) => <Icon component={MailAddLineSVG} {...props} />;
+export const TextIcon = (props) => <Icon component={TextSVG} {...props} />;
+
 
 const WABSvg = () => (
   <svg viewBox='0 0 32 32' xmlns='http://www.w3.org/2000/svg' width='16' height='16'>
diff --git a/src/config.js b/src/config.js
index d3794a8..6ce24ef 100644
--- a/src/config.js
+++ b/src/config.js
@@ -39,3 +39,5 @@ const __BUILD_DATE__ = `__BUILD_DATE__`;
 
 export const BUILD_VERSION = process.env.NODE_ENV === 'production' ? __BUILD_VERSION__ : process.env.NODE_ENV;
 export const BUILD_DATE = process.env.NODE_ENV === 'production' ? __BUILD_DATE__ : new Date().toLocaleString();
+
+export const POPUP_FEATURES = 'left=20,top=20,width=1000,height=800';
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index dae6dd1..6d6b2ad 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -54,6 +54,11 @@ export const useEmailDetail = (mai_sn, data) => {
         // console.log(data)
         setMailData(data)
         setColiSN(data.info.MAI_COLI_SN)
+        if (!isEmpty(data.info.MAI_COLI_SN)) {
+          const orderData = await getEmailOrderAction({ colisn: data.info.MAI_COLI_SN })
+          setOrderDetail(orderData)
+          // console.log(orderData)
+        }
         setLoading(false)
       } catch (err) {
         setLoading(false)
@@ -71,29 +76,30 @@ export const useEmailDetail = (mai_sn, data) => {
   }, [mai_sn])
 
 
-  useEffect(() => {
-    const getOrderDetail = async () => {
-      if (isEmpty(coliSN)) {
-        return false
-      }
-      try {
-        setLoading(true)
-        const data = await getEmailOrderAction({ colisn: coliSN })
-        setOrderDetail(data)
-        setLoading(false)
-      } catch (err) {
-        setLoading(false)
-        notification.error({
-          message: "请求失败",
-          description: err.message || '网络异常',
-          placement: "top",
-          duration: 3,
-        });
-      }
-    }
-
-    getOrderDetail()
-  }, [coliSN])
+  // useEffect(() => {
+  //   console.log(coliSN, '====colisn======')
+  //   const getOrderDetail = async () => {
+  //     if (isEmpty(coliSN)) {
+  //       return false
+  //     }
+  //     try {
+  //       setLoading(true)
+  //       const data = await getEmailOrderAction({ colisn: coliSN })
+  //       setOrderDetail(data)
+  //       setLoading(false)
+  //     } catch (err) {
+  //       setLoading(false)
+  //       notification.error({
+  //         message: "请求失败",
+  //         description: err.message || '网络异常',
+  //         placement: "top",
+  //         duration: 3,
+  //       });
+  //     }
+  //   }
+
+  //   getOrderDetail()
+  // }, [coliSN])
 
   const postEmailResend = async ({ mai_sn, conversationid: externalid, actionId: actionid, ...body }) => {
     if (isEmpty(mai_sn)) {
@@ -108,5 +114,5 @@ export const useEmailDetail = (mai_sn, data) => {
 }
 
 export const EmailBuilder = ({subject, content}) => {
-  return `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><title>${subject}</title><meta http-equiv="Content-Type" content="text/html charset=UTF-8" /><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="telephone=no,address=no,email=no,date=no,url=no" name="format-detection"><meta content="light" name="color-scheme"><meta content="light" name="supported-color-schemes"><style id="font">body#highlights-email{ font-family: Verdana, sans-serif;} table{ border-collapse: collapse; border-spacing: 0;} </style></head><body id="highlights-email" style="margin: 0 auto; padding: undefined; width: 900px; background-color: #fcfcfc;">${content}</body></html>`;
+  return `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><title>${subject}</title><meta http-equiv="Content-Type" content="text/html charset=UTF-8" /><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="telephone=no,address=no,email=no,date=no,url=no" name="format-detection"><meta content="light" name="color-scheme"><meta content="light" name="supported-color-schemes"><style id="font">body#highlights-email{ font-family: Verdana, sans-serif;} table{ border-collapse: collapse; border-spacing: 0;} </style></head><body id="highlights-email" style="margin: 0 auto; padding: 0; width: 900px; background-color: #fcfcfc;">${content}</body></html>`;
 }
diff --git a/src/utils/commons.js b/src/utils/commons.js
index 1032e2f..fd64c59 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -722,11 +722,11 @@ export const writeIndexDB = (row, table, database) => {
 export const deleteIndexDBbyKey = (key, table, database) => {
   var open = indexedDB.open(database, INDEXED_DB_VERSION)
   open.onupgradeneeded = function () {
-    var db = open.result
-    // 数据库是否存在
-    if (!db.objectStoreNames.contains(table)) {
-      var store = db.createObjectStore(table, { keyPath: 'id', autoIncrement: true })
-    }
+    // var db = open.result
+    // // 数据库是否存在
+    // if (!db.objectStoreNames.contains(table)) {
+    //   var store = db.createObjectStore(table, { keyPath: 'id', autoIncrement: true })
+    // }
   }
   open.onsuccess = function () {
     var db = open.result
diff --git a/src/views/Conversations/History/MessagesList.jsx b/src/views/Conversations/History/MessagesList.jsx
index 1d06974..d88a8ab 100644
--- a/src/views/Conversations/History/MessagesList.jsx
+++ b/src/views/Conversations/History/MessagesList.jsx
@@ -9,7 +9,7 @@ import { useShallow } from 'zustand/react/shallow';
 import MergeConversationTo from './MergeConversationTo';
 import BubbleIM from '../Online/Components/BubbleIM';
 import BubbleEmail from '../Online/Components/BubbleEmail';
-import { ERROR_IMG } from '@/config';
+import { ERROR_IMG, POPUP_FEATURES } from '@/config';
 
 const BIG_PAGE_SIZE = MESSAGE_PAGE_SIZE * 20;
 const MessagesList = ({ ...listProps }) => {
@@ -215,7 +215,7 @@ const MessagesList = ({ ...listProps }) => {
         return false;
 
       case 'document':
-        window.open(msg.data.link || msg.data.uri, '_blank', 'noopener,noreferrer');
+        window.open(msg.data.link || msg.data.uri, msg.data.uri, POPUP_FEATURES);
         return false;
 
       default:
diff --git a/src/views/Conversations/Online/Components/EmailContent.jsx b/src/views/Conversations/Online/Components/EmailContent.jsx
index d56ff88..8d53b1d 100644
--- a/src/views/Conversations/Online/Components/EmailContent.jsx
+++ b/src/views/Conversations/Online/Components/EmailContent.jsx
@@ -28,6 +28,7 @@ const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
               margin: 0;
               padding: 0;
               /*overflow-y: hidden;*/
+              width: 900px;
             }
               img {
                 max-width: 90%;
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 53f5c76..d3c8a33 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -1,13 +1,13 @@
 import { useState, useEffect } from 'react'
 import { App, Button, Divider, Avatar, List, Flex, Typography } from 'antd'
 import { LoadingOutlined, ApiOutlined, FilePdfOutlined, FileOutlined, FileWordOutlined, FileExcelOutlined, FileJpgOutlined, FileImageOutlined, FileTextOutlined, FileGifOutlined, GlobalOutlined, FileZipOutlined } from '@ant-design/icons'
-import { EditIcon, ReplyIcon, ResendIcon, ShareForwardIcon } from '@/components/Icons'
+import { EditIcon, ReplyAllIcon, ReplyIcon, ResendIcon, ShareForwardIcon } from '@/components/Icons'
 import { isEmpty, TagColorStyle } from '@/utils/commons'
 import EmailEditorPopup from '../Input/EmailEditorPopup'
 import DnDModal from '@/components/DnDModal'
 import useStyleStore from '@/stores/StyleStore'
 import { useEmailDetail } from '@/hooks/useEmail'
-import { EMAIL_ATTA_HOST } from '@/config'
+import { EMAIL_ATTA_HOST, POPUP_FEATURES } from '@/config'
 import EmailBindFormModal from './EmailBind'
 import EmailContent from './EmailContent'
 
@@ -50,7 +50,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, ...props }
   }, [mailID])
 
   const onOpenEditor = (msgOrigin, action='reply') => {
-    window.open(`/email/${action}/${msgOrigin.email.mai_sn || 0}`, `${action}-${msgOrigin.email.mai_sn || 0}`,'left=20,width=1000')
+    window.open(`/email/${action}/${msgOrigin.email.mai_sn || 0}`, `${action}-${msgOrigin.email.mai_sn || 0}`,POPUP_FEATURES)
     console.log('first000', emailMsg)
     console.log('first', msgOrigin)
     if (typeof props.onOpenEditor === 'function') {
@@ -122,6 +122,11 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, ...props }
             回复
           </Button>,
         )
+        btns.push(
+          <Button key={'replyall'} onClick={() => onOpenEditor(emailMsg.msgOrigin, 'replyall')} size='small' type='text' icon={<ReplyAllIcon className='text-indigo-500' />}>
+            回复全部
+          </Button>,
+        )
         btns.push(
           <Button key={'forward'} onClick={() => onOpenEditor(emailMsg.msgOrigin, 'forward')} size='small' type='text' icon={<ShareForwardIcon className='text-primary' />}>
             转发
diff --git a/src/views/Conversations/Online/MessagesWrapper.jsx b/src/views/Conversations/Online/MessagesWrapper.jsx
index 4ff8fc2..7d47651 100644
--- a/src/views/Conversations/Online/MessagesWrapper.jsx
+++ b/src/views/Conversations/Online/MessagesWrapper.jsx
@@ -14,6 +14,7 @@ import { useOrderStore, } from "@/stores/OrderStore";
 import { isEmpty } from '@/utils/commons';
 import useStyleStore from '@/stores/StyleStore';
 import EmailListDrawer from './Components/EmailListDrawer';
+import { POPUP_FEATURES } from '@/config';
 
 const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
   const userId = useAuthStore((state) => state.loginUser.userId);
@@ -166,7 +167,7 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
         return false;
 
       case 'document':
-        window.open(msg.data.link || msg.data.uri, '_blank', 'noopener,noreferrer');
+        window.open(msg.data.link || msg.data.uri, msg.data.link || msg.data.uri, POPUP_FEATURES);
         return false;
 
       default:
diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index 87d2749..f7179b4 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -1,11 +1,11 @@
 import { useEffect, useState, useRef, useCallback } from 'react'
 import { useParams, useNavigate, useLocation } from 'react-router-dom';
-import { App, ConfigProvider, Button, Form, Input, Flex, Checkbox, Popconfirm, Select, Space, Upload, Divider, Modal, Tabs } from 'antd'
-import { UploadOutlined, LoadingOutlined } from '@ant-design/icons'
+import { App, ConfigProvider, Button, Form, Input, Flex, Checkbox, Popconfirm, Select, Space, Upload, Divider, Modal, Tabs, Radio } from 'antd'
+import { UploadOutlined, LoadingOutlined, SaveOutlined, SendOutlined, CheckCircleOutlined } from '@ant-design/icons'
 import '@dckj/react-better-modal/dist/index.css'
 import DnDModal from '@/components/DnDModal'
 import useStyleStore from '@/stores/StyleStore'
-import useConversationStore from '@/stores/ConversationStore'
+// import useConversationStore from '@/stores/ConversationStore'
 import useAuthStore from '@/stores/AuthStore'
 
 import LexicalEditor from '@/components/LexicalEditor'
@@ -17,8 +17,11 @@ import { postSendEmail } from '@/actions/EmailActions'
 import { sentMsgTypeMapped } from '@/channel/bubbleMsgUtils'
 import { EmailBuilder, useEmailDetail, useEmailSignature } from '@/hooks/useEmail'
 import useSnippetStore from '@/stores/SnippetStore'
-import { useOrderStore } from '@/stores/OrderStore'
+// import { useOrderStore } from '@/stores/OrderStore'
 import PaymentlinkBtn from '@/views/Conversations/Online/Input/PaymentlinkBtn'
+import { TextIcon } from '@/components/Icons';
+import GenerateAutoDocDrawer from './Conversations/Online/Components/GenerateAutoDocDrawer';
+import { POPUP_FEATURES } from '@/config';
 
 // 禁止上传的附件类型
 // .application, .exe, .app
@@ -73,7 +76,7 @@ const generateMailContent = (mailData) => `<br><br><p>${mailData.content}</p>`
  */
 const NewEmail = ({ ...props }) => {
   const pageParam = useParams();
-  const editorKey = `${pageParam.action}-${pageParam.quoteid}`
+  const editorKey = pageParam.action==='new' ? `new-${Date.now().toString(32)}` : `${pageParam.action}-${pageParam.quoteid}`
 
   const { notification, message } = App.useApp()
   const [form] = Form.useForm()
@@ -85,53 +88,32 @@ const NewEmail = ({ ...props }) => {
   const emailListMatMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.mat_sn]: v }), {})
   // console.log('emailListMapped', emailListOption, emailListAddrMapped);
 
-  const emailEdiorProps = useConversationStore((state) => state.emailEdiorProps)
-  const [open, setOpen, closeEditor1, currentEditKey, setCurrentEditKey] = useConversationStore((state) => [
-    state.editorOpen,
-    state.setEditorOpen,
-    state.closeEditor1,
-    state.currentEditKey,
-    state.setCurrentEditKey,
-  ])
+  // const emailEdiorProps = useConversationStore((state) => state.emailEdiorProps)
+  // const [open, setOpen, closeEditor1, currentEditKey, setCurrentEditKey] = useConversationStore((state) => [
+  //   state.editorOpen,
+  //   state.setEditorOpen,
+  //   state.closeEditor1,
+  //   state.currentEditKey,
+  //   state.setCurrentEditKey,
+  // ])
 
-  const propsKeysArr = Array.from(emailEdiorProps.keys())
-  const propsArr = Array.from(emailEdiorProps.values())
+  // const propsKeysArr = Array.from(emailEdiorProps.keys())
+  // const propsArr = Array.from(emailEdiorProps.values())
 
-  const [activeEdit, setActiveEdit] = useState(emailEdiorProps.get(editorKey) || {})
+  // const [activeEdit, setActiveEdit] = useState(emailEdiorProps.get(editorKey) || {})
   // const { fromEmail, fromUser, fromOrder, oid, toEmail, conversationid, quoteid, initial = {}, mailData: _mailData, action = 'reply', draft = {}, receiverName, ...props } = emailEdiorProps.get(currentEditKey) || {};
 
-  const onChangeActiveEditor = (key) => {
-    setCurrentEditKey(key)
-    const _find = emailEdiorProps.get(key) || {}
-    setActiveEdit(_find)
-  }
-
-  const onEditTab = (targetKey, action) => {
-    if (action === 'add') {
-      //
-    } else {
-      if (propsKeysArr.length === 1) {
-        setOpen(false)
-      }
-      closeEditor1(targetKey)
-    }
-  }
-
   const mai_sn = pageParam.quoteid // activeEdit.quoteid
-  const { loading: getLoading, mailData } = useEmailDetail(mai_sn, activeEdit.mailData)
-
-  const [stickToProps, setStickToProps] = useState({})
-  const [propsSerialize, setPropsSerialize] = useState('')
+  const { loading: getLoading, mailData, orderDetail } = useEmailDetail(mai_sn)
 
   const [newFromEmail, setNewFromEmail] = useState('')
   const [newToEmail, setNewToEmail] = useState('')
   const [emailOPI, setEmailOPI] = useState('')
   const [emailOrder, setEmailOrder] = useState('')
+  const [emailOrderSN, setEmailOrderSN] = useState('')
   const [emailMat, setEmailMat] = useState('')
 
   const stateReset = () => {
-    setStickToProps({})
-    setStickToCid('')
     setEmailOrder('')
     setEmailOPI('')
     setNewFromEmail('')
@@ -140,60 +122,15 @@ const NewEmail = ({ ...props }) => {
 
   const [contentPrefix, setContentPrefix] = useState('')
 
-  // 存储: 会话ID,
-  // 这个窗口没有模态, 即使不是focus, 还是需要保持会话ID
-  // 否则, 会话列表切换之后, 会话ID更新, 导致消息关联错误
-  const [stickToCid, setStickToCid] = useState(activeEdit.conversationid)
+  // const [stickToCid, setStickToCid] = useState(pageParam.conversationid)
   useEffect(() => {
-    console.log('useeffect', mailData.info);
-    setTimeout(() => {
-      document.title = mailData.info?.MAI_Subject || 'New Email-'
-    }, 1500);
-    const propsObj = { ...activeEdit, mai: activeEdit.mailData?.info?.MAI_MAT_SN }
+    console.log('useeffect\n', orderDetail.order_no);
+    // const propsObj = { ...activeEdit, mai: activeEdit.mailData?.info?.MAI_MAT_SN }
 
-    setContentPrefix(activeEdit.oid ? `<p>Dear Mr./Ms. ${activeEdit.receiverName || ''}</p><p>Reference Number: ${activeEdit.oid}</p>` : '')
-
-    // 没有引用邮件
-    if (isEmpty(activeEdit.quoteid)) {
-      setStickToProps(propsObj)
-      setPropsSerialize(JSON.stringify(propsObj))
-
-      setStickToCid(activeEdit.conversationid)
-      setEmailOrder(activeEdit.fromOrder)
-      setEmailOPI(activeEdit.fromUser)
-      setNewFromEmail(activeEdit.fromEmail)
-      setNewToEmail(activeEdit.toEmail)
-
-      const _findMat = emailListAddrMapped?.[activeEdit.fromEmail]?.mat_sn
-      setEmailMat(_findMat)
-
-      // if (open !== true) {
-      // form.resetFields()
-      // }
-    }
-    // 转发/回复时, 使用详情的账户信息
-    if (mailData.info?.MAI_MAT_SN) {
-      const reEmailO = mailData.info?.MAI_COLI_SN
-      const reEmailUser = mailData.info?.MAI_OPI_SN
-      const reEmailUserMat = mailData.info?.MAI_MAT_SN
-
-      setEmailOrder((prev) => reEmailO || prev || activeEdit.fromOrder)
-      setEmailOPI((prev) => reEmailUser || prev)
-      setEmailMat((prev) => reEmailUserMat || prev)
-
-      const _findMatOld = emailListMatMapped?.[reEmailUserMat]
-      if (_findMatOld) {
-        setNewFromEmail(_findMatOld.email)
-        setEmailOPI(_findMatOld.opi_sn)
-        setEmailMat(_findMatOld.mat_sn)
-      }
-    }
-    setShowQuoteContent(false)
-    setMergeQuote(true)
-    setQuoteContent('')
+    setContentPrefix(orderDetail.order_no ? `<p>Dear Mr./Ms. ${orderDetail.contact?.[0]?.name || ''}</p><p>Reference Number: ${orderDetail.order_no}</p>` : '')
 
     return () => {}
-  }, [open, mailData])
+  }, [orderDetail.order_no])
 
   const handleSwitchEmail = (labelValue) => {
     const { value } = labelValue
@@ -225,8 +162,8 @@ const NewEmail = ({ ...props }) => {
     setHtmlContent(htmlContent)
     setTextContent(textContent)
     form.setFieldValue('content', htmlContent)
-    form.setFieldValue('abstract', getAbstract(textContent))
-    debouncedSave({ htmlContent })
+    // form.setFieldValue('abstract', getAbstract(textContent))
+    debouncedSave({ htmlContent, ...form.getFieldsValue() })
   }
 
   const [initialForm, setInitialForm] = useState({})
@@ -235,8 +172,49 @@ const NewEmail = ({ ...props }) => {
   const [mergeQuote, setMergeQuote] = useState(true)
   const [quoteContent, setQuoteContent] = useState('')
 
+  const setPreFillInProperty = () => {  };
+
   useEffect(() => {
-    // console.log('quoteid', quoteid, isEmpty(quoteid), isEmpty(mailData.info));
+    console.log('useEffect 2---- \nform.setFieldsValue ');
+    setTimeout(() => {
+      document.title = mailData.info?.MAI_Subject || 'New Email-'
+    }, 1500);
+    // 没有引用邮件
+    if (isEmpty(pageParam.quoteid)) {
+
+      // setEmailOrder(orderDetail.order_no)
+      // setEmailOPI(orderDetail.opi_sn)
+      // setNewFromEmail(activeEdit.fromEmail)
+      // setNewToEmail(activeEdit.toEmail)
+
+      // const _findMat = emailListAddrMapped?.[activeEdit.fromEmail]?.mat_sn
+      // setEmailMat(_findMat)
+
+      // if (open !== true) {
+      // form.resetFields()
+      // }
+    }
+    // 转发/回复时, 使用详情的账户信息
+    if (mailData.info?.MAI_MAT_SN) {
+      const reEmailO = mailData.info?.MAI_COLI_SN
+      const reEmailUser = mailData.info?.MAI_OPI_SN
+      const reEmailUserMat = mailData.info?.MAI_MAT_SN
+
+      setEmailOrder((prev) => reEmailO || prev ) // activeEdit.fromOrder
+      setEmailOPI((prev) => reEmailUser || prev)
+      setEmailMat((prev) => reEmailUserMat || prev)
+
+      const _findMatOld = emailListMatMapped?.[reEmailUserMat]
+      if (_findMatOld) {
+        setNewFromEmail(_findMatOld.email)
+        setEmailOPI(_findMatOld.opi_sn)
+        setEmailMat(_findMatOld.mat_sn)
+      }
+    }
+    setShowQuoteContent(false)
+    setMergeQuote(true)
+    setQuoteContent('')
+
 
     if (isEmpty(pageParam.quoteid) && pageParam.action !== 'new') {
       return () => {}
@@ -254,18 +232,26 @@ const NewEmail = ({ ...props }) => {
       setInitialContent(contentPrefix + signatureBody)
     }
 
-    const _formValues = {
-      to: info?.replyToAll || newFromEmail,
-      cc: info?.MAI_CS || '',
-      // bcc: quote.bcc || '',
-      subject: `Re: ${info.MAI_Subject || ''}`,
-    }
     const forwardValues = { from: newFromEmail, subject: `Fw: ${info.MAI_Subject || ''}` }
     if (pageParam.action === 'reply') {
+      const _formValues = {
+        to: info?.replyTo || newFromEmail,
+        cc: info?.MAI_CS || '',
+        // bcc: quote.bcc || '',
+        subject: `Re: ${info.MAI_Subject || ''}`,
+      }
+      form.setFieldsValue(_formValues)
+      setInitialForm(_formValues)
+    } else if (pageParam.action === 'replyall') {
+      const _formValues = {
+        to: info?.replyToAll || newFromEmail,
+        cc: info?.MAI_CS || '',
+        // bcc: quote.bcc || '',
+        subject: `Re: ${info.MAI_Subject || ''}`,
+      }
       form.setFieldsValue(_formValues)
       setInitialForm(_formValues)
     } else if (pageParam.action === 'forward') {
-      setStickToCid('0')
       form.setFieldsValue(forwardValues)
       setInitialForm(forwardValues)
     } else if (pageParam.action === 'edit') {
@@ -288,12 +274,12 @@ const NewEmail = ({ ...props }) => {
     }
 
     return () => {}
-  }, [propsSerialize, mailData.info, signature, newToEmail, newFromEmail])
+  }, [ mailData.info, signature, newToEmail])
 
   const [openPlainTextConfirm, setOpenPlainTextConfirm] = useState(false)
   const handlePlainTextOpenChange = ({ target }) => {
-    const { checked: newChecked } = target
-    if (!newChecked) {
+    const { value: newChecked } = target
+    if (newChecked === true) {
       setIsRichText(true)
       setOpenPlainTextConfirm(false)
       return
@@ -366,7 +352,7 @@ const NewEmail = ({ ...props }) => {
             resolve(e.target.result)
             return
           }
-          var win = window.open('', file.uid, 'width=1000,height=800,left=20,top=20')
+          var win = window.open('', file.uid, POPUP_FEATURES)
           win.document.body.style.margin = '0'
           if (file.type.startsWith('image/')) {
             win.document.write("<img src='" + e.target.result + '\' style="max-width: 100%;" />')
@@ -407,7 +393,7 @@ const NewEmail = ({ ...props }) => {
    * 保存成功, 推一个气泡
    * 再从异步通知更新消息发送状态
    */
-  const sentOrReceivedNewMessage = useConversationStore((state) => state.sentOrReceivedNewMessage)
+  // const sentOrReceivedNewMessage = useConversationStore((state) => state.sentOrReceivedNewMessage)
   const invokeEmailMessage = (msgObj) => {
     const msgObjMerge = {
       sender: 'me',
@@ -418,13 +404,13 @@ const NewEmail = ({ ...props }) => {
       ...msgObj,
       // id: `${currentConversation.sn}.${msgObj.id}`,
       // id: `${stickToCid}.${msgObj.id}`,
-      conversationid: stickToCid,
+      // conversationid: stickToCid,
       msg_source: 'email',
     }
     // olog('invoke upload', msgObjMerge)
     const contentToRender = sentMsgTypeMapped[msgObjMerge.type].contentToRender(msgObjMerge)
     // console.log(contentToRender, 'contentToRender  sendMessage------------------');
-    sentOrReceivedNewMessage(contentToRender.conversationid, contentToRender)
+    // sentOrReceivedNewMessage(contentToRender.conversationid, contentToRender)
   }
 
   const [sendLoading, setSendLoading] = useState(false)
@@ -440,7 +426,7 @@ const NewEmail = ({ ...props }) => {
     body.coli_sn = emailOrder || ''
     // console.log('body', body, '\n', emailOrder);
     const values = await form.validateFields()
-    const preQuoteBody = activeEdit.quoteid ? (quoteContent ? quoteContent : generateQuoteContent(mailData, isRichText)) : ''
+    const preQuoteBody = pageParam.quoteid ? (quoteContent ? quoteContent : generateQuoteContent(mailData, isRichText)) : ''
     body.mailcontent = isRichText ? EmailBuilder({ subject: values.subject, content: htmlContent + preQuoteBody }) : textContent + preQuoteBody
     body.cc = values.cc || ''
     body.bcc = values.bcc || ''
@@ -457,15 +443,15 @@ const NewEmail = ({ ...props }) => {
         subject: values.subject,
         content: body.mailcontent,
       },
-      coli_id: stickToProps.oid || (emailOrder ? `{${emailOrder}}` : ''),
+      coli_id: orderDetail.order_no || (emailOrder ? `{${emailOrder}}` : ''),
     }
     setSendLoading(true)
-    body.externalID = stickToCid
-    body.actionID = `${stickToCid}.${msgObj.id}`
+    // body.externalID = stickToCid
+    // body.actionID = `${stickToCid}.${msgObj.id}`
     body.contenttype = isRichText ? 'text/html' : 'text/plain'
     try {
       const bubbleMsg = cloneDeep(msgObj)
-      bubbleMsg.id = `${stickToCid}.${msgObj.id}`
+      // bubbleMsg.id = `${stickToCid}.${msgObj.id}`
       // bubbleMsg.email.mai_sn = '';
       bubbleMsg.content = undefined
       // invokeEmailMessage(bubbleMsg);
@@ -481,7 +467,7 @@ const NewEmail = ({ ...props }) => {
 
       // setSendLoading(false);
 
-      setOpen(false)
+      // setOpen(false)
     } catch (error) {
       notification.error({
         message: '邮件保存失败',
@@ -495,7 +481,7 @@ const NewEmail = ({ ...props }) => {
   }
 
   const [openDrawerSnippet] = useSnippetStore((state) => [state.openDrawer])
-  const [openPaymentDrawer] = useOrderStore((state) => [state.openDrawer])
+  // const [openPaymentDrawer] = useOrderStore((state) => [state.openDrawer])
 
   const [bakData, setBakData] = useState({})
   const idleCallbackId = useRef(null)
@@ -503,7 +489,7 @@ const NewEmail = ({ ...props }) => {
     debounce((data) => {
       idleCallbackId.current = window.requestIdleCallback(() => {
         console.log('Saving data (idle, debounced):', data)
-        writeIndexDB({ ...data, key: currentEditKey }, 'draft', 'EmailEditor')
+        writeIndexDB({ ...data, key: editorKey }, 'draft', 'EmailEditor')
       })
     }, 1500), //  1.5s
     [],
@@ -526,6 +512,25 @@ const NewEmail = ({ ...props }) => {
   return (
     <>
       <ConfigProvider theme={{ token: { colorPrimary: '#6366f1' } }}>
+            <div className='w-full flex gap-4 justify-start items-center text-indigo-600 pb-1 mb-2 border-x-0 border-t-0 border-b border-solid border-neutral-200'>
+              <Button type='primary' onClick={onHandleSend} loading={sendLoading} icon={<SendOutlined />}>
+                发送
+              </Button>
+              <Select labelInValue options={emailListOption} value={{ key: newFromEmail, value: newFromEmail, label: newFromEmail }} onChange={handleSwitchEmail} labelRender={item => `发件人: ${item.label || '选择'}`} variant={'borderless'} className='[&_.ant-select-selection-item]:font-bold' />
+              <div className='ml-auto'></div>
+              <Popconfirm trigger1={['hover', 'click']}
+                description='切换内容为纯文本格式将丢失信件和签名的格式, 确定使用纯文本?'
+                onConfirm={confirmPlainText}
+                open={openPlainTextConfirm}
+                onCancel={() => setOpenPlainTextConfirm(false)}>
+                {/* <Checkbox checked={!isRichText} onChange={handlePlainTextOpenChange}>
+                  纯文本
+                </Checkbox> */}
+                {/* <Button type='link' size='small' icon={<TextIcon />} className=' ' >纯文本</Button> */}
+                <Radio.Group options={[{label: '纯文本', value: false}, {label: '富文本', value: true}]} optionType="button" buttonStyle="solid" onChange={handlePlainTextOpenChange} value={isRichText} size='small' />
+              </Popconfirm>
+              <Button type='dashed' icon={<SaveOutlined />} size='small' className='' >存草稿</Button>
+            </div>
         <Form
           form={form}
           onValuesChange={onEditChange}
@@ -548,32 +553,16 @@ const NewEmail = ({ ...props }) => {
               <Flex gap={4}>
                 {!showCc && (
                   <Button type='text' onClick={handleShowCc}>
-                    Cc
+                    抄送
                   </Button>
                 )}
                 {!showBcc && (
                   <Button type='text' hidden={showBcc} onClick={handleShowBcc}>
-                    Bcc
+                    密送
                   </Button>
                 )}
               </Flex>
             </Space.Compact>
-            {/* <Input
-              addonAfter={
-                <Flex gap={4}>
-                  {!showCc && (
-                    <Button type='text' onClick={handleShowCc}>
-                      Cc
-                    </Button>
-                  )}
-                  {!showBcc && (
-                    <Button type='text' hidden={showBcc} onClick={handleShowBcc}>
-                      Bcc
-                    </Button>
-                  )}
-                </Flex>
-              }
-            /> */}
           </Form.Item>
           <Form.Item label='抄&nbsp;&nbsp;&nbsp;&nbsp;送' name={'cc'} hidden={!showCc} className='w-full pt-1'>
             <Input />
@@ -615,10 +604,10 @@ const NewEmail = ({ ...props }) => {
           </Form.Item>
         </Form>
         <LexicalEditor {...{ isRichText }} onChange={handleEditorChange} defaultValue={initialContent} />
-        {activeEdit.quoteid && !showQuoteContent && (
+        {pageParam.quoteid && !showQuoteContent && (
           <div className='flex justify-start items-center ml-2'>
             <Button className='flex gap-2 ' type='link' onClick={() => setShowQuoteContent(!showQuoteContent)}>
-              显示引用内容 ↓
+              显示引用内容 ↓ {/*(不可更改)*/}
             </Button>
             {/* <Button className='flex gap-2 ' type='link' danger onClick={() => {setMergeQuote(false);setShowQuoteContent(false)}}>
                 删除引用内容
@@ -627,8 +616,8 @@ const NewEmail = ({ ...props }) => {
         )}
         {showQuoteContent && (
           <blockquote
-            contentEditable
-            className='border-0 outline-none'
+            // contentEditable
+            className='border-0 outline-none cursor-text'
             onBlur={(e) => setQuoteContent(`<blockquote>${e.target.innerHTML}</blockquote>`)}
             dangerouslySetInnerHTML={{ __html: generateQuoteContent(mailData) }}></blockquote>
         )}

From 04c71b1ff0ac5538b59c63b6c1fddeccd9a4f949 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 30 May 2025 09:58:36 +0800
Subject: [PATCH 027/143] =?UTF-8?q?=E2=8F=B3=20=E9=82=AE=E4=BB=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85;=20`=E5=B7=B2=E5=A4=84=E7=90=86`=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/mail-check-fill.svg          |  1 +
 src/assets/icons/mail-check-line.svg          |  1 +
 src/components/Icons.jsx                      |  2 +
 .../Online/Components/EmailContent.jsx        |  3 +-
 .../Online/Components/EmailDetailInline.jsx   | 79 ++++++++++++-------
 5 files changed, 57 insertions(+), 29 deletions(-)
 create mode 100644 src/assets/icons/mail-check-fill.svg
 create mode 100644 src/assets/icons/mail-check-line.svg

diff --git a/src/assets/icons/mail-check-fill.svg b/src/assets/icons/mail-check-fill.svg
new file mode 100644
index 0000000..ff704d7
--- /dev/null
+++ b/src/assets/icons/mail-check-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M22 13.3414C21.3744 13.1203 20.7013 13 20 13C16.6863 13 14 15.6863 14 19C14 19.7013 14.1203 20.3744 14.3414 21H3C2.44772 21 2 20.5523 2 20V4C2 3.44772 2.44772 3 3 3H21C21.5523 3 22 3.44772 22 4V13.3414ZM12.0606 11.6829L5.64722 6.2377L4.35278 7.7623L12.0731 14.3171L19.6544 7.75616L18.3456 6.24384L12.0606 11.6829ZM19 22L15.4645 18.4645L16.8787 17.0503L19 19.1716L22.5355 15.636L23.9497 17.0503L19 22Z"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/mail-check-line.svg b/src/assets/icons/mail-check-line.svg
new file mode 100644
index 0000000..5c53713
--- /dev/null
+++ b/src/assets/icons/mail-check-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M22 14H20V7.23792L12.0718 14.338L4 7.21594V19H14V21H3C2.44772 21 2 20.5523 2 20V4C2 3.44772 2.44772 3 3 3H21C21.5523 3 22 3.44772 22 4V14ZM4.51146 5L12.0619 11.662L19.501 5H4.51146ZM19 22L15.4645 18.4645L16.8787 17.0503L19 19.1716L22.5355 15.636L23.9497 17.0503L19 22Z"></path></svg>
\ No newline at end of file
diff --git a/src/components/Icons.jsx b/src/components/Icons.jsx
index 3209606..338fa77 100644
--- a/src/components/Icons.jsx
+++ b/src/components/Icons.jsx
@@ -14,6 +14,7 @@ import ResendLineSVG from '@/assets/icons/reset-left-line.svg?react';
 import EditLineSVG from '@/assets/icons/quill-pen-line.svg?react';
 import MailDownloadLineSVG from '@/assets/icons/mail-download-line.svg?react';
 import MailAddLineSVG from '@/assets/icons/mail-add-line.svg?react';
+import MailCheckSVG from '@/assets/icons/mail-check-line.svg?react';
 import TextSVG from '@/assets/icons/text.svg?react';
 
 
@@ -30,6 +31,7 @@ export const ResendIcon = (props) => <Icon component={ResendLineSVG} {...props}
 export const EditIcon = (props) => <Icon component={EditLineSVG} {...props} />;
 export const MailDownloadIcon = (props) => <Icon component={MailDownloadLineSVG} {...props} />;
 export const MailAddloadIcon = (props) => <Icon component={MailAddLineSVG} {...props} />;
+export const MailCheckIcon = (props) => <Icon component={MailCheckSVG} {...props} />;
 export const TextIcon = (props) => <Icon component={TextSVG} {...props} />;
 
 
diff --git a/src/views/Conversations/Online/Components/EmailContent.jsx b/src/views/Conversations/Online/Components/EmailContent.jsx
index 8d53b1d..b2f2cf9 100644
--- a/src/views/Conversations/Online/Components/EmailContent.jsx
+++ b/src/views/Conversations/Online/Components/EmailContent.jsx
@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef } from 'react'
 
 const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
-  const [iframeHeight, setIframeHeight] = useState(800) // Initial height
+  const [iframeHeight, setIframeHeight] = useState(5000) // Initial height
   const [content, setContent] = useState(MailContent)
   const iframeRef = useRef(null)
   const containerRef = useRef(null)
@@ -29,6 +29,7 @@ const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
               padding: 0;
               /*overflow-y: hidden;*/
               width: 900px;
+              max-width: 100%;
             }
               img {
                 max-width: 90%;
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index d3c8a33..48dbbc5 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -1,7 +1,7 @@
-import { useState, useEffect } from 'react'
-import { App, Button, Divider, Avatar, List, Flex, Typography } from 'antd'
+import { useState, useEffect, useRef } from 'react'
+import { App, Button, Divider, Avatar, List, Flex, Typography, Tooltip } from 'antd'
 import { LoadingOutlined, ApiOutlined, FilePdfOutlined, FileOutlined, FileWordOutlined, FileExcelOutlined, FileJpgOutlined, FileImageOutlined, FileTextOutlined, FileGifOutlined, GlobalOutlined, FileZipOutlined } from '@ant-design/icons'
-import { EditIcon, ReplyAllIcon, ReplyIcon, ResendIcon, ShareForwardIcon } from '@/components/Icons'
+import { EditIcon, MailCheckIcon, ReplyAllIcon, ReplyIcon, ResendIcon, ShareForwardIcon } from '@/components/Icons'
 import { isEmpty, TagColorStyle } from '@/utils/commons'
 import EmailEditorPopup from '../Input/EmailEditorPopup'
 import DnDModal from '@/components/DnDModal'
@@ -30,8 +30,19 @@ const extTypeMapped = {
 /**
  * @property {*} emailMsg - 邮件数据. { conversationid, actionId, order_opi, coli_sn, msgOrigin: { from, to, id, email: { subject, mai_sn, } } }
  */
-const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, ...props }) => {
+const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, size, ...props }) => {
   // console.log('emailDetail', emailMsg);
+  const componentRef = useRef(null);
+  const [compactBtn, setCompactBtn] = useState(size==='small');
+
+  useEffect(() => {
+    if (componentRef.current) {
+      // console.log(componentRef.current.getBoundingClientRect().width);
+      setCompactBtn(componentRef.current.offsetWidth < 769);
+    }
+    return () => {}
+  }, [])
+
 
   const { notification, message } = App.useApp()
 
@@ -50,7 +61,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, ...props }
   }, [mailID])
 
   const onOpenEditor = (msgOrigin, action='reply') => {
-    window.open(`/email/${action}/${msgOrigin.email.mai_sn || 0}`, `${action}-${msgOrigin.email.mai_sn || 0}`,POPUP_FEATURES)
+    window.open(`/email/${action}/${mailID || 0}`, `${action}-${mailID || 0}`,POPUP_FEATURES)
     console.log('first000', emailMsg)
     console.log('first', msgOrigin)
     if (typeof props.onOpenEditor === 'function') {
@@ -106,10 +117,11 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, ...props }
 
     let btns = []
 
+    btns.push(<Button type='text' onClick={() => { alert('todo')}} icon={<MailCheckIcon className={'text-yellow-600'} />} size='small'>已处理</Button>)
     // 没有关联订单的邮件`绑定订单`
     if (showBindBtn) {
       btns.push(<EmailBindFormModal key={'bind'} onBoundSuccess={() => setShowBindBtn(false)} {...{ conversationid, mai_sn, showBindBtn }} />)
-      btns.push(<Divider key='divider1' type='vertical' />)
+      btns.push(<Divider key='divider1' type='vertical' className='mx-0' />)
     }
 
     switch (status) {
@@ -118,51 +130,62 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, ...props }
       case 'sent':
       case '': // 接收的邮件没有发送状态
         btns.push(
+          <Tooltip key='reply-t' title='回复'>
           <Button key={'reply'} onClick={() => onOpenEditor(emailMsg.msgOrigin, 'reply')} size='small' type='text' icon={<ReplyIcon className='text-indigo-500' />}>
-            回复
-          </Button>,
+            {compactBtn ? '' : '回复'}
+          </Button>
+          </Tooltip>,
         )
         btns.push(
-          <Button key={'replyall'} onClick={() => onOpenEditor(emailMsg.msgOrigin, 'replyall')} size='small' type='text' icon={<ReplyAllIcon className='text-indigo-500' />}>
-            回复全部
-          </Button>,
+          <Tooltip key='replyall-t' title='回复全部'>
+            <Button key={'replyall'} onClick={() => onOpenEditor(emailMsg.msgOrigin, 'replyall')} size='small' type='text' icon={<ReplyAllIcon className='text-indigo-500' />} >{compactBtn ? '' : '回复全部'}</Button>
+          </Tooltip>,
         )
         btns.push(
-          <Button key={'forward'} onClick={() => onOpenEditor(emailMsg.msgOrigin, 'forward')} size='small' type='text' icon={<ShareForwardIcon className='text-primary' />}>
-            转发
-          </Button>,
+          <Tooltip key='forward-t' title='转发'>
+          <Button key={'forward'} onClick={() => onOpenEditor(emailMsg.msgOrigin, 'forward')} size='small' type='text' icon={<ShareForwardIcon className='text-primary' />}>{compactBtn ? '' : '转发'}</Button></Tooltip>,
         )
         break
       case 'failed':
         btns.push(
-          <Button key={'resend'} onClick={() => handleResend()} size='small' type='text' icon={<ResendIcon className='text-orange-500' />}>
-            重发
-          </Button>,
+          <Tooltip key='resend-t' title='重发'>
+          <Button key={'resend'} onClick={() => handleResend()} size='small' type='text' icon={<ResendIcon className='text-orange-500' />}>{compactBtn ? '' : '重发'}</Button></Tooltip>,
         )
         btns.push(
+          <Tooltip key='edit-t' title='编辑'>
           <Button
             key={'edit'}
             onClick={() => onOpenEditor({ ...(emailMsg.msgOrigin || {}), content: mailData.content }, 'edit')}
             size='small'
             type='text'
-            icon={<EditIcon className='text-indigo-500' />}>
-            编辑
-          </Button>,
+            icon={<EditIcon className='text-indigo-500' />}>{compactBtn ? '' : '编辑'}</Button></Tooltip>,
         )
         break
       default:
         break
     }
 
-    return <div className={`flex justify-end items-center gap-1 w-full ${className || ''}`}>{btns}</div>
+    return <div className={`flex justify-end items-center gap-1  ${className || ''}`}>{btns}</div>
+  }
+
+  const variantCls = (variant) => {
+    switch (variant) {
+      case 'outline':
+        return 'border-y-0 border-x border-solid border-neutral-200'
+    }
   }
 
   return (
     <>
-      <div className='email-container h-full flex flex-col gap-0 divide-y divide-neutral-200 divide-solid *:p-2 *:border-0'>
+      <div ref={componentRef} className={`email-container h-full flex flex-col gap-0 divide-y divide-neutral-200 divide-solid *:p-2 *:border-0 bg-white ${variantCls(variant)}`} >
         <div className=''>
-          {loading ? <LoadingOutlined className='mr-1' /> : null}
-          <span className=' font-bold '>{mailData.info?.MAI_Subject || emailMsg?.msgOrigin?.subject}</span>
+          <div className='flex flex-wrap justify-between'>
+          <span className=' font-bold '>
+            {loading ? <LoadingOutlined className='mr-1' /> : null}
+            {mailData.info?.MAI_Subject || emailMsg?.msgOrigin?.subject}
+          </span>
+          <ActionBtns className={'ml-auto'}/>
+          </div>
           <Divider className='my-2' />
           <div className={['flex flex-wrap justify-end', window.innerWidth < 600 ? 'flex-col' : 'flex-row '].join(' ')}>
             <div className=' flex-auto basis-0 flex flex-wrap gap-2 mb-2 items-center'>
@@ -175,12 +198,12 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, ...props }
               </div>
             </div>
             <div className=' ml-auto flex flex-col justify-start gap-1 items-end'>
-              <ActionBtns />
+              {/* <ActionBtns /> */}
               <div className='text-xs '>{mailData.info?.MAI_SendDate || emailMsg.localDate}</div>
             </div>
           </div>
           <div className='text-sm'>
-            <span className='text-neutral-500 pr-2 w-12 inline-block text-justify' style={{ textAlignLast: 'justify' }}>
+            <span className='text-neutral-500 pr-2 w-14 inline-block text-justify' style={{ textAlignLast: 'justify' }}>
               收件人
             </span>
             {mailData.info?.MAI_To}
@@ -203,14 +226,14 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, ...props }
           )}
         </div>
         <div className='overflow-auto'>
-          <Flex className=' divide-y-0 divide-x divide-gray-200 divide-solid gap-0'>
+          <Flex className={` divide-gray-200 divide-solid gap-0 ${compactBtn === false ? 'divide-y-0 divide-x' : 'flex-col-reverse divide-x-0 '}`}>
             {mailData.info?.mailType === 'text/html' ? (
               <EmailContent content={mailData.content} id={mailID} key={mailID} />
             ) : (
               <div className='mt-2 whitespace-pre-wrap' dangerouslySetInnerHTML={{ __html: mailData.content }}></div>
             )}
             {mailData.attachments.length > 0 && (
-            <div className='w-48 overflow-hidden'>
+            <div className={`${compactBtn === false ? 'w-48' : 'border-b border-t-0'} overflow-hidden`}>
               <span>&nbsp;附件 ({mailData.attachments.length})</span>
               <List
                 dataSource={mailData.attachments || []}

From e88fa389918d2685463cc512f9ae1f8ed7d12d50 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 30 May 2025 10:10:51 +0800
Subject: [PATCH 028/143] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA:=20=E9=82=AE=E4=BB=B6=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useEmail.js                         | 58 ++++++-------
 .../Online/Components/EmailDetailInline.jsx   |  4 +-
 src/views/orders/Follow.jsx                   | 86 +++++--------------
 3 files changed, 53 insertions(+), 95 deletions(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 6d6b2ad..7cb142a 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -54,11 +54,11 @@ export const useEmailDetail = (mai_sn, data) => {
         // console.log(data)
         setMailData(data)
         setColiSN(data.info.MAI_COLI_SN)
-        if (!isEmpty(data.info.MAI_COLI_SN)) {
-          const orderData = await getEmailOrderAction({ colisn: data.info.MAI_COLI_SN })
-          setOrderDetail(orderData)
-          // console.log(orderData)
-        }
+        // if (!isEmpty(data.info.MAI_COLI_SN)) {
+        //   const orderData = await getEmailOrderAction({ colisn: data.info.MAI_COLI_SN })
+        //   setOrderDetail(orderData)
+        //   // console.log(orderData)
+        // }
         setLoading(false)
       } catch (err) {
         setLoading(false)
@@ -76,30 +76,30 @@ export const useEmailDetail = (mai_sn, data) => {
   }, [mai_sn])
 
 
-  // useEffect(() => {
-  //   console.log(coliSN, '====colisn======')
-  //   const getOrderDetail = async () => {
-  //     if (isEmpty(coliSN)) {
-  //       return false
-  //     }
-  //     try {
-  //       setLoading(true)
-  //       const data = await getEmailOrderAction({ colisn: coliSN })
-  //       setOrderDetail(data)
-  //       setLoading(false)
-  //     } catch (err) {
-  //       setLoading(false)
-  //       notification.error({
-  //         message: "请求失败",
-  //         description: err.message || '网络异常',
-  //         placement: "top",
-  //         duration: 3,
-  //       });
-  //     }
-  //   }
-
-  //   getOrderDetail()
-  // }, [coliSN])
+  useEffect(() => {
+    console.log(coliSN, '====colisn======')
+    const getOrderDetail = async () => {
+      if (isEmpty(coliSN)) {
+        return false
+      }
+      try {
+        setLoading(true)
+        const data = await getEmailOrderAction({ colisn: coliSN })
+        setOrderDetail(data)
+        setLoading(false)
+      } catch (err) {
+        setLoading(false)
+        notification.error({
+          message: "请求失败",
+          description: err.message || '网络异常',
+          placement: "top",
+          duration: 3,
+        });
+      }
+    }
+
+    getOrderDetail()
+  }, [coliSN])
 
   const postEmailResend = async ({ mai_sn, conversationid: externalid, actionId: actionid, ...body }) => {
     if (isEmpty(mai_sn)) {
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 48dbbc5..2547031 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -117,7 +117,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
 
     let btns = []
 
-    btns.push(<Button type='text' onClick={() => { alert('todo')}} icon={<MailCheckIcon className={'text-yellow-600'} />} size='small'>已处理</Button>)
+    btns.push(<Button type='text' key={'set-done'} onClick={() => { alert('todo')}} icon={<MailCheckIcon className={'text-yellow-600'} />} size='small'>已处理</Button>)
     // 没有关联订单的邮件`绑定订单`
     if (showBindBtn) {
       btns.push(<EmailBindFormModal key={'bind'} onBoundSuccess={() => setShowBindBtn(false)} {...{ conversationid, mai_sn, showBindBtn }} />)
@@ -184,7 +184,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
             {loading ? <LoadingOutlined className='mr-1' /> : null}
             {mailData.info?.MAI_Subject || emailMsg?.msgOrigin?.subject}
           </span>
-          <ActionBtns className={'ml-auto'}/>
+          <ActionBtns key='actions' className={'ml-auto'}/>
           </div>
           <Divider className='my-2' />
           <div className={['flex flex-wrap justify-end', window.innerWidth < 600 ? 'flex-col' : 'flex-row '].join(' ')}>
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 9dd8dcb..97599d8 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -38,6 +38,7 @@ import { Link } from 'react-router-dom'
 import { useShallow } from 'zustand/react/shallow'
 import { UNREAD_MARK } from '@/actions/ConversationActions'
 import AdvanceSearchForm from './AdvanceSearchForm'
+import EmailDetailInline from '../Conversations/Online/Components/EmailDetailInline'
 
 function OrderGroupTable({ formValues }) {
   const handleImportEmail = useCallback((order) => {
@@ -360,6 +361,8 @@ const [collapsed, setCollapsed] = useState(false)
     setFormValues({ ...values, type: 'advance' })
   }, [])
 
+  const [activeEmailId, setActiveEmailId] = useState(0);
+
   return (
     <>
   <Layout>
@@ -495,7 +498,7 @@ const [collapsed, setCollapsed] = useState(false)
 
 
 <Row>
-      <Col className='bg-white' span={16}>
+      <Col className='bg-white' span={14}>
 
       <div className='bg-white h-auto px-1 flex gap-1 items-center'>
 
@@ -563,7 +566,7 @@ const [collapsed, setCollapsed] = useState(false)
     pagination={false}
     dataSource={[
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5291957, // Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
                 mailDate: '2025-05-01 19:21:00',
@@ -571,7 +574,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5277561, // Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
                 mailDate: '2025-05-01 19:21:00',
@@ -579,7 +582,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5119909, //Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: 'Re: Personal information',
                 mailDate: '2025-05-01 19:21:00',
@@ -587,7 +590,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5115479, // Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: 'Re: Your Future Trip with Asia Highlights',
                 mailDate: '2025-05-01 19:21:00',
@@ -595,7 +598,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5113514, // Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
                 mailDate: '2025-05-01 19:21:00',
@@ -603,7 +606,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5113512, //Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: 'Re: Greeting from Asia Highlights Alisa',
                 mailDate: '2025-05-01 19:21:00',
@@ -611,7 +614,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5113508, // Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: 'Re: Have you made any decisions about your Japan trip',
                 mailDate: '2025-05-01 19:21:00',
@@ -619,7 +622,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5112214, //Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: 'Re: Sri Lanka tour',
                 mailDate: '2025-05-01 19:21:00',
@@ -627,7 +630,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5095421, //Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: 'Re: How do you like the itinerary 3',
                 mailDate: '2025-05-01 19:21:00',
@@ -635,7 +638,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5095097, //Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: 'Re: Re: Re: Final cost',
                 mailDate: '2025-05-01 19:21:00',
@@ -643,7 +646,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5095083, //Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: 'Reference Number: LSS240628079',
                 mailDate: '2025-05-01 19:21:00',
@@ -651,7 +654,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5093980, //Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: 'Re: Personal information and Hiroshima tour for 2 people',
                 mailDate: '2025-05-01 19:21:00',
@@ -659,7 +662,7 @@ const [collapsed, setCollapsed] = useState(false)
                 country: 'Thailand',
               },
               {
-                key: Math.random().toString(36).substring(2, 9),
+                key: 5093968, //Math.random().toString(36).substring(2, 9),
                 description: 'Fran Grundman <frangrundman@rogers.com>',
                 title: 'Re: Asia Travel Tips /LSS250429038',
                 mailDate: '2025-05-01 19:21:00',
@@ -681,7 +684,7 @@ const [collapsed, setCollapsed] = useState(false)
       >
         <List.Item.Meta
           className='cursor-pointer'
-        onClick={() => console.info('item: ', item)}
+        onClick={() => {console.info('item: ', item); setActiveEmailId(item.key)}}
           title={<a href={item.href} onClick={() => setSubject(item.title)}>{item.title}</a>}
           description={item.description + ' ' + item.mailDate}
         />
@@ -691,55 +694,10 @@ const [collapsed, setCollapsed] = useState(false)
   />
   </div>
   </Col>
-      <Col span={8}>
-
-  <div>
-    <Flex gap="small">
-            <Space.Compact>
-          <Button color="primary" variant="solid" onClick={() => {
-            window.open(`/email/reply/5190495`, `${1}-${0}`,'left=20,width=1000')
-          }}>
-            回复
-          </Button>
-          <Button color="primary" variant="outlined" onClick={() => {
-            window.open(`/email/reply/5220965`, `${2}-${0}`,'left=20,width=1000')
-          }}>
-            回复全部
-          </Button>
-          <Button color="primary" variant="outlined"  onClick={() => {
-            window.open(`/email/forward/5128754`, `${3}-${0}`,'left=20,width=1000')
-          }}>
-            转发
-          </Button>
-          </Space.Compact>
-          <Button color="cyan" variant="outlined">
-            已处理
-          </Button>
-          <Button color="cyan" variant="outlined">
-            绑定订单
-          </Button>
-          </Flex>
-     <Descriptions column={2} title={mailSubject} items={[
-  {
-    key: '1',
-    label: '发件人',
-    children: '"阿里邮箱" <no-reply@mailsupport.aliyun.com>',
-  },
-  {
-    key: '2',
-    label: '收件人',
-    children: '<liaoyijun@chinahighlights.com>',
-  },
-  {
-    key: '3',
-    label: '发送日期',
-    children: '2025-05-16 14:11',
-  },
-]} />
-        <p>{Math.random().toString(36).substring(2, 9)}Some contents...</p>
-        <p>Some {Math.random().toString(36).substring(2, 9)}contents...</p>
-        <p>Some contents...{Math.random().toString(36).substring(2, 9)}</p>
-  </div></Col>
+      <Col span={10} className='' style={{height: 'calc(100vh - 166px)'}}>
+      <EmailDetailInline mailID={activeEmailId || 5291957} emailMsg={{}} variant={'outline'} size={'small'} />
+      {/* <EmailDetailInline mailID={5277561} emailMsg={{}} variant={'outline'} size={'small'} /> */}
+</Col>
     </Row>
 
     </Layout.Content>

From 99862de5939eed3c74b5a204142c1dd811f5fbf0 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 30 May 2025 13:52:46 +0800
Subject: [PATCH 029/143] #

---
 src/views/orders/Follow.jsx | 273 +-----------------------------------
 1 file changed, 5 insertions(+), 268 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 97599d8..bd8b7c0 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -41,189 +41,7 @@ import AdvanceSearchForm from './AdvanceSearchForm'
 import EmailDetailInline from '../Conversations/Online/Components/EmailDetailInline'
 
 function OrderGroupTable({ formValues }) {
-  const handleImportEmail = useCallback((order) => {
-    importEmailMessage({ orderId: order.COLI_SN, orderNumber: order.COLI_ID })
-      .then((r) => {
-        console.info(r)
-        notification.info({
-          message: 'Notification',
-          description: '订单：' + order.COLI_ID + ' 导入' + r.result.length + '条邮件消息',
-          placement: 'top',
-        })
-      })
-      .catch((ex) =>
-        notification.error({
-          message: 'Notification',
-          description: ex.message,
-          placement: 'top',
-          duration: 4,
-        }),
-      )
-  }, [])
-
-  const orderColumns = [
-    {
-      title: '订单号',
-      dataIndex: 'COLI_ID',
-      width: 222,
-      render: (text, record) => {
-        let tagIcon = ''
-
-        if (record.COLI_LineGrade === 240003) tagIcon = <Tag color='red'>重点</Tag>
-        else if (record.COLI_LineGrade === 240002) tagIcon = <Tag color='green'>次重点</Tag>
-        else if (record.COLI_LineGrade === 240001) tagIcon = <Tag color='blue'>一般</Tag>
-
-        return (
-          <Space>
-            <Conditional
-              condition={isPermitted(PERM_IMPORT_EMAIL)}
-              whenTrue={<Button type='default' shape='round' icon={<ImportOutlined />} size='small' onClick={() => handleImportEmail(record)} />}
-            />
-            <Link to={`/order/chat/${record.COLI_SN}`} state={record}>
-              {text}
-            </Link>
-            {tagIcon}
-          </Space>
-        )
-      },
-    },
-    {
-      title: '客人姓名',
-      dataIndex: 'coli_guest',
-      render: (text, record) => {
-        let regularText = ''
-        if (record.buytime > 0) regularText = '(R' + record.buytime + ')'
-        return (
-          <Space>
-            <Conditional
-              condition={isPermitted(record.coli_guest_WhatsApp)}
-              whenTrue={
-                <Tooltip title={record.coli_guest_WhatsApp}>
-                  <WhatsAppOutlined className={['pl-1', record.last_received_time ? 'text-whatsapp' : 'text-neutral-500']} />
-                </Tooltip>
-              }
-            />
-            {text + regularText}
-            <Badge
-              count={record.unread_msg >= UNREAD_MARK ? ' ' : record.unread_msg}
-              style={{
-                backgroundColor: '#52c41a',
-              }}
-            />
-          </Space>
-        )
-      },
-    },
-    {
-      title: '订单状态',
-      dataIndex: 'COLI_State',
-      width: 140,
-      render: (text, record) => {
-        let extra = ''
-        if (record.coli_ordertype === 3 || record.coli_ordertype === 4 || record.coli_ordertype === 5) {
-          extra = '(' + (record.coli_ordertype - 2) + '催)'
-        }
-
-        return (
-          <Space>
-            {extra}
-            {text}
-          </Space>
-        )
-      },
-    },
-    {
-      title: '报价 Title',
-      dataIndex: 'lettertitle',
-      ellipsis: true,
-      hidden: false,
-    },
-    {
-      title: '出发日期',
-      dataIndex: 'COLI_OrderStartDate',
-      width: 120,
-      hidden: false,
-      sortDirections: ['ascend', 'descend'],
-      sorter: (a, b) => {
-        const datejsA = isEmpty(a.COLI_OrderStartDate) ? 0 : new dayjs(a.COLI_OrderStartDate).valueOf()
-        const datejsB = isEmpty(b.COLI_OrderStartDate) ? 0 : new dayjs(b.COLI_OrderStartDate).valueOf()
-        return datejsA - datejsB
-      },
-    },
-    {
-      title: '客人最后一次回复时间',
-      dataIndex: 'last_received_time',
-      width: 180,
-      render: (text, record) => {
-        if (record.last_received_time) {
-          return new dayjs(record.last_received_time).format('YYYY-MM-DD HH:mm:ss')
-        }
-      },
-    },
-    {
-      title: '附加信息',
-      ellipsis: true,
-      dataIndex: 'COLI_Introduction',
-    },
-  ]
 
-  const { notification } = App.useApp()
-  const [loading, setLoading] = useState(false)
-  const orderList = useOrderStore((state) => state.orderList)
-  const fetchOrderList = useOrderStore((state) => state.fetchOrderList)
-  const importEmailMessage = useOrderStore((state) => state.importEmailMessage)
-  const [loginUser, isPermitted] = useAuthStore((state) => [state.loginUser, state.isPermitted])
-
-  useEffect(() => {
-    let canSearch = true
-
-    if (formValues.type === 'advance') {
-      const copyObject = copy(formValues)
-      delete copyObject.type
-      const allEmpty = Object.values(copyObject).every((val) => {
-        return val === null || val === '' || val === undefined
-      })
-      if (allEmpty) {
-        canSearch = false
-        notification.warning({
-          message: '温馨提示',
-          description: '请输入至少一个条件',
-          placement: 'top',
-          duration: 60,
-        })
-      }
-    }
-
-    if (canSearch) {
-      setLoading(true)
-      fetchOrderList(formValues, loginUser)
-        .finally(() => setLoading(false))
-        .catch((reason) => {
-          notification.error({
-            message: '查询出错',
-            description: reason.message,
-            placement: 'top',
-            duration: 60,
-          })
-        })
-    }
-  }, [formValues])
-
-  const paginationProps = {
-    showQuickJumper: true,
-    showLessItems: true,
-    showSizeChanger: true,
-    showTotal: (total) => {
-      return `总数：${total}`
-    },
-  }
-
-  function groupByParam(array, param) {
-    return array.reduce((result, item) => {
-      ;(result[item[param]] = result[item[param]] || []).push(item)
-      return result
-    }, {})
-  }
 
   const deptMap = new Map([
     ['1', 'CH直销组'],
@@ -258,85 +76,6 @@ function OrderGroupTable({ formValues }) {
     ['35', 'newsletter营销'],
   ])
 
-  const groupOrderData = groupByParam(orderList, 'OPI_DEI_SN')
-  const deptKeys = Object.keys(groupOrderData)
-  const deptItems = []
-
-  deptKeys.forEach((deptNo, index) => {
-    const deptOrderList = groupOrderData[deptNo]
-    // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
-    const newOrderList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 1
-    })
-    const newMsgList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 2 || o.coli_ordertype === 6
-    })
-    const followUpList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 3 || o.coli_ordertype === 4 || o.coli_ordertype === 5
-    })
-    const entryList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 7
-    })
-    const paymentList = deptOrderList.filter((o) => {
-      return o.coli_ordertype === 8
-    })
-    if (formValues.type === 'today') {
-      deptItems.push({
-        key: index,
-        label: deptMap.get(deptNo),
-        children: (
-          <>
-            <Divider orientation='left'>新订单</Divider>
-            <Conditional
-              condition={newOrderList.length > 0}
-              whenTrue={<Table key={'newOrderTable' + deptNo} loading={loading} dataSource={newOrderList} columns={orderColumns} pagination={newOrderList.length <= 10 ? false : paginationProps} />}
-              whenFalse={<Empty />}
-            />
-
-            <Divider orientation='left'>新消息/老邮件</Divider>
-            <Conditional
-              condition={newMsgList.length > 0}
-              whenTrue={<Table key={'newMsgTable' + deptNo} loading={loading} dataSource={newMsgList} columns={orderColumns} pagination={newMsgList.length <= 10 ? false : paginationProps} />}
-              whenFalse={<Empty />}
-            />
-
-            <Divider orientation='left'>催信</Divider>
-            <Conditional
-              condition={followUpList.length > 0}
-              whenTrue={<Table key={'followUpTable' + deptNo} loading={loading} dataSource={followUpList} columns={orderColumns} pagination={followUpList.length <= 10 ? false : paginationProps} />}
-              whenFalse={<Empty />}
-            />
-
-            <Divider orientation='left'>余款收付</Divider>
-            <Conditional
-              condition={paymentList.length > 0}
-              whenTrue={<Table key={'paymentTable' + deptNo} loading={loading} dataSource={paymentList} columns={orderColumns} pagination={paymentList.length <= 10 ? false : paginationProps} />}
-              whenFalse={<Empty />}
-            />
-
-            <Divider orientation='left'>入境提醒</Divider>
-            <Conditional
-              condition={entryList.length > 0}
-              whenTrue={<Table key={'entryTable' + deptNo} loading={loading} dataSource={entryList} columns={orderColumns} pagination={entryList.length <= 10 ? false : paginationProps} />}
-              whenFalse={<Empty />}
-            />
-          </>
-        ),
-      })
-    } else {
-      deptItems.push({
-        key: index,
-        label: deptMap.get(deptNo),
-        children: (
-          <>
-            <Table key={'advanceOrderTable' + deptNo} loading={loading} dataSource={deptOrderList} columns={orderColumns} pagination={deptOrderList.length <= 10 ? false : paginationProps} />
-          </>
-        ),
-      })
-    }
-  })
-
-  return <Conditional condition={orderList.length > 0} whenTrue={<Tabs defaultActiveKey={0} items={deptItems} />} whenFalse={<Empty />} />
 }
 
 function Follow() {
@@ -377,7 +116,7 @@ const [collapsed, setCollapsed] = useState(false)
               onSelect={(selectedKeys, e) => {
                 console.info('selectedKeys: ', selectedKeys)
               }}
-              defaultExpandedKeys={['0-0-today-task', '0-1-todo-task']}
+              defaultExpandedKeys={['0-0-today-task', '0-1-todo-list']}
               defaultSelectedKeys={['0-0-0']}
               treeData={[
                 {
@@ -397,7 +136,7 @@ const [collapsed, setCollapsed] = useState(false)
                 },
                 {
                   title: '待办任务',
-                  key: '0-1-todo-task',
+                  key: '0-1-todo-list',
                   icon: <CalendarTwoTone />,
                   children: [
                     {
@@ -494,7 +233,7 @@ const [collapsed, setCollapsed] = useState(false)
               ]}
             />
           </Flex></Layout.Sider>
-    <Layout.Content>
+    <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
 
 
 <Row>
@@ -671,7 +410,7 @@ const [collapsed, setCollapsed] = useState(false)
               },
             ]}
     renderItem={item => (
-      <List.Item
+      <List.Item className={item.key===activeEmailId?`bg-blue-100`:''}
         key={item.title}
         // actions={[
         //   <a key="list-vertical-star-o">回复</a>,
@@ -701,9 +440,7 @@ const [collapsed, setCollapsed] = useState(false)
     </Row>
 
     </Layout.Content>
-    <Layout.Sider zeroWidthTriggerStyle={{top: '30px'}} width='280' style={{
-  backgroundColor: '#fff',
-}} collapsible collapsed={collapsed} onCollapse={value => setCollapsed(value)} collapsedWidth={0} reverseArrow={true}>
+    <Layout.Sider zeroWidthTriggerStyle={{top: '30px'}} width='280' theme={'light'} style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)' }} collapsible collapsed={collapsed} onCollapse={value => setCollapsed(value)} collapsedWidth={0} reverseArrow={true}>
       <Flex gap={6} vertical={true} justify='space-between'>
               <Typography.Text>
                 <FieldNumberOutlined className='pr-1' />

From dfb7016240da3a6616191143836040854ed99253 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 30 May 2025 13:59:18 +0800
Subject: [PATCH 030/143] =?UTF-8?q?feat:=20=E8=AE=A2=E5=8D=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA:=20=E9=82=AE=E4=BB=B6=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Conversations/Online/Components/EmailDetailInline.jsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 2547031..97f8cee 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -1,7 +1,7 @@
 import { useState, useEffect, useRef } from 'react'
 import { App, Button, Divider, Avatar, List, Flex, Typography, Tooltip } from 'antd'
 import { LoadingOutlined, ApiOutlined, FilePdfOutlined, FileOutlined, FileWordOutlined, FileExcelOutlined, FileJpgOutlined, FileImageOutlined, FileTextOutlined, FileGifOutlined, GlobalOutlined, FileZipOutlined } from '@ant-design/icons'
-import { EditIcon, MailCheckIcon, ReplyAllIcon, ReplyIcon, ResendIcon, ShareForwardIcon } from '@/components/Icons'
+import { EditIcon, MailCheckIcon, ReplyAllIcon, ReplyIcon, ResendIcon, ShareForwardIcon, SendPlaneFillIcon, InboxIcon } from '@/components/Icons'
 import { isEmpty, TagColorStyle } from '@/utils/commons'
 import EmailEditorPopup from '../Input/EmailEditorPopup'
 import DnDModal from '@/components/DnDModal'
@@ -117,7 +117,9 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
 
     let btns = []
 
-    btns.push(<Button type='text' key={'set-done'} onClick={() => { alert('todo')}} icon={<MailCheckIcon className={'text-yellow-600'} />} size='small'>已处理</Button>)
+    if (mailData.info.MAI_Direction !== 1) {
+      btns.push(<Button type='text' key={'set-done'} onClick={() => { alert('todo')}} icon={<MailCheckIcon className={'text-yellow-600'} />} size='small'>已处理</Button>)
+    }
     // 没有关联订单的邮件`绑定订单`
     if (showBindBtn) {
       btns.push(<EmailBindFormModal key={'bind'} onBoundSuccess={() => setShowBindBtn(false)} {...{ conversationid, mai_sn, showBindBtn }} />)
@@ -199,7 +201,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
             </div>
             <div className=' ml-auto flex flex-col justify-start gap-1 items-end'>
               {/* <ActionBtns /> */}
-              <div className='text-xs '>{mailData.info?.MAI_SendDate || emailMsg.localDate}</div>
+              <div className='text-xs '>{mailData.info?.MAI_SendDate || emailMsg.localDate}{mailData.info.MAI_Direction === 1 ? <SendPlaneFillIcon className='text-primary' /> : <InboxIcon className='text-indigo-500' />}</div>
             </div>
           </div>
           <div className='text-sm'>

From 55e787b97f7695bbefe7f9f83867cce15059a187 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 30 May 2025 14:34:33 +0800
Subject: [PATCH 031/143] =?UTF-8?q?=E2=8F=B3=20=E9=82=AE=E4=BB=B6=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js | 71 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index a2cbfaf..448a911 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -1,4 +1,4 @@
-import { fetchJSON, postForm } from '@/utils/request';
+import { fetchJSON, postForm, postJSON } from '@/utils/request';
 import { API_HOST, EMAIL_HOST } from '@/config';
 import { isEmpty } from '@/utils/commons';
 
@@ -136,3 +136,72 @@ export const fetchEmailBindOrderAction = async (params) => {
   const { errcode, result } = await fetchJSON(`${API_HOST}/mailinfo_bindorder`, params)
   return errcode === 0 ? true : false;
 }
+
+/**
+ * 顾问的邮箱目录
+ * @param {object} { opi_sn }
+ */
+export const getEmailDirAction = async (params = { opi_sn: '' }) => {
+  const { errcode, result } = await fetchJSON(`${EMAIL_HOST}/email/dir`, params);
+  return errcode === 0 ? [] : result;
+} ;
+
+/**
+ * 获取邮件列表
+ * @usage 邮件目录下的邮件列表
+ * @usage 订单的邮件列表
+ * @usage 高级搜索
+ */
+export const queryEmailListAction = async (params = { opi_sn: '', pagesize: 10, last_id: '', query: {}, order: {} }) => {
+  const { errcode, result } = await postJSON(`${EMAIL_HOST}/email/list`, params)
+  return errcode === 0 ? [] : result
+}
+
+/**
+ * 获取收件箱下的订单目录
+ */
+export const getEmailOrderListAction = async (params = { opi_sn: '', ordertype: 227001 }) => {
+  const { errcode, result } = await fetchJSON(`${EMAIL_HOST}/email/order`, params)
+  return errcode === 0 ? [] : result
+}
+
+/**
+ * 更新邮件属性
+ */
+export const updateEmailAction = async (params = { mai_sn_list: [], set: {} }) => {
+  const { errcode, result } = await postJSON(`${EMAIL_HOST}/email/update`, params)
+  return errcode === 0 ? {} : result
+}
+
+/**
+ * 获取邮件模板
+ */
+export const getEmailTemplateAction = async (template_name, params = { coli_sn: 0, lgc: 1 }) => {
+  const { errcode, result } = await fetchJSON(`${EMAIL_HOST}/email/template/${template_name}`, params)
+  return errcode === 0 ? {} : result
+}
+
+/**
+ * 保存邮件草稿
+ */
+export const saveEmailDraftAction = async (body) => {
+  const { attaList=[], atta, content, ...bodyData } = body;
+  bodyData.ordertype = 227001;
+  const formData = new FormData();
+  Object.keys(bodyData).forEach(function (key) {
+    formData.append(key, bodyData[key]);
+  });
+  attaList.forEach(function (item) {
+    formData.append('attachment', item);
+  });
+  const { result } = await postForm(`${EMAIL_HOST}/email-draft/save`, formData);
+  return result;
+};
+
+/**
+ * 删除邮件草稿
+ */
+export const deleteEmailDraftAction = async (id) => {
+  const { errcode, result } = await postJSON(`${EMAIL_HOST}/email-draft/delete`, { id })
+  return errcode === 0 ? {} : result
+};

From b6903c7a9d3769563a58b16d73bb9d6697f73f20 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 30 May 2025 16:40:48 +0800
Subject: [PATCH 032/143] =?UTF-8?q?=E2=8F=B3=20=E9=82=AE=E4=BB=B6=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                            |    1 +
 src/actions/EmailActions.js           |   66 ++
 src/assets/icons/mail-unread-fill.svg |    1 +
 src/assets/icons/mail-unread-line.svg |    1 +
 src/components/Icons.jsx              |    2 +
 src/views/orders/Follow.jsx           | 1074 +++++++++++++------------
 6 files changed, 647 insertions(+), 498 deletions(-)
 create mode 100644 src/assets/icons/mail-unread-fill.svg
 create mode 100644 src/assets/icons/mail-unread-line.svg

diff --git a/.gitignore b/.gitignore
index a8dcb06..970a368 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ schema*
 
 vonage-client*
 **/test
+*.bak
diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 448a911..e0599b3 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -142,6 +142,72 @@ export const fetchEmailBindOrderAction = async (params) => {
  * @param {object} { opi_sn }
  */
 export const getEmailDirAction = async (params = { opi_sn: '' }) => {
+  return [
+  {
+    "MDR_SN": 1474,
+    "MDR_Name": "收件箱",
+    "MDR_ParentSN": 1,
+    "MDR_Type": 1,
+    "MDR_Order": 1
+  },
+  {
+    "MDR_SN": 1475,
+    "MDR_Name": "未读邮件",
+    "MDR_ParentSN": 1,
+    "MDR_Type": 2,
+    "MDR_Order": 2
+  },
+  {
+    "MDR_SN": 1476,
+    "MDR_Name": "已发邮件",
+    "MDR_ParentSN": 1,
+    "MDR_Type": 3,
+    "MDR_Order": 3
+  },
+  {
+    "MDR_SN": 1477,
+    "MDR_Name": "待发邮件",
+    "MDR_ParentSN": 1,
+    "MDR_Type": 4,
+    "MDR_Order": 4
+  },
+  {
+    "MDR_SN": 1478,
+    "MDR_Name": "草稿",
+    "MDR_ParentSN": 1,
+    "MDR_Type": 5,
+    "MDR_Order": 5
+  },
+  {
+    "MDR_SN": 1479,
+    "MDR_Name": "垃圾邮件",
+    "MDR_ParentSN": 1,
+    "MDR_Type": 6,
+    "MDR_Order": 6
+  },
+  {
+    "MDR_SN": 1480,
+    "MDR_Name": "已处理邮件",
+    "MDR_ParentSN": 1,
+    "MDR_Type": 7,
+    "MDR_Order": 7
+  },
+  {
+    "MDR_SN": 1504,
+    "MDR_Name": "客户信息模板",
+    "MDR_ParentSN": 1,
+    "MDR_Type": 0,
+    "MDR_Order": 100
+  },
+  {
+    "MDR_SN": 1505,
+    "MDR_Name": "客户信息模板",
+    "MDR_ParentSN": 1474,
+    "MDR_Type": 0,
+    "MDR_Order": 100
+  }
+];
+
   const { errcode, result } = await fetchJSON(`${EMAIL_HOST}/email/dir`, params);
   return errcode === 0 ? [] : result;
 } ;
diff --git a/src/assets/icons/mail-unread-fill.svg b/src/assets/icons/mail-unread-fill.svg
new file mode 100644
index 0000000..fe215b9
--- /dev/null
+++ b/src/assets/icons/mail-unread-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M18.8032 8.4928C19.4663 8.81764 20.2118 9 21 9C21.3425 9 21.6769 8.96557 22 8.89998V20C22 20.5523 21.5523 21 21 21H3C2.44772 21 2 20.5523 2 20V4C2 3.44772 2.44772 3 3 3H16.1C16.0344 3.32311 16 3.65753 16 4C16 5.23672 16.449 6.36857 17.1929 7.24142L12.0606 11.6829L5.64722 6.2377L4.35278 7.7623L12.0731 14.3171L18.8032 8.4928ZM21 7C19.3431 7 18 5.65685 18 4C18 2.34315 19.3431 1 21 1C22.6569 1 24 2.34315 24 4C24 5.65685 22.6569 7 21 7Z"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/mail-unread-line.svg b/src/assets/icons/mail-unread-line.svg
new file mode 100644
index 0000000..98f7eb3
--- /dev/null
+++ b/src/assets/icons/mail-unread-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M16.1 3C16.0344 3.32311 16 3.65753 16 4C16 4.34247 16.0344 4.67689 16.1 5H4.51146L12.0619 11.662L17.1098 7.14141C17.5363 7.66888 18.0679 8.10787 18.6728 8.42652L12.0718 14.338L4 7.21594V19H20V8.89998C20.3231 8.96557 20.6575 9 21 9C21.3425 9 21.6769 8.96557 22 8.89998V20C22 20.5523 21.5523 21 21 21H3C2.44772 21 2 20.5523 2 20V4C2 3.44772 2.44772 3 3 3H16.1ZM21 1C22.6569 1 24 2.34315 24 4C24 5.65685 22.6569 7 21 7C19.3431 7 18 5.65685 18 4C18 2.34315 19.3431 1 21 1Z"></path></svg>
\ No newline at end of file
diff --git a/src/components/Icons.jsx b/src/components/Icons.jsx
index 338fa77..d093358 100644
--- a/src/components/Icons.jsx
+++ b/src/components/Icons.jsx
@@ -15,6 +15,7 @@ import EditLineSVG from '@/assets/icons/quill-pen-line.svg?react';
 import MailDownloadLineSVG from '@/assets/icons/mail-download-line.svg?react';
 import MailAddLineSVG from '@/assets/icons/mail-add-line.svg?react';
 import MailCheckSVG from '@/assets/icons/mail-check-line.svg?react';
+import MailUnreadSVG from '@/assets/icons/mail-unread-line.svg?react';
 import TextSVG from '@/assets/icons/text.svg?react';
 
 
@@ -32,6 +33,7 @@ export const EditIcon = (props) => <Icon component={EditLineSVG} {...props} />;
 export const MailDownloadIcon = (props) => <Icon component={MailDownloadLineSVG} {...props} />;
 export const MailAddloadIcon = (props) => <Icon component={MailAddLineSVG} {...props} />;
 export const MailCheckIcon = (props) => <Icon component={MailCheckSVG} {...props} />;
+export const MailUnreadIcon = (props) => <Icon component={MailUnreadSVG} {...props} />;
 export const TextIcon = (props) => <Icon component={TextSVG} {...props} />;
 
 
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index bd8b7c0..467ea1b 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -3,7 +3,7 @@ import useAuthStore from '@/stores/AuthStore'
 import { PERM_IMPORT_EMAIL } from '@/stores/AuthStore'
 import useFormStore from '@/stores/FormStore'
 import { useOrderStore } from '@/stores/OrderStore'
-import { copy, isNotEmpty, isEmpty } from '@/utils/commons'
+import { copy, isNotEmpty, isEmpty, groupBy, cloneDeep, sortBy, sortArrayByOrder } from '@/utils/commons'
 import {
   WhatsAppOutlined,
   ImportOutlined,
@@ -17,7 +17,8 @@ import {
   SaveOutlined,
   PlusOutlined,
   SearchOutlined,
-  ReloadOutlined,ReadOutlined,
+  ReloadOutlined,
+  ReadOutlined,
   CompassOutlined,
   CheckSquareTwoTone,
   CarryOutTwoTone,
@@ -29,68 +30,106 @@ import {
   FolderTwoTone,
   CalendarTwoTone,
   CalendarOutlined,
-  HeartTwoTone, MoneyCollectTwoTone
+  HeartTwoTone,
+  MoneyCollectTwoTone, FolderOutlined, DeleteOutlined,
+  SendOutlined,
+  ClockCircleOutlined,
+  FormOutlined,
 } from '@ant-design/icons'
-import { App, Badge, Empty, Flex, Button, Drawer , Space, Radio, Table, Tabs, Divider, Tag, Tooltip, List, Dropdown , Segmented, Tree, Typography, Input, Descriptions, Checkbox, Layout,  Row, Col  } from 'antd'
+import {
+  App,
+  Badge,
+  Empty,
+  Flex,
+  Button,
+  Drawer,
+  Space,
+  Radio,
+  Table,
+  Tabs,
+  Divider,
+  Tag,
+  Tooltip,
+  List,
+  Dropdown,
+  Segmented,
+  Tree,
+  Typography,
+  Input,
+  Descriptions,
+  Checkbox,
+  Layout,
+  Row,
+  Col,
+} from 'antd'
 import dayjs from 'dayjs'
 import { useCallback, useEffect, useState } from 'react'
+import { InboxIcon, MailCheckIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
 import { Link } from 'react-router-dom'
 import { useShallow } from 'zustand/react/shallow'
 import { UNREAD_MARK } from '@/actions/ConversationActions'
 import AdvanceSearchForm from './AdvanceSearchForm'
 import EmailDetailInline from '../Conversations/Online/Components/EmailDetailInline'
+import { getEmailDirAction } from '@/actions/EmailActions'
 
-function OrderGroupTable({ formValues }) {
+const EmailDirTypeIcons = {
+  '0': { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
+  '1': { component: InboxIcon, color: '', className: 'text-indigo-500' },
+  '2': { component: MailUnreadIcon, color: '', className: 'text-indigo-500' },
+  '3': { component: SendPlaneFillIcon, color: '', className: 'text-primary' },
+  '4': { component: ClockCircleOutlined, color: '', className: 'text-yellow-500' },
+  '5': { component: FormOutlined, color: '', className: 'text-blue-500' },
+  '6': { component: DeleteOutlined, color: '', className: 'text-red-500' },
+  '7': { component: MailCheckIcon, color: '', className: 'text-yellow-600' },
+}
 
+const deptMap = new Map([
+  ['1', 'CH'], // CH直销组
+  ['2', 'CH大客户组'],
+  ['7', '市场推广'],
+  ['8', '德语市场'],
+  ['9', '日语市场'],
+  ['10', '商旅市场'],
+  ['11', '法语市场'],
+  ['12', '西语市场'],
+  ['13', '英文在线组'],
+  ['14', '商务Biztravel'],
+  ['15', 'CH产品'],
+  ['16', 'APP移动项目组'],
+  ['17', 'ChinaTravel组'],
+  ['18', 'CT市场'],
+  ['20', '俄语市场'],
+  ['21', '意语市场'],
+  ['22', '爱游网'],
+  ['23', '三峡站'],
+  ['24', '桂林站'],
+  ['25', '上海站'],
+  ['26', '北京站'],
+  ['27', '西藏站'],
+  ['28', 'AH'], // AH亚洲项目组
+  ['29', 'DMC地接组'],
+  ['30', 'Trippest项目组'], //
+  ['31', '花梨鹰'],
+  ['32', 'Daytours板块'],
+  ['33', 'GH'], // GH项目组
+  ['34', 'trippest网站'],
+  ['35', 'newsletter营销'],
+])
 
-  const deptMap = new Map([
-    ['1', 'CH直销组'],
-    ['2', 'CH大客户组'],
-    ['7', '市场推广'],
-    ['8', '德语市场'],
-    ['9', '日语市场'],
-    ['10', '商旅市场'],
-    ['11', '法语市场'],
-    ['12', '西语市场'],
-    ['13', '英文在线组'],
-    ['14', '商务Biztravel'],
-    ['15', 'CH产品'],
-    ['16', 'APP移动项目组'],
-    ['17', 'ChinaTravel组'],
-    ['18', 'CT市场'],
-    ['20', '俄语市场'],
-    ['21', '意语市场'],
-    ['22', '爱游网'],
-    ['23', '三峡站'],
-    ['24', '桂林站'],
-    ['25', '上海站'],
-    ['26', '北京站'],
-    ['27', '西藏站'],
-    ['28', 'AH亚洲项目组'],
-    ['29', 'DMC地接组'],
-    ['30', 'Trippest项目组'],
-    ['31', '花梨鹰'],
-    ['32', 'Daytours板块'],
-    ['33', 'GH项目组'],
-    ['34', 'trippest网站'],
-    ['35', 'newsletter营销'],
-  ])
-
-}
+function OrderGroupTable({ formValues }) {}
 
 function Follow() {
+  const orderList = useOrderStore((state) => state.orderList)
+  const fetchOrderList = useOrderStore((state) => state.fetchOrderList)
 
-  const [openMail, setOpenMail] = useState(false);
-  const [mailSubject, setSubject] = useState('');
-
-  const [openOrder, setOpenOrder] = useState(false);
-const [collapsed, setCollapsed] = useState(false)
+  const [openOrder, setOpenOrder] = useState(false)
+  const [collapsed, setCollapsed] = useState(false)
 
   const [formValues, setFormValues] = useFormStore(useShallow((state) => [state.orderFollowForm, state.setOrderFollowForm]))
   const [advanceChecked, toggleAdvance] = useFormStore(useShallow((state) => [state.orderFollowAdvanceChecked, state.setOrderFollowAdvanceChecked]))
 
   const batchImportEmailMessage = useOrderStore((state) => state.batchImportEmailMessage)
-  const [isPermitted] = useAuthStore((state) => [state.isPermitted])
+  const [loginUser, isPermitted] = useAuthStore((state) => [state.loginUser, state.isPermitted])
 
   const handleImportEmail = useCallback(() => {
     batchImportEmailMessage()
@@ -100,17 +139,69 @@ const [collapsed, setCollapsed] = useState(false)
     setFormValues({ ...values, type: 'advance' })
   }, [])
 
-  const [activeEmailId, setActiveEmailId] = useState(0);
+  const [activeEmailId, setActiveEmailId] = useState(0)
+
+  const [mailboxDir, setMailboxDir] = useState([]);
+  const DirTypeIcon = ({ type }) => {
+    const Icon = EmailDirTypeIcons[type || '0'].component
+    const className = EmailDirTypeIcons[type || '0'].className
+    return <Icon className={className} />
+  }
+
+  const getOPIEmailDir = async (opi_sn=0) => {
+    const x = await getEmailDirAction(opi_sn)
+    const mailboxSort = x.sort(sortBy('MDR_Order'));
+    const dirs = mailboxSort.map((ele) => {
+      return { ...ele, key: ele.MDR_SN, title: ele.MDR_Name, icon: <DirTypeIcon type={ele.MDR_Type} /> }
+    })
+    setMailboxDir(dirs)
+  }
+
+  const [stickyTreeData, setStickyTreeData] = useState([{ title: '今日任务', key: 'today' }, { title: '待办任务', key: 'todo' }]);
+  const [deiStickyTree, setDeiStickyTree] = useState({});
+  useEffect(() => {
+    fetchOrderList({ type: 'today' }, loginUser)
+    getOPIEmailDir();
+    return () => {}
+  }, [])
+
+  // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
+  useEffect(() => {
+    const byDEI = groupBy(orderList, 'OPI_DEI_SN');
+    // console.log(byDEI, 'byDEI')
+    const byState = Object.keys(byDEI).reduce((acc, key) => {
+      // const stickyIndex0 = byDEI[key].filter(ele => [1, 2, 6].includes(ele.COLI_StateCode))
+      // const stickyIndex1 = byDEI[key].filter(ele => ![1, 2, 6].includes(ele.COLI_StateCode))
+      const sticky = groupBy(byDEI[key], ele => [1, 2, 6].includes(ele.COLI_StateCode) ? 0 : 1);
+      // const sticky = groupBy(byDEI[key], ele => [1, 2, 6].includes(ele.COLI_StateCode) ? 'today' : 'todo');
+      // console.log(sticky, ';;;;');
+      const deiName = deptMap.get(`${key}`);
+      const treeNode = [{ title: '今日任务', key: 'today', icon: <StarTwoTone />,children: (sticky[0]||[]).map(o => ({...o, key: o.COLI_SN, title: `(${o.COLI_State})${o.COLI_ID}`})) }, { title: '待办任务', key: 'todo', icon: <CalendarTwoTone />,children: (sticky[1] || []).map(o => ({...o, key: o.COLI_SN, title: `(${o.COLI_State})${o.COLI_ID}`})) }];
+      // { key, title: deiName, children: sticky[0] };
+      return {...acc, [key]: treeNode};
+    }, {});
+    setDeiStickyTree(byState);
+    console.log(byState, 'byState')
+
+
+    return () => {
+
+    }
+  }, [orderList])
+
+
 
   return (
     <>
-  <Layout>
-    <Layout.Sider width='300' style={{
-  backgroundColor: '#fff',
-}}>
-      <Flex justify='start' align='start' vertical>
+      <Layout>
+        <Layout.Sider
+          width='300'
+          style={{
+            backgroundColor: '#fff',
+          }}>
+          <Flex justify='start' align='start' vertical>
             <Segmented className='w-full' block shape='round' options={['AH', 'CH', 'GH']} />
-            <Tree
+            <Tree blockNode
               showIcon
               showLine
               onSelect={(selectedKeys, e) => {
@@ -118,488 +209,475 @@ const [collapsed, setCollapsed] = useState(false)
               }}
               defaultExpandedKeys={['0-0-today-task', '0-1-todo-list']}
               defaultSelectedKeys={['0-0-0']}
-              treeData={[
-                {
-                  title: '今日任务',
-                  key: '0-0-today-task',
-                  icon: <StarTwoTone />,
-                  children: [
+              treeData={[...deiStickyTree['28']||deiStickyTree['30']||[], ...mailboxDir]
+              //   [
+              //   {
+              //     title: '今日任务',
+              //     key: '0-0-today-task',
+              //     icon: <StarTwoTone />,
+              //     children: [
+              //       {
+              //         title: '(新订单)HXZ240913082',
+              //         key: '0-0-0',
+              //       },
+              //       {
+              //         title: '(老邮件)HXZ241017089',
+              //         key: '0-0-1',
+              //       },
+              //     ],
+              //   },
+              //   {
+              //     title: '待办任务',
+              //     key: '0-1-todo-list',
+              //     icon: <CalendarTwoTone />,
+              //     children: [
+              //       {
+              //         title: '(一催)HXZ250213117',
+              //         key: '0-1-0',
+              //       },
+              //       {
+              //         title: '(二催)HXZ250213117',
+              //         key: '0-1-1',
+              //       },
+              //       {
+              //         title: '(三催)HXZ250213117',
+              //         key: '0-1-2',
+              //       },
+              //       {
+              //         title: '(余款收付)HXZ250209048',
+              //         key: '0-1-3',
+              //       },
+              //       {
+              //         title: '(入境提醒)HXZ250209048',
+              //         key: '0-1-4',
+              //       },
+              //     ],
+              //   },
+              //   {
+              //     title: '草稿',
+              //     key: '0-2-draft',
+              //     icon: <BookTwoTone />,
+              //   },
+              //   {
+              //     title: '收件箱',
+              //     key: '0-3-inbox',
+              //     icon: <MailTwoTone />,
+              //     children: [
+              //       {
+              //         title: '1月',
+              //         key: '0-3-0',
+              //         icon: <FolderTwoTone />,
+              //       },
+              //       {
+              //         title: '2月',
+              //         key: '0-3-1',
+              //         icon: <FolderTwoTone />,
+              //       },
+              //       {
+              //         title: '3月',
+              //         key: '0-3-2',
+              //         icon: <FolderTwoTone />,
+              //       },
+              //       {
+              //         title: '4月',
+              //         key: '0-3-3',
+              //         icon: <FolderTwoTone />,
+              //       },
+              //       {
+              //         title: '5月',
+              //         key: '0-3-4',
+              //         icon: <FolderTwoTone />,
+              //         children: [
+              //           {
+              //             title: 'Albee240422193452',
+              //             key: 'Albee240422193452',
+              //           },
+              //           {
+              //             title: 'Albee240422193285',
+              //             key: 'Albee240422193285',
+              //           },
+              //           {
+              //             title: 'Albee240422193752',
+              //             key: 'Albee240422193752',
+              //           },
+              //           {
+              //             title: 'Albee2404221934583',
+              //             key: 'Albee2404221934583',
+              //           },
+              //           {
+              //             title: 'Albee2404221937836',
+              //             key: 'Albee2404221937836',
+              //           },
+              //         ],
+              //       },
+              //     ],
+              //   },
+              //   {
+              //     title: '已发送',
+              //     key: '0-4-sent',
+              //     icon: <RightSquareTwoTone />,
+              //   },
+              //   {
+              //     title: '已处理',
+              //     key: '0-5-completed',
+              //     icon: <CheckSquareTwoTone />,
+              //   },
+              // ]
+              }
+            />
+          </Flex>
+        </Layout.Sider>
+        <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
+          <Row>
+            <Col className='bg-white' span={14}>
+              <div className='bg-white h-auto px-1 flex gap-1 items-center'>
+                <Dropdown.Button
+                  className='w-auto'
+                  placement='bottom'
+                  arrow
+                  type={'primary'}
+                  menu={{
+                    items: [
+                      {
+                        key: '1',
+                        label: '一催模板一，询问客人是否收到报价信',
+                      },
+                      {
+                        key: '2',
+                        label: '一催模板二，询问客人是否修改行程',
+                      },
+                      {
+                        type: 'divider',
+                      },
+                      {
+                        key: '3',
+                        label: '二催模板一，询问客人对行程的看法',
+                      },
+                      {
+                        key: '4',
+                        label: '二催模板二，表达服务的意识',
+                      },
+                      {
+                        type: 'divider',
+                      },
+                      {
+                        key: '5',
+                        label: '三催模板三，强调价格有效期',
+                      },
+                    ],
+                    onClick: (item) => {
+                      console.info('menu', item)
+                    },
+                  }}
+                  onClick={() => {
+                    console.info('新邮件')
+                  }}>
+                  新邮件
+                </Dropdown.Button>
+                <Input.Search
+                  className=''
+                  allowClear
+                  onChange={(e) => {}}
+                  onPressEnter={(e) => {
+                    return false
+                  }}
+                  placeholder={`邮件主题`}
+                />
+                <Button onClick={() => {}}>高级搜索</Button>
+              </div>
+              <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
+                <List
+                  // header={null}
+                  header={
+                    <Flex wrap gap='small'>
+                      <Tooltip title='选择'>
+                        <Checkbox></Checkbox>
+                      </Tooltip>
+                      <Tooltip title='标记已读'>
+                        <Button shape='circle' type='text' size='small' icon={<ReadOutlined />} />
+                      </Tooltip>
+                      <Tooltip title='已处理'>
+                        <Button shape='circle' type='text' size='small' icon={<CheckSquareOutlined />} />
+                      </Tooltip>
+                      <Tooltip title='刷新'>
+                        <Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} />
+                      </Tooltip>
+                    </Flex>
+                  }
+                  itemLayout='vertical'
+                  size='large'
+                  pagination={false}
+                  dataSource={[
                     {
-                      title: '(新订单)HXZ240913082',
-                      key: '0-0-0',
+                      key: 5291957, // Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
                     {
-                      title: '(老邮件)HXZ241017089',
-                      key: '0-0-1',
+                      key: 5277561, // Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
-                  ],
-                },
-                {
-                  title: '待办任务',
-                  key: '0-1-todo-list',
-                  icon: <CalendarTwoTone />,
-                  children: [
                     {
-                      title: '(一催)HXZ250213117',
-                      key: '0-1-0',
+                      key: 5119909, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Personal information',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
                     {
-                      title: '(二催)HXZ250213117',
-                      key: '0-1-1',
+                      key: 5115479, // Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Your Future Trip with Asia Highlights',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
                     {
-                      title: '(三催)HXZ250213117',
-                      key: '0-1-2',
+                      key: 5113514, // Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
                     {
-                      title: '(余款收付)HXZ250209048',
-                      key: '0-1-3',
+                      key: 5113512, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Greeting from Asia Highlights Alisa',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
                     {
-                      title: '(入境提醒)HXZ250209048',
-                      key: '0-1-4',
+                      key: 5113508, // Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Have you made any decisions about your Japan trip',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
-                  ],
-                },
-                {
-                  title: '草稿',
-                  key: '0-2-draft',
-                  icon: <BookTwoTone />,
-                },
-                {
-                  title: '收件箱',
-                  key: '0-3-inbox',
-                  icon: <MailTwoTone />,
-                  children: [
                     {
-                      title: '1月',
-                      key: '0-3-0',
-                      icon: <FolderTwoTone />,
+                      key: 5112214, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Sri Lanka tour',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
                     {
-                      title: '2月',
-                      key: '0-3-1',
-                      icon: <FolderTwoTone />,
+                      key: 5095421, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: How do you like the itinerary 3',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
                     {
-                      title: '3月',
-                      key: '0-3-2',
-                      icon: <FolderTwoTone />,
+                      key: 5095097, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Re: Re: Final cost',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
                     {
-                      title: '4月',
-                      key: '0-3-3',
-                      icon: <FolderTwoTone />,
+                      key: 5095083, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Reference Number: LSS240628079',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
                     {
-                      title: '5月',
-                      key: '0-3-4',
-                      icon: <FolderTwoTone />,
-                      children: [
-                        {
-                          title: 'Albee240422193452',
-                          key: 'Albee240422193452',
-                        },
-                        {
-                          title: 'Albee240422193285',
-                          key: 'Albee240422193285',
-                        },
-                        {
-                          title: 'Albee240422193752',
-                          key: 'Albee240422193752',
-                        },
-                        {
-                          title: 'Albee2404221934583',
-                          key: 'Albee2404221934583',
-                        },
-                        {
-                          title: 'Albee2404221937836',
-                          key: 'Albee2404221937836',
-                        },
-                      ],
+                      key: 5093980, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Personal information and Hiroshima tour for 2 people',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
                     },
-                  ],
-                },
-                {
-                  title: '已发送',
-                  key: '0-4-sent',
-                  icon: <RightSquareTwoTone />,
-                },
-                {
-                  title: '已处理',
-                  key: '0-5-completed',
-                  icon: <CheckSquareTwoTone />,
-                },
-              ]}
-            />
-          </Flex></Layout.Sider>
-    <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
-
-
-<Row>
-      <Col className='bg-white' span={14}>
-
-      <div className='bg-white h-auto px-1 flex gap-1 items-center'>
-
-  <Dropdown.Button className='w-auto' placement="bottom" arrow type={'primary'} menu={{
-  items: [
-  {
-    key: '1',
-    label: '一催模板一，询问客人是否收到报价信',
-  },
-  {
-    key: '2',
-    label: '一催模板二，询问客人是否修改行程',
-  },{
-    type: 'divider',
-  },
-  {
-    key: '3',
-    label: '二催模板一，询问客人对行程的看法',
-  },
-  {
-    key: '4',
-    label: '二催模板二，表达服务的意识',
-  },{
-    type: 'divider',
-  },
-  {
-    key: '5',
-    label: '三催模板三，强调价格有效期',
-  }],
-  onClick: (item)=> {console.info('menu', item)},
-}} onClick={()  => {console.info('新邮件')}}>
-      新邮件
-    </Dropdown.Button>
-            <Input.Search
-              className=''
-              allowClear
-              onChange={(e) => {}}
-              onPressEnter={(e) => {
-                return false
-              }}
-              placeholder={`邮件主题`}
-            />
-            <Button onClick={() => {}} >高级搜索</Button>
-            </div>
-            <div  className='bg-white overflow-y-auto'
- style={{height: 'calc(100vh - 198px)'}}>
-<List
-    // header={null}
-    header={ <Flex wrap gap="small">
-          <Tooltip title="选择">
-      <Checkbox></Checkbox>
-      </Tooltip>
-          <Tooltip title="标记已读">
-            <Button shape="circle" type="text" size='small' icon={<ReadOutlined />} />
-          </Tooltip>
-          <Tooltip title="已处理">
-            <Button shape="circle" type="text" size='small' icon={<CheckSquareOutlined />} />
-          </Tooltip>
-          <Tooltip title="刷新">
-            <Button shape="circle" type="text" size='small' icon={<ReloadOutlined />} />
-          </Tooltip>
-        </Flex>}
-    itemLayout="vertical"
-    size="large"
-    pagination={false}
-    dataSource={[
-              {
-                key: 5291957, // Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5277561, // Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5119909, //Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Personal information',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5115479, // Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Your Future Trip with Asia Highlights',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5113514, // Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5113512, //Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Greeting from Asia Highlights Alisa',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5113508, // Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Have you made any decisions about your Japan trip',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5112214, //Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Sri Lanka tour',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5095421, //Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: How do you like the itinerary 3',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5095097, //Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Re: Re: Final cost',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5095083, //Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Reference Number: LSS240628079',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5093980, //Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Personal information and Hiroshima tour for 2 people',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: 5093968, //Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Asia Travel Tips /LSS250429038',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-            ]}
-    renderItem={item => (
-      <List.Item className={item.key===activeEmailId?`bg-blue-100`:''}
-        key={item.title}
-        // actions={[
-        //   <a key="list-vertical-star-o">回复</a>,
-        //   <a key="list-vertical-refor">转发</a>,
-        // ]}
-        extra={
-          <Checkbox></Checkbox>
-        }
-
-      >
-        <List.Item.Meta
-          className='cursor-pointer'
-        onClick={() => {console.info('item: ', item); setActiveEmailId(item.key)}}
-          title={<a href={item.href} onClick={() => setSubject(item.title)}>{item.title}</a>}
-          description={item.description + ' ' + item.mailDate}
-        />
-        {item.content}LSS250501006, Thailand
-      </List.Item>
-    )}
-  />
-  </div>
-  </Col>
-      <Col span={10} className='' style={{height: 'calc(100vh - 166px)'}}>
-      <EmailDetailInline mailID={activeEmailId || 5291957} emailMsg={{}} variant={'outline'} size={'small'} />
-      {/* <EmailDetailInline mailID={5277561} emailMsg={{}} variant={'outline'} size={'small'} /> */}
-</Col>
-    </Row>
-
-    </Layout.Content>
-    <Layout.Sider zeroWidthTriggerStyle={{top: '30px'}} width='280' theme={'light'} style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)' }} collapsible collapsed={collapsed} onCollapse={value => setCollapsed(value)} collapsedWidth={0} reverseArrow={true}>
-      <Flex gap={6} vertical={true} justify='space-between'>
-              <Typography.Text>
-                <FieldNumberOutlined className='pr-1' />
-                LSS250501006
-                <HeartTwoTone twoToneColor="#eb2f96"/>
-                <MoneyCollectTwoTone twoToneColor="#eb2f96" />
-              </Typography.Text>
-              <Typography.Text>
-                <UserOutlined className=' pr-1' />
-                Jorgina(R1)
-              </Typography.Text>
-              <Typography.Text>
-                <CompassOutlined className=' pr-1' />
-                Thailand
-              </Typography.Text>
-              <Typography.Text>
-                <PhoneOutlined className=' pr-1' />
-                <Button type='link' size={'small'} onClick={() => {}}>
-                  6596823833
-                </Button>
-              </Typography.Text>
-              <Typography.Text>
-                <MailOutlined className=' pr-1' />
-                Jorgina@gmail.com
-              </Typography.Text>
-              <Typography.Text>
-                <WhatsAppOutlined className='pr-1' />
-                <Button type='link' size={'small'} onClick={() => {}}>
-                  6596826951
-                </Button>
-              </Typography.Text>
-              <Typography.Text>
-                <CalendarOutlined className='pr-1' />
-                <span>出发日期：</span>2025-09-18，已下计划
-              </Typography.Text>
-              <Typography.Text>
-                <span>特殊要求：</span>
-                在华城市 桂林 对酒店和房型要求 5-star
-              </Typography.Text>
-              <Typography.Text>
-                <span>外联备注：</span>
-                泰国马来水灯节
-              </Typography.Text>
-            </Flex>
-            <Divider orientation="left">
-						<Typography.Text strong>表单信息</Typography.Text>
+                    {
+                      key: 5093968, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Asia Travel Tips /LSS250429038',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                  ]}
+                  renderItem={(item) => (
+                    <List.Item
+                      className={item.key === activeEmailId ? `bg-blue-100` : ''}
+                      key={item.title}
+                      // actions={[
+                      //   <a key="list-vertical-star-o">回复</a>,
+                      //   <a key="list-vertical-refor">转发</a>,
+                      // ]}
+                      extra={<Checkbox></Checkbox>}>
+                      <List.Item.Meta
+                        className='cursor-pointer'
+                        onClick={() => {
+                          console.info('item: ', item)
+                          setActiveEmailId(item.key)
+                        }}
+                        title={
+                          <a href={item.href} onClick={() => {}}>
+                            {item.title}
+                          </a>
+                        }
+                        description={item.description + ' ' + item.mailDate}
+                      />
+                      {item.content}LSS250501006, Thailand
+                    </List.Item>
+                  )}
+                />
+              </div>
+            </Col>
+            <Col span={10} className='' style={{ height: 'calc(100vh - 166px)' }}>
+              <EmailDetailInline mailID={activeEmailId || 5291957} emailMsg={{}} variant={'outline'} size={'small'} />
+              {/* <EmailDetailInline mailID={5277561} emailMsg={{}} variant={'outline'} size={'small'} /> */}
+            </Col>
+          </Row>
+        </Layout.Content>
+        <Layout.Sider
+          zeroWidthTriggerStyle={{ top: '30px' }}
+          width='280'
+          theme={'light'}
+          style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)' }}
+          collapsible
+          collapsed={collapsed}
+          onCollapse={(value) => setCollapsed(value)}
+          collapsedWidth={0}
+          reverseArrow={true}>
+          <Flex gap={6} vertical={true} justify='space-between'>
+            <Typography.Text>
+              <FieldNumberOutlined className='pr-1' />
+              LSS250501006
+              <HeartTwoTone twoToneColor='#eb2f96' />
+              <MoneyCollectTwoTone twoToneColor='#eb2f96' />
+            </Typography.Text>
+            <Typography.Text>
+              <UserOutlined className=' pr-1' />
+              Jorgina(R1)
+            </Typography.Text>
+            <Typography.Text>
+              <CompassOutlined className=' pr-1' />
+              Thailand
+            </Typography.Text>
+            <Typography.Text>
+              <PhoneOutlined className=' pr-1' />
+              <Button type='link' size={'small'} onClick={() => {}}>
+                6596823833
+              </Button>
+            </Typography.Text>
+            <Typography.Text>
+              <MailOutlined className=' pr-1' />
+              Jorgina@gmail.com
+            </Typography.Text>
+            <Typography.Text>
+              <WhatsAppOutlined className='pr-1' />
+              <Button type='link' size={'small'} onClick={() => {}}>
+                6596826951
+              </Button>
+            </Typography.Text>
+            <Typography.Text>
+              <CalendarOutlined className='pr-1' />
+              <span>出发日期：</span>2025-09-18，已下计划
+            </Typography.Text>
+            <Typography.Text>
+              <span>特殊要求：</span>
+              在华城市 桂林 对酒店和房型要求 5-star
+            </Typography.Text>
+            <Typography.Text>
+              <span>外联备注：</span>
+              泰国马来水灯节
+            </Typography.Text>
+          </Flex>
+          <Divider orientation='left'>
+            <Typography.Text strong>表单信息</Typography.Text>
             <FileAddOutlined className='pl-1' />
-					</Divider>
-					<p className="p-2 overflow-auto m-0 break-words whitespace-pre-wrap" dangerouslySetInnerHTML={{ __html: 'orderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detail' }}></p>
-<Space.Compact block>
-      <Input addonBefore="附加信息" />
-      <Button icon={<SaveOutlined />} />
-    </Space.Compact>
-          <Flex gap="small">
-          <Button color="cyan" variant="outlined" onClick={() => {
-            setOpenOrder(true)
-            }}>
-            订单状态
-          </Button>
-          </Flex></Layout.Sider>
-  </Layout>
-
-<Drawer
-        title={mailSubject}
-        placement="right"
-        // getContainer={false}
-        size={'large'}
-        mask={false}
-        maskClosable={true}
-        open={openMail}
-        onClose={() => setOpenMail(false)}
-        extra={
-          <Space>
-            <Button color="primary" variant="solid">
-            回复
-          </Button>
-          <Button color="primary" variant="outlined">
-            回复全部
-          </Button>
-          <Button color="primary" variant="outlined" >
-            转发
-          </Button>
-          <Button color="cyan" variant="outlined">
-            已处理
-          </Button>
-          </Space>
-        }
-        footer={
-          <Space>footer</Space>
-        }
-      >
-        <Descriptions column={1} title="Your Thailand Private tour by 'Asia Highlights' 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到" items={[
-  {
-    key: '1',
-    label: '发件人',
-    children: '"阿里邮箱" <no-reply@mailsupport.aliyun.com>',
-  },
-  {
-    key: '2',
-    label: '收件人',
-    children: '<liaoyijun@chinahighlights.com>',
-  },
-  {
-    key: '3',
-    label: '发送日期',
-    children: '2025-05-16 14:11',
-  },
-]} />
-        <p>{Math.random().toString(36).substring(2, 9)}Some contents...</p>
-        <p>Some {Math.random().toString(36).substring(2, 9)}contents...</p>
-        <p>Some contents...{Math.random().toString(36).substring(2, 9)}</p>
-      </Drawer>
+          </Divider>
+          <p
+            className='p-2 overflow-auto m-0 break-words whitespace-pre-wrap'
+            dangerouslySetInnerHTML={{
+              __html:
+                'orderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detail',
+            }}></p>
+          <Space.Compact block>
+            <Input addonBefore='附加信息' />
+            <Button icon={<SaveOutlined />} />
+          </Space.Compact>
+          <Flex gap='small'>
+            <Button
+              color='cyan'
+              variant='outlined'
+              onClick={() => {
+                setOpenOrder(true)
+              }}>
+              订单状态
+            </Button>
+          </Flex>
+        </Layout.Sider>
+      </Layout>
 
       <Drawer
         title={'订单状态'}
-        placement="right"
+        placement='right'
         // getContainer={false}
         size={'large'}
         mask={false}
         maskClosable={true}
         open={openOrder}
-        onClose={() => setOpenOrder(false)}
-      >
-        <Divider orientation="left">
-						<Typography.Text strong>是否重要</Typography.Text>
-					</Divider>
-            <Radio.Group options={[
-  { label: '重点', value: '1' },
-  { label: '次重点', value: '2' },
-  { label: '一般', value: '3' },
-]} />
-
-        <Divider orientation="left">
-						<Typography.Text strong>状态</Typography.Text>
-					</Divider>
-            <Radio.Group options={[
-  { label: '新订单', value: '4' },
-  { label: '报价中', value: '5' },
-  { label: '以后联系', value: '6' },
-  { label: '等待付订金', value: '7' },
-  { label: '成行', value: '8' },
-  { label: '丢失', value: '9' },
-  { label: '取消', value: '10' },
-  { label: '未报价', value: '11' },
-]}  />
+        onClose={() => setOpenOrder(false)}>
+        <Divider orientation='left'>
+          <Typography.Text strong>是否重要</Typography.Text>
+        </Divider>
+        <Radio.Group
+          options={[
+            { label: '重点', value: '1' },
+            { label: '次重点', value: '2' },
+            { label: '一般', value: '3' },
+          ]}
+        />
 
+        <Divider orientation='left'>
+          <Typography.Text strong>状态</Typography.Text>
+        </Divider>
+        <Radio.Group
+          options={[
+            { label: '新订单', value: '4' },
+            { label: '报价中', value: '5' },
+            { label: '以后联系', value: '6' },
+            { label: '等待付订金', value: '7' },
+            { label: '成行', value: '8' },
+            { label: '丢失', value: '9' },
+            { label: '取消', value: '10' },
+            { label: '未报价', value: '11' },
+          ]}
+        />
 
-        <Divider orientation="left">
-						<Typography.Text strong> 催信</Typography.Text>
-					</Divider>
-<Checkbox.Group options={[
-  { label: '一催', value: 'Apple', className: 'label-1' },
-  { label: '二催', value: 'Pear', className: 'label-2' },
-  { label: '三催', value: 'Orange', className: 'label-3' },
-  { label: '重点团', value: '2233342', className: 'label-3' },
-  { label: '已发 travel advisor survey', value: '43535', className: 'label-3' },
-]} defaultValue={['Apple']}  />
+        <Divider orientation='left'>
+          <Typography.Text strong> 催信</Typography.Text>
+        </Divider>
+        <Checkbox.Group
+          options={[
+            { label: '一催', value: 'Apple', className: 'label-1' },
+            { label: '二催', value: 'Pear', className: 'label-2' },
+            { label: '三催', value: 'Orange', className: 'label-3' },
+            { label: '重点团', value: '2233342', className: 'label-3' },
+            { label: '已发 travel advisor survey', value: '43535', className: 'label-3' },
+          ]}
+          defaultValue={['Apple']}
+        />
       </Drawer>
-
     </>
   )
 }

From 8b6326380d0bad8de21c64e41d0d5285e1c7c892 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 30 May 2025 16:49:07 +0800
Subject: [PATCH 033/143] =?UTF-8?q?perf=EF=BC=9A=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=82=AC=E4=BF=A1=E6=A8=A1=E6=9D=BF=E8=8F=9C=E5=8D=95=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat：增加树节点选择显示
---
 src/views/orders/Follow.jsx | 350 ++++++++++++++++++++++++------------
 1 file changed, 240 insertions(+), 110 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 467ea1b..758abe9 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -504,116 +504,246 @@ function Follow() {
                       orderNo: 'LSS250501006',
                       country: 'Thailand',
                     },
-                    {
-                      key: 5093968, //Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: 'Re: Asia Travel Tips /LSS250429038',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                  ]}
-                  renderItem={(item) => (
-                    <List.Item
-                      className={item.key === activeEmailId ? `bg-blue-100` : ''}
-                      key={item.title}
-                      // actions={[
-                      //   <a key="list-vertical-star-o">回复</a>,
-                      //   <a key="list-vertical-refor">转发</a>,
-                      // ]}
-                      extra={<Checkbox></Checkbox>}>
-                      <List.Item.Meta
-                        className='cursor-pointer'
-                        onClick={() => {
-                          console.info('item: ', item)
-                          setActiveEmailId(item.key)
-                        }}
-                        title={
-                          <a href={item.href} onClick={() => {}}>
-                            {item.title}
-                          </a>
-                        }
-                        description={item.description + ' ' + item.mailDate}
-                      />
-                      {item.content}LSS250501006, Thailand
-                    </List.Item>
-                  )}
-                />
-              </div>
-            </Col>
-            <Col span={10} className='' style={{ height: 'calc(100vh - 166px)' }}>
-              <EmailDetailInline mailID={activeEmailId || 5291957} emailMsg={{}} variant={'outline'} size={'small'} />
-              {/* <EmailDetailInline mailID={5277561} emailMsg={{}} variant={'outline'} size={'small'} /> */}
-            </Col>
-          </Row>
-        </Layout.Content>
-        <Layout.Sider
-          zeroWidthTriggerStyle={{ top: '30px' }}
-          width='280'
-          theme={'light'}
-          style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)' }}
-          collapsible
-          collapsed={collapsed}
-          onCollapse={(value) => setCollapsed(value)}
-          collapsedWidth={0}
-          reverseArrow={true}>
-          <Flex gap={6} vertical={true} justify='space-between'>
-            <Typography.Text>
-              <FieldNumberOutlined className='pr-1' />
-              LSS250501006
-              <HeartTwoTone twoToneColor='#eb2f96' />
-              <MoneyCollectTwoTone twoToneColor='#eb2f96' />
-            </Typography.Text>
-            <Typography.Text>
-              <UserOutlined className=' pr-1' />
-              Jorgina(R1)
-            </Typography.Text>
-            <Typography.Text>
-              <CompassOutlined className=' pr-1' />
-              Thailand
-            </Typography.Text>
-            <Typography.Text>
-              <PhoneOutlined className=' pr-1' />
-              <Button type='link' size={'small'} onClick={() => {}}>
-                6596823833
-              </Button>
-            </Typography.Text>
-            <Typography.Text>
-              <MailOutlined className=' pr-1' />
-              Jorgina@gmail.com
-            </Typography.Text>
-            <Typography.Text>
-              <WhatsAppOutlined className='pr-1' />
-              <Button type='link' size={'small'} onClick={() => {}}>
-                6596826951
-              </Button>
-            </Typography.Text>
-            <Typography.Text>
-              <CalendarOutlined className='pr-1' />
-              <span>出发日期：</span>2025-09-18，已下计划
-            </Typography.Text>
-            <Typography.Text>
-              <span>特殊要求：</span>
-              在华城市 桂林 对酒店和房型要求 5-star
-            </Typography.Text>
-            <Typography.Text>
-              <span>外联备注：</span>
-              泰国马来水灯节
-            </Typography.Text>
-          </Flex>
-          <Divider orientation='left'>
-            <Typography.Text strong>表单信息</Typography.Text>
-            <FileAddOutlined className='pl-1' />
-          </Divider>
-          <p
-            className='p-2 overflow-auto m-0 break-words whitespace-pre-wrap'
-            dangerouslySetInnerHTML={{
-              __html:
-                'orderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detail',
-            }}></p>
-          <Space.Compact block>
-            <Input addonBefore='附加信息' />
-            <Button icon={<SaveOutlined />} />
+                  ],
+                },
+                {
+                  title: '已发送',
+                  key: '0-4-sent',
+                  icon: <RightSquareTwoTone />,
+                },
+                {
+                  title: '已处理',
+                  key: '0-5-completed',
+                  icon: <CheckSquareTwoTone />,
+                },
+              ]}
+            />
+          </Flex></Layout.Sider>
+    <Layout.Content>
+
+
+<Row>
+      <Col className='bg-white' span={16}>
+
+      <div className='bg-white h-auto px-1 flex gap-1 items-center'>
+
+  <Dropdown.Button className='w-auto' placement="bottom" arrow type={'primary'} menu={{
+  items: [
+  {
+    key: '1',
+    label: '一催模版1：鼓励客人回复和讨论行程',
+  },
+  {
+    key: '2',
+    label: '一催模版2：询问客人对于报价是否有疑问',
+  },{
+    type: 'divider',
+  },
+  {
+    key: '3',
+    label: '二催模版1：省钱的方式',
+  },
+  {
+    key: '4',
+    label: '二催模版2：Why us',
+  },{
+    type: 'divider',
+  },
+  {
+    key: '5',
+    label: '三催模版1：再次强调服务',
+  },
+  {
+    key: '6',
+    label: '三催模版2：客人常见问题询问',
+  }],
+  onClick: (item)=> {console.info('menu', item)},
+}} onClick={()  => {console.info('新邮件')}}>
+      新邮件
+    </Dropdown.Button>
+            <Input.Search
+              className=''
+              allowClear
+              onChange={(e) => {}}
+              onPressEnter={(e) => {
+                return false
+              }}
+              placeholder={`邮件主题`}
+            />
+            <Button onClick={() => {}} >高级搜索</Button>
+  <Flex wrap gap="small">
+          <Tooltip title="选择">
+      <Checkbox></Checkbox>
+      </Tooltip>
+          <Tooltip title="标记已读">
+            <Button shape="circle" type="text" size='small' icon={<ReadOutlined />} />
+          </Tooltip>
+          <Tooltip title="已处理">
+            <Button shape="circle" type="text" size='small' icon={<CheckSquareOutlined />} />
+          </Tooltip>
+          <Tooltip title="刷新">
+            <Button shape="circle" type="text" size='small' icon={<ReloadOutlined />} />
+          </Tooltip>
+        </Flex>
+            </div>
+            <div  className='bg-white overflow-y-auto'
+ style={{height: 'calc(100vh - 198px)'}}>
+<List
+    // header={null}
+    header={<div>今日任务</div>}
+    itemLayout="vertical"
+    size="large"
+    pagination={false}
+    dataSource={[
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Personal information',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Your Future Trip with Asia Highlights',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Greeting from Asia Highlights Alisa',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Have you made any decisions about your Japan trip',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Sri Lanka tour',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: How do you like the itinerary 3',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Re: Re: Final cost',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Reference Number: LSS240628079',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Personal information and Hiroshima tour for 2 people',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+              {
+                key: Math.random().toString(36).substring(2, 9),
+                description: 'Fran Grundman <frangrundman@rogers.com>',
+                title: 'Re: Asia Travel Tips /LSS250429038',
+                mailDate: '2025-05-01 19:21:00',
+                orderNo: 'LSS250501006',
+                country: 'Thailand',
+              },
+            ]}
+    renderItem={item => (
+      <List.Item
+        key={item.title}
+        // actions={[
+        //   <a key="list-vertical-star-o">回复</a>,
+        //   <a key="list-vertical-refor">转发</a>,
+        // ]}
+        extra={
+          <Checkbox></Checkbox>
+        }
+
+      >
+        <List.Item.Meta
+          className='cursor-pointer'
+        onClick={() => console.info('item: ', item)}
+          title={<a href={item.href} onClick={() => setSubject(item.title)}>{item.title}</a>}
+          description={item.description + ' ' + item.mailDate}
+        />
+        {item.content}LSS250501006, Thailand
+      </List.Item>
+    )}
+  />
+  </div>
+  </Col>
+      <Col span={8}>
+
+  <div>
+    <Flex gap="small">
+            <Space.Compact>
+          <Button color="primary" variant="solid" onClick={() => {
+            window.open(`/email/reply/5190495`, `${1}-${0}`,'left=20,width=1000')
+          }}>
+            回复
+          </Button>
+          <Button color="primary" variant="outlined" onClick={() => {
+            window.open(`/email/reply/5220965`, `${2}-${0}`,'left=20,width=1000')
+          }}>
+            回复全部
+          </Button>
+          <Button color="primary" variant="outlined"  onClick={() => {
+            window.open(`/email/forward/5128754`, `${3}-${0}`,'left=20,width=1000')
+          }}>
+            转发
+          </Button>
           </Space.Compact>
           <Flex gap='small'>
             <Button

From 25722eff773255c883cffa7811856191b0d03aaa Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 3 Jun 2025 09:13:43 +0800
Subject: [PATCH 034/143] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=86=B2=E7=AA=81=E5=90=8E=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 316 ++----------------------------------
 1 file changed, 13 insertions(+), 303 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 758abe9..69e5bb5 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -210,119 +210,7 @@ function Follow() {
               defaultExpandedKeys={['0-0-today-task', '0-1-todo-list']}
               defaultSelectedKeys={['0-0-0']}
               treeData={[...deiStickyTree['28']||deiStickyTree['30']||[], ...mailboxDir]
-              //   [
-              //   {
-              //     title: '今日任务',
-              //     key: '0-0-today-task',
-              //     icon: <StarTwoTone />,
-              //     children: [
-              //       {
-              //         title: '(新订单)HXZ240913082',
-              //         key: '0-0-0',
-              //       },
-              //       {
-              //         title: '(老邮件)HXZ241017089',
-              //         key: '0-0-1',
-              //       },
-              //     ],
-              //   },
-              //   {
-              //     title: '待办任务',
-              //     key: '0-1-todo-list',
-              //     icon: <CalendarTwoTone />,
-              //     children: [
-              //       {
-              //         title: '(一催)HXZ250213117',
-              //         key: '0-1-0',
-              //       },
-              //       {
-              //         title: '(二催)HXZ250213117',
-              //         key: '0-1-1',
-              //       },
-              //       {
-              //         title: '(三催)HXZ250213117',
-              //         key: '0-1-2',
-              //       },
-              //       {
-              //         title: '(余款收付)HXZ250209048',
-              //         key: '0-1-3',
-              //       },
-              //       {
-              //         title: '(入境提醒)HXZ250209048',
-              //         key: '0-1-4',
-              //       },
-              //     ],
-              //   },
-              //   {
-              //     title: '草稿',
-              //     key: '0-2-draft',
-              //     icon: <BookTwoTone />,
-              //   },
-              //   {
-              //     title: '收件箱',
-              //     key: '0-3-inbox',
-              //     icon: <MailTwoTone />,
-              //     children: [
-              //       {
-              //         title: '1月',
-              //         key: '0-3-0',
-              //         icon: <FolderTwoTone />,
-              //       },
-              //       {
-              //         title: '2月',
-              //         key: '0-3-1',
-              //         icon: <FolderTwoTone />,
-              //       },
-              //       {
-              //         title: '3月',
-              //         key: '0-3-2',
-              //         icon: <FolderTwoTone />,
-              //       },
-              //       {
-              //         title: '4月',
-              //         key: '0-3-3',
-              //         icon: <FolderTwoTone />,
-              //       },
-              //       {
-              //         title: '5月',
-              //         key: '0-3-4',
-              //         icon: <FolderTwoTone />,
-              //         children: [
-              //           {
-              //             title: 'Albee240422193452',
-              //             key: 'Albee240422193452',
-              //           },
-              //           {
-              //             title: 'Albee240422193285',
-              //             key: 'Albee240422193285',
-              //           },
-              //           {
-              //             title: 'Albee240422193752',
-              //             key: 'Albee240422193752',
-              //           },
-              //           {
-              //             title: 'Albee2404221934583',
-              //             key: 'Albee2404221934583',
-              //           },
-              //           {
-              //             title: 'Albee2404221937836',
-              //             key: 'Albee2404221937836',
-              //           },
-              //         ],
-              //       },
-              //     ],
-              //   },
-              //   {
-              //     title: '已发送',
-              //     key: '0-4-sent',
-              //     icon: <RightSquareTwoTone />,
-              //   },
-              //   {
-              //     title: '已处理',
-              //     key: '0-5-completed',
-              //     icon: <CheckSquareTwoTone />,
-              //   },
-              // ]
+
               }
             />
           </Flex>
@@ -384,194 +272,7 @@ function Follow() {
                   placeholder={`邮件主题`}
                 />
                 <Button onClick={() => {}}>高级搜索</Button>
-              </div>
-              <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
-                <List
-                  // header={null}
-                  header={
-                    <Flex wrap gap='small'>
-                      <Tooltip title='选择'>
-                        <Checkbox></Checkbox>
-                      </Tooltip>
-                      <Tooltip title='标记已读'>
-                        <Button shape='circle' type='text' size='small' icon={<ReadOutlined />} />
-                      </Tooltip>
-                      <Tooltip title='已处理'>
-                        <Button shape='circle' type='text' size='small' icon={<CheckSquareOutlined />} />
-                      </Tooltip>
-                      <Tooltip title='刷新'>
-                        <Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} />
-                      </Tooltip>
-                    </Flex>
-                  }
-                  itemLayout='vertical'
-                  size='large'
-                  pagination={false}
-                  dataSource={[
-                    {
-                      key: 5291957, // Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                    {
-                      key: 5277561, // Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                    {
-                      key: 5119909, //Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: 'Re: Personal information',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                    {
-                      key: 5115479, // Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: 'Re: Your Future Trip with Asia Highlights',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                    {
-                      key: 5113514, // Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                    {
-                      key: 5113512, //Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: 'Re: Greeting from Asia Highlights Alisa',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                    {
-                      key: 5113508, // Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: 'Re: Have you made any decisions about your Japan trip',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                    {
-                      key: 5112214, //Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: 'Re: Sri Lanka tour',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                    {
-                      key: 5095421, //Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: 'Re: How do you like the itinerary 3',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                    {
-                      key: 5095097, //Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: 'Re: Re: Re: Final cost',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                    {
-                      key: 5095083, //Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: 'Reference Number: LSS240628079',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                    {
-                      key: 5093980, //Math.random().toString(36).substring(2, 9),
-                      description: 'Fran Grundman <frangrundman@rogers.com>',
-                      title: 'Re: Personal information and Hiroshima tour for 2 people',
-                      mailDate: '2025-05-01 19:21:00',
-                      orderNo: 'LSS250501006',
-                      country: 'Thailand',
-                    },
-                  ],
-                },
-                {
-                  title: '已发送',
-                  key: '0-4-sent',
-                  icon: <RightSquareTwoTone />,
-                },
-                {
-                  title: '已处理',
-                  key: '0-5-completed',
-                  icon: <CheckSquareTwoTone />,
-                },
-              ]}
-            />
-          </Flex></Layout.Sider>
-    <Layout.Content>
-
-
-<Row>
-      <Col className='bg-white' span={16}>
-
-      <div className='bg-white h-auto px-1 flex gap-1 items-center'>
-
-  <Dropdown.Button className='w-auto' placement="bottom" arrow type={'primary'} menu={{
-  items: [
-  {
-    key: '1',
-    label: '一催模版1：鼓励客人回复和讨论行程',
-  },
-  {
-    key: '2',
-    label: '一催模版2：询问客人对于报价是否有疑问',
-  },{
-    type: 'divider',
-  },
-  {
-    key: '3',
-    label: '二催模版1：省钱的方式',
-  },
-  {
-    key: '4',
-    label: '二催模版2：Why us',
-  },{
-    type: 'divider',
-  },
-  {
-    key: '5',
-    label: '三催模版1：再次强调服务',
-  },
-  {
-    key: '6',
-    label: '三催模版2：客人常见问题询问',
-  }],
-  onClick: (item)=> {console.info('menu', item)},
-}} onClick={()  => {console.info('新邮件')}}>
-      新邮件
-    </Dropdown.Button>
-            <Input.Search
-              className=''
-              allowClear
-              onChange={(e) => {}}
-              onPressEnter={(e) => {
-                return false
-              }}
-              placeholder={`邮件主题`}
-            />
-            <Button onClick={() => {}} >高级搜索</Button>
-  <Flex wrap gap="small">
+                <Flex wrap gap="small">
           <Tooltip title="选择">
       <Checkbox></Checkbox>
       </Tooltip>
@@ -585,7 +286,9 @@ function Follow() {
             <Button shape="circle" type="text" size='small' icon={<ReloadOutlined />} />
           </Tooltip>
         </Flex>
-            </div>
+              </div>
+
+
             <div  className='bg-white overflow-y-auto'
  style={{height: 'calc(100vh - 198px)'}}>
 <List
@@ -724,6 +427,8 @@ function Follow() {
   />
   </div>
   </Col>
+
+
       <Col span={8}>
 
   <div>
@@ -755,7 +460,12 @@ function Follow() {
               订单状态
             </Button>
           </Flex>
-        </Layout.Sider>
+          </Flex>
+  </div>
+  </Col>
+  </Row>
+
+        </Layout.Content>
       </Layout>
 
       <Drawer

From f4a64f0a03722e1e0c39ae06d449389c9a676887 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 3 Jun 2025 09:48:24 +0800
Subject: [PATCH 035/143] =?UTF-8?q?feat:=20=E7=8B=AC=E7=AB=8B=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx | 95 +++++++++++++++++++++++++++++++++
 src/views/orders/Follow.jsx     |  8 ++-
 2 files changed, 102 insertions(+), 1 deletion(-)
 create mode 100644 src/components/OrderProfile.jsx

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
new file mode 100644
index 0000000..c5166a9
--- /dev/null
+++ b/src/components/OrderProfile.jsx
@@ -0,0 +1,95 @@
+import {
+  WhatsAppOutlined, FileAddOutlined, MailOutlined,
+  PhoneOutlined,
+  UserOutlined,
+  FieldNumberOutlined,
+  SaveOutlined, CompassOutlined, CalendarOutlined,
+  HeartTwoTone,
+  MoneyCollectTwoTone,
+  FolderOutlined,
+  DeleteOutlined, ClockCircleOutlined,
+  FormOutlined
+} from '@ant-design/icons'
+import {
+  Flex,
+  Button, Space, Divider, Typography,
+  Input
+} from 'antd'
+import { InboxIcon, MailCheckIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
+
+const OrderProfile = (props) => {
+  return (
+    <>
+      <Flex gap={6} vertical={true} justify='space-between'>
+        <Typography.Text>
+          <FieldNumberOutlined className='pr-1' />
+          LSS250501006
+          <HeartTwoTone twoToneColor='#eb2f96' />
+          <MoneyCollectTwoTone twoToneColor='#eb2f96' />
+        </Typography.Text>
+        <Typography.Text>
+          <UserOutlined className=' pr-1' />
+          Jorgina(R1)
+        </Typography.Text>
+        <Typography.Text>
+          <CompassOutlined className=' pr-1' />
+          Thailand
+        </Typography.Text>
+        <Typography.Text>
+          <PhoneOutlined className=' pr-1' />
+          <Button type='link' size={'small'} onClick={() => {}}>
+            6596823833
+          </Button>
+        </Typography.Text>
+        <Typography.Text>
+          <MailOutlined className=' pr-1' />
+          Jorgina@gmail.com
+        </Typography.Text>
+        <Typography.Text>
+          <WhatsAppOutlined className='pr-1' />
+          <Button type='link' size={'small'} onClick={() => {}}>
+            6596826951
+          </Button>
+        </Typography.Text>
+        <Typography.Text>
+          <CalendarOutlined className='pr-1' />
+          <span>出发日期：</span>2025-09-18，已下计划
+        </Typography.Text>
+        <Typography.Text>
+          <span>特殊要求：</span>
+          在华城市 桂林 对酒店和房型要求 5-star
+        </Typography.Text>
+        <Typography.Text>
+          <span>外联备注：</span>
+          泰国马来水灯节
+        </Typography.Text>
+      </Flex>
+      <Divider orientation='left'>
+        <Typography.Text strong>表单信息</Typography.Text>
+        <FileAddOutlined className='pl-1' />
+      </Divider>
+      <p
+        className='p-2 overflow-auto m-0 break-words whitespace-pre-wrap'
+        dangerouslySetInnerHTML={{
+          __html:
+            'orderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detail',
+        }}></p>
+      <Space.Compact block>
+        <Input addonBefore='附加信息' />
+        <Button icon={<SaveOutlined />} />
+      </Space.Compact>
+      <Flex gap='small'>
+        <Button
+          color='cyan'
+          variant='outlined'
+          onClick={() => {
+            // setOpenOrder(true)
+          }}>
+          订单状态
+        </Button>
+      </Flex>
+    </>
+  )
+}
+
+export default OrderProfile
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 69e5bb5..c149711 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -71,6 +71,7 @@ import { UNREAD_MARK } from '@/actions/ConversationActions'
 import AdvanceSearchForm from './AdvanceSearchForm'
 import EmailDetailInline from '../Conversations/Online/Components/EmailDetailInline'
 import { getEmailDirAction } from '@/actions/EmailActions'
+import OrderProfile from '@/components/OrderProfile'
 
 const EmailDirTypeIcons = {
   '0': { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
@@ -464,8 +465,13 @@ function Follow() {
   </div>
   </Col>
   </Row>
-
         </Layout.Content>
+
+    <Layout.Sider zeroWidthTriggerStyle={{top: '30px'}} width='280' style={{
+  backgroundColor: '#fff',
+}} collapsible collapsed={collapsed} onCollapse={value => setCollapsed(value)} collapsedWidth={0} reverseArrow={true}>
+      <OrderProfile/>
+          </Layout.Sider>
       </Layout>
 
       <Drawer

From e4fc6f79c05f6bf384b5633b9a3d225b0dc01dc8 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 3 Jun 2025 09:59:05 +0800
Subject: [PATCH 036/143] =?UTF-8?q?feat:=20=E7=8B=AC=E7=AB=8B=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E7=AE=B1=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx             | 212 +----------------------
 src/views/orders/components/MailBox.jsx | 221 ++++++++++++++++++++++++
 2 files changed, 224 insertions(+), 209 deletions(-)
 create mode 100644 src/views/orders/components/MailBox.jsx

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index c149711..65eed8d 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -72,6 +72,7 @@ import AdvanceSearchForm from './AdvanceSearchForm'
 import EmailDetailInline from '../Conversations/Online/Components/EmailDetailInline'
 import { getEmailDirAction } from '@/actions/EmailActions'
 import OrderProfile from '@/components/OrderProfile'
+import Mailbox from './components/Mailbox'
 
 const EmailDirTypeIcons = {
   '0': { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
@@ -219,215 +220,8 @@ function Follow() {
         <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
           <Row>
             <Col className='bg-white' span={14}>
-              <div className='bg-white h-auto px-1 flex gap-1 items-center'>
-                <Dropdown.Button
-                  className='w-auto'
-                  placement='bottom'
-                  arrow
-                  type={'primary'}
-                  menu={{
-                    items: [
-                      {
-                        key: '1',
-                        label: '一催模板一，询问客人是否收到报价信',
-                      },
-                      {
-                        key: '2',
-                        label: '一催模板二，询问客人是否修改行程',
-                      },
-                      {
-                        type: 'divider',
-                      },
-                      {
-                        key: '3',
-                        label: '二催模板一，询问客人对行程的看法',
-                      },
-                      {
-                        key: '4',
-                        label: '二催模板二，表达服务的意识',
-                      },
-                      {
-                        type: 'divider',
-                      },
-                      {
-                        key: '5',
-                        label: '三催模板三，强调价格有效期',
-                      },
-                    ],
-                    onClick: (item) => {
-                      console.info('menu', item)
-                    },
-                  }}
-                  onClick={() => {
-                    console.info('新邮件')
-                  }}>
-                  新邮件
-                </Dropdown.Button>
-                <Input.Search
-                  className=''
-                  allowClear
-                  onChange={(e) => {}}
-                  onPressEnter={(e) => {
-                    return false
-                  }}
-                  placeholder={`邮件主题`}
-                />
-                <Button onClick={() => {}}>高级搜索</Button>
-                <Flex wrap gap="small">
-          <Tooltip title="选择">
-      <Checkbox></Checkbox>
-      </Tooltip>
-          <Tooltip title="标记已读">
-            <Button shape="circle" type="text" size='small' icon={<ReadOutlined />} />
-          </Tooltip>
-          <Tooltip title="已处理">
-            <Button shape="circle" type="text" size='small' icon={<CheckSquareOutlined />} />
-          </Tooltip>
-          <Tooltip title="刷新">
-            <Button shape="circle" type="text" size='small' icon={<ReloadOutlined />} />
-          </Tooltip>
-        </Flex>
-              </div>
-
-
-            <div  className='bg-white overflow-y-auto'
- style={{height: 'calc(100vh - 198px)'}}>
-<List
-    // header={null}
-    header={<div>今日任务</div>}
-    itemLayout="vertical"
-    size="large"
-    pagination={false}
-    dataSource={[
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Personal information',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Your Future Trip with Asia Highlights',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Greeting from Asia Highlights Alisa',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Have you made any decisions about your Japan trip',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Sri Lanka tour',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: How do you like the itinerary 3',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Re: Re: Final cost',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Reference Number: LSS240628079',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Personal information and Hiroshima tour for 2 people',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Asia Travel Tips /LSS250429038',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-            ]}
-    renderItem={item => (
-      <List.Item
-        key={item.title}
-        // actions={[
-        //   <a key="list-vertical-star-o">回复</a>,
-        //   <a key="list-vertical-refor">转发</a>,
-        // ]}
-        extra={
-          <Checkbox></Checkbox>
-        }
-
-      >
-        <List.Item.Meta
-          className='cursor-pointer'
-        onClick={() => console.info('item: ', item)}
-          title={<a href={item.href} onClick={() => setSubject(item.title)}>{item.title}</a>}
-          description={item.description + ' ' + item.mailDate}
-        />
-        {item.content}LSS250501006, Thailand
-      </List.Item>
-    )}
-  />
-  </div>
-  </Col>
+            <Mailbox />
+            </Col>
 
 
       <Col span={8}>
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
new file mode 100644
index 0000000..4421d30
--- /dev/null
+++ b/src/views/orders/components/MailBox.jsx
@@ -0,0 +1,221 @@
+import {
+  ReloadOutlined,
+  ReadOutlined, CheckSquareOutlined
+} from '@ant-design/icons'
+import {
+  Flex,
+  Button, Tooltip,
+  List,
+  Dropdown, Input, Checkbox
+} from 'antd'
+
+const MailBox = (props) => {
+  return (
+    <>
+      <div className='bg-white h-auto px-1 flex gap-1 items-center'>
+        <Dropdown.Button
+          className='w-auto'
+          placement='bottom'
+          arrow
+          type={'primary'}
+          menu={{
+            items: [
+              {
+                key: '1',
+                label: '一催模板一，询问客人是否收到报价信',
+              },
+              {
+                key: '2',
+                label: '一催模板二，询问客人是否修改行程',
+              },
+              {
+                type: 'divider',
+              },
+              {
+                key: '3',
+                label: '二催模板一，询问客人对行程的看法',
+              },
+              {
+                key: '4',
+                label: '二催模板二，表达服务的意识',
+              },
+              {
+                type: 'divider',
+              },
+              {
+                key: '5',
+                label: '三催模板三，强调价格有效期',
+              },
+            ],
+            onClick: (item) => {
+              console.info('menu', item)
+            },
+          }}
+          onClick={() => {
+            console.info('新邮件')
+          }}>
+          新邮件
+        </Dropdown.Button>
+        <Input.Search
+          className=''
+          allowClear
+          onChange={(e) => {}}
+          onPressEnter={(e) => {
+            return false
+          }}
+          placeholder={`邮件主题`}
+        />
+        <Button onClick={() => {}}>高级搜索</Button>
+        <Flex wrap gap='small'>
+          <Tooltip title='选择'>
+            <Checkbox></Checkbox>
+          </Tooltip>
+          <Tooltip title='标记已读'>
+            <Button shape='circle' type='text' size='small' icon={<ReadOutlined />} />
+          </Tooltip>
+          <Tooltip title='已处理'>
+            <Button shape='circle' type='text' size='small' icon={<CheckSquareOutlined />} />
+          </Tooltip>
+          <Tooltip title='刷新'>
+            <Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} />
+          </Tooltip>
+        </Flex>
+      </div>
+
+      <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
+        <List
+          // header={null}
+          header={<div>今日任务</div>}
+          itemLayout='vertical'
+          size='large'
+          pagination={false}
+          dataSource={[
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Personal information',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Your Future Trip with Asia Highlights',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Greeting from Asia Highlights Alisa',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Have you made any decisions about your Japan trip',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Sri Lanka tour',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: How do you like the itinerary 3',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Re: Re: Final cost',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Reference Number: LSS240628079',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Personal information and Hiroshima tour for 2 people',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Asia Travel Tips /LSS250429038',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+          ]}
+          renderItem={(item) => (
+            <List.Item
+              key={item.title}
+              // actions={[
+              //   <a key="list-vertical-star-o">回复</a>,
+              //   <a key="list-vertical-refor">转发</a>,
+              // ]}
+              extra={<Checkbox></Checkbox>}>
+              <List.Item.Meta
+                className='cursor-pointer'
+                onClick={() => console.info('item: ', item)}
+                title={<a href={item.href} onClick={() => console.info('')}></a>}
+                description={item.description + ' ' + item.mailDate}
+              />
+              {item.content}LSS250501006, Thailand
+            </List.Item>
+          )}
+        />
+      </div>
+    </>
+  )
+}
+
+export default MailBox

From 428524b23239a75e1e068e6eff7541fbfb5f7c5a Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 3 Jun 2025 10:35:09 +0800
Subject: [PATCH 037/143] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 241 +++++++++++++++---------------------
 1 file changed, 102 insertions(+), 139 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index c149711..14e7461 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -299,111 +299,104 @@ function Follow() {
     size="large"
     pagination={false}
     dataSource={[
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Personal information',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Your Future Trip with Asia Highlights',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Greeting from Asia Highlights Alisa',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Have you made any decisions about your Japan trip',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Sri Lanka tour',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: How do you like the itinerary 3',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Re: Re: Final cost',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Reference Number: LSS240628079',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Personal information and Hiroshima tour for 2 people',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-              {
-                key: Math.random().toString(36).substring(2, 9),
-                description: 'Fran Grundman <frangrundman@rogers.com>',
-                title: 'Re: Asia Travel Tips /LSS250429038',
-                mailDate: '2025-05-01 19:21:00',
-                orderNo: 'LSS250501006',
-                country: 'Thailand',
-              },
-            ]}
+                    {
+                      key: 5291957, // Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                    {
+                      key: 5277561, // Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                    {
+                      key: 5119909, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Personal information',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                    {
+                      key: 5115479, // Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Your Future Trip with Asia Highlights',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                    {
+                      key: 5113514, // Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                    {
+                      key: 5113512, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Greeting from Asia Highlights Alisa',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                    {
+                      key: 5113508, // Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Have you made any decisions about your Japan trip',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                    {
+                      key: 5112214, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Sri Lanka tour',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                    {
+                      key: 5095421, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: How do you like the itinerary 3',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                    {
+                      key: 5095097, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Re: Re: Final cost',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                    {
+                      key: 5095083, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Reference Number: LSS240628079',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                    {
+                      key: 5093980, //Math.random().toString(36).substring(2, 9),
+                      description: 'Fran Grundman <frangrundman@rogers.com>',
+                      title: 'Re: Personal information and Hiroshima tour for 2 people',
+                      mailDate: '2025-05-01 19:21:00',
+                      orderNo: 'LSS250501006',
+                      country: 'Thailand',
+                    },
+                  ]
+                }
     renderItem={item => (
       <List.Item
         key={item.title}
@@ -418,8 +411,8 @@ function Follow() {
       >
         <List.Item.Meta
           className='cursor-pointer'
-        onClick={() => console.info('item: ', item)}
-          title={<a href={item.href} onClick={() => setSubject(item.title)}>{item.title}</a>}
+          onClick={() => {console.info('item: ', item); setActiveEmailId(item.key)}}
+          title={<a href={item.href} onClick={() => {}}>{item.title}</a>}
           description={item.description + ' ' + item.mailDate}
         />
         {item.content}LSS250501006, Thailand
@@ -430,39 +423,9 @@ function Follow() {
   </Col>
 
 
-      <Col span={8}>
+      <Col span={10} style={{ height: 'calc(100vh - 166px)' }}>
+        <EmailDetailInline mailID={activeEmailId || 5291957} emailMsg={{}} variant={'outline'} size={'small'} />
 
-  <div>
-    <Flex gap="small">
-            <Space.Compact>
-          <Button color="primary" variant="solid" onClick={() => {
-            window.open(`/email/reply/5190495`, `${1}-${0}`,'left=20,width=1000')
-          }}>
-            回复
-          </Button>
-          <Button color="primary" variant="outlined" onClick={() => {
-            window.open(`/email/reply/5220965`, `${2}-${0}`,'left=20,width=1000')
-          }}>
-            回复全部
-          </Button>
-          <Button color="primary" variant="outlined"  onClick={() => {
-            window.open(`/email/forward/5128754`, `${3}-${0}`,'left=20,width=1000')
-          }}>
-            转发
-          </Button>
-          </Space.Compact>
-          <Flex gap='small'>
-            <Button
-              color='cyan'
-              variant='outlined'
-              onClick={() => {
-                setOpenOrder(true)
-              }}>
-              订单状态
-            </Button>
-          </Flex>
-          </Flex>
-  </div>
   </Col>
   </Row>
         </Layout.Content>

From ab3c763238cbd79071689048708bd9ebc20b06e7 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 3 Jun 2025 16:24:14 +0800
Subject: [PATCH 038/143] =?UTF-8?q?feat:=20=E9=82=AE=E7=AE=B1=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js         |  85 +-------
 src/assets/icons/archive-2-line.svg |   1 +
 src/components/Icons.jsx            |   2 +
 src/stores/OrderStore.js            |   6 +-
 src/utils/commons.js                |  61 ++++++
 src/views/orders/Follow.jsx         | 319 +++++++++++++++-------------
 6 files changed, 246 insertions(+), 228 deletions(-)
 create mode 100644 src/assets/icons/archive-2-line.svg

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index e0599b3..3fe3a3f 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -1,6 +1,6 @@
 import { fetchJSON, postForm, postJSON } from '@/utils/request';
 import { API_HOST, EMAIL_HOST } from '@/config';
-import { isEmpty } from '@/utils/commons';
+import { buildTree, isEmpty, objectMapper } from '@/utils/commons';
 
 const parseHTMLString = (html, needText = false) => {
   const parser = new DOMParser()
@@ -142,73 +142,9 @@ export const fetchEmailBindOrderAction = async (params) => {
  * @param {object} { opi_sn }
  */
 export const getEmailDirAction = async (params = { opi_sn: '' }) => {
-  return [
-  {
-    "MDR_SN": 1474,
-    "MDR_Name": "收件箱",
-    "MDR_ParentSN": 1,
-    "MDR_Type": 1,
-    "MDR_Order": 1
-  },
-  {
-    "MDR_SN": 1475,
-    "MDR_Name": "未读邮件",
-    "MDR_ParentSN": 1,
-    "MDR_Type": 2,
-    "MDR_Order": 2
-  },
-  {
-    "MDR_SN": 1476,
-    "MDR_Name": "已发邮件",
-    "MDR_ParentSN": 1,
-    "MDR_Type": 3,
-    "MDR_Order": 3
-  },
-  {
-    "MDR_SN": 1477,
-    "MDR_Name": "待发邮件",
-    "MDR_ParentSN": 1,
-    "MDR_Type": 4,
-    "MDR_Order": 4
-  },
-  {
-    "MDR_SN": 1478,
-    "MDR_Name": "草稿",
-    "MDR_ParentSN": 1,
-    "MDR_Type": 5,
-    "MDR_Order": 5
-  },
-  {
-    "MDR_SN": 1479,
-    "MDR_Name": "垃圾邮件",
-    "MDR_ParentSN": 1,
-    "MDR_Type": 6,
-    "MDR_Order": 6
-  },
-  {
-    "MDR_SN": 1480,
-    "MDR_Name": "已处理邮件",
-    "MDR_ParentSN": 1,
-    "MDR_Type": 7,
-    "MDR_Order": 7
-  },
-  {
-    "MDR_SN": 1504,
-    "MDR_Name": "客户信息模板",
-    "MDR_ParentSN": 1,
-    "MDR_Type": 0,
-    "MDR_Order": 100
-  },
-  {
-    "MDR_SN": 1505,
-    "MDR_Name": "客户信息模板",
-    "MDR_ParentSN": 1474,
-    "MDR_Type": 0,
-    "MDR_Order": 100
-  }
-];
-
-  const { errcode, result } = await fetchJSON(`${EMAIL_HOST}/email/dir`, params);
+  const list = [{"VKey":-227001,"VName":"长线订单","VParent":2159,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-12,"VName":"12月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-11,"VName":"11月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-10,"VName":"10月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-9,"VName":"9月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-8,"VName":"8月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-7,"VName":"7月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-6,"VName":"6月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-5,"VName":"5月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-4,"VName":"4月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-3,"VName":"3月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-2,"VName":"2月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-1,"VName":"1月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":1,"VName":"李汉超(AH)","VParent":0,"ImageIndex":0,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2159,"VName":"收件箱","VParent":1,"ImageIndex":3,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2160,"VName":"未读邮件","VParent":1,"ImageIndex":11,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2161,"VName":"已发邮件","VParent":1,"ImageIndex":4,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2162,"VName":"待发邮件","VParent":1,"ImageIndex":2,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2163,"VName":"草稿","VParent":1,"ImageIndex":5,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2164,"VName":"垃圾邮件","VParent":1,"ImageIndex":7,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2165,"VName":"已处理邮件","VParent":1,"ImageIndex":3,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":1101593,"VName":"250104-LHC240621097(WX 1.3 老客人11人哈尔滨雪乡亚布力 全款已付)","VParent":-1,"ImageIndex":13,"COLI_SN":1101593,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-01-04","IsSuccess":1,"COLI_OrderStartDate":"2025-01-04"},{"VKey":1122677,"VName":"250113-LHC241104145(1.13 KIMI老客人哈尔滨成都 全款已付)","VParent":-1,"ImageIndex":13,"COLI_SN":1122677,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-01-14","IsSuccess":1,"COLI_OrderStartDate":"2025-01-14"},{"VKey":1129232,"VName":"250114-LHC241219062(1.13 老客人不丹 全款已付)","VParent":-1,"ImageIndex":13,"COLI_SN":1129232,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-01-14","IsSuccess":1,"COLI_OrderStartDate":"2025-01-14"},{"VKey":1125159,"VName":"250113-LHC241120012(WA 1.19 老客人成都西藏 全款已付)","VParent":-1,"ImageIndex":13,"COLI_SN":1125159,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-01-25","IsSuccess":1,"COLI_OrderStartDate":"2025-01-25"},{"VKey":992847,"VName":"240205-LHC230217002(25.1.26 印尼8老客人哈尔滨 全款已付)","VParent":-1,"ImageIndex":13,"COLI_SN":992847,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-01-26","IsSuccess":1,"COLI_OrderStartDate":"2025-01-26"},{"VKey":1138070,"VName":"250221-LHC250214061(2.21 北京一地 全款已付)","VParent":-2,"ImageIndex":13,"COLI_SN":1138070,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-02-21","IsSuccess":1,"COLI_OrderStartDate":"2025-02-21"},{"VKey":1121384,"VName":"250224-LHC241026054(2.24 新加坡云南 全款已付)","VParent":-2,"ImageIndex":13,"COLI_SN":1121384,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-02-24","IsSuccess":1,"COLI_OrderStartDate":"2025-02-24"},{"VKey":1027604,"VName":"250305-LHC230915012(3.5 美国教授京西上 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1027604,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-04","IsSuccess":1,"COLI_OrderStartDate":"2025-03-04"},{"VKey":1133974,"VName":"250306-LHC250120040(WA 3.6 俄罗斯给女儿问的云南 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1133974,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-06","IsSuccess":1,"COLI_OrderStartDate":"2025-03-06"},{"VKey":1138819,"VName":"250308-LHC250218116(3.8 北京一地 全款已付 推荐券USD100.0可用 总计：USD100.0)","VParent":-3,"ImageIndex":13,"COLI_SN":1138819,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-08","IsSuccess":1,"COLI_OrderStartDate":"2025-03-08"},{"VKey":1131907,"VName":"250310-LHC250107062(3.10 潮汕一地 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1131907,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-10","IsSuccess":1,"COLI_OrderStartDate":"2025-03-10"},{"VKey":1109383,"VName":"250315-LHC240811004(3.15 美国人京西上 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1109383,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-15","IsSuccess":1,"COLI_OrderStartDate":"2025-03-15"},{"VKey":1140248,"VName":"250315-LHC250227043(3.15 老客人内蒙古 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1140248,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-15","IsSuccess":1,"COLI_OrderStartDate":"2025-03-15"},{"VKey":1131785,"VName":"250316-LHC250106123(WA 3.16 老客人推荐北京一地 全款已付 推荐券USD200.0可用 总计：USD200.0)","VParent":-3,"ImageIndex":13,"COLI_SN":1131785,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-16","IsSuccess":1,"COLI_OrderStartDate":"2025-03-16"},{"VKey":1122705,"VName":"250319-LHC241105045(WA 3.19 英国人退休3周半自由行 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1122705,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-19","IsSuccess":1,"COLI_OrderStartDate":"2025-03-19"},{"VKey":1119363,"VName":"250322-LHC241012072(3.22 老客人广州桂林 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1119363,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-22","IsSuccess":1,"COLI_OrderStartDate":"2025-03-22"},{"VKey":1139524,"VName":"250325-LHC250223083(WA 3.26 九寨沟一地5人 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1139524,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-25","IsSuccess":1,"COLI_OrderStartDate":"2025-03-25"},{"VKey":1143130,"VName":"250328-LHC250314110(WA 3.28 老客人推荐北京一地 全款已付 推荐券USD100.0可用 总计：USD100.0)","VParent":-3,"ImageIndex":13,"COLI_SN":1143130,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-28","IsSuccess":1,"COLI_OrderStartDate":"2025-03-28"},{"VKey":1128795,"VName":"250402-LHC241216025(WA 4.2 德国人京西成桂港 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1128795,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-01","IsSuccess":1,"COLI_OrderStartDate":"2025-04-01"},{"VKey":1003324,"VName":"250401-LHC230417001(4.4 英国40人北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1003324,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-04","IsSuccess":1,"COLI_OrderStartDate":"2025-04-04"},{"VKey":1121686,"VName":"250404-LHC241028118(WX 4.4 老客人北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1121686,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-04","IsSuccess":1,"COLI_OrderStartDate":"2025-04-04"},{"VKey":1130283,"VName":"250404-LHC241228012(4.4 老客人北京承德 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1130283,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-04","IsSuccess":1,"COLI_OrderStartDate":"2025-04-04"},{"VKey":1146231,"VName":"250404-LHC250331006(4.4 老客人推荐北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1146231,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-04","IsSuccess":1,"COLI_OrderStartDate":"2025-04-04"},{"VKey":1141487,"VName":"250405-LHC250305088(4.5 老客人甘肃重庆西安 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1141487,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-05","IsSuccess":1,"COLI_OrderStartDate":"2025-04-05"},{"VKey":1143697,"VName":"250405-LHC250318036(4.5 故宫一日游 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1143697,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-05","IsSuccess":1,"COLI_OrderStartDate":"2025-04-05"},{"VKey":1105702,"VName":"250407-LHC240718072(4.7 澳洲人西藏一地含机票火车 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1105702,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-06","IsSuccess":1,"COLI_OrderStartDate":"2025-04-06"},{"VKey":1087509,"VName":"250409-LHC240410090(4.9 西藏林芝桃花+珠峰 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1087509,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-09","IsSuccess":1,"COLI_OrderStartDate":"2025-04-09"},{"VKey":1086414,"VName":"250410-LHC240404015(WA 4.12 南非豪华5星北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1086414,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-10","IsSuccess":1,"COLI_OrderStartDate":"2025-04-10"},{"VKey":1118529,"VName":"250412-LHC241008060(4.11 菲律宾6人京西上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1118529,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-11","IsSuccess":1,"COLI_OrderStartDate":"2025-04-11"},{"VKey":1135638,"VName":"250411-LHC250130092(4.11 菲律宾4人北京西安 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1135638,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-11","IsSuccess":1,"COLI_OrderStartDate":"2025-04-11"},{"VKey":1114549,"VName":"250413-LHC240912040(4.13 澳洲4人京西上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1114549,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-12","IsSuccess":1,"COLI_OrderStartDate":"2025-04-12"},{"VKey":1134815,"VName":"250412-LHC250125006(WA 4.13 菲律宾6人北京张家界 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1134815,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-12","IsSuccess":1,"COLI_OrderStartDate":"2025-04-12"},{"VKey":1109767,"VName":"250413-LHC240813029(4.14 美籍华人丝路新疆 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1109767,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-13","IsSuccess":1,"COLI_OrderStartDate":"2025-04-13"},{"VKey":1138076,"VName":"250415-LHC250214012(WA 4.15 墨西哥5星京西桂上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1138076,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-15","IsSuccess":1,"COLI_OrderStartDate":"2025-04-15"},{"VKey":1116902,"VName":"250417-LHC240926040(4.17 意大利京西张桂上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1116902,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-17","IsSuccess":1,"COLI_OrderStartDate":"2025-04-17"},{"VKey":1127599,"VName":"250418-LHC241206071(WA 4.18 老客人5星云南 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1127599,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-18","IsSuccess":1,"COLI_OrderStartDate":"2025-04-18"},{"VKey":1138390,"VName":"250418-LHC250216016(4.18 9人桂林一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1138390,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-18","IsSuccess":1,"COLI_OrderStartDate":"2025-04-18"},{"VKey":1129053,"VName":"250420-LHC241218024(4.19 塞尔维亚京西张桂上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1129053,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-20","IsSuccess":1,"COLI_OrderStartDate":"2025-04-20"},{"VKey":1147711,"VName":"250420-LHC250409009(4.20 美国人成西京上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1147711,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-20","IsSuccess":1,"COLI_OrderStartDate":"2025-04-20"},{"VKey":1096743,"VName":"250422-LHC240601010(4.22 美国4人京西成熊猫四姑娘山 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1096743,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-22","IsSuccess":1,"COLI_OrderStartDate":"2025-04-22"},{"VKey":1138355,"VName":"250422-LHC250216014(4.22 比利时人北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1138355,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-22","IsSuccess":1,"COLI_OrderStartDate":"2025-04-22"},{"VKey":1145009,"VName":"250426-LHC250325033(4.26 老客人北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1145009,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-26","IsSuccess":1,"COLI_OrderStartDate":"2025-04-26"},{"VKey":1129188,"VName":"250427-LHC241219004(4.27 北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1129188,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-27","IsSuccess":1,"COLI_OrderStartDate":"2025-04-27"},{"VKey":1094804,"VName":"250430-LHC240520047(4.30 新加坡老客人云南2天 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1094804,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-30","IsSuccess":1,"COLI_OrderStartDate":"2025-04-30"},{"VKey":1086829,"VName":"250505-LHC240406029(WA 5.5 老客人6人广东 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1086829,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-05","IsSuccess":1,"COLI_OrderStartDate":"2025-05-05"},{"VKey":1115111,"VName":"250505-LHC240915012(WA 5.5 美籍印度12人京西张桂上 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1115111,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-05","IsSuccess":1,"COLI_OrderStartDate":"2025-05-05"},{"VKey":1126002,"VName":"250505-LHC241125135(5.4 美国人14天5星儿子在武汉 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1126002,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-05","IsSuccess":1,"COLI_OrderStartDate":"2025-05-05"},{"VKey":1118669,"VName":"250509-LHC241008014(5.9 老客人推荐葡萄牙人15天 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1118669,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-09","IsSuccess":1,"COLI_OrderStartDate":"2025-05-09"},{"VKey":1129906,"VName":"250509-LHC241225014(WA 5.9 美国12人上云南桂 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1129906,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-09","IsSuccess":1,"COLI_OrderStartDate":"2025-05-09"},{"VKey":1143938,"VName":"250509-LHC250319084(WX 5.8 美国老客人长线 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1143938,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-09","IsSuccess":1,"COLI_OrderStartDate":"2025-05-09"},{"VKey":1106928,"VName":"250510-LHC240726046(WA 5.10 美国老客人中国香港越南 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1106928,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-10","IsSuccess":1,"COLI_OrderStartDate":"2025-05-10"},{"VKey":1122673,"VName":"250410-LHC241104135(WX 5.11 老客人西安北京 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1122673,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-11","IsSuccess":1,"COLI_OrderStartDate":"2025-05-11"},{"VKey":1106493,"VName":"250421-LHC240723070(WA 5.14 老客人湖南 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1106493,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-14","IsSuccess":1,"COLI_OrderStartDate":"2025-05-14"},{"VKey":1143709,"VName":"250514-LHC250318037(WA 5.14 桂林一地 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1143709,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-14","IsSuccess":1,"COLI_OrderStartDate":"2025-05-14"},{"VKey":1134816,"VName":"250515-LHC250125007(5.15 意大利人京西成贵张上 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1134816,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-15","IsSuccess":1,"COLI_OrderStartDate":"2025-05-15"},{"VKey":1127982,"VName":"250516-LHC241209102(5.16 老客人天津山东东北 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1127982,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-16","IsSuccess":1,"COLI_OrderStartDate":"2025-05-16"},{"VKey":1151792,"VName":"250518-LHC250430100(WA 5.18 老客人推荐北京西安 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1151792,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-18","IsSuccess":1,"COLI_OrderStartDate":"2025-05-18"},{"VKey":1140658,"VName":"250524-LHC250302012(5.24 美国人京西桂上 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1140658,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-24","IsSuccess":1,"COLI_OrderStartDate":"2025-05-24"},{"VKey":1036416,"VName":"250525-LHC231031091(5.25 湖南2人 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1036416,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-25","IsSuccess":1,"COLI_OrderStartDate":"2025-05-25"},{"VKey":1061633,"VName":"250527-LHC240125045(5.27 卢森堡张家界桂林 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1061633,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-27","IsSuccess":1,"COLI_OrderStartDate":"2025-05-27"},{"VKey":1157023,"VName":"250603-LHC250527101(6.3 老客人广州一地 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1157023,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-03","IsSuccess":1,"COLI_OrderStartDate":"2025-06-03"},{"VKey":1126193,"VName":"250531-LHC241127004(WA 6.4 骆老客人推荐8个新马人去新疆 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1126193,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-04","IsSuccess":1,"COLI_OrderStartDate":"2025-06-04"},{"VKey":1145376,"VName":"250607-LHC250327060(WA 6.7 老客人推荐九寨沟张家界 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1145376,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-07","IsSuccess":1,"COLI_OrderStartDate":"2025-06-07"},{"VKey":1136429,"VName":"250610-LHC250204114(WA 6.10 老客人新疆 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1136429,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-10","IsSuccess":1,"COLI_OrderStartDate":"2025-06-10"},{"VKey":1133294,"VName":"250612-LHC250115090(WA 6.12 美华日本 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1133294,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-12","IsSuccess":1,"COLI_OrderStartDate":"2025-06-12"},{"VKey":1134944,"VName":"250613-LHC250126065(6.13 意大利5星京西成上港 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1134944,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-13","IsSuccess":1,"COLI_OrderStartDate":"2025-06-13"},{"VKey":1141141,"VName":"250614-LHC250304034(6.14 美籍印度6人京西桂港 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1141141,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-14","IsSuccess":1,"COLI_OrderStartDate":"2025-06-14"},{"VKey":1130127,"VName":"250615-LHC241226069(WA 6.15 老客人重庆送三峡 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1130127,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-15","IsSuccess":1,"COLI_OrderStartDate":"2025-06-15"},{"VKey":1132507,"VName":"250616-LHC250111012(WA 6.14 新加坡家庭京西桂上 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1132507,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-16","IsSuccess":1,"COLI_OrderStartDate":"2025-06-16"},{"VKey":1153428,"VName":"250616-LHC250509099(WA 6.16 老客人推荐成都一地 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1153428,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-16","IsSuccess":1,"COLI_OrderStartDate":"2025-06-16"},{"VKey":1133201,"VName":"250621-LHC250115033(WA 6.21 美华一家7人5星20天 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1133201,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-21","IsSuccess":1,"COLI_OrderStartDate":"2025-06-21"},{"VKey":1095489,"VName":"250626-LHC240523076(7.1 老客人西安河南山东杭州 全款已付)","VParent":-7,"ImageIndex":13,"COLI_SN":1095489,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-01","IsSuccess":1,"COLI_OrderStartDate":"2025-07-01"},{"VKey":1120738,"VName":"250703-LHC241022034(WA 7.2 巴西3人京西成张上深港 全款已付)","VParent":-7,"ImageIndex":13,"COLI_SN":1120738,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-03","IsSuccess":1,"COLI_OrderStartDate":"2025-07-03"},{"VKey":1122337,"VName":"250706-LHC241102048(WA 7.7 京西上奶爸+4娃5星 全款已付)","VParent":-7,"ImageIndex":13,"COLI_SN":1122337,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-07","IsSuccess":1,"COLI_OrderStartDate":"2025-07-07"},{"VKey":1141434,"VName":"250708-LHC250305056(WA 7.8 美华5人云南 余款6.8)","VParent":-7,"ImageIndex":13,"COLI_SN":1141434,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-08","IsSuccess":1,"COLI_OrderStartDate":"2025-07-08"},{"VKey":1150871,"VName":"250709-LHC250425066(WA 7.8 肯尼亚印度人长线 余款6.8)","VParent":-7,"ImageIndex":13,"COLI_SN":1150871,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-09","IsSuccess":1,"COLI_OrderStartDate":"2025-07-09"},{"VKey":1115058,"VName":"250708-LHC240915011(7.8 英国人港上西京 余款6.8)","VParent":-7,"ImageIndex":13,"COLI_SN":1115058,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-10","IsSuccess":1,"COLI_OrderStartDate":"2025-07-10"},{"VKey":1156028,"VName":"250710-LHC250522082(WA 7.14 京西张墨西哥 余款6.14)","VParent":-7,"ImageIndex":13,"COLI_SN":1156028,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-10","IsSuccess":1,"COLI_OrderStartDate":"2025-07-10"},{"VKey":1135144,"VName":"250714-LHC250127018(WX 7.14 老客人云南 余款6.14)","VParent":-7,"ImageIndex":13,"COLI_SN":1135144,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-14","IsSuccess":1,"COLI_OrderStartDate":"2025-07-14"},{"VKey":1137033,"VName":"250808-LHC250208015(WA 8.8 意大利4人19天 余款7.8)","VParent":-8,"ImageIndex":13,"COLI_SN":1137033,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-08-08","IsSuccess":1,"COLI_OrderStartDate":"2025-08-08"},{"VKey":1121825,"VName":"250809-LHC241029090(WA 8.9 马耳他3周FB来单 余款7.9)","VParent":-8,"ImageIndex":13,"COLI_SN":1121825,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-08-09","IsSuccess":1,"COLI_OrderStartDate":"2025-08-09"},{"VKey":1152564,"VName":"250815-LHC250506139(WA 8.15 印度高端5星上张京 余款7.15)","VParent":-8,"ImageIndex":13,"COLI_SN":1152564,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-08-15","IsSuccess":1,"COLI_OrderStartDate":"2025-08-15"},{"VKey":1119643,"VName":"250828-LHC241014149(WA 8.28 老客人四川云南12天 余款7871 7.28)","VParent":-8,"ImageIndex":13,"COLI_SN":1119643,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-08-28","IsSuccess":1,"COLI_OrderStartDate":"2025-08-28"},{"VKey":1129858,"VName":"250831-LHC241224003(8.30 美国人京西上 余款7.30)","VParent":-8,"ImageIndex":13,"COLI_SN":1129858,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-08-31","IsSuccess":1,"COLI_OrderStartDate":"2025-08-31"},{"VKey":1123254,"VName":"250908-LHC241108084(9.8 老客人新疆+上海5星 余款8.8)","VParent":-9,"ImageIndex":13,"COLI_SN":1123254,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-09-07","IsSuccess":1,"COLI_OrderStartDate":"2025-09-07"},{"VKey":1132436,"VName":"250912-LHC250110047(9.11 意大利语老客人成都西安 余款8.10)","VParent":-9,"ImageIndex":13,"COLI_SN":1132436,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-09-12","IsSuccess":1,"COLI_OrderStartDate":"2025-09-12"},{"VKey":1131881,"VName":"251009-LHC250107061(10.10 美籍印度人京西桂上 余款9.10)","VParent":-10,"ImageIndex":13,"COLI_SN":1131881,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-09","IsSuccess":1,"COLI_OrderStartDate":"2025-10-09"},{"VKey":1127765,"VName":"251010-LHC241208010(10.10 斯洛伐克北京西安5星 余款9.10)","VParent":-10,"ImageIndex":13,"COLI_SN":1127765,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-10","IsSuccess":1,"COLI_OrderStartDate":"2025-10-10"},{"VKey":1146482,"VName":"251010-LHC250402029(10.10 美国2人深度游览古镇 余款9.10)","VParent":-10,"ImageIndex":13,"COLI_SN":1146482,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-10","IsSuccess":1,"COLI_OrderStartDate":"2025-10-10"},{"VKey":1122286,"VName":"251011-LHC241102005(10.11 德国人京西张桂上 余款9.11)","VParent":-10,"ImageIndex":13,"COLI_SN":1122286,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-11","IsSuccess":1,"COLI_OrderStartDate":"2025-10-11"},{"VKey":1143898,"VName":"251015-LHC250319026(10.15 美国京西上 余款9.15)","VParent":-10,"ImageIndex":13,"COLI_SN":1143898,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-15","IsSuccess":1,"COLI_OrderStartDate":"2025-10-15"},{"VKey":1150171,"VName":"251018-LHC250421121(WX 10.18 老客人solo桂林 余款9.18)","VParent":-10,"ImageIndex":13,"COLI_SN":1150171,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-18","IsSuccess":1,"COLI_OrderStartDate":"2025-10-18"},{"VKey":1088497,"VName":"251019-LHC240416069(WA 10.18 马来老客人16人四川深度游 余款9.18)","VParent":-10,"ImageIndex":13,"COLI_SN":1088497,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-19","IsSuccess":1,"COLI_OrderStartDate":"2025-10-19"},{"VKey":1146889,"VName":"261028-LHC250404015(10.29 西班牙6人15天含云南 余款9.29)","VParent":-10,"ImageIndex":13,"COLI_SN":1146889,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-29","IsSuccess":1,"COLI_OrderStartDate":"2025-10-29"},{"VKey":1154788,"VName":"251102-LHC250516014(WA 11.2 老客人推荐5星加拿大教授 余款10.2)","VParent":-11,"ImageIndex":13,"COLI_SN":1154788,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-11-02","IsSuccess":1,"COLI_OrderStartDate":"2025-11-02"},{"VKey":1147361,"VName":"251108-LHC250407085(11月 老客人云南 通用券USD50.0可用,生日券USD200.0可用,老客户券USD71.0可用 总计：USD321.0)","VParent":-11,"ImageIndex":13,"COLI_SN":1147361,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-11-08","IsSuccess":1,"COLI_OrderStartDate":"2025-11-08"},{"VKey":1082730,"VName":"251111-LHC240320059(11.11 美国人北京香港 余款10.10)","VParent":-11,"ImageIndex":13,"COLI_SN":1082730,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-11-11","IsSuccess":1,"COLI_OrderStartDate":"2025-11-11"},{"VKey":1108702,"VName":"250905-LHC240806092(11.17 老客人三峡张家界 余款10.17)","VParent":-11,"ImageIndex":13,"COLI_SN":1108702,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-11-17","IsSuccess":1,"COLI_OrderStartDate":"2025-11-17"},{"VKey":1150732,"VName":"251128-LHC250424096(WA 11.28 老客人上海苏州 余款10.28)","VParent":-11,"ImageIndex":13,"COLI_SN":1150732,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-11-28","IsSuccess":1,"COLI_OrderStartDate":"2025-11-28"},{"VKey":1156704,"VName":"251204-LHC250526111(WA 12.4 澳洲5人京上 余款11.4)","VParent":-12,"ImageIndex":13,"COLI_SN":1156704,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-12-04","IsSuccess":1,"COLI_OrderStartDate":"2025-12-04"},{"VKey":1129904,"VName":"(12.1 老客人西藏 余款11.1)","VParent":-12,"ImageIndex":13,"COLI_SN":1129904,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-12-05","IsSuccess":1,"COLI_OrderStartDate":"2025-12-05"},{"VKey":1150117,"VName":"251207-LHC250421084(WA 12月 老客人成都九寨沟 老客户券USD166.0可用 总计：RMB1206.0)","VParent":-12,"ImageIndex":13,"COLI_SN":1150117,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-12-07","IsSuccess":1,"COLI_OrderStartDate":"2025-12-07"},{"VKey":1151334,"VName":"251220-LHC250428004(12.20 老客人成都重庆 余款11.20 翻倍券USD34.0可用 总计：USD34.0)","VParent":-12,"ImageIndex":13,"COLI_SN":1151334,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-12-20","IsSuccess":1,"COLI_OrderStartDate":"2025-12-20"}];
+  return list;
+  const { errcode, result } = await fetchJSON(`${EMAIL_HOST}/v3/email_dir`, params);
   return errcode === 0 ? [] : result;
 } ;
 
@@ -218,16 +154,9 @@ export const getEmailDirAction = async (params = { opi_sn: '' }) => {
  * @usage 订单的邮件列表
  * @usage 高级搜索
  */
-export const queryEmailListAction = async (params = { opi_sn: '', pagesize: 10, last_id: '', query: {}, order: {} }) => {
-  const { errcode, result } = await postJSON(`${EMAIL_HOST}/email/list`, params)
-  return errcode === 0 ? [] : result
-}
-
-/**
- * 获取收件箱下的订单目录
- */
-export const getEmailOrderListAction = async (params = { opi_sn: '', ordertype: 227001 }) => {
-  const { errcode, result } = await fetchJSON(`${EMAIL_HOST}/email/order`, params)
+export const queryEmailListAction = async ({ opi_sn= '', pagesize= 10, last_id= '', query={}, order= {} }={}) => {
+  const _params = { ...order, ...query, opi_sn }
+  const { errcode, result } = await postJSON(`${EMAIL_HOST}/v3/mail_list`, _params)
   return errcode === 0 ? [] : result
 }
 
diff --git a/src/assets/icons/archive-2-line.svg b/src/assets/icons/archive-2-line.svg
new file mode 100644
index 0000000..9d6b0b9
--- /dev/null
+++ b/src/assets/icons/archive-2-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M22 20V7L20 3H4L2 7.00353V20C2 20.5523 2.44772 21 3 21H21C21.5523 21 22 20.5523 22 20ZM4 9H20V19H4V9ZM5.236 5H18.764L19.764 7H4.237L5.236 5ZM15 11H9V13H15V11Z"></path></svg>
\ No newline at end of file
diff --git a/src/components/Icons.jsx b/src/components/Icons.jsx
index d093358..d09ddf6 100644
--- a/src/components/Icons.jsx
+++ b/src/components/Icons.jsx
@@ -16,6 +16,7 @@ import MailDownloadLineSVG from '@/assets/icons/mail-download-line.svg?react';
 import MailAddLineSVG from '@/assets/icons/mail-add-line.svg?react';
 import MailCheckSVG from '@/assets/icons/mail-check-line.svg?react';
 import MailUnreadSVG from '@/assets/icons/mail-unread-line.svg?react';
+import MailArchiveSVG from '@/assets/icons/archive-2-line.svg?react';
 import TextSVG from '@/assets/icons/text.svg?react';
 
 
@@ -34,6 +35,7 @@ export const MailDownloadIcon = (props) => <Icon component={MailDownloadLineSVG}
 export const MailAddloadIcon = (props) => <Icon component={MailAddLineSVG} {...props} />;
 export const MailCheckIcon = (props) => <Icon component={MailCheckSVG} {...props} />;
 export const MailUnreadIcon = (props) => <Icon component={MailUnreadSVG} {...props} />;
+export const MailArchiveIcon = (props) => <Icon component={MailArchiveSVG} {...props} />;
 export const TextIcon = (props) => <Icon component={TextSVG} {...props} />;
 
 
diff --git a/src/stores/OrderStore.js b/src/stores/OrderStore.js
index 82d0afa..5db191f 100644
--- a/src/stores/OrderStore.js
+++ b/src/stores/OrderStore.js
@@ -2,7 +2,7 @@ import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
 import { fetchJSON, postForm } from '@/utils/request'
 import { API_HOST, EMAIL_HOST } from '@/config'
-import { isNotEmpty, prepareUrl } from '@/utils/commons'
+import { isNotEmpty, prepareUrl, uniqWith } from '@/utils/commons'
 
 const initialState = {
   orderList: [],
@@ -45,8 +45,10 @@ export const useOrderStore = create(devtools((set, get) => ({
     return fetchJSON(fetchOrderUrl, params)
       .then(json => {
         if (json.errcode === 0) {
+          const _result = json.result.map((order) => { return { ...order, key: order.COLI_ID } })
+          const _result_unique = uniqWith(_result, (a, b) => a.COLI_SN === b.COLI_SN)
           set(() => ({
-            orderList: json.result.map((order) => { return { ...order, key: order.COLI_ID } }),
+            orderList: _result_unique,
           }))
         } else {
           throw new Error(json?.errmsg + ': ' + json.errcode)
diff --git a/src/utils/commons.js b/src/utils/commons.js
index fd64c59..e79db44 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -592,6 +592,66 @@ export const TagColorStyle = (tag, outerStyle = false) => {
   return { color: `${color}`, ...outerStyleObj };
 };
 
+// 数组去掉重复
+export function unique(arr) {
+	const x = new Set(arr);
+	return [...x];
+}
+export const uniqWith = (arr, fn) => arr.filter((element, index) => arr.findIndex((step) => fn(element, step)) === index);
+
+/**
+ * Creates a new tree node object.
+ * @param {string} key - The unique identifier for the node.
+ * @param {string} name - The display name of the node.
+ * @param {string|null} parent - The key of the parent node, or null if it's a root.
+ * @returns {object} A plain JavaScript object representing the tree node.
+ */
+function createTreeNode(key, name, parent = null, _raw={}) {
+    return {
+        key: key,
+        title: name,
+        parent: parent,
+        icon: _raw?.icon,
+        _raw: _raw,
+        children: []
+    };
+}
+/**
+ * Builds a tree structure from a flat list of nodes.
+ * @returns {Array<object>} An array of root tree nodes.
+ */
+export const buildTree = (list, keyMap={}) => {
+  if (!list || list.length === 0) {
+    return []
+  }
+
+  const nodeMap = new Map()
+  const treeRoots = []
+
+  list.forEach((item) => {
+    const node = createTreeNode(item[keyMap.key], item[keyMap.name], item[keyMap.parent], item)
+    nodeMap.set(item[keyMap.key], node)
+  })
+
+  list.forEach((item) => {
+    const node = nodeMap.get(item[keyMap.key])
+    if (item[keyMap.parent] === keyMap.rootKey || item[keyMap.parent] === 0 || item[keyMap.parent] === 1 || item[keyMap.parent] === null || item[keyMap.parent] === undefined) {
+      // This is a root node
+      treeRoots.push(node)
+    } else {
+      const parentNode = nodeMap.get(item[keyMap.parent])
+      if (parentNode) {
+        parentNode.children.push(node)
+      } else {
+        console.warn(`Parent with key '${item[keyMap.parent]}' not found for node '${item[keyMap.key]}'. This node will be treated as a root.`)
+        treeRoots.push(node)
+      }
+    }
+  })
+
+  return treeRoots
+}
+
 /**
  *
  */
@@ -835,3 +895,4 @@ function cleanOldData(database, storeName, dateKey = 'timestamp') {
 }
 
 export const clean7DaysWebsocketLog = cleanOldData('LogWebsocketData', 'LogStore');
+
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 197b661..b5b2a46 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -1,88 +1,44 @@
-import { Conditional } from '@/components/Conditional'
 import useAuthStore from '@/stores/AuthStore'
-import { PERM_IMPORT_EMAIL } from '@/stores/AuthStore'
 import useFormStore from '@/stores/FormStore'
 import { useOrderStore } from '@/stores/OrderStore'
-import { copy, isNotEmpty, isEmpty, groupBy, cloneDeep, sortBy, sortArrayByOrder } from '@/utils/commons'
-import {
-  WhatsAppOutlined,
-  ImportOutlined,
-  FileAddOutlined,
-  StarTwoTone,
-  StarOutlined,
-  MailOutlined,
-  PhoneOutlined,
-  UserOutlined,
-  FieldNumberOutlined,
-  SaveOutlined,
-  PlusOutlined,
-  SearchOutlined,
-  ReloadOutlined,
-  ReadOutlined,
-  CompassOutlined,
-  CheckSquareTwoTone,
-  CarryOutTwoTone,
-  CheckSquareOutlined,
-  MailTwoTone,
-  BookTwoTone,
-  RightSquareTwoTone,
-  SwitcherTwoTone,
-  FolderTwoTone,
-  CalendarTwoTone,
-  CalendarOutlined,
-  HeartTwoTone,
-  MoneyCollectTwoTone, FolderOutlined, DeleteOutlined,
-  SendOutlined,
-  ClockCircleOutlined,
-  FormOutlined,
-} from '@ant-design/icons'
-import {
-  App,
-  Badge,
-  Empty,
-  Flex,
-  Button,
-  Drawer,
-  Space,
-  Radio,
-  Table,
-  Tabs,
-  Divider,
-  Tag,
-  Tooltip,
-  List,
-  Dropdown,
-  Segmented,
-  Tree,
-  Typography,
-  Input,
-  Descriptions,
-  Checkbox,
-  Layout,
-  Row,
-  Col,
-} from 'antd'
-import dayjs from 'dayjs'
-import { useCallback, useEffect, useState } from 'react'
-import { InboxIcon, MailCheckIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
-import { Link } from 'react-router-dom'
+import { isEmpty, groupBy, buildTree } from '@/utils/commons'
+import { StarTwoTone, CalendarTwoTone, FolderOutlined, DeleteOutlined, ClockCircleOutlined, FormOutlined, DatabaseOutlined } from '@ant-design/icons'
+import { Flex, Drawer, Radio, Divider, Segmented, Tree, Typography, Checkbox, Layout, Row, Col } from 'antd'
+import { useEffect, useMemo, useState } from 'react'
+import { InboxIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
 import { useShallow } from 'zustand/react/shallow'
-import { UNREAD_MARK } from '@/actions/ConversationActions'
-import AdvanceSearchForm from './AdvanceSearchForm'
 import EmailDetailInline from '../Conversations/Online/Components/EmailDetailInline'
-import { getEmailDirAction } from '@/actions/EmailActions'
+import { getEmailDirAction, queryEmailListAction } from '@/actions/EmailActions'
 import OrderProfile from '@/components/OrderProfile'
 import Mailbox from './components/Mailbox'
 
 const EmailDirTypeIcons = {
-  '0': { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
-  '1': { component: InboxIcon, color: '', className: 'text-indigo-500' },
-  '2': { component: MailUnreadIcon, color: '', className: 'text-indigo-500' },
-  '3': { component: SendPlaneFillIcon, color: '', className: 'text-primary' },
-  '4': { component: ClockCircleOutlined, color: '', className: 'text-yellow-500' },
-  '5': { component: FormOutlined, color: '', className: 'text-blue-500' },
-  '6': { component: DeleteOutlined, color: '', className: 'text-red-500' },
-  '7': { component: MailCheckIcon, color: '', className: 'text-yellow-600' },
+  0: { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
+  1: { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
+  3: { component: InboxIcon, color: '', className: 'text-indigo-500' },
+  17: { component: InboxIcon, color: '', className: 'text-indigo-500' },
+  11: { component: MailUnreadIcon, color: '', className: 'text-indigo-500' },
+  4: { component: SendPlaneFillIcon, color: '', className: 'text-primary' },
+  2: { component: ClockCircleOutlined, color: '', className: 'text-yellow-500' },
+  5: { component: FormOutlined, color: '', className: 'text-blue-500' },
+  7: { component: DeleteOutlined, color: '', className: 'text-red-500' },
+  // '3': { component: MailCheckIcon, color: '', className: 'text-yellow-600' },
+  12: { component: DatabaseOutlined, color: '', className: 'text-blue-600' },
+  13: { component: () => null, color: '', className: '' },
+  14: { component: () => '❗', color: '', className: '' }, // 240002 较重要/高品牌价值客户
+  15: { component: () => '❣️', color: '', className: '' }, // 240003 很重要/高订单价值客户
+}
+
+const todoTypes = {
+  // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
+  1: '新订单',
+  2: '未读',
+  3: '一催',
+  4: '二催',
+  5: '三催',
+  6: '未处理',
+  7: '入境提醒',
+  8: '余款提醒',
 }
 
 const deptMap = new Map([
@@ -118,8 +74,6 @@ const deptMap = new Map([
   ['35', 'newsletter营销'],
 ])
 
-function OrderGroupTable({ formValues }) {}
-
 function Follow() {
   const orderList = useOrderStore((state) => state.orderList)
   const fetchOrderList = useOrderStore((state) => state.fetchOrderList)
@@ -127,118 +81,187 @@ function Follow() {
   const [openOrder, setOpenOrder] = useState(false)
   const [collapsed, setCollapsed] = useState(false)
 
-  const [formValues, setFormValues] = useFormStore(useShallow((state) => [state.orderFollowForm, state.setOrderFollowForm]))
-  const [advanceChecked, toggleAdvance] = useFormStore(useShallow((state) => [state.orderFollowAdvanceChecked, state.setOrderFollowAdvanceChecked]))
-
-  const batchImportEmailMessage = useOrderStore((state) => state.batchImportEmailMessage)
   const [loginUser, isPermitted] = useAuthStore((state) => [state.loginUser, state.isPermitted])
-
-  const handleImportEmail = useCallback(() => {
-    batchImportEmailMessage()
-  }, [])
-
-  const handleSubmit = useCallback((values) => {
-    setFormValues({ ...values, type: 'advance' })
-  }, [])
+  const { accountList } = loginUser
+  const accountListDEIMapped = useMemo(() => accountList.reduce((a, c) => ({ ...a, [c.OPI_DEI_SN]: c }), {}), [accountList])
+  const accountDEI = useMemo(() => {
+    return accountList.map((ele) => ({ key: ele.OPI_DEI_SN, value: ele.OPI_DEI_SN, label: deptMap.get(`${ele.OPI_DEI_SN}`) }))
+  }, [accountList])
+  const defaultStickyTree = useMemo(() => {
+    return accountList.reduce(
+      (a, ele) => ({
+        ...a,
+        [ele.OPI_DEI_SN]: [
+          {
+            title: '今日任务',
+            key: ele.OPI_DEI_SN + '-today',
+            getMails: false,
+            icon: <StarTwoTone />,
+            children: [],
+          },
+          {
+            title: '待办任务',
+            key: ele.OPI_DEI_SN + '-todo',
+            getMails: false,
+            icon: <CalendarTwoTone />,
+            children: [],
+          },
+        ],
+      }),
+      {},
+    )
+  }, [accountList])
 
   const [activeEmailId, setActiveEmailId] = useState(0)
 
-  const [mailboxDir, setMailboxDir] = useState([]);
+  const [mailboxDir, setMailboxDir] = useState([])
   const DirTypeIcon = ({ type }) => {
-    const Icon = EmailDirTypeIcons[type || '0'].component
-    const className = EmailDirTypeIcons[type || '0'].className
+    const Icon = EmailDirTypeIcons[type || '0']?.component || EmailDirTypeIcons['0'].component
+    const className = EmailDirTypeIcons[type || '0']?.className || EmailDirTypeIcons['0'].className
     return <Icon className={className} />
   }
 
-  const getOPIEmailDir = async (opi_sn=0) => {
+  const getOPIEmailDir = async (opi_sn = 0) => {
+    console.log('🌐requesting opi dir', opi_sn)
     const x = await getEmailDirAction(opi_sn)
-    const mailboxSort = x.sort(sortBy('MDR_Order'));
+    const mailboxSort = x //.sort(sortBy('MDR_Order'));
     const dirs = mailboxSort.map((ele) => {
-      return { ...ele, key: ele.MDR_SN, title: ele.MDR_Name, icon: <DirTypeIcon type={ele.MDR_Type} /> }
+      return { ...ele, icon: ele.ImageIndex !== void 0 ? <DirTypeIcon type={ele.ImageIndex} /> : false }
     })
-    setMailboxDir(dirs)
+    let tree = buildTree(dirs, { key: 'VKey', parent: 'VParent', name: 'VName', rootKey: 1 })
+    tree = tree.filter((ele) => ele.key !== 1)
+    // console.log(tree)
+    setMailboxDir(tree)
+    const level1 = tree.filter((ele) => !isEmpty(ele.children)).map((ele) => ele.key)
+    setExpandTree((pre) => [...pre, ...level1])
+  }
+
+  const getMailList = async ({ query, order }) => {
+    const opi_sn = accountListDEIMapped[activeAccount].OPI_SN
+    const x = await queryEmailListAction({ opi_sn, query, order })
+  }
+
+  const [deiStickyTree, setDeiStickyTree] = useState({})
+  const [stickyTree, setStickyTree] = useState([])
+  const [expandTree, setExpandTree] = useState([])
+  const [activeAccount, setActiveAccount] = useState()
+  const handleSwitchAccount = (value) => {
+    setActiveAccount(value)
+    setStickyTree(deiStickyTree[value] || [])
+    setExpandTree([`${value}-today`, `${value}-todo`])
+    const opi = accountListDEIMapped[value].OPI_SN
+    getOPIEmailDir(opi)
+  }
+
+  const handleTreeSelectGetMails = (selectedKeys, { node }) => {
+    // console.info('selectedKeys: ', selectedKeys, node)
+    if (node?.COLI_SN || node?._raw?.COLI_SN) {
+      // 固定列表; 邮箱文件夹
+      // get order mails
+      // console.log('get order mails', { order: { coli_sn: node?.COLI_SN || node?._raw?.COLI_SN, order_source_type: node?._raw?.OrderSourceType || 227001, vkey: node.key } })
+      getMailList({ order: { coli_sn: node?.COLI_SN || node?._raw?.COLI_SN, order_source_type: node?._raw?.OrderSourceType || 227001, vkey: node.key } })
+    } else if ([-227001, -227002].includes(node.key) || [-227001, -227002].includes(node.parent) || node?.getMails === false) {
+      // nothing, expand only
+      console.log('nothing')
+    } else {
+      // get mail list
+      console.log('get mail list')
+      getMailList({ query: { vkey: selectedKeys[0] } })
+    }
   }
 
-  const [stickyTreeData, setStickyTreeData] = useState([{ title: '今日任务', key: 'today' }, { title: '待办任务', key: 'todo' }]);
-  const [deiStickyTree, setDeiStickyTree] = useState({});
   useEffect(() => {
     fetchOrderList({ type: 'today' }, loginUser)
-    getOPIEmailDir();
+    getOPIEmailDir()
     return () => {}
   }, [])
 
   // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
   useEffect(() => {
-    const byDEI = groupBy(orderList, 'OPI_DEI_SN');
+    const byDEI = groupBy(orderList, 'OPI_DEI_SN')
     // console.log(byDEI, 'byDEI')
     const byState = Object.keys(byDEI).reduce((acc, key) => {
       // const stickyIndex0 = byDEI[key].filter(ele => [1, 2, 6].includes(ele.COLI_StateCode))
       // const stickyIndex1 = byDEI[key].filter(ele => ![1, 2, 6].includes(ele.COLI_StateCode))
-      const sticky = groupBy(byDEI[key], ele => [1, 2, 6].includes(ele.COLI_StateCode) ? 0 : 1);
+      const sticky = groupBy(byDEI[key], (ele) => ([1, 2, 6].includes(ele.coli_ordertype) ? 0 : 1))
       // const sticky = groupBy(byDEI[key], ele => [1, 2, 6].includes(ele.COLI_StateCode) ? 'today' : 'todo');
       // console.log(sticky, ';;;;');
-      const deiName = deptMap.get(`${key}`);
-      const treeNode = [{ title: '今日任务', key: 'today', icon: <StarTwoTone />,children: (sticky[0]||[]).map(o => ({...o, key: o.COLI_SN, title: `(${o.COLI_State})${o.COLI_ID}`})) }, { title: '待办任务', key: 'todo', icon: <CalendarTwoTone />,children: (sticky[1] || []).map(o => ({...o, key: o.COLI_SN, title: `(${o.COLI_State})${o.COLI_ID}`})) }];
+      // const deiName = deptMap.get(`${key}`);
+      const treeNode = [
+        {
+          title: '今日任务',
+          key: key + '-today',
+          getMails: false,
+          icon: <StarTwoTone />,
+          children: (sticky[0] || []).map((o) => ({ ...o, key: o.COLI_SN, title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}` })),
+        },
+        {
+          title: '待办任务',
+          key: key + '-todo',
+          getMails: false,
+          icon: <CalendarTwoTone />,
+          children: (sticky[1] || []).map((o) => ({ ...o, key: o.COLI_SN, title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}` })),
+        },
+      ]
       // { key, title: deiName, children: sticky[0] };
-      return {...acc, [key]: treeNode};
-    }, {});
-    setDeiStickyTree(byState);
-    console.log(byState, 'byState')
-
+      return { ...acc, [key]: treeNode }
+    }, defaultStickyTree)
+    setDeiStickyTree(byState)
+    const first = accountDEI[0].value
+    setExpandTree([`${first}-today`, `${first}-todo`])
+    setStickyTree(byState[first] || [])
 
-    return () => {
-
-    }
+    return () => {}
   }, [orderList])
 
-
-
   return (
     <>
       <Layout>
-        <Layout.Sider
-          width='300'
-          style={{
-            backgroundColor: '#fff',
-          }}>
-          <Flex justify='start' align='start' vertical>
-            <Segmented className='w-full' block shape='round' options={['AH', 'CH', 'GH']} />
-            <Tree blockNode
-              showIcon
-              showLine
-              onSelect={(selectedKeys, e) => {
-                console.info('selectedKeys: ', selectedKeys)
-              }}
-              defaultExpandedKeys={['0-0-today-task', '0-1-todo-list']}
-              defaultSelectedKeys={['0-0-0']}
-              treeData={[...deiStickyTree['28']||deiStickyTree['30']||[], ...mailboxDir]
-
-              }
-            />
+        <Layout.Sider width='300' theme='light' style={{ height: 'calc(100vh - 166px)' }}>
+          <Flex justify='start' align='start' vertical className='h-full'>
+            <Segmented className='w-full' block shape='round' options={accountDEI} value={activeAccount} onChange={handleSwitchAccount} />
+            <div className='overflow-y-auto flex-auto w-full [&_.ant-tree-switcher]:me-0 [&_.ant-tree-node-content-wrapper]:px-0 [&_.ant-tree-node-content-wrapper]:text-ellipsis [&_.ant-tree-node-content-wrapper]:overflow-hidden [&_.ant-tree-node-content-wrapper]:whitespace-nowrap'>
+              <Tree
+                key='sticky-today'
+                blockNode
+                showIcon
+                showLine
+                onSelect={handleTreeSelectGetMails}
+                onExpand={(expandedKeys) => setExpandTree(expandedKeys)}
+                expandedKeys={expandTree}
+                defaultExpandedKeys={expandTree}
+                defaultSelectedKeys={['today']}
+                treeData={[...(stickyTree || []), ...mailboxDir]}
+                titleRender={(node) => <Typography.Text ellipsis={{ tooltip: node.title }}>{node.title}</Typography.Text>}
+              />
+            </div>
           </Flex>
         </Layout.Sider>
         <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
           <Row>
             <Col className='bg-white' span={14}>
-            <Mailbox />
-              {/* },
-        onClick={() => console.info('item: ', item)}
-          title={<a href={item.href} onClick={() => setSubject(item.title)}>{item.title}</a>} */}
+              <Mailbox />
             </Col>
 
-
-      <Col span={10} style={{ height: 'calc(100vh - 166px)' }}>
-        <EmailDetailInline mailID={activeEmailId || 5291957} emailMsg={{}} variant={'outline'} size={'small'} />
-
-  </Col>
-  </Row>
+            <Col span={10} style={{ height: 'calc(100vh - 166px)' }}>
+              <EmailDetailInline mailID={activeEmailId || 5291957} emailMsg={{}} variant={'outline'} size={'small'} />
+            </Col>
+          </Row>
         </Layout.Content>
 
-    <Layout.Sider zeroWidthTriggerStyle={{top: '30px'}} width='280' style={{
-  backgroundColor: '#fff',
-}} collapsible collapsed={collapsed} onCollapse={value => setCollapsed(value)} collapsedWidth={0} reverseArrow={true}>
-      <OrderProfile/>
-          </Layout.Sider>
+        <Layout.Sider
+          zeroWidthTriggerStyle={{ top: '30px' }}
+          width='280'
+          style={{
+            backgroundColor: '#fff',
+          }}
+          collapsible
+          collapsed={collapsed}
+          onCollapse={(value) => setCollapsed(value)}
+          collapsedWidth={0}
+          reverseArrow={true}>
+          <OrderProfile />
+        </Layout.Sider>
       </Layout>
 
       <Drawer

From a778bc475f254957237257bfaaa446f1f6afb112 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 3 Jun 2025 16:58:03 +0800
Subject: [PATCH 039/143] =?UTF-8?q?perf:=20=E6=95=B4=E5=90=88=E5=8E=9F?=
 =?UTF-8?q?=E6=9D=A5=20CustomerProfile=20=E7=95=8C=E9=9D=A2=EF=BC=9B?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=B9=E9=87=8F=E6=93=8D=E4=BD=9C=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx         | 78 ++++++++++++++++++------
 src/views/orders/Follow.jsx             | 52 ----------------
 src/views/orders/components/MailBox.jsx | 80 +++++++++++++++++++++----
 3 files changed, 127 insertions(+), 83 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index c5166a9..343ab23 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -10,17 +10,27 @@ import {
   DeleteOutlined, ClockCircleOutlined,
   FormOutlined
 } from '@ant-design/icons'
+
+import { useCallback, useEffect, useState } from 'react'
 import {
-  Flex,
+  Flex,Select,Tooltip,
   Button, Space, Divider, Typography,
-  Input
+  Input, Radio,Drawer,Checkbox,
 } from 'antd'
 import { InboxIcon, MailCheckIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
-
+import { useOrderStore, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions, fetchSetRemindStateAction, remindStatusOptionsMapped } from "@/stores/OrderStore";
+import { copy, isEmpty } from "@/utils/commons";
 const OrderProfile = (props) => {
+
+    const orderLabelOptions = copy(OrderLabelDefaultOptions);
+    orderLabelOptions.unshift({ value: 0, label: "未设置", disabled: true });
+
+	const orderStatusOptions = copy(OrderStatusDefaultOptions);
+
+    const [openOrder, setOpenOrder] = useState(false)
   return (
     <>
-      <Flex gap={6} vertical={true} justify='space-between'>
+      <Flex gap='small' vertical={true} justify='space-between'>
         <Typography.Text>
           <FieldNumberOutlined className='pr-1' />
           LSS250501006
@@ -63,10 +73,46 @@ const OrderProfile = (props) => {
           <span>外联备注：</span>
           泰国马来水灯节
         </Typography.Text>
+        <Divider orientation="left">
+            <Typography.Text strong>订单状态</Typography.Text>
+          </Divider>
+      <Select className={`[&_.ant-select-selection-item]:text-gray-950`}
+								key={"orderlabel"}
+								size="small"
+								style={{
+									width: "100%",
+								}}
+								variant="underlined"
+								onSelect={value => {
+								}}
+								value={0}
+								options={orderLabelOptions}
+							/>
+
+              <Select className={`[&_.ant-select-selection-item]:text-gray-950`}
+								key={"orderstatus"}
+								size="small"
+								style={{
+									width: "100%",
+								}}
+								variant="underlined"
+								onSelect={value => {
+								}}
+								value={1}
+								options={orderStatusOptions}
+							/>
+
       </Flex>
+              <Divider orientation="left">
+            <Typography.Text strong>催信</Typography.Text>
+          </Divider>
+          <Checkbox.Group key='substatus' className="px-2"  options={remindStatusOptions}  />
+
       <Divider orientation='left'>
         <Typography.Text strong>表单信息</Typography.Text>
+        <Tooltip title='添加'>
         <FileAddOutlined className='pl-1' />
+        </Tooltip>
       </Divider>
       <p
         className='p-2 overflow-auto m-0 break-words whitespace-pre-wrap'
@@ -74,20 +120,16 @@ const OrderProfile = (props) => {
           __html:
             'orderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detail',
         }}></p>
-      <Space.Compact block>
-        <Input addonBefore='附加信息' />
-        <Button icon={<SaveOutlined />} />
-      </Space.Compact>
-      <Flex gap='small'>
-        <Button
-          color='cyan'
-          variant='outlined'
-          onClick={() => {
-            // setOpenOrder(true)
-          }}>
-          订单状态
-        </Button>
-      </Flex>
+
+      <Divider orientation='left'>
+        <Typography.Text strong>附加信息</Typography.Text>
+        <Tooltip title='修改'>
+        <FileAddOutlined className='pl-1' />
+        </Tooltip>
+      </Divider>
+      <Typography.Text>
+          泰国马来水灯节
+        </Typography.Text>
     </>
   )
 }
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index b5b2a46..0733a0b 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -78,7 +78,6 @@ function Follow() {
   const orderList = useOrderStore((state) => state.orderList)
   const fetchOrderList = useOrderStore((state) => state.fetchOrderList)
 
-  const [openOrder, setOpenOrder] = useState(false)
   const [collapsed, setCollapsed] = useState(false)
 
   const [loginUser, isPermitted] = useAuthStore((state) => [state.loginUser, state.isPermitted])
@@ -263,57 +262,6 @@ function Follow() {
           <OrderProfile />
         </Layout.Sider>
       </Layout>
-
-      <Drawer
-        title={'订单状态'}
-        placement='right'
-        // getContainer={false}
-        size={'large'}
-        mask={false}
-        maskClosable={true}
-        open={openOrder}
-        onClose={() => setOpenOrder(false)}>
-        <Divider orientation='left'>
-          <Typography.Text strong>是否重要</Typography.Text>
-        </Divider>
-        <Radio.Group
-          options={[
-            { label: '重点', value: '1' },
-            { label: '次重点', value: '2' },
-            { label: '一般', value: '3' },
-          ]}
-        />
-
-        <Divider orientation='left'>
-          <Typography.Text strong>状态</Typography.Text>
-        </Divider>
-        <Radio.Group
-          options={[
-            { label: '新订单', value: '4' },
-            { label: '报价中', value: '5' },
-            { label: '以后联系', value: '6' },
-            { label: '等待付订金', value: '7' },
-            { label: '成行', value: '8' },
-            { label: '丢失', value: '9' },
-            { label: '取消', value: '10' },
-            { label: '未报价', value: '11' },
-          ]}
-        />
-
-        <Divider orientation='left'>
-          <Typography.Text strong> 催信</Typography.Text>
-        </Divider>
-        <Checkbox.Group
-          options={[
-            { label: '一催', value: 'Apple', className: 'label-1' },
-            { label: '二催', value: 'Pear', className: 'label-2' },
-            { label: '三催', value: 'Orange', className: 'label-3' },
-            { label: '重点团', value: '2233342', className: 'label-3' },
-            { label: '已发 travel advisor survey', value: '43535', className: 'label-3' },
-          ]}
-          defaultValue={['Apple']}
-        />
-      </Drawer>
     </>
   )
 }
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 4421d30..83d277d 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -1,3 +1,5 @@
+
+import { useCallback, useEffect, useState } from 'react'
 import {
   ReloadOutlined,
   ReadOutlined, CheckSquareOutlined
@@ -5,11 +7,12 @@ import {
 import {
   Flex,
   Button, Tooltip,
-  List,
+  List,Radio,Typography,Divider,Drawer,
   Dropdown, Input, Checkbox
 } from 'antd'
 
 const MailBox = (props) => {
+    const [openOrder, setOpenOrder] = useState(false)
   return (
     <>
       <div className='bg-white h-auto px-1 flex gap-1 items-center'>
@@ -56,18 +59,8 @@ const MailBox = (props) => {
           }}>
           新邮件
         </Dropdown.Button>
-        <Input.Search
-          className=''
-          allowClear
-          onChange={(e) => {}}
-          onPressEnter={(e) => {
-            return false
-          }}
-          placeholder={`邮件主题`}
-        />
-        <Button onClick={() => {}}>高级搜索</Button>
-        <Flex wrap gap='small'>
-          <Tooltip title='选择'>
+        <Flex wrap gap='middle' justify={'center'} className='min-w-40'>
+          <Tooltip title='全选'>
             <Checkbox></Checkbox>
           </Tooltip>
           <Tooltip title='标记已读'>
@@ -80,6 +73,16 @@ const MailBox = (props) => {
             <Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} />
           </Tooltip>
         </Flex>
+        <Input.Search
+          className=''
+          allowClear
+          onChange={(e) => {}}
+          onPressEnter={(e) => {
+            return false
+          }}
+          placeholder={`邮件主题`}
+        />
+        <Button onClick={() => {setOpenOrder(true)}}>高级搜索</Button>
       </div>
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
@@ -214,6 +217,57 @@ const MailBox = (props) => {
           )}
         />
       </div>
+
+      <Drawer
+        title={'高级搜索'}
+        placement='right'
+        getContainer={false}
+        size={'large'}
+        mask={true}
+        maskClosable={true}
+        open={openOrder}
+        onClose={() => setOpenOrder(false)}>
+        <Divider orientation='left'>
+          <Typography.Text strong>是否重要</Typography.Text>
+        </Divider>
+        <Radio.Group
+          options={[
+            { label: '重点', value: '1' },
+            { label: '次重点', value: '2' },
+            { label: '一般', value: '3' },
+          ]}
+        />
+
+        <Divider orientation='left'>
+          <Typography.Text strong>状态</Typography.Text>
+        </Divider>
+        <Radio.Group
+          options={[
+            { label: '新订单', value: '4' },
+            { label: '报价中', value: '5' },
+            { label: '以后联系', value: '6' },
+            { label: '等待付订金', value: '7' },
+            { label: '成行', value: '8' },
+            { label: '丢失', value: '9' },
+            { label: '取消', value: '10' },
+            { label: '未报价', value: '11' },
+          ]}
+        />
+
+        <Divider orientation='left'>
+          <Typography.Text strong> 催信</Typography.Text>
+        </Divider>
+        <Checkbox.Group
+          options={[
+            { label: '一催', value: 'Apple', className: 'label-1' },
+            { label: '二催', value: 'Pear', className: 'label-2' },
+            { label: '三催', value: 'Orange', className: 'label-3' },
+            { label: '重点团', value: '2233342', className: 'label-3' },
+            { label: '已发 travel advisor survey', value: '43535', className: 'label-3' },
+          ]}
+          defaultValue={['Apple']}
+        />
+      </Drawer>
     </>
   )
 }

From 36068565f9adcbf2acfe7ee83f31249e55c4df75 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 4 Jun 2025 09:56:31 +0800
Subject: [PATCH 040/143] .

---
 src/views/orders/Follow.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 0733a0b..57c1507 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -250,9 +250,9 @@ function Follow() {
 
         <Layout.Sider
           zeroWidthTriggerStyle={{ top: '30px' }}
-          width='280'
+          width='280' theme='light' className='overflow-y-auto'
           style={{
-            backgroundColor: '#fff',
+            height: 'calc(100vh - 166px)'
           }}
           collapsible
           collapsed={collapsed}

From 9100e4b19d525d177c4923c93caf9da8cfdf9a00 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 4 Jun 2025 09:57:41 +0800
Subject: [PATCH 041/143] =?UTF-8?q?fix:=20=E4=BC=9A=E8=AF=9D=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Conversations/Online/MessagesWrapper.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/Conversations/Online/MessagesWrapper.jsx b/src/views/Conversations/Online/MessagesWrapper.jsx
index 7d47651..10c1743 100644
--- a/src/views/Conversations/Online/MessagesWrapper.jsx
+++ b/src/views/Conversations/Online/MessagesWrapper.jsx
@@ -89,7 +89,7 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
     setLongList(activeMessages);
     const thisLastTime = activeMessages.length > 0 ? activeMessages[0].msgtime : '';
     const loadNextPage = !(activeMessages.length === 0 || activeMessages.length < MESSAGE_PAGE_SIZE);
-    updateCurrentConversation({ lasttime: thisLastTime, loadNextPage, });
+    updateCurrentConversation({ lasttime1: thisLastTime, loadNextPage, });
     return () => {};
   }, [activeMessages, currentConversationSN]);
 
@@ -125,7 +125,7 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
 
     const thisLastTime = data.length > 0 ? data[0].msgtime : ''; // orgmsgtime
     const loadNextPage = !(data.length === 0 || data.length < MESSAGE_PAGE_SIZE);
-    updateCurrentConversation({ lasttime: thisLastTime, loadNextPage, });
+    updateCurrentConversation({ lasttime1: thisLastTime, loadNextPage, });
     // setPrevSN(item.sn);
 
     setMsgLoading(false);
@@ -147,7 +147,7 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
     setLongList(prevValue => data.concat(prevValue));
     const thisLastTime = data.length > 0 ? data[0].msgtime : '';
     const loadNextPage = !(data.length === 0 || data.length < MESSAGE_PAGE_SIZE);
-    updateCurrentConversation({ lasttime: thisLastTime, loadNextPage, });
+    updateCurrentConversation({ lasttime1: thisLastTime, loadNextPage, });
     return data.length;
   };
 

From 9d31e69db98ca76650c2f1e9c2e80e0ca38bc5d4 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 4 Jun 2025 14:08:59 +0800
Subject: [PATCH 042/143] =?UTF-8?q?feat:=20=E9=82=AE=E7=AE=B1=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E6=8E=A5=E5=8F=A3;=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js             | 16 ++++-----
 src/config.js                           |  1 +
 src/utils/commons.js                    | 13 +++++--
 src/views/orders/Follow.jsx             | 46 +++++++++++++++----------
 src/views/orders/components/MailBox.jsx |  9 ++---
 5 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 3fe3a3f..9a4ec36 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -1,6 +1,7 @@
 import { fetchJSON, postForm, postJSON } from '@/utils/request';
-import { API_HOST, EMAIL_HOST } from '@/config';
+import { API_HOST, DATE_FORMAT, DATEEND_FORMAT, DATETIME_FORMAT, EMAIL_HOST } from '@/config';
 import { buildTree, isEmpty, objectMapper } from '@/utils/commons';
+import dayjs from 'dayjs';
 
 const parseHTMLString = (html, needText = false) => {
   const parser = new DOMParser()
@@ -142,10 +143,9 @@ export const fetchEmailBindOrderAction = async (params) => {
  * @param {object} { opi_sn }
  */
 export const getEmailDirAction = async (params = { opi_sn: '' }) => {
-  const list = [{"VKey":-227001,"VName":"长线订单","VParent":2159,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-12,"VName":"12月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-11,"VName":"11月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-10,"VName":"10月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-9,"VName":"9月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-8,"VName":"8月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-7,"VName":"7月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-6,"VName":"6月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-5,"VName":"5月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-4,"VName":"4月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-3,"VName":"3月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-2,"VName":"2月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":-1,"VName":"1月","VParent":-227001,"ImageIndex":1,"COLI_SN":0,"OrderSourceType":0,"IsTrue":0,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":1,"VName":"李汉超(AH)","VParent":0,"ImageIndex":0,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2159,"VName":"收件箱","VParent":1,"ImageIndex":3,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2160,"VName":"未读邮件","VParent":1,"ImageIndex":11,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2161,"VName":"已发邮件","VParent":1,"ImageIndex":4,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2162,"VName":"待发邮件","VParent":1,"ImageIndex":2,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2163,"VName":"草稿","VParent":1,"ImageIndex":5,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2164,"VName":"垃圾邮件","VParent":1,"ImageIndex":7,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":2165,"VName":"已处理邮件","VParent":1,"ImageIndex":3,"COLI_SN":0,"OrderSourceType":0,"IsTrue":1,"ApplyDate":null,"IsSuccess":0,"COLI_OrderStartDate":null},{"VKey":1101593,"VName":"250104-LHC240621097(WX 1.3 老客人11人哈尔滨雪乡亚布力 全款已付)","VParent":-1,"ImageIndex":13,"COLI_SN":1101593,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-01-04","IsSuccess":1,"COLI_OrderStartDate":"2025-01-04"},{"VKey":1122677,"VName":"250113-LHC241104145(1.13 KIMI老客人哈尔滨成都 全款已付)","VParent":-1,"ImageIndex":13,"COLI_SN":1122677,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-01-14","IsSuccess":1,"COLI_OrderStartDate":"2025-01-14"},{"VKey":1129232,"VName":"250114-LHC241219062(1.13 老客人不丹 全款已付)","VParent":-1,"ImageIndex":13,"COLI_SN":1129232,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-01-14","IsSuccess":1,"COLI_OrderStartDate":"2025-01-14"},{"VKey":1125159,"VName":"250113-LHC241120012(WA 1.19 老客人成都西藏 全款已付)","VParent":-1,"ImageIndex":13,"COLI_SN":1125159,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-01-25","IsSuccess":1,"COLI_OrderStartDate":"2025-01-25"},{"VKey":992847,"VName":"240205-LHC230217002(25.1.26 印尼8老客人哈尔滨 全款已付)","VParent":-1,"ImageIndex":13,"COLI_SN":992847,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-01-26","IsSuccess":1,"COLI_OrderStartDate":"2025-01-26"},{"VKey":1138070,"VName":"250221-LHC250214061(2.21 北京一地 全款已付)","VParent":-2,"ImageIndex":13,"COLI_SN":1138070,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-02-21","IsSuccess":1,"COLI_OrderStartDate":"2025-02-21"},{"VKey":1121384,"VName":"250224-LHC241026054(2.24 新加坡云南 全款已付)","VParent":-2,"ImageIndex":13,"COLI_SN":1121384,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-02-24","IsSuccess":1,"COLI_OrderStartDate":"2025-02-24"},{"VKey":1027604,"VName":"250305-LHC230915012(3.5 美国教授京西上 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1027604,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-04","IsSuccess":1,"COLI_OrderStartDate":"2025-03-04"},{"VKey":1133974,"VName":"250306-LHC250120040(WA 3.6 俄罗斯给女儿问的云南 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1133974,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-06","IsSuccess":1,"COLI_OrderStartDate":"2025-03-06"},{"VKey":1138819,"VName":"250308-LHC250218116(3.8 北京一地 全款已付 推荐券USD100.0可用 总计：USD100.0)","VParent":-3,"ImageIndex":13,"COLI_SN":1138819,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-08","IsSuccess":1,"COLI_OrderStartDate":"2025-03-08"},{"VKey":1131907,"VName":"250310-LHC250107062(3.10 潮汕一地 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1131907,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-10","IsSuccess":1,"COLI_OrderStartDate":"2025-03-10"},{"VKey":1109383,"VName":"250315-LHC240811004(3.15 美国人京西上 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1109383,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-15","IsSuccess":1,"COLI_OrderStartDate":"2025-03-15"},{"VKey":1140248,"VName":"250315-LHC250227043(3.15 老客人内蒙古 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1140248,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-15","IsSuccess":1,"COLI_OrderStartDate":"2025-03-15"},{"VKey":1131785,"VName":"250316-LHC250106123(WA 3.16 老客人推荐北京一地 全款已付 推荐券USD200.0可用 总计：USD200.0)","VParent":-3,"ImageIndex":13,"COLI_SN":1131785,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-16","IsSuccess":1,"COLI_OrderStartDate":"2025-03-16"},{"VKey":1122705,"VName":"250319-LHC241105045(WA 3.19 英国人退休3周半自由行 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1122705,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-19","IsSuccess":1,"COLI_OrderStartDate":"2025-03-19"},{"VKey":1119363,"VName":"250322-LHC241012072(3.22 老客人广州桂林 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1119363,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-22","IsSuccess":1,"COLI_OrderStartDate":"2025-03-22"},{"VKey":1139524,"VName":"250325-LHC250223083(WA 3.26 九寨沟一地5人 全款已付)","VParent":-3,"ImageIndex":13,"COLI_SN":1139524,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-25","IsSuccess":1,"COLI_OrderStartDate":"2025-03-25"},{"VKey":1143130,"VName":"250328-LHC250314110(WA 3.28 老客人推荐北京一地 全款已付 推荐券USD100.0可用 总计：USD100.0)","VParent":-3,"ImageIndex":13,"COLI_SN":1143130,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-03-28","IsSuccess":1,"COLI_OrderStartDate":"2025-03-28"},{"VKey":1128795,"VName":"250402-LHC241216025(WA 4.2 德国人京西成桂港 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1128795,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-01","IsSuccess":1,"COLI_OrderStartDate":"2025-04-01"},{"VKey":1003324,"VName":"250401-LHC230417001(4.4 英国40人北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1003324,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-04","IsSuccess":1,"COLI_OrderStartDate":"2025-04-04"},{"VKey":1121686,"VName":"250404-LHC241028118(WX 4.4 老客人北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1121686,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-04","IsSuccess":1,"COLI_OrderStartDate":"2025-04-04"},{"VKey":1130283,"VName":"250404-LHC241228012(4.4 老客人北京承德 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1130283,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-04","IsSuccess":1,"COLI_OrderStartDate":"2025-04-04"},{"VKey":1146231,"VName":"250404-LHC250331006(4.4 老客人推荐北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1146231,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-04","IsSuccess":1,"COLI_OrderStartDate":"2025-04-04"},{"VKey":1141487,"VName":"250405-LHC250305088(4.5 老客人甘肃重庆西安 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1141487,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-05","IsSuccess":1,"COLI_OrderStartDate":"2025-04-05"},{"VKey":1143697,"VName":"250405-LHC250318036(4.5 故宫一日游 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1143697,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-05","IsSuccess":1,"COLI_OrderStartDate":"2025-04-05"},{"VKey":1105702,"VName":"250407-LHC240718072(4.7 澳洲人西藏一地含机票火车 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1105702,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-06","IsSuccess":1,"COLI_OrderStartDate":"2025-04-06"},{"VKey":1087509,"VName":"250409-LHC240410090(4.9 西藏林芝桃花+珠峰 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1087509,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-09","IsSuccess":1,"COLI_OrderStartDate":"2025-04-09"},{"VKey":1086414,"VName":"250410-LHC240404015(WA 4.12 南非豪华5星北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1086414,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-10","IsSuccess":1,"COLI_OrderStartDate":"2025-04-10"},{"VKey":1118529,"VName":"250412-LHC241008060(4.11 菲律宾6人京西上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1118529,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-11","IsSuccess":1,"COLI_OrderStartDate":"2025-04-11"},{"VKey":1135638,"VName":"250411-LHC250130092(4.11 菲律宾4人北京西安 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1135638,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-11","IsSuccess":1,"COLI_OrderStartDate":"2025-04-11"},{"VKey":1114549,"VName":"250413-LHC240912040(4.13 澳洲4人京西上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1114549,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-12","IsSuccess":1,"COLI_OrderStartDate":"2025-04-12"},{"VKey":1134815,"VName":"250412-LHC250125006(WA 4.13 菲律宾6人北京张家界 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1134815,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-12","IsSuccess":1,"COLI_OrderStartDate":"2025-04-12"},{"VKey":1109767,"VName":"250413-LHC240813029(4.14 美籍华人丝路新疆 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1109767,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-13","IsSuccess":1,"COLI_OrderStartDate":"2025-04-13"},{"VKey":1138076,"VName":"250415-LHC250214012(WA 4.15 墨西哥5星京西桂上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1138076,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-15","IsSuccess":1,"COLI_OrderStartDate":"2025-04-15"},{"VKey":1116902,"VName":"250417-LHC240926040(4.17 意大利京西张桂上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1116902,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-17","IsSuccess":1,"COLI_OrderStartDate":"2025-04-17"},{"VKey":1127599,"VName":"250418-LHC241206071(WA 4.18 老客人5星云南 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1127599,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-18","IsSuccess":1,"COLI_OrderStartDate":"2025-04-18"},{"VKey":1138390,"VName":"250418-LHC250216016(4.18 9人桂林一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1138390,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-18","IsSuccess":1,"COLI_OrderStartDate":"2025-04-18"},{"VKey":1129053,"VName":"250420-LHC241218024(4.19 塞尔维亚京西张桂上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1129053,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-20","IsSuccess":1,"COLI_OrderStartDate":"2025-04-20"},{"VKey":1147711,"VName":"250420-LHC250409009(4.20 美国人成西京上 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1147711,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-20","IsSuccess":1,"COLI_OrderStartDate":"2025-04-20"},{"VKey":1096743,"VName":"250422-LHC240601010(4.22 美国4人京西成熊猫四姑娘山 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1096743,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-22","IsSuccess":1,"COLI_OrderStartDate":"2025-04-22"},{"VKey":1138355,"VName":"250422-LHC250216014(4.22 比利时人北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1138355,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-22","IsSuccess":1,"COLI_OrderStartDate":"2025-04-22"},{"VKey":1145009,"VName":"250426-LHC250325033(4.26 老客人北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1145009,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-26","IsSuccess":1,"COLI_OrderStartDate":"2025-04-26"},{"VKey":1129188,"VName":"250427-LHC241219004(4.27 北京一地 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1129188,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-27","IsSuccess":1,"COLI_OrderStartDate":"2025-04-27"},{"VKey":1094804,"VName":"250430-LHC240520047(4.30 新加坡老客人云南2天 全款已付)","VParent":-4,"ImageIndex":13,"COLI_SN":1094804,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-04-30","IsSuccess":1,"COLI_OrderStartDate":"2025-04-30"},{"VKey":1086829,"VName":"250505-LHC240406029(WA 5.5 老客人6人广东 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1086829,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-05","IsSuccess":1,"COLI_OrderStartDate":"2025-05-05"},{"VKey":1115111,"VName":"250505-LHC240915012(WA 5.5 美籍印度12人京西张桂上 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1115111,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-05","IsSuccess":1,"COLI_OrderStartDate":"2025-05-05"},{"VKey":1126002,"VName":"250505-LHC241125135(5.4 美国人14天5星儿子在武汉 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1126002,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-05","IsSuccess":1,"COLI_OrderStartDate":"2025-05-05"},{"VKey":1118669,"VName":"250509-LHC241008014(5.9 老客人推荐葡萄牙人15天 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1118669,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-09","IsSuccess":1,"COLI_OrderStartDate":"2025-05-09"},{"VKey":1129906,"VName":"250509-LHC241225014(WA 5.9 美国12人上云南桂 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1129906,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-09","IsSuccess":1,"COLI_OrderStartDate":"2025-05-09"},{"VKey":1143938,"VName":"250509-LHC250319084(WX 5.8 美国老客人长线 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1143938,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-09","IsSuccess":1,"COLI_OrderStartDate":"2025-05-09"},{"VKey":1106928,"VName":"250510-LHC240726046(WA 5.10 美国老客人中国香港越南 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1106928,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-10","IsSuccess":1,"COLI_OrderStartDate":"2025-05-10"},{"VKey":1122673,"VName":"250410-LHC241104135(WX 5.11 老客人西安北京 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1122673,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-11","IsSuccess":1,"COLI_OrderStartDate":"2025-05-11"},{"VKey":1106493,"VName":"250421-LHC240723070(WA 5.14 老客人湖南 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1106493,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-14","IsSuccess":1,"COLI_OrderStartDate":"2025-05-14"},{"VKey":1143709,"VName":"250514-LHC250318037(WA 5.14 桂林一地 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1143709,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-14","IsSuccess":1,"COLI_OrderStartDate":"2025-05-14"},{"VKey":1134816,"VName":"250515-LHC250125007(5.15 意大利人京西成贵张上 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1134816,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-15","IsSuccess":1,"COLI_OrderStartDate":"2025-05-15"},{"VKey":1127982,"VName":"250516-LHC241209102(5.16 老客人天津山东东北 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1127982,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-16","IsSuccess":1,"COLI_OrderStartDate":"2025-05-16"},{"VKey":1151792,"VName":"250518-LHC250430100(WA 5.18 老客人推荐北京西安 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1151792,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-18","IsSuccess":1,"COLI_OrderStartDate":"2025-05-18"},{"VKey":1140658,"VName":"250524-LHC250302012(5.24 美国人京西桂上 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1140658,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-24","IsSuccess":1,"COLI_OrderStartDate":"2025-05-24"},{"VKey":1036416,"VName":"250525-LHC231031091(5.25 湖南2人 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1036416,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-25","IsSuccess":1,"COLI_OrderStartDate":"2025-05-25"},{"VKey":1061633,"VName":"250527-LHC240125045(5.27 卢森堡张家界桂林 全款已付)","VParent":-5,"ImageIndex":13,"COLI_SN":1061633,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-05-27","IsSuccess":1,"COLI_OrderStartDate":"2025-05-27"},{"VKey":1157023,"VName":"250603-LHC250527101(6.3 老客人广州一地 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1157023,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-03","IsSuccess":1,"COLI_OrderStartDate":"2025-06-03"},{"VKey":1126193,"VName":"250531-LHC241127004(WA 6.4 骆老客人推荐8个新马人去新疆 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1126193,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-04","IsSuccess":1,"COLI_OrderStartDate":"2025-06-04"},{"VKey":1145376,"VName":"250607-LHC250327060(WA 6.7 老客人推荐九寨沟张家界 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1145376,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-07","IsSuccess":1,"COLI_OrderStartDate":"2025-06-07"},{"VKey":1136429,"VName":"250610-LHC250204114(WA 6.10 老客人新疆 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1136429,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-10","IsSuccess":1,"COLI_OrderStartDate":"2025-06-10"},{"VKey":1133294,"VName":"250612-LHC250115090(WA 6.12 美华日本 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1133294,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-12","IsSuccess":1,"COLI_OrderStartDate":"2025-06-12"},{"VKey":1134944,"VName":"250613-LHC250126065(6.13 意大利5星京西成上港 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1134944,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-13","IsSuccess":1,"COLI_OrderStartDate":"2025-06-13"},{"VKey":1141141,"VName":"250614-LHC250304034(6.14 美籍印度6人京西桂港 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1141141,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-14","IsSuccess":1,"COLI_OrderStartDate":"2025-06-14"},{"VKey":1130127,"VName":"250615-LHC241226069(WA 6.15 老客人重庆送三峡 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1130127,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-15","IsSuccess":1,"COLI_OrderStartDate":"2025-06-15"},{"VKey":1132507,"VName":"250616-LHC250111012(WA 6.14 新加坡家庭京西桂上 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1132507,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-16","IsSuccess":1,"COLI_OrderStartDate":"2025-06-16"},{"VKey":1153428,"VName":"250616-LHC250509099(WA 6.16 老客人推荐成都一地 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1153428,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-16","IsSuccess":1,"COLI_OrderStartDate":"2025-06-16"},{"VKey":1133201,"VName":"250621-LHC250115033(WA 6.21 美华一家7人5星20天 全款已付)","VParent":-6,"ImageIndex":13,"COLI_SN":1133201,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-06-21","IsSuccess":1,"COLI_OrderStartDate":"2025-06-21"},{"VKey":1095489,"VName":"250626-LHC240523076(7.1 老客人西安河南山东杭州 全款已付)","VParent":-7,"ImageIndex":13,"COLI_SN":1095489,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-01","IsSuccess":1,"COLI_OrderStartDate":"2025-07-01"},{"VKey":1120738,"VName":"250703-LHC241022034(WA 7.2 巴西3人京西成张上深港 全款已付)","VParent":-7,"ImageIndex":13,"COLI_SN":1120738,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-03","IsSuccess":1,"COLI_OrderStartDate":"2025-07-03"},{"VKey":1122337,"VName":"250706-LHC241102048(WA 7.7 京西上奶爸+4娃5星 全款已付)","VParent":-7,"ImageIndex":13,"COLI_SN":1122337,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-07","IsSuccess":1,"COLI_OrderStartDate":"2025-07-07"},{"VKey":1141434,"VName":"250708-LHC250305056(WA 7.8 美华5人云南 余款6.8)","VParent":-7,"ImageIndex":13,"COLI_SN":1141434,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-08","IsSuccess":1,"COLI_OrderStartDate":"2025-07-08"},{"VKey":1150871,"VName":"250709-LHC250425066(WA 7.8 肯尼亚印度人长线 余款6.8)","VParent":-7,"ImageIndex":13,"COLI_SN":1150871,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-09","IsSuccess":1,"COLI_OrderStartDate":"2025-07-09"},{"VKey":1115058,"VName":"250708-LHC240915011(7.8 英国人港上西京 余款6.8)","VParent":-7,"ImageIndex":13,"COLI_SN":1115058,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-10","IsSuccess":1,"COLI_OrderStartDate":"2025-07-10"},{"VKey":1156028,"VName":"250710-LHC250522082(WA 7.14 京西张墨西哥 余款6.14)","VParent":-7,"ImageIndex":13,"COLI_SN":1156028,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-10","IsSuccess":1,"COLI_OrderStartDate":"2025-07-10"},{"VKey":1135144,"VName":"250714-LHC250127018(WX 7.14 老客人云南 余款6.14)","VParent":-7,"ImageIndex":13,"COLI_SN":1135144,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-07-14","IsSuccess":1,"COLI_OrderStartDate":"2025-07-14"},{"VKey":1137033,"VName":"250808-LHC250208015(WA 8.8 意大利4人19天 余款7.8)","VParent":-8,"ImageIndex":13,"COLI_SN":1137033,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-08-08","IsSuccess":1,"COLI_OrderStartDate":"2025-08-08"},{"VKey":1121825,"VName":"250809-LHC241029090(WA 8.9 马耳他3周FB来单 余款7.9)","VParent":-8,"ImageIndex":13,"COLI_SN":1121825,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-08-09","IsSuccess":1,"COLI_OrderStartDate":"2025-08-09"},{"VKey":1152564,"VName":"250815-LHC250506139(WA 8.15 印度高端5星上张京 余款7.15)","VParent":-8,"ImageIndex":13,"COLI_SN":1152564,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-08-15","IsSuccess":1,"COLI_OrderStartDate":"2025-08-15"},{"VKey":1119643,"VName":"250828-LHC241014149(WA 8.28 老客人四川云南12天 余款7871 7.28)","VParent":-8,"ImageIndex":13,"COLI_SN":1119643,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-08-28","IsSuccess":1,"COLI_OrderStartDate":"2025-08-28"},{"VKey":1129858,"VName":"250831-LHC241224003(8.30 美国人京西上 余款7.30)","VParent":-8,"ImageIndex":13,"COLI_SN":1129858,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-08-31","IsSuccess":1,"COLI_OrderStartDate":"2025-08-31"},{"VKey":1123254,"VName":"250908-LHC241108084(9.8 老客人新疆+上海5星 余款8.8)","VParent":-9,"ImageIndex":13,"COLI_SN":1123254,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-09-07","IsSuccess":1,"COLI_OrderStartDate":"2025-09-07"},{"VKey":1132436,"VName":"250912-LHC250110047(9.11 意大利语老客人成都西安 余款8.10)","VParent":-9,"ImageIndex":13,"COLI_SN":1132436,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-09-12","IsSuccess":1,"COLI_OrderStartDate":"2025-09-12"},{"VKey":1131881,"VName":"251009-LHC250107061(10.10 美籍印度人京西桂上 余款9.10)","VParent":-10,"ImageIndex":13,"COLI_SN":1131881,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-09","IsSuccess":1,"COLI_OrderStartDate":"2025-10-09"},{"VKey":1127765,"VName":"251010-LHC241208010(10.10 斯洛伐克北京西安5星 余款9.10)","VParent":-10,"ImageIndex":13,"COLI_SN":1127765,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-10","IsSuccess":1,"COLI_OrderStartDate":"2025-10-10"},{"VKey":1146482,"VName":"251010-LHC250402029(10.10 美国2人深度游览古镇 余款9.10)","VParent":-10,"ImageIndex":13,"COLI_SN":1146482,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-10","IsSuccess":1,"COLI_OrderStartDate":"2025-10-10"},{"VKey":1122286,"VName":"251011-LHC241102005(10.11 德国人京西张桂上 余款9.11)","VParent":-10,"ImageIndex":13,"COLI_SN":1122286,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-11","IsSuccess":1,"COLI_OrderStartDate":"2025-10-11"},{"VKey":1143898,"VName":"251015-LHC250319026(10.15 美国京西上 余款9.15)","VParent":-10,"ImageIndex":13,"COLI_SN":1143898,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-15","IsSuccess":1,"COLI_OrderStartDate":"2025-10-15"},{"VKey":1150171,"VName":"251018-LHC250421121(WX 10.18 老客人solo桂林 余款9.18)","VParent":-10,"ImageIndex":13,"COLI_SN":1150171,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-18","IsSuccess":1,"COLI_OrderStartDate":"2025-10-18"},{"VKey":1088497,"VName":"251019-LHC240416069(WA 10.18 马来老客人16人四川深度游 余款9.18)","VParent":-10,"ImageIndex":13,"COLI_SN":1088497,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-19","IsSuccess":1,"COLI_OrderStartDate":"2025-10-19"},{"VKey":1146889,"VName":"261028-LHC250404015(10.29 西班牙6人15天含云南 余款9.29)","VParent":-10,"ImageIndex":13,"COLI_SN":1146889,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-10-29","IsSuccess":1,"COLI_OrderStartDate":"2025-10-29"},{"VKey":1154788,"VName":"251102-LHC250516014(WA 11.2 老客人推荐5星加拿大教授 余款10.2)","VParent":-11,"ImageIndex":13,"COLI_SN":1154788,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-11-02","IsSuccess":1,"COLI_OrderStartDate":"2025-11-02"},{"VKey":1147361,"VName":"251108-LHC250407085(11月 老客人云南 通用券USD50.0可用,生日券USD200.0可用,老客户券USD71.0可用 总计：USD321.0)","VParent":-11,"ImageIndex":13,"COLI_SN":1147361,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-11-08","IsSuccess":1,"COLI_OrderStartDate":"2025-11-08"},{"VKey":1082730,"VName":"251111-LHC240320059(11.11 美国人北京香港 余款10.10)","VParent":-11,"ImageIndex":13,"COLI_SN":1082730,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-11-11","IsSuccess":1,"COLI_OrderStartDate":"2025-11-11"},{"VKey":1108702,"VName":"250905-LHC240806092(11.17 老客人三峡张家界 余款10.17)","VParent":-11,"ImageIndex":13,"COLI_SN":1108702,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-11-17","IsSuccess":1,"COLI_OrderStartDate":"2025-11-17"},{"VKey":1150732,"VName":"251128-LHC250424096(WA 11.28 老客人上海苏州 余款10.28)","VParent":-11,"ImageIndex":13,"COLI_SN":1150732,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-11-28","IsSuccess":1,"COLI_OrderStartDate":"2025-11-28"},{"VKey":1156704,"VName":"251204-LHC250526111(WA 12.4 澳洲5人京上 余款11.4)","VParent":-12,"ImageIndex":13,"COLI_SN":1156704,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-12-04","IsSuccess":1,"COLI_OrderStartDate":"2025-12-04"},{"VKey":1129904,"VName":"(12.1 老客人西藏 余款11.1)","VParent":-12,"ImageIndex":13,"COLI_SN":1129904,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-12-05","IsSuccess":1,"COLI_OrderStartDate":"2025-12-05"},{"VKey":1150117,"VName":"251207-LHC250421084(WA 12月 老客人成都九寨沟 老客户券USD166.0可用 总计：RMB1206.0)","VParent":-12,"ImageIndex":13,"COLI_SN":1150117,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-12-07","IsSuccess":1,"COLI_OrderStartDate":"2025-12-07"},{"VKey":1151334,"VName":"251220-LHC250428004(12.20 老客人成都重庆 余款11.20 翻倍券USD34.0可用 总计：USD34.0)","VParent":-12,"ImageIndex":13,"COLI_SN":1151334,"OrderSourceType":227001,"IsTrue":0,"ApplyDate":"2025-12-20","IsSuccess":1,"COLI_OrderStartDate":"2025-12-20"}];
-  return list;
-  const { errcode, result } = await fetchJSON(`${EMAIL_HOST}/v3/email_dir`, params);
-  return errcode === 0 ? [] : result;
+  const defaultParams = { opi_sn: 0, year: dayjs().year() }
+  const { errcode, result } = await fetchJSON(`http://202.103.68.144:8889/v3/email_dir`, { ...defaultParams, ...params })
+  return errcode === 0 ? result : [];
 } ;
 
 /**
@@ -155,9 +155,9 @@ export const getEmailDirAction = async (params = { opi_sn: '' }) => {
  * @usage 高级搜索
  */
 export const queryEmailListAction = async ({ opi_sn= '', pagesize= 10, last_id= '', query={}, order= {} }={}) => {
-  const _params = { ...order, ...query, opi_sn }
-  const { errcode, result } = await postJSON(`${EMAIL_HOST}/v3/mail_list`, _params)
-  return errcode === 0 ? [] : result
+  const _params = { vkey: 0, vparent: 0, order_source_type: 0, mai_senddate1: dayjs().startOf('year').format(DATE_FORMAT), mai_senddate2: dayjs().format(DATEEND_FORMAT), ...order, ...query, opi_sn }
+  const { errcode, result } = await fetchJSON(`http://202.103.68.144:8889/v3/mail_list`, _params)
+  return errcode === 0 ? result : []
 }
 
 /**
diff --git a/src/config.js b/src/config.js
index 6ce24ef..43dbbde 100644
--- a/src/config.js
+++ b/src/config.js
@@ -25,6 +25,7 @@ export const HT3 =  process.env.NODE_ENV === 'production' ? 'https://p9axztuwd7x
 
 export const DATE_FORMAT = 'YYYY-MM-DD';
 export const DATETIME_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+export const DATEEND_FORMAT = 'YYYY-MM-DD 23:59';
 
 export const ERROR_IMG = 'https://hiana-crm.oss-accelerate.aliyuncs.com/WAMedia/afe412d4-3acf-4e79-a623-048aeb4d696a.png';
 export const OSS_URL_CN = 'https://haina-sale-system.oss-cn-shenzhen.aliyuncs.com/WAMedia/';
diff --git a/src/utils/commons.js b/src/utils/commons.js
index e79db44..44e7c2e 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -620,7 +620,7 @@ function createTreeNode(key, name, parent = null, _raw={}) {
  * Builds a tree structure from a flat list of nodes.
  * @returns {Array<object>} An array of root tree nodes.
  */
-export const buildTree = (list, keyMap={}) => {
+export const buildTree = (list, keyMap={ rootKeys: [], ignoreKeys: [] }) => {
   if (!list || list.length === 0) {
     return []
   }
@@ -635,12 +635,19 @@ export const buildTree = (list, keyMap={}) => {
 
   list.forEach((item) => {
     const node = nodeMap.get(item[keyMap.key])
-    if (item[keyMap.parent] === keyMap.rootKey || item[keyMap.parent] === 0 || item[keyMap.parent] === 1 || item[keyMap.parent] === null || item[keyMap.parent] === undefined) {
+    if (keyMap.rootKeys.includes(item[keyMap.parent]) || item[keyMap.parent] === null || item[keyMap.parent] === undefined) {
       // This is a root node
       treeRoots.push(node)
     } else {
       const parentNode = nodeMap.get(item[keyMap.parent])
-      if (parentNode) {
+      if (keyMap.ignoreKeys.includes(item[keyMap.parent])) {
+        const grandParentNode = nodeMap.get(parentNode.parent);
+        node.parent = parentNode.parent;
+        grandParentNode.children.push(node)
+      } else if (keyMap.ignoreKeys.includes(item[keyMap.key])) {
+        //
+      }
+      else if (parentNode) {
         parentNode.children.push(node)
       } else {
         console.warn(`Parent with key '${item[keyMap.parent]}' not found for node '${item[keyMap.key]}'. This node will be treated as a root.`)
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 57c1507..ea05c22 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -113,7 +113,15 @@ function Follow() {
 
   const [activeEmailId, setActiveEmailId] = useState(0)
 
+  const [activeAccount, setActiveAccount] = useState(accountDEI[0].value)
   const [mailboxDir, setMailboxDir] = useState([])
+  const [deiStickyTree, setDeiStickyTree] = useState({})
+  const [stickyTree, setStickyTree] = useState([])
+  const [mergedTree, setMergedTree] = useState([]);
+  const [expandTree, setExpandTree] = useState([])
+
+  const [mailList, setMailList] = useState([]);
+
   const DirTypeIcon = ({ type }) => {
     const Icon = EmailDirTypeIcons[type || '0']?.component || EmailDirTypeIcons['0'].component
     const className = EmailDirTypeIcons[type || '0']?.className || EmailDirTypeIcons['0'].className
@@ -122,28 +130,27 @@ function Follow() {
 
   const getOPIEmailDir = async (opi_sn = 0) => {
     console.log('🌐requesting opi dir', opi_sn)
-    const x = await getEmailDirAction(opi_sn)
+    const x = await getEmailDirAction({opi_sn})
     const mailboxSort = x //.sort(sortBy('MDR_Order'));
     const dirs = mailboxSort.map((ele) => {
       return { ...ele, icon: ele.ImageIndex !== void 0 ? <DirTypeIcon type={ele.ImageIndex} /> : false }
     })
-    let tree = buildTree(dirs, { key: 'VKey', parent: 'VParent', name: 'VName', rootKey: 1 })
+    let tree = buildTree(dirs, { key: 'VKey', parent: 'VParent', name: 'VName', rootKeys: [1], ignoreKeys: [-227001, -227002] })
     tree = tree.filter((ele) => ele.key !== 1)
-    // console.log(tree)
+    // console.log('tree', tree)
     setMailboxDir(tree)
-    const level1 = tree.filter((ele) => !isEmpty(ele.children)).map((ele) => ele.key)
-    setExpandTree((pre) => [...pre, ...level1])
+    setMergedTree([...stickyTree, ...tree]);
+    // const level1 = []; // tree.filter((ele) => !isEmpty(ele.children)).map((ele) => ele.key)
+    // setExpandTree((pre) => [...pre, ...level1])
   }
 
   const getMailList = async ({ query, order }) => {
-    const opi_sn = accountListDEIMapped[activeAccount].OPI_SN
+    const opi_sn = accountListDEIMapped[activeAccount].OPI_SN || 404
     const x = await queryEmailListAction({ opi_sn, query, order })
+    const _x = x.map(ele => ({...ele, key: ele.MAI_SN, title: ele.MAI_Subject, description: ele.SenderReceiver, mailDate: ele.SRDate, orderNo: ele.MAI_COLI_ID, country: ele.CountryCN}));
+    setMailList(_x);
   }
 
-  const [deiStickyTree, setDeiStickyTree] = useState({})
-  const [stickyTree, setStickyTree] = useState([])
-  const [expandTree, setExpandTree] = useState([])
-  const [activeAccount, setActiveAccount] = useState()
   const handleSwitchAccount = (value) => {
     setActiveAccount(value)
     setStickyTree(deiStickyTree[value] || [])
@@ -153,25 +160,26 @@ function Follow() {
   }
 
   const handleTreeSelectGetMails = (selectedKeys, { node }) => {
-    // console.info('selectedKeys: ', selectedKeys, node)
+    console.info('selectedTreeKeys: ', selectedKeys, node)
     if (node?.COLI_SN || node?._raw?.COLI_SN) {
       // 固定列表; 邮箱文件夹
       // get order mails
       // console.log('get order mails', { order: { coli_sn: node?.COLI_SN || node?._raw?.COLI_SN, order_source_type: node?._raw?.OrderSourceType || 227001, vkey: node.key } })
-      getMailList({ order: { coli_sn: node?.COLI_SN || node?._raw?.COLI_SN, order_source_type: node?._raw?.OrderSourceType || 227001, vkey: node.key } })
+      const coli_sn = node?.COLI_SN || node?._raw?.COLI_SN;
+      getMailList({ order: { coli_sn: coli_sn, order_source_type: node?._raw?.OrderSourceType || 227001, vkey: coli_sn, vparent: node?.parent || -1, mai_senddate1: node?._raw?.ApplyDate || '' } })
     } else if ([-227001, -227002].includes(node.key) || [-227001, -227002].includes(node.parent) || node?.getMails === false) {
       // nothing, expand only
       console.log('nothing')
     } else {
       // get mail list
       console.log('get mail list')
-      getMailList({ query: { vkey: selectedKeys[0] } })
+      getMailList({ query: { vkey: selectedKeys[0], vparent: node.parent } })
     }
   }
 
   useEffect(() => {
     fetchOrderList({ type: 'today' }, loginUser)
-    getOPIEmailDir()
+    getOPIEmailDir(accountList[0].OPI_SN)
     return () => {}
   }, [])
 
@@ -192,19 +200,20 @@ function Follow() {
           key: key + '-today',
           getMails: false,
           icon: <StarTwoTone />,
-          children: (sticky[0] || []).map((o) => ({ ...o, key: o.COLI_SN, title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}` })),
+          children: (sticky[0] || []).map((o) => ({ key: `today-${o.COLI_SN}`, title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`, _raw: {...o, ApplyDate: '', OrderSourceType: 227001,parent: -1, }})),
         },
         {
           title: '待办任务',
           key: key + '-todo',
           getMails: false,
           icon: <CalendarTwoTone />,
-          children: (sticky[1] || []).map((o) => ({ ...o, key: o.COLI_SN, title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}` })),
+          children: (sticky[1] || []).map((o) => ({ key: `todo-${o.COLI_SN}`, title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`, _raw: {...o, ApplyDate: '', OrderSourceType: 227001,parent: -1, } })),
         },
       ]
       // { key, title: deiName, children: sticky[0] };
       return { ...acc, [key]: treeNode }
     }, defaultStickyTree)
+    // console.log('tree 0', byState);
     setDeiStickyTree(byState)
     const first = accountDEI[0].value
     setExpandTree([`${first}-today`, `${first}-todo`])
@@ -224,13 +233,14 @@ function Follow() {
                 key='sticky-today'
                 blockNode
                 showIcon
-                showLine
+                showLine expandAction={'doubleClick'}
                 onSelect={handleTreeSelectGetMails}
                 onExpand={(expandedKeys) => setExpandTree(expandedKeys)}
                 expandedKeys={expandTree}
                 defaultExpandedKeys={expandTree}
                 defaultSelectedKeys={['today']}
                 treeData={[...(stickyTree || []), ...mailboxDir]}
+                // treeData={mergedTree}
                 titleRender={(node) => <Typography.Text ellipsis={{ tooltip: node.title }}>{node.title}</Typography.Text>}
               />
             </div>
@@ -239,7 +249,7 @@ function Follow() {
         <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
           <Row>
             <Col className='bg-white' span={14}>
-              <Mailbox />
+              <Mailbox dataSource={mailList} onMailClick={id => setActiveEmailId(id)} />
             </Col>
 
             <Col span={10} style={{ height: 'calc(100vh - 166px)' }}>
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 83d277d..b9a2dec 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -88,11 +88,12 @@ const MailBox = (props) => {
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
         <List
           // header={null}
-          header={<div>今日任务</div>}
+          header={<div>{props.title}</div>}
           itemLayout='vertical'
           size='large'
           pagination={false}
-          dataSource={[
+          dataSource={props.dataSource}
+          dataSource1={[...props.dataSource,
             {
               key: Math.random().toString(36).substring(2, 9),
               description: 'Fran Grundman <frangrundman@rogers.com>',
@@ -208,8 +209,8 @@ const MailBox = (props) => {
               extra={<Checkbox></Checkbox>}>
               <List.Item.Meta
                 className='cursor-pointer'
-                onClick={() => console.info('item: ', item)}
-                title={<a href={item.href} onClick={() => console.info('')}></a>}
+                onClick={() => {console.info('item: ', item); props?.onMailClick(item.key)}}
+                title={<a href={item.href} onClick={() => {console.info(''); props?.onMailClick(item.key)}}>{item.title}</a>}
                 description={item.description + ' ' + item.mailDate}
               />
               {item.content}LSS250501006, Thailand

From 3519c4a414acd3a6cb5d1dd19d769a08b3988465 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 4 Jun 2025 14:42:33 +0800
Subject: [PATCH 043/143] =?UTF-8?q?perf=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E7=B2=BE=E7=AE=80=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E3=80=81?=
 =?UTF-8?q?=E8=A1=8C=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx | 59 +++++++++----------------
 1 file changed, 22 insertions(+), 37 deletions(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index b9a2dec..7f3147a 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -1,18 +1,9 @@
-
 import { useCallback, useEffect, useState } from 'react'
-import {
-  ReloadOutlined,
-  ReadOutlined, CheckSquareOutlined
-} from '@ant-design/icons'
-import {
-  Flex,
-  Button, Tooltip,
-  List,Radio,Typography,Divider,Drawer,
-  Dropdown, Input, Checkbox
-} from 'antd'
+import { ReloadOutlined, ReadOutlined, CheckSquareOutlined } from '@ant-design/icons'
+import { Flex, Button, Tooltip, List, Radio, Typography, Divider, Drawer, Dropdown, Input, Checkbox } from 'antd'
 
 const MailBox = (props) => {
-    const [openOrder, setOpenOrder] = useState(false)
+  const [openOrder, setOpenOrder] = useState(false)
   return (
     <>
       <div className='bg-white h-auto px-1 flex gap-1 items-center'>
@@ -82,7 +73,12 @@ const MailBox = (props) => {
           }}
           placeholder={`邮件主题`}
         />
-        <Button onClick={() => {setOpenOrder(true)}}>高级搜索</Button>
+        <Button
+          onClick={() => {
+            setOpenOrder(true)
+          }}>
+          高级搜索
+        </Button>
       </div>
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
@@ -200,34 +196,23 @@ const MailBox = (props) => {
             },
           ]}
           renderItem={(item) => (
-            <List.Item
-              key={item.title}
-              // actions={[
-              //   <a key="list-vertical-star-o">回复</a>,
-              //   <a key="list-vertical-refor">转发</a>,
-              // ]}
-              extra={<Checkbox></Checkbox>}>
-              <List.Item.Meta
-                className='cursor-pointer'
-                onClick={() => {console.info('item: ', item); props?.onMailClick(item.key)}}
-                title={<a href={item.href} onClick={() => {console.info(''); props?.onMailClick(item.key)}}>{item.title}</a>}
-                description={item.description + ' ' + item.mailDate}
-              />
-              {item.content}LSS250501006, Thailand
-            </List.Item>
+            <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-gray-100 p-2'>
+              <div className='flex-1'>
+                <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
+                  <span className="font-bold">{item.title}</span>
+                  <span className="text-neutral-500 text-wrap break-words break-all ">{item.description + ' ' + item.mailDate}</span>
+                  {item.orderNo + ' ' + item.country}
+                </Flex>
+              </div>
+              <div className=''>
+                <Checkbox></Checkbox>
+              </div>
+            </li>
           )}
         />
       </div>
 
-      <Drawer
-        title={'高级搜索'}
-        placement='right'
-        getContainer={false}
-        size={'large'}
-        mask={true}
-        maskClosable={true}
-        open={openOrder}
-        onClose={() => setOpenOrder(false)}>
+      <Drawer title={'高级搜索'} placement='top' getContainer={false} size={'large'} mask={true} maskClosable={true} open={openOrder} onClose={() => setOpenOrder(false)}>
         <Divider orientation='left'>
           <Typography.Text strong>是否重要</Typography.Text>
         </Divider>

From 2a629df2ed0bfedddfef17402373d1db4fa8e0c0 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 4 Jun 2025 15:23:57 +0800
Subject: [PATCH 044/143] =?UTF-8?q?feat:=20=E9=82=AE=E7=AE=B1=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E6=8E=A5=E5=8F=A3;=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Online/Components/EmailDetailInline.jsx   |   5 +-
 src/views/orders/Follow.jsx                   |   6 +-
 src/views/orders/components/MailBox.jsx       | 110 +-----------------
 3 files changed, 8 insertions(+), 113 deletions(-)

diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 97f8cee..53358fb 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -78,7 +78,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
   const { loading, mailData, orderDetail, postEmailResend } = useEmailDetail(mailID)
   const [showBindBtn, setShowBindBtn] = useState(false)
   useEffect(() => {
-    setShowBindBtn(isEmpty(mailData.info?.MAI_COLI_SN))
+    setShowBindBtn(mailID ? isEmpty(mailData.info?.MAI_COLI_SN) : false)
     return () => {}
   }, [mailData.info?.MAI_COLI_SN])
 
@@ -117,7 +117,8 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
 
     let btns = []
 
-    if (mailData.info.MAI_Direction !== 1) {
+    const showDoneBtn = mailData.info?.MAI_Direction !== 1 ? true : false
+    if (showDoneBtn) {
       btns.push(<Button type='text' key={'set-done'} onClick={() => { alert('todo')}} icon={<MailCheckIcon className={'text-yellow-600'} />} size='small'>已处理</Button>)
     }
     // 没有关联订单的邮件`绑定订单`
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index ea05c22..4ce5cc8 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -147,7 +147,7 @@ function Follow() {
   const getMailList = async ({ query, order }) => {
     const opi_sn = accountListDEIMapped[activeAccount].OPI_SN || 404
     const x = await queryEmailListAction({ opi_sn, query, order })
-    const _x = x.map(ele => ({...ele, key: ele.MAI_SN, title: ele.MAI_Subject, description: ele.SenderReceiver, mailDate: ele.SRDate, orderNo: ele.MAI_COLI_ID, country: ele.CountryCN}));
+    const _x = x.map(ele => ({...ele, key: ele.MAI_SN, title: ele.MAI_Subject, description: ele.SenderReceiver, mailDate: ele.SRDate, orderNo: ele.MAI_COLI_ID || '', country: ele.CountryCN || ''}));
     setMailList(_x);
   }
 
@@ -249,11 +249,11 @@ function Follow() {
         <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
           <Row>
             <Col className='bg-white' span={14}>
-              <Mailbox dataSource={mailList} onMailClick={id => setActiveEmailId(id)} />
+              <Mailbox dataSource={mailList} selectedIds={[activeEmailId]} onMailClick={id => setActiveEmailId(id)} />
             </Col>
 
             <Col span={10} style={{ height: 'calc(100vh - 166px)' }}>
-              <EmailDetailInline mailID={activeEmailId || 5291957} emailMsg={{}} variant={'outline'} size={'small'} />
+              <EmailDetailInline mailID={activeEmailId || 0} emailMsg={{}} variant={'outline'} size={'small'} />
             </Col>
           </Row>
         </Layout.Content>
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 7f3147a..bee7ceb 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -89,115 +89,9 @@ const MailBox = (props) => {
           size='large'
           pagination={false}
           dataSource={props.dataSource}
-          dataSource1={[...props.dataSource,
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Personal information',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Your Future Trip with Asia Highlights',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Greeting from Asia Highlights Alisa',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Have you made any decisions about your Japan trip',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Sri Lanka tour',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: How do you like the itinerary 3',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Re: Re: Final cost',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Reference Number: LSS240628079',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Personal information and Hiroshima tour for 2 people',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Asia Travel Tips /LSS250429038',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-          ]}
           renderItem={(item) => (
-            <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-gray-100 p-2'>
-              <div className='flex-1'>
+            <li className={`flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-gray-100 p-2 ${props?.selectedIds?.includes(item.key) ? 'bg-gray-100' : ''}`}>
+              <div className='flex-1' onClick={() => props?.onMailClick(item.key)}>
                 <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
                   <span className="font-bold">{item.title}</span>
                   <span className="text-neutral-500 text-wrap break-words break-all ">{item.description + ' ' + item.mailDate}</span>

From 9823214e4b355223d55ffcaaeeeb13f76f7d93b6 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 4 Jun 2025 17:00:22 +0800
Subject: [PATCH 045/143] =?UTF-8?q?perf=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91=EF=BC=9B=E8=B0=83=E6=95=B4=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=8D=95=E9=80=89=E6=A1=86=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx         |   4 +-
 src/views/orders/components/MailBox.jsx | 245 +++++++++---------------
 2 files changed, 91 insertions(+), 158 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index 343ab23..60b6303 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -7,7 +7,7 @@ import {
   HeartTwoTone,
   MoneyCollectTwoTone,
   FolderOutlined,
-  DeleteOutlined, ClockCircleOutlined,
+  DeleteOutlined, EditOutlined,
   FormOutlined
 } from '@ant-design/icons'
 
@@ -124,7 +124,7 @@ const OrderProfile = (props) => {
       <Divider orientation='left'>
         <Typography.Text strong>附加信息</Typography.Text>
         <Tooltip title='修改'>
-        <FileAddOutlined className='pl-1' />
+        <EditOutlined className='pl-1' />
         </Tooltip>
       </Divider>
       <Typography.Text>
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 7f3147a..424ee87 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -1,9 +1,39 @@
 import { useCallback, useEffect, useState } from 'react'
-import { ReloadOutlined, ReadOutlined, CheckSquareOutlined } from '@ant-design/icons'
-import { Flex, Button, Tooltip, List, Radio, Typography, Divider, Drawer, Dropdown, Input, Checkbox } from 'antd'
+import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, StarOutlined, HomeOutlined } from '@ant-design/icons'
+import { Flex, Button, Tooltip, List, Form, Row, Col, Drawer, Dropdown, Input, Checkbox, DatePicker, Select, Breadcrumb } from 'antd'
+import dayjs from 'dayjs';
 
+const { RangePicker } = DatePicker;
 const MailBox = (props) => {
+  const DATE_RANGE_PRESETS = [
+      {
+        label: '本周',
+        value: [dayjs().startOf('w'), dayjs().endOf('w')],
+      },
+      {
+        label: '上周',
+        value: [dayjs().startOf('w').subtract(7, 'days'), dayjs().endOf('w').subtract(7, 'days')],
+      },
+      {
+        label: '本月',
+        value: [dayjs().startOf('M'), dayjs().endOf('M')],
+      },
+      {
+        label: '上月',
+        value: [dayjs().subtract(1, 'M').startOf('M'), dayjs().subtract(1, 'M').endOf('M')],
+      },
+      {
+        label: '前三月',
+        value: [dayjs().subtract(2, 'M').startOf('M'), dayjs().endOf('M')],
+      },
+      {
+        label: '本年',
+        value: [dayjs().startOf('y'), dayjs().endOf('y')],
+      },
+    ];
   const [openOrder, setOpenOrder] = useState(false)
+  const [form] = Form.useForm()
+
   return (
     <>
       <div className='bg-white h-auto px-1 flex gap-1 items-center'>
@@ -83,176 +113,79 @@ const MailBox = (props) => {
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
         <List
-          // header={null}
-          header={<div>{props.title}</div>}
+          header={<Breadcrumb
+    items={[
+      {
+        title: (
+          <>
+            <StarOutlined />
+            <span>今日任务</span>
+          </>
+        ),
+      },
+      {
+        title: (
+          <>
+            <span>lyj20210810144702</span>
+          </>
+        ),
+      },
+    ]}
+  />}
           itemLayout='vertical'
           size='large'
           pagination={false}
           dataSource={props.dataSource}
-          dataSource1={[...props.dataSource,
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Personal information',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Your Future Trip with Asia Highlights',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Greeting from Asia Highlights Alisa',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Have you made any decisions about your Japan trip',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Sri Lanka tour',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: How do you like the itinerary 3',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Re: Re: Final cost',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Reference Number: LSS240628079',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Personal information and Hiroshima tour for 2 people',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-            {
-              key: Math.random().toString(36).substring(2, 9),
-              description: 'Fran Grundman <frangrundman@rogers.com>',
-              title: 'Re: Asia Travel Tips /LSS250429038',
-              mailDate: '2025-05-01 19:21:00',
-              orderNo: 'LSS250501006',
-              country: 'Thailand',
-            },
-          ]}
           renderItem={(item) => (
-            <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-gray-100 p-2'>
-              <div className='flex-1'>
+            <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2'>
+              <div className=''>
+                <Checkbox></Checkbox>
+              </div>
+              <div className='flex-1 pl-2'>
                 <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
                   <span className="font-bold">{item.title}</span>
                   <span className="text-neutral-500 text-wrap break-words break-all ">{item.description + ' ' + item.mailDate}</span>
-                  {item.orderNo + ' ' + item.country}
+                  {item.orderNo + ' ' + (item.country===null?'' : item.country)}
                 </Flex>
               </div>
-              <div className=''>
-                <Checkbox></Checkbox>
-              </div>
             </li>
           )}
         />
       </div>
 
       <Drawer title={'高级搜索'} placement='top' getContainer={false} size={'large'} mask={true} maskClosable={true} open={openOrder} onClose={() => setOpenOrder(false)}>
-        <Divider orientation='left'>
-          <Typography.Text strong>是否重要</Typography.Text>
-        </Divider>
-        <Radio.Group
-          options={[
-            { label: '重点', value: '1' },
-            { label: '次重点', value: '2' },
-            { label: '一般', value: '3' },
-          ]}
-        />
-
-        <Divider orientation='left'>
-          <Typography.Text strong>状态</Typography.Text>
-        </Divider>
-        <Radio.Group
-          options={[
-            { label: '新订单', value: '4' },
-            { label: '报价中', value: '5' },
-            { label: '以后联系', value: '6' },
-            { label: '等待付订金', value: '7' },
-            { label: '成行', value: '8' },
-            { label: '丢失', value: '9' },
-            { label: '取消', value: '10' },
-            { label: '未报价', value: '11' },
-          ]}
-        />
-
-        <Divider orientation='left'>
-          <Typography.Text strong> 催信</Typography.Text>
-        </Divider>
-        <Checkbox.Group
-          options={[
-            { label: '一催', value: 'Apple', className: 'label-1' },
-            { label: '二催', value: 'Pear', className: 'label-2' },
-            { label: '三催', value: 'Orange', className: 'label-3' },
-            { label: '重点团', value: '2233342', className: 'label-3' },
-            { label: '已发 travel advisor survey', value: '43535', className: 'label-3' },
-          ]}
-          defaultValue={['Apple']}
-        />
+        <Form
+      layout={'vertical'}
+      form={form}
+      initialValues={{
+      }}
+      // onFinish={handleSubmit}
+      >
+      <Row justify='start' gutter={16}>
+        <Col span={4}>
+          <Form.Item label='订单号' name='orderNumber'>
+            <Input placeholder='订单号' allowClear />
+          </Form.Item>
+        </Col>
+        <Col span={4}>
+          <Form.Item label='出发日期' name='startDateRange'>
+            <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
+          </Form.Item>
+        </Col>
+        <Col span={4}>
+          <Form.Item label='确认日期' name='confirmDateRange'>
+            <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
+          </Form.Item>
+        </Col>
+      </Row>
+      <Row justify='start' align='middle' gutter={16}>
+        <Col span={1} offset={1}>
+          <Button type='primary' htmlType='submit'>
+            搜索
+          </Button>
+        </Col>
+      </Row>
+    </Form>
       </Drawer>
     </>
   )

From c8ca19954f6bacb9d7dfb0621fd06f7f4848b1ea Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 5 Jun 2025 16:31:17 +0800
Subject: [PATCH 046/143] =?UTF-8?q?feat=EF=BC=9A=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=8C=89=E9=92=AE=E5=8F=8A=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx | 171 +++++++++++++-----------
 1 file changed, 90 insertions(+), 81 deletions(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 424ee87..51b6d2a 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -1,36 +1,36 @@
 import { useCallback, useEffect, useState } from 'react'
-import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, StarOutlined, HomeOutlined } from '@ant-design/icons'
+import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, StarOutlined, RightOutlined, LeftOutlined } from '@ant-design/icons'
 import { Flex, Button, Tooltip, List, Form, Row, Col, Drawer, Dropdown, Input, Checkbox, DatePicker, Select, Breadcrumb } from 'antd'
-import dayjs from 'dayjs';
+import dayjs from 'dayjs'
 
-const { RangePicker } = DatePicker;
+const { RangePicker } = DatePicker
 const MailBox = (props) => {
   const DATE_RANGE_PRESETS = [
-      {
-        label: '本周',
-        value: [dayjs().startOf('w'), dayjs().endOf('w')],
-      },
-      {
-        label: '上周',
-        value: [dayjs().startOf('w').subtract(7, 'days'), dayjs().endOf('w').subtract(7, 'days')],
-      },
-      {
-        label: '本月',
-        value: [dayjs().startOf('M'), dayjs().endOf('M')],
-      },
-      {
-        label: '上月',
-        value: [dayjs().subtract(1, 'M').startOf('M'), dayjs().subtract(1, 'M').endOf('M')],
-      },
-      {
-        label: '前三月',
-        value: [dayjs().subtract(2, 'M').startOf('M'), dayjs().endOf('M')],
-      },
-      {
-        label: '本年',
-        value: [dayjs().startOf('y'), dayjs().endOf('y')],
-      },
-    ];
+    {
+      label: '本周',
+      value: [dayjs().startOf('w'), dayjs().endOf('w')],
+    },
+    {
+      label: '上周',
+      value: [dayjs().startOf('w').subtract(7, 'days'), dayjs().endOf('w').subtract(7, 'days')],
+    },
+    {
+      label: '本月',
+      value: [dayjs().startOf('M'), dayjs().endOf('M')],
+    },
+    {
+      label: '上月',
+      value: [dayjs().subtract(1, 'M').startOf('M'), dayjs().subtract(1, 'M').endOf('M')],
+    },
+    {
+      label: '前三月',
+      value: [dayjs().subtract(2, 'M').startOf('M'), dayjs().endOf('M')],
+    },
+    {
+      label: '本年',
+      value: [dayjs().startOf('y'), dayjs().endOf('y')],
+    },
+  ]
   const [openOrder, setOpenOrder] = useState(false)
   const [form] = Form.useForm()
 
@@ -113,25 +113,35 @@ const MailBox = (props) => {
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
         <List
-          header={<Breadcrumb
-    items={[
-      {
-        title: (
-          <>
-            <StarOutlined />
-            <span>今日任务</span>
-          </>
-        ),
-      },
-      {
-        title: (
-          <>
-            <span>lyj20210810144702</span>
-          </>
-        ),
-      },
-    ]}
-  />}
+          header={
+            <Flex align='center' justify="space-between">
+            <Breadcrumb
+              items={[
+                {
+                  title: (
+                    <>
+                      <StarOutlined />
+                      <span>今日任务</span>
+                    </>
+                  ),
+                },
+                {
+                  title: (
+                    <>
+                      <span>lyj20210810144702</span>
+                    </>
+                  ),
+                },
+              ]}
+            />
+            <Flex align="center" justify="space-between">
+              <span>51-100 of 562</span>
+            <Button icon={<LeftOutlined />} type="text" iconPosition={'end'}></Button>
+            <Button icon={<RightOutlined />} type="text" iconPosition={'end'}></Button>
+            </Flex>
+
+          </Flex>
+          }
           itemLayout='vertical'
           size='large'
           pagination={false}
@@ -143,9 +153,9 @@ const MailBox = (props) => {
               </div>
               <div className='flex-1 pl-2'>
                 <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
-                  <span className="font-bold">{item.title}</span>
-                  <span className="text-neutral-500 text-wrap break-words break-all ">{item.description + ' ' + item.mailDate}</span>
-                  {item.orderNo + ' ' + (item.country===null?'' : item.country)}
+                  <span className='font-bold'>{item.title}</span>
+                  <span className='text-neutral-500 text-wrap break-words break-all '>{item.description + ' ' + item.mailDate}</span>
+                  {item.orderNo + ' ' + (item.country === null ? '' : item.country)}
                 </Flex>
               </div>
             </li>
@@ -155,37 +165,36 @@ const MailBox = (props) => {
 
       <Drawer title={'高级搜索'} placement='top' getContainer={false} size={'large'} mask={true} maskClosable={true} open={openOrder} onClose={() => setOpenOrder(false)}>
         <Form
-      layout={'vertical'}
-      form={form}
-      initialValues={{
-      }}
-      // onFinish={handleSubmit}
-      >
-      <Row justify='start' gutter={16}>
-        <Col span={4}>
-          <Form.Item label='订单号' name='orderNumber'>
-            <Input placeholder='订单号' allowClear />
-          </Form.Item>
-        </Col>
-        <Col span={4}>
-          <Form.Item label='出发日期' name='startDateRange'>
-            <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
-          </Form.Item>
-        </Col>
-        <Col span={4}>
-          <Form.Item label='确认日期' name='confirmDateRange'>
-            <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
-          </Form.Item>
-        </Col>
-      </Row>
-      <Row justify='start' align='middle' gutter={16}>
-        <Col span={1} offset={1}>
-          <Button type='primary' htmlType='submit'>
-            搜索
-          </Button>
-        </Col>
-      </Row>
-    </Form>
+          layout={'vertical'}
+          form={form}
+          initialValues={{}}
+          // onFinish={handleSubmit}
+        >
+          <Row justify='start' gutter={16}>
+            <Col span={4}>
+              <Form.Item label='订单号' name='orderNumber'>
+                <Input placeholder='订单号' allowClear />
+              </Form.Item>
+            </Col>
+            <Col span={4}>
+              <Form.Item label='出发日期' name='startDateRange'>
+                <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
+              </Form.Item>
+            </Col>
+            <Col span={4}>
+              <Form.Item label='确认日期' name='confirmDateRange'>
+                <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
+              </Form.Item>
+            </Col>
+          </Row>
+          <Row justify='start' align='middle' gutter={16}>
+            <Col span={1} offset={1}>
+              <Button type='primary' htmlType='submit'>
+                搜索
+              </Button>
+            </Col>
+          </Row>
+        </Form>
       </Drawer>
     </>
   )

From 05de1791edd6cca42148dddb6234fe18c1ac1a9a Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 6 Jun 2025 11:33:49 +0800
Subject: [PATCH 047/143] =?UTF-8?q?perf:=20=E5=8F=96=E6=B6=88=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E6=90=9C=E7=B4=A2=20Drawer=EF=BC=9B=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=A1=B9=E4=B8=BA=E4=B8=A4=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx | 117 ++++++++++++++++++++++--
 1 file changed, 111 insertions(+), 6 deletions(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 51b6d2a..80f24e2 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -145,7 +145,113 @@ const MailBox = (props) => {
           itemLayout='vertical'
           size='large'
           pagination={false}
-          dataSource={props.dataSource}
+          // dataSource={props.dataSource}
+          dataSource={[
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: '250520-LSS250429038 团的 变更 �确认：Japan Fleet',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Your Thailand Private tour by Asia Highlights 超长主题怎么办？？？？？？？？？？？？到框框到得奖看到',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Personal information',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Your Future Trip with Asia Highlights',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: '回复： 回复：中华游251110-LSS250413051(AH)团计划',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Greeting from Asia Highlights Alisa',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Have you made any decisions about your Japan trip',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Sri Lanka tour',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: How do you like the itinerary 3',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Re: Re: Final cost',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Reference Number: LSS240628079',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Personal information and Hiroshima tour for 2 people',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+            {
+              key: Math.random().toString(36).substring(2, 9),
+              description: 'Fran Grundman <frangrundman@rogers.com>',
+              title: 'Re: Asia Travel Tips /LSS250429038',
+              mailDate: '2025-05-01 19:21:00',
+              orderNo: 'LSS250501006',
+              country: 'Thailand',
+            },
+          ]}
           renderItem={(item) => (
             <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2'>
               <div className=''>
@@ -153,9 +259,8 @@ const MailBox = (props) => {
               </div>
               <div className='flex-1 pl-2'>
                 <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
-                  <span className='font-bold'>{item.title}</span>
-                  <span className='text-neutral-500 text-wrap break-words break-all '>{item.description + ' ' + item.mailDate}</span>
-                  {item.orderNo + ' ' + (item.country === null ? '' : item.country)}
+                  <div>{item.orderNo + ' - '}<span className='font-bold'>{item.title}</span></div>
+                  <span className='text-neutral-500 text-wrap break-words break-all '>{'[' + (item.country === null ? '' : item.country) + '] ' + item.description + ' ' + item.mailDate}</span>
                 </Flex>
               </div>
             </li>
@@ -163,7 +268,7 @@ const MailBox = (props) => {
         />
       </div>
 
-      <Drawer title={'高级搜索'} placement='top' getContainer={false} size={'large'} mask={true} maskClosable={true} open={openOrder} onClose={() => setOpenOrder(false)}>
+      {/* <Drawer title={'高级搜索'} placement='top'  size={'large'} mask={true} maskClosable={true} open={openOrder} onClose={() => setOpenOrder(false)}>
         <Form
           layout={'vertical'}
           form={form}
@@ -195,7 +300,7 @@ const MailBox = (props) => {
             </Col>
           </Row>
         </Form>
-      </Drawer>
+      </Drawer> */}
     </>
   )
 }

From efae99e81eed2212b3ffd9d58a446ba56f73b3f2 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 6 Jun 2025 14:12:21 +0800
Subject: [PATCH 048/143] feat: useEmailList hooks

---
 src/actions/EmailActions.js                   |  34 +++-
 src/hooks/useEmail.js                         |  67 +++++++-
 src/stores/ConversationStore.js               |  74 +--------
 src/stores/EmailSlice.js                      | 134 ++++++++++++++++
 src/utils/commons.js                          | 119 +++++++++++++-
 .../Online/Components/EmailDetailInline.jsx   |   6 +-
 .../Online/Input/EmailEditorPopup.jsx         |   2 +-
 src/views/NewEmail.jsx                        |   2 +-
 src/views/orders/Follow.jsx                   | 150 +++++++-----------
 src/views/orders/components/MailBox.jsx       |   7 +-
 .../orders/components/MailboxDirIcon.jsx      |  27 ++++
 11 files changed, 445 insertions(+), 177 deletions(-)
 create mode 100644 src/stores/EmailSlice.js
 create mode 100644 src/views/orders/components/MailboxDirIcon.jsx

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 9a4ec36..451aba8 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -1,6 +1,6 @@
 import { fetchJSON, postForm, postJSON } from '@/utils/request';
 import { API_HOST, DATE_FORMAT, DATEEND_FORMAT, DATETIME_FORMAT, EMAIL_HOST } from '@/config';
-import { buildTree, isEmpty, objectMapper } from '@/utils/commons';
+import { buildTree, isEmpty, objectMapper, omitEmpty, readIndexDB, uniqWith, writeIndexDB } from '@/utils/commons';
 import dayjs from 'dayjs';
 
 const parseHTMLString = (html, needText = false) => {
@@ -80,6 +80,12 @@ const encodeEmailInfo = (info) => {
  * @param {object} { mai_sn }
  */
 export const getEmailDetailAction = async (params) => {
+  // const cacheKey = params.mai_sn;
+  // const readCache = await readIndexDB(cacheKey, 'mailinfo', 'mailbox');
+  // if (!isEmpty(readCache)) { // todo: 除了草稿
+  //   return readCache.data;
+  // }
+
   const { result } = await fetchJSON(`${EMAIL_HOST}/getmail`, params);
   let mailType = result.MailInfo?.[0]?.MAI_ContentType || '';
   mailType = mailType === '' && (result.MailContent||'').includes('<html') ? 'text/html' : mailType;
@@ -94,12 +100,14 @@ export const getEmailDetailAction = async (params) => {
 
   const attachments = (isEmpty(result?.AttachList) ? [] : result.AttachList).filter(ele => isEmpty(ele.ATI_ContentID));
 
-  return {
+  const ret = {
     info: { ...encodeEmailInfo(result.MailInfo?.[0] || {}), mailType },
     content: mailType === 'text/html' ? html : result.MailContent || '',
     abstract: bodyText || result.MailContent || '',
     attachments,
   }
+  // writeIndexDB([{key: cacheKey, data: ret}], 'mailinfo', 'mailbox')
+  return ret;
 }
 
 export const getEmailOrderAction = async ({ colisn }) => {
@@ -154,10 +162,26 @@ export const getEmailDirAction = async (params = { opi_sn: '' }) => {
  * @usage 订单的邮件列表
  * @usage 高级搜索
  */
-export const queryEmailListAction = async ({ opi_sn= '', pagesize= 10, last_id= '', query={}, order= {} }={}) => {
-  const _params = { vkey: 0, vparent: 0, order_source_type: 0, mai_senddate1: dayjs().startOf('year').format(DATE_FORMAT), mai_senddate2: dayjs().format(DATEEND_FORMAT), ...order, ...query, opi_sn }
+export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id = '', node = {}, } = {}) => {
+  const _params = {
+    vkey: 0,
+    vparent: 0,
+    order_source_type: 0,
+    mai_senddate1: dayjs().subtract(1, 'year').startOf('year').format(DATE_FORMAT),
+    mai_senddate2: dayjs().format(DATEEND_FORMAT),
+    ...omitEmpty({
+      ...node,
+      opi_sn,
+    }),
+  }
+  _params.mai_senddate1 = dayjs(_params.mai_senddate1).format(DATE_FORMAT)
+  const cacheKey = isEmpty(_params.coli_sn) ? `dir-${node.vkey}` : `order-${node.vkey}`;
   const { errcode, result } = await fetchJSON(`http://202.103.68.144:8889/v3/mail_list`, _params)
-  return errcode === 0 ? result : []
+  const ret = errcode === 0 ? result : []
+  if (!isEmpty(ret)) {
+    writeIndexDB([{key: cacheKey, data: ret}], 'maillist', 'mailbox')
+  }
+  return ret;
 }
 
 /**
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 7cb142a..1c06f17 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -1,6 +1,6 @@
 import { useState, useEffect, useCallback } from 'react'
-import { isEmpty } from '@/utils/commons'
-import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction } from '@/actions/EmailActions'
+import { isEmpty, readIndexDB, } from '@/utils/commons'
+import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction } from '@/actions/EmailActions'
 import { App } from 'antd'
 import useConversationStore from '@/stores/ConversationStore';
 import { msgStatusRenderMapped } from '@/channel/bubbleMsgUtils';
@@ -116,3 +116,66 @@ export const useEmailDetail = (mai_sn, data) => {
 export const EmailBuilder = ({subject, content}) => {
   return `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><title>${subject}</title><meta http-equiv="Content-Type" content="text/html charset=UTF-8" /><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="telephone=no,address=no,email=no,date=no,url=no" name="format-detection"><meta content="light" name="color-scheme"><meta content="light" name="supported-color-schemes"><style id="font">body#highlights-email{ font-family: Verdana, sans-serif;} table{ border-collapse: collapse; border-spacing: 0;} </style></head><body id="highlights-email" style="margin: 0 auto; padding: 0; width: 900px; background-color: #fcfcfc;">${content}</body></html>`;
 }
+
+export const useEmailList = (mailboxDirNode) => {
+  const [loading, setLoading] = useState(false)
+  const [mailList, setMailList] = useState([])
+  const [error, setError] = useState(null)
+  const [isFreshData, setIsFreshData] = useState(false)
+  const { OPI_SN: opi_sn, COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = mailboxDirNode
+
+  const getMailList = useCallback(async () => {
+    console.log('getMailList', mailboxDirNode)
+    if (!opi_sn || !VKey || (!IsTrue && !COLI_SN)) {
+      setMailList([])
+      setLoading(false)
+      setError(null)
+      setIsFreshData(false)
+      return
+    }
+
+    setLoading(true)
+    setError(null)
+    setIsFreshData(false)
+
+    const cacheKey = isEmpty(COLI_SN) ? `dir-${VKey}` : `order-${VKey}`
+    const readCache = await readIndexDB(cacheKey, 'maillist', 'mailbox')
+    if (!isEmpty(readCache)) {
+      const _x = readCache.data.map((ele) => ({
+        ...ele,
+        key: ele.MAI_SN,
+        title: ele.MAI_Subject,
+        description: ele.SenderReceiver,
+        mailDate: ele.SRDate,
+        orderNo: ele.MAI_COLI_ID || '',
+        country: ele.CountryCN || '',
+      }))
+      setMailList(_x)
+    }
+    try {
+      const nodeParam = { coli_sn: COLI_SN, order_source_type: OrderSourceType, vkey: VKey, vparent: VParent, mai_senddate1: ApplyDate }
+      const x = await queryEmailListAction({ opi_sn, node: nodeParam })
+      // 配合List的结构
+      const _x = x.map((ele) => ({
+        ...ele,
+        key: ele.MAI_SN,
+        title: ele.MAI_Subject,
+        description: ele.SenderReceiver,
+        mailDate: ele.SRDate,
+        orderNo: ele.MAI_COLI_ID || '',
+        country: ele.CountryCN || '',
+      }))
+      setMailList(_x)
+    } catch (networkError) {
+      setError(new Error(`Failed to get mail list: ${networkError.message}.`))
+    } finally {
+      setLoading(false)
+    }
+  }, [VKey])
+
+  useEffect(() => {
+    getMailList()
+  }, [getMailList])
+
+  return { loading, isFreshData, error, mailList }
+}
diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js
index 3c9b289..c6fc272 100644
--- a/src/stores/ConversationStore.js
+++ b/src/stores/ConversationStore.js
@@ -1,11 +1,12 @@
 import { create } from 'zustand';
 import { RealTimeAPI } from '@/channel/realTimeAPI';
-import { olog, isEmpty, groupBy, sortArrayByOrder, logWebsocket, pick, sortKeys, omit, sortObjectsByKeysMap, clean7DaysWebsocketLog } from '@/utils/commons';
+import { olog, isEmpty, groupBy, sortArrayByOrder, logWebsocket, pick, sortKeys, omit, sortObjectsByKeysMap, clean7DaysWebsocketLog, createIndexedDBStore } from '@/utils/commons';
 import { receivedMsgTypeMapped, handleNotification } from '@/channel/bubbleMsgUtils';
 import { fetchConversationsList, fetchTemplates, fetchConversationsSearch, UNREAD_MARK, fetchTags } from '@/actions/ConversationActions';
 import { devtools } from 'zustand/middleware';
 import { WS_URL, DATETIME_FORMAT } from '@/config';
 import dayjs from 'dayjs';
+import EmailSlice from './EmailSlice';
 
 const replaceObjectsByKey = (arr1, arr2, key) => {
   const map2 = new Map(arr2.map(ele => [ele[key], ele]));
@@ -552,70 +553,6 @@ const messageSlice = (set, get) => ({
   },
 });
 
-/**
- * Email
- */
-const emailSlice = (set, get) => ({
-  emailMsg: { id: -1, conversationid: '', actionId: '', order_opi: '', coli_sn: '', msgOrigin: {} },
-  setEmailMsg: (emailMsg) => {
-    const { editorOpen } = get();
-    return editorOpen ? false : set({ emailMsg }); // 已经打开的不更新
-  },
-  detailPopupOpen: false,
-  setDetailOpen: (v) => set({ detailPopupOpen: v }),
-  openDetail: () => set(() => ({ detailPopupOpen: true })),
-  closeDetail: () => set(() => ({ detailPopupOpen: false })),
-  editorOpen: false,
-  setEditorOpen: (v) => set({ editorOpen: v }),
-  openEditor: () => set(() => ({ editorOpen: true })),
-  closeEditor: () => set(() => ({ editorOpen: false })),
-
-  // EmailEditorPopup 组件的 props
-  // @property {string} fromEmail - 发件人邮箱
-  // @property {string} fromUser - 发件人用户
-  // @property {string} fromOrder - 发件订单
-  // @property {string} toEmail - 收件人邮箱
-  // @property {string} conversationid - 会话ID
-  // @property {string} quoteid - 引用邮件ID
-  // @property {object} draft - 草稿
-  // @property {string} action - reply / forward / new / edit
-  // @property {string} oid - coli_sn
-  // @property {object} mailData - 邮件内容
-  // @property {string} receiverName - 收件人称呼
-  emailEdiorProps: new Map(),
-  setEditorProps: (v) => {
-    const { emailEdiorProps } = get();
-    const uniqueKey = v.quoteid || Date.now().toString(32);
-    const currentEditValue = {...v, key: `${v.action}-${uniqueKey}`};
-    const news = new Map(emailEdiorProps).set(currentEditValue.key, currentEditValue);
-    for (const [key, value] of news.entries()) {
-      console.log(value);
-    }
-    return set((state) => ({ emailEdiorProps: news, currentEditKey: currentEditValue.key, currentEditValue }))
-    // return set((state) => ({ emailEdiorProps: { ...state.emailEdiorProps, ...v } }))
-  },
-  closeEditor1: (key) => {
-    const { emailEdiorProps } = get();
-    const newProps = new Map(emailEdiorProps);
-    newProps.delete(key);
-    return set(() => ({ emailEdiorProps: newProps }))
-  },
-  clearEditor: () => {
-    return set(() => ({ emailEdiorProps: new Map() }))
-  },
-  currentEditKey: '',
-  setCurrentEditKey: (key) => {
-    const { emailEdiorProps, setCurrentEditValue } = get();
-    const value = emailEdiorProps.get(key);
-    setCurrentEditValue(value);
-    return set(() => ({ currentEditKey: key }))
-  },
-  currentEditValue: {},
-  setCurrentEditValue: (v) => {
-    return set(() => ({ currentEditValue: v }))
-  }
-})
-
 export const useConversationStore = create(
   devtools((set, get) => ({
     ...initialConversationState,
@@ -628,7 +565,7 @@ export const useConversationStore = create(
     ...tagsSlice(set, get),
     ...filterSlice(set, get),
     ...globalNotifySlice(set, get),
-    ...emailSlice(set, get),
+    ...EmailSlice(set, get),
     ...waiSlice(set, get),
 
     // state actions
@@ -637,7 +574,10 @@ export const useConversationStore = create(
 
     // side effects
     fetchInitialData: async ({userId, whatsAppBusiness, ...loginUser}) => {
-      const { addToConversationList, setTemplates, setInitial, setTags } = get();
+      const { addToConversationList, setTemplates, setInitial, setTags,
+        initMailbox } = get();
+
+      initMailbox({ userId, dei_sn: loginUser.accountList[0].OPI_DEI_SN, opi_sn: loginUser.accountList[0].OPI_SN })
 
       const conversationsList = await fetchConversationsList({ opisn: userId });
       addToConversationList(conversationsList);
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
new file mode 100644
index 0000000..8cbec4f
--- /dev/null
+++ b/src/stores/EmailSlice.js
@@ -0,0 +1,134 @@
+import { getEmailDirAction } from '@/actions/EmailActions'
+import { buildTree, isEmpty, readIndexDB, writeIndexDB, createIndexedDBStore } from '@/utils/commons'
+
+/**
+ * Email
+ */
+const emailSlice = (set, get) => ({
+  emailMsg: { id: -1, conversationid: '', actionId: '', order_opi: '', coli_sn: '', msgOrigin: {} },
+  setEmailMsg: (emailMsg) => {
+    const { editorOpen } = get()
+    return editorOpen ? false : set({ emailMsg }) // 已经打开的不更新
+  },
+  detailPopupOpen: false,
+  setDetailOpen: (v) => set({ detailPopupOpen: v }),
+  openDetail: () => set(() => ({ detailPopupOpen: true })),
+  closeDetail: () => set(() => ({ detailPopupOpen: false })),
+  editorOpen: false,
+  setEditorOpen: (v) => set({ editorOpen: v }),
+  openEditor: () => set(() => ({ editorOpen: true })),
+  closeEditor: () => set(() => ({ editorOpen: false })),
+
+  // EmailEditorPopup 组件的 props
+  // @property {string} fromEmail - 发件人邮箱
+  // @property {string} fromUser - 发件人用户
+  // @property {string} fromOrder - 发件订单
+  // @property {string} toEmail - 收件人邮箱
+  // @property {string} conversationid - 会话ID
+  // @property {string} quoteid - 引用邮件ID
+  // @property {object} draft - 草稿
+  // @property {string} action - reply / forward / new / edit
+  // @property {string} oid - coli_sn
+  // @property {object} mailData - 邮件内容
+  // @property {string} receiverName - 收件人称呼
+  emailEdiorProps: new Map(),
+  setEditorProps: (v) => {
+    const { emailEdiorProps } = get()
+    const uniqueKey = v.quoteid || Date.now().toString(32)
+    const currentEditValue = { ...v, key: `${v.action}-${uniqueKey}` }
+    const news = new Map(emailEdiorProps).set(currentEditValue.key, currentEditValue)
+    for (const [key, value] of news.entries()) {
+      console.log(value)
+    }
+    return set((state) => ({ emailEdiorProps: news, currentEditKey: currentEditValue.key, currentEditValue }))
+    // return set((state) => ({ emailEdiorProps: { ...state.emailEdiorProps, ...v } }))
+  },
+  closeEditor1: (key) => {
+    const { emailEdiorProps } = get()
+    const newProps = new Map(emailEdiorProps)
+    newProps.delete(key)
+    return set(() => ({ emailEdiorProps: newProps }))
+  },
+  clearEditor: () => {
+    return set(() => ({ emailEdiorProps: new Map() }))
+  },
+  currentEditKey: '',
+  setCurrentEditKey: (key) => {
+    const { emailEdiorProps, setCurrentEditValue } = get()
+    const value = emailEdiorProps.get(key)
+    setCurrentEditValue(value)
+    return set(() => ({ currentEditKey: key }))
+  },
+  currentEditValue: {},
+  setCurrentEditValue: (v) => {
+    return set(() => ({ currentEditValue: v }))
+  },
+
+  // mailboxNestedDirs: new Map(),
+  // setMailboxNestedDirs: (opi, dirs) => {
+  //   const { mailboxNestedDirs } = get()
+  //   const news = mailboxNestedDirs.set(opi, dirs)
+  //   return set(() => ({ mailboxNestedDirs: news }))
+  // },
+
+  currentMailboxDEI: 0,
+  setCurrentMailboxDEI: (id) => {
+    return set(() => ({ currentMailboxDEI: id }))
+  },
+  currentMailboxOPI: 0,
+  setCurrentMailboxOPI: (id) => {
+    return set(() => ({ currentMailboxOPI: id }))
+  },
+
+  mailboxNestedDirsActive: [],
+  setMailboxNestedDirsActive: (dir) => {
+    return set(() => ({ mailboxNestedDirsActive: dir }))
+  },
+
+  mailboxActiveNode: {},
+  setMailboxActiveNode: (node) => {
+    return set(() => ({ mailboxActiveNode: node }))
+  },
+
+  mailboxList: [],
+  setMailboxList: (list) => {
+    return set(() => ({ mailboxList: list }))
+  },
+  mailboxActiveMAI: 0,
+  setMailboxActiveMAI: (mai) => {
+    return set(() => ({ mailboxActiveMAI: mai }))
+  },
+
+  getOPIEmailDir: async (opi_sn = 0) => {
+    // console.log('🌐requesting opi dir', opi_sn, typeof opi_sn)
+    const { setMailboxNestedDirsActive } = get()
+    const readCache = await readIndexDB(Number(opi_sn), 'dirs', 'mailbox')
+    // console.log(readCache);
+    // setMailboxNestedDirs(Number(opi_sn), readCache.tree)
+    let isNeedRefresh = false
+    if (!isEmpty(readCache)) {
+      setMailboxNestedDirsActive(readCache?.tree || [])
+      isNeedRefresh = Date.now() - readCache.timestamp > 4 * 60 * 60 * 1000
+    } else if (isEmpty(readCache) || isNeedRefresh) {
+      // > {4} 更新
+      const x = await getEmailDirAction({ opi_sn })
+      const mailboxSort = x //.sort(sortBy('MDR_Order'));
+      let tree = buildTree(mailboxSort, { key: 'VKey', parent: 'VParent', name: 'VName', iconIndex: 'ImageIndex', rootKeys: [1], ignoreKeys: [-227001, -227002] })
+      tree = tree.filter((ele) => ele.key !== 1)
+      writeIndexDB([{ key: Number(opi_sn), tree }], 'dirs', 'mailbox')
+      // setMailboxNestedDirs(Number(opi_sn), tree)
+      setMailboxNestedDirsActive(tree)
+    }
+    return false
+  },
+
+  async initMailbox({ opi_sn, dei_sn, userId }) {
+    const { setCurrentMailboxOPI, setCurrentMailboxDEI, getOPIEmailDir } = get()
+    createIndexedDBStore(['dirs', 'maillist', 'mailinfo'], 'mailbox')
+    setCurrentMailboxOPI(opi_sn)
+    setCurrentMailboxDEI(dei_sn)
+    getOPIEmailDir(userId)
+  },
+
+})
+export default emailSlice
diff --git a/src/utils/commons.js b/src/utils/commons.js
index 44e7c2e..7c5f9c4 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -226,6 +226,15 @@ export function omit(object, keysToOmit) {
   return Object.fromEntries(Object.entries(object).filter(([key]) => !keysToOmit.includes(key)));
 }
 
+/**
+ * 去除无效的值: undefined, null, '', []
+ * * 只删除 null undefined: 用 flush 方法;
+ */
+export const omitEmpty = _object => {
+  Object.keys(_object).forEach(key => (_object[key] == null || _object[key] === '' || _object[key].length === 0) && delete _object[key]);
+  return _object;
+};
+
 /**
  * 深拷贝
  */
@@ -606,12 +615,14 @@ export const uniqWith = (arr, fn) => arr.filter((element, index) => arr.findInde
  * @param {string|null} parent - The key of the parent node, or null if it's a root.
  * @returns {object} A plain JavaScript object representing the tree node.
  */
-function createTreeNode(key, name, parent = null, _raw={}) {
+function createTreeNode(key, name, parent = null, keyMap={}, _raw={}) {
     return {
         key: key,
         title: name,
         parent: parent,
+        parentTitle: '',
         icon: _raw?.icon,
+        iconIndex: _raw?.[keyMap.iconIndex],
         _raw: _raw,
         children: []
     };
@@ -629,7 +640,7 @@ export const buildTree = (list, keyMap={ rootKeys: [], ignoreKeys: [] }) => {
   const treeRoots = []
 
   list.forEach((item) => {
-    const node = createTreeNode(item[keyMap.key], item[keyMap.name], item[keyMap.parent], item)
+    const node = createTreeNode(item[keyMap.key], item[keyMap.name], item[keyMap.parent], keyMap, item)
     nodeMap.set(item[keyMap.key], node)
   })
 
@@ -642,12 +653,15 @@ export const buildTree = (list, keyMap={ rootKeys: [], ignoreKeys: [] }) => {
       const parentNode = nodeMap.get(item[keyMap.parent])
       if (keyMap.ignoreKeys.includes(item[keyMap.parent])) {
         const grandParentNode = nodeMap.get(parentNode.parent);
+        node.rawParent = node.parent;
         node.parent = parentNode.parent;
+        node.parentTitle = parentNode.title;
         grandParentNode.children.push(node)
       } else if (keyMap.ignoreKeys.includes(item[keyMap.key])) {
         //
       }
       else if (parentNode) {
+        node.parentTitle = parentNode.title;
         parentNode.children.push(node)
       } else {
         console.warn(`Parent with key '${item[keyMap.parent]}' not found for node '${item[keyMap.key]}'. This node will be treated as a root.`)
@@ -761,9 +775,30 @@ export const clearWebsocketLog = () => {
   }
 }
 
-export const writeIndexDB = (row, table, database) => {
+export const createIndexedDBStore = (tables, database) => {
   var open = indexedDB.open(database, INDEXED_DB_VERSION)
   open.onupgradeneeded = function () {
+    console.log('readIndexDB onupgradeneeded', database, )
+    var db = open.result
+    // 数据库是否存在
+    for (const table of tables) {
+      if (!db.objectStoreNames.contains(table)) {
+        var store = db.createObjectStore(table, { keyPath: 'key' })
+        store.createIndex('timestamp', 'timestamp', { unique: false })
+      } else {
+        const objectStore = open.transaction.objectStore(table)
+        if (!objectStore.indexNames.contains('timestamp')) {
+          objectStore.createIndex('timestamp', 'timestamp', { unique: false })
+        }
+      }
+    }
+  }
+};
+
+export const writeIndexDB = (rows, table, database) => {
+  var open = indexedDB.open(database, INDEXED_DB_VERSION)
+  open.onupgradeneeded = function () {
+    console.log('readIndexDB onupgradeneeded', table, )
     var db = open.result
     // 数据库是否存在
     if (!db.objectStoreNames.contains(table)) {
@@ -780,12 +815,87 @@ export const writeIndexDB = (row, table, database) => {
     var db = open.result
     var tx = db.transaction(table, 'readwrite')
     var store = tx.objectStore(table)
-    store.put({ ...row, _date: new Date().toLocaleString(), timestamp: Date.now() })
+    rows.forEach(row => {
+      store.put({ ...row, _date: new Date().toLocaleString(), timestamp: Date.now() })
+    });
     tx.oncomplete = function () {
       db.close()
     }
   }
 };
+
+export const readIndexDB = (key=null, table, database) => {
+  return new Promise((resolve, reject) => {
+    let openRequest = indexedDB.open(database)
+    openRequest.onupgradeneeded = function () {
+      console.log('readIndexDB onupgradeneeded', table, )
+      var db = openRequest.result
+      // 数据库是否存在
+      if (!db.objectStoreNames.contains(table)) {
+        var store = db.createObjectStore(table, { keyPath: 'key' })
+        store.createIndex('timestamp', 'timestamp', { unique: false })
+      } else {
+        const logStore = openRequest.transaction.objectStore(table)
+        if (!logStore.indexNames.contains('timestamp')) {
+          logStore.createIndex('timestamp', 'timestamp', { unique: false })
+        }
+      }
+    }
+    openRequest.onerror = function (e) {
+      console.error(`Error opening database.`, table, e)
+      reject('Error opening database.')
+    }
+    openRequest.onsuccess = function (e) {
+      let db = e.target.result
+      // 数据库是否存在
+      if (!db.objectStoreNames.contains(table)) {
+        resolve('Database does not exist.')
+        return
+      }
+      let transaction = db.transaction(table, 'readonly')
+      let store = transaction.objectStore(table)
+      // read by key
+      const getRequest = isEmpty(key) ? store.all() : store.get(key);
+      getRequest.onsuccess = (event) => {
+        const result = event.target.result
+        if (result) {
+          console.log(`Found record with key ${key}:`, result)
+          resolve(result)
+        } else {
+          console.log(`No record found with key ${key}.`)
+          resolve();
+        }
+      }
+
+      getRequest.onerror = (event) => {
+        console.error(`Error getting record with key ${key}:`, event.target.error)
+      }
+
+      // const request = store.openCursor(null, 'prev'); // 从后往前
+      // const results = [];
+      // let count = 0;
+      // request.onerror = function (e) {
+      //   reject('Error getting records.')
+      // }
+      // request.onsuccess = function (e) {
+      //   const cursor = e.target.result
+      //   if (cursor) {
+      //     if (count < limit) {
+      //       results.unshift(cursor.value)
+      //       count++
+      //       cursor.continue()
+      //     } else {
+      //       console.log(JSON.stringify(results))
+      //       resolve(results)
+      //     }
+      //   } else {
+      //     console.log(JSON.stringify(results))
+      //     resolve(results)
+      //   }
+      // }
+    }
+  })
+};
 export const deleteIndexDBbyKey = (key, table, database) => {
   var open = indexedDB.open(database, INDEXED_DB_VERSION)
   open.onupgradeneeded = function () {
@@ -902,4 +1012,3 @@ function cleanOldData(database, storeName, dateKey = 'timestamp') {
 }
 
 export const clean7DaysWebsocketLog = cleanOldData('LogWebsocketData', 'LogStore');
-
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 53358fb..dea7317 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -1,5 +1,5 @@
 import { useState, useEffect, useRef } from 'react'
-import { App, Button, Divider, Avatar, List, Flex, Typography, Tooltip } from 'antd'
+import { App, Button, Divider, Avatar, List, Flex, Typography, Tooltip, Empty } from 'antd'
 import { LoadingOutlined, ApiOutlined, FilePdfOutlined, FileOutlined, FileWordOutlined, FileExcelOutlined, FileJpgOutlined, FileImageOutlined, FileTextOutlined, FileGifOutlined, GlobalOutlined, FileZipOutlined } from '@ant-design/icons'
 import { EditIcon, MailCheckIcon, ReplyAllIcon, ReplyIcon, ResendIcon, ShareForwardIcon, SendPlaneFillIcon, InboxIcon } from '@/components/Icons'
 import { isEmpty, TagColorStyle } from '@/utils/commons'
@@ -178,7 +178,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
     }
   }
 
-  return (
+  return mailID ?(
     <>
       <div ref={componentRef} className={`email-container h-full flex flex-col gap-0 divide-y divide-neutral-200 divide-solid *:p-2 *:border-0 bg-white ${variantCls(variant)}`} >
         <div className=''>
@@ -274,6 +274,8 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
         key={`email-detail-inline-${action}_${mailID}`}
       /> */}
     </>
+  ) : (
+    <Empty description={'未打开邮件'} image={Empty.PRESENTED_IMAGE_SIMPLE} />
   )
 }
 export default EmailDetailInline
diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
index 6582c33..284aad2 100644
--- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
+++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
@@ -483,7 +483,7 @@ const EmailEditorPopup = () => {
     debounce((data) => {
       idleCallbackId.current = window.requestIdleCallback(() => {
         console.log('Saving data (idle, debounced):', data);
-        if (currentEditKey) writeIndexDB({ ...data, key: currentEditKey }, 'draft', 'EmailEditor')
+        if (currentEditKey) writeIndexDB([{ ...data, key: currentEditKey }], 'draft', 'EmailEditor')
       });
     }, 1500), //  1.5s
     []
diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index f7179b4..5658204 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -489,7 +489,7 @@ const NewEmail = ({ ...props }) => {
     debounce((data) => {
       idleCallbackId.current = window.requestIdleCallback(() => {
         console.log('Saving data (idle, debounced):', data)
-        writeIndexDB({ ...data, key: editorKey }, 'draft', 'EmailEditor')
+        writeIndexDB([{ ...data, key: editorKey }], 'draft', 'EmailEditor')
       })
     }, 1500), //  1.5s
     [],
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 4ce5cc8..6a2a71a 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -1,9 +1,9 @@
 import useAuthStore from '@/stores/AuthStore'
 import useFormStore from '@/stores/FormStore'
 import { useOrderStore } from '@/stores/OrderStore'
-import { isEmpty, groupBy, buildTree } from '@/utils/commons'
+import { isEmpty, groupBy, buildTree, readIndexDB, writeIndexDB, pick } from '@/utils/commons'
 import { StarTwoTone, CalendarTwoTone, FolderOutlined, DeleteOutlined, ClockCircleOutlined, FormOutlined, DatabaseOutlined } from '@ant-design/icons'
-import { Flex, Drawer, Radio, Divider, Segmented, Tree, Typography, Checkbox, Layout, Row, Col } from 'antd'
+import { Flex, Drawer, Radio, Divider, Segmented, Tree, Typography, Checkbox, Layout, Row, Col, Empty, Splitter } from 'antd'
 import { useEffect, useMemo, useState } from 'react'
 import { InboxIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
 import { useShallow } from 'zustand/react/shallow'
@@ -11,23 +11,10 @@ import EmailDetailInline from '../Conversations/Online/Components/EmailDetailInl
 import { getEmailDirAction, queryEmailListAction } from '@/actions/EmailActions'
 import OrderProfile from '@/components/OrderProfile'
 import Mailbox from './components/Mailbox'
-
-const EmailDirTypeIcons = {
-  0: { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
-  1: { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
-  3: { component: InboxIcon, color: '', className: 'text-indigo-500' },
-  17: { component: InboxIcon, color: '', className: 'text-indigo-500' },
-  11: { component: MailUnreadIcon, color: '', className: 'text-indigo-500' },
-  4: { component: SendPlaneFillIcon, color: '', className: 'text-primary' },
-  2: { component: ClockCircleOutlined, color: '', className: 'text-yellow-500' },
-  5: { component: FormOutlined, color: '', className: 'text-blue-500' },
-  7: { component: DeleteOutlined, color: '', className: 'text-red-500' },
-  // '3': { component: MailCheckIcon, color: '', className: 'text-yellow-600' },
-  12: { component: DatabaseOutlined, color: '', className: 'text-blue-600' },
-  13: { component: () => null, color: '', className: '' },
-  14: { component: () => '❗', color: '', className: '' }, // 240002 较重要/高品牌价值客户
-  15: { component: () => '❣️', color: '', className: '' }, // 240003 很重要/高订单价值客户
-}
+import useConversationStore from '@/stores/ConversationStore';
+import dayjs from 'dayjs'
+import { DATE_FORMAT, DATETIME_FORMAT } from '@/config'
+import { MailboxDirIcon } from './components/MailboxDirIcon'
 
 const todoTypes = {
   // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
@@ -96,14 +83,14 @@ function Follow() {
             key: ele.OPI_DEI_SN + '-today',
             getMails: false,
             icon: <StarTwoTone />,
-            children: [],
+            children: [], COLI_SN: 0,
           },
           {
             title: '待办任务',
             key: ele.OPI_DEI_SN + '-todo',
             getMails: false,
             icon: <CalendarTwoTone />,
-            children: [],
+            children: [], COLI_SN: 0,
           },
         ],
       }),
@@ -111,80 +98,45 @@ function Follow() {
     )
   }, [accountList])
 
-  const [activeEmailId, setActiveEmailId] = useState(0)
+  const [getOPIEmailDir] = useConversationStore(state => [state.getOPIEmailDir]);
+  const [currentMailboxDEI, setCurrentMailboxDEI, mailboxNestedDirsActive] = useConversationStore(state => [state.currentMailboxDEI, state.setCurrentMailboxDEI, state.mailboxNestedDirsActive]);
+  const [currentMailboxOPI, setCurrentMailboxOPI] = useConversationStore(state => [state.currentMailboxOPI, state.setCurrentMailboxOPI]);
+  const [mailboxActiveNode, setMailboxActiveNode] = useConversationStore(state => [state.mailboxActiveNode, state.setMailboxActiveNode]);
+  const [activeEmailId, setActiveEmailId] = useConversationStore(state => [state.mailboxActiveMAI, state.setMailboxActiveMAI]);
+
+  // const [activeEmailId, setActiveEmailId] = useState(0)
 
-  const [activeAccount, setActiveAccount] = useState(accountDEI[0].value)
-  const [mailboxDir, setMailboxDir] = useState([])
   const [deiStickyTree, setDeiStickyTree] = useState({})
   const [stickyTree, setStickyTree] = useState([])
-  const [mergedTree, setMergedTree] = useState([]);
   const [expandTree, setExpandTree] = useState([])
 
-  const [mailList, setMailList] = useState([]);
-
-  const DirTypeIcon = ({ type }) => {
-    const Icon = EmailDirTypeIcons[type || '0']?.component || EmailDirTypeIcons['0'].component
-    const className = EmailDirTypeIcons[type || '0']?.className || EmailDirTypeIcons['0'].className
-    return <Icon className={className} />
-  }
-
-  const getOPIEmailDir = async (opi_sn = 0) => {
-    console.log('🌐requesting opi dir', opi_sn)
-    const x = await getEmailDirAction({opi_sn})
-    const mailboxSort = x //.sort(sortBy('MDR_Order'));
-    const dirs = mailboxSort.map((ele) => {
-      return { ...ele, icon: ele.ImageIndex !== void 0 ? <DirTypeIcon type={ele.ImageIndex} /> : false }
-    })
-    let tree = buildTree(dirs, { key: 'VKey', parent: 'VParent', name: 'VName', rootKeys: [1], ignoreKeys: [-227001, -227002] })
-    tree = tree.filter((ele) => ele.key !== 1)
-    // console.log('tree', tree)
-    setMailboxDir(tree)
-    setMergedTree([...stickyTree, ...tree]);
-    // const level1 = []; // tree.filter((ele) => !isEmpty(ele.children)).map((ele) => ele.key)
-    // setExpandTree((pre) => [...pre, ...level1])
-  }
-
-  const getMailList = async ({ query, order }) => {
-    const opi_sn = accountListDEIMapped[activeAccount].OPI_SN || 404
-    const x = await queryEmailListAction({ opi_sn, query, order })
-    const _x = x.map(ele => ({...ele, key: ele.MAI_SN, title: ele.MAI_Subject, description: ele.SenderReceiver, mailDate: ele.SRDate, orderNo: ele.MAI_COLI_ID || '', country: ele.CountryCN || ''}));
-    setMailList(_x);
-  }
-
   const handleSwitchAccount = (value) => {
-    setActiveAccount(value)
+    setActiveEmailId(0);
+
+    setCurrentMailboxDEI(value)
     setStickyTree(deiStickyTree[value] || [])
     setExpandTree([`${value}-today`, `${value}-todo`])
     const opi = accountListDEIMapped[value].OPI_SN
     getOPIEmailDir(opi)
+    setCurrentMailboxOPI(opi);
   }
 
   const handleTreeSelectGetMails = (selectedKeys, { node }) => {
-    console.info('selectedTreeKeys: ', selectedKeys, node)
-    if (node?.COLI_SN || node?._raw?.COLI_SN) {
-      // 固定列表; 邮箱文件夹
-      // get order mails
-      // console.log('get order mails', { order: { coli_sn: node?.COLI_SN || node?._raw?.COLI_SN, order_source_type: node?._raw?.OrderSourceType || 227001, vkey: node.key } })
-      const coli_sn = node?.COLI_SN || node?._raw?.COLI_SN;
-      getMailList({ order: { coli_sn: coli_sn, order_source_type: node?._raw?.OrderSourceType || 227001, vkey: coli_sn, vparent: node?.parent || -1, mai_senddate1: node?._raw?.ApplyDate || '' } })
-    } else if ([-227001, -227002].includes(node.key) || [-227001, -227002].includes(node.parent) || node?.getMails === false) {
-      // nothing, expand only
-      console.log('nothing')
-    } else {
-      // get mail list
-      console.log('get mail list')
-      getMailList({ query: { vkey: selectedKeys[0], vparent: node.parent } })
-    }
+    // console.info('selectedTreeKeys: ', node)
+    const treeNode = pick(node, ['key', 'parent', 'getMails', 'title', 'parentTitle', ]);
+    setMailboxActiveNode({...treeNode, ...node._raw, OPI_SN: currentMailboxOPI});
+    // const { COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = node?._raw || {}
+    setActiveEmailId(0);
   }
 
   useEffect(() => {
     fetchOrderList({ type: 'today' }, loginUser)
-    getOPIEmailDir(accountList[0].OPI_SN)
     return () => {}
   }, [])
 
   // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
   useEffect(() => {
+    console.log('orderList render', currentMailboxDEI, currentMailboxOPI)
     const byDEI = groupBy(orderList, 'OPI_DEI_SN')
     // console.log(byDEI, 'byDEI')
     const byState = Object.keys(byDEI).reduce((acc, key) => {
@@ -199,15 +151,27 @@ function Follow() {
           title: '今日任务',
           key: key + '-today',
           getMails: false,
-          icon: <StarTwoTone />,
-          children: (sticky[0] || []).map((o) => ({ key: `today-${o.COLI_SN}`, title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`, _raw: {...o, ApplyDate: '', OrderSourceType: 227001,parent: -1, }})),
+          icon: <StarTwoTone />, _raw: {COLI_SN: 0},
+          children: (sticky[0] || []).map((o) => ({
+            key: `today-${o.COLI_SN}`,
+            title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
+            parent: key + '-today',
+            parentTitle: '今日任务',
+            _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
+          })),
         },
         {
           title: '待办任务',
           key: key + '-todo',
           getMails: false,
-          icon: <CalendarTwoTone />,
-          children: (sticky[1] || []).map((o) => ({ key: `todo-${o.COLI_SN}`, title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`, _raw: {...o, ApplyDate: '', OrderSourceType: 227001,parent: -1, } })),
+          icon: <CalendarTwoTone />,_raw: {COLI_SN: 0},
+          children: (sticky[1] || []).map((o) => ({
+            key: `todo-${o.COLI_SN}`,
+            title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
+            parent: key + '-todo',
+            parentTitle: '待办任务',
+            _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
+          })),
         },
       ]
       // { key, title: deiName, children: sticky[0] };
@@ -215,7 +179,7 @@ function Follow() {
     }, defaultStickyTree)
     // console.log('tree 0', byState);
     setDeiStickyTree(byState)
-    const first = accountDEI[0].value
+    const first = currentMailboxDEI || accountDEI[0].value
     setExpandTree([`${first}-today`, `${first}-todo`])
     setStickyTree(byState[first] || [])
 
@@ -227,42 +191,44 @@ function Follow() {
       <Layout>
         <Layout.Sider width='300' theme='light' style={{ height: 'calc(100vh - 166px)' }}>
           <Flex justify='start' align='start' vertical className='h-full'>
-            <Segmented className='w-full' block shape='round' options={accountDEI} value={activeAccount} onChange={handleSwitchAccount} />
+            <Segmented className='w-full' block shape='round' options={accountDEI} value={currentMailboxDEI} onChange={handleSwitchAccount} />
             <div className='overflow-y-auto flex-auto w-full [&_.ant-tree-switcher]:me-0 [&_.ant-tree-node-content-wrapper]:px-0 [&_.ant-tree-node-content-wrapper]:text-ellipsis [&_.ant-tree-node-content-wrapper]:overflow-hidden [&_.ant-tree-node-content-wrapper]:whitespace-nowrap'>
               <Tree
                 key='sticky-today'
                 blockNode
                 showIcon
-                showLine expandAction={'doubleClick'}
+                showLine
+                expandAction={'doubleClick'}
                 onSelect={handleTreeSelectGetMails}
                 onExpand={(expandedKeys) => setExpandTree(expandedKeys)}
                 expandedKeys={expandTree}
                 defaultExpandedKeys={expandTree}
-                defaultSelectedKeys={['today']}
-                treeData={[...(stickyTree || []), ...mailboxDir]}
+                treeData={[...(stickyTree || []), ...mailboxNestedDirsActive]}
                 // treeData={mergedTree}
+                icon={(node) => <MailboxDirIcon type={node?.iconIndex} />}
                 titleRender={(node) => <Typography.Text ellipsis={{ tooltip: node.title }}>{node.title}</Typography.Text>}
               />
             </div>
           </Flex>
         </Layout.Sider>
         <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
-          <Row>
-            <Col className='bg-white' span={14}>
-              <Mailbox dataSource={mailList} selectedIds={[activeEmailId]} onMailClick={id => setActiveEmailId(id)} />
-            </Col>
-
-            <Col span={10} style={{ height: 'calc(100vh - 166px)' }}>
+          <Splitter>
+            <Splitter.Panel defaultSize='40%' min={580} max='70%'>
+              <Mailbox mailboxDir={mailboxActiveNode} onMailItemClick={(id) => setActiveEmailId(id)} />
+            </Splitter.Panel>
+            <Splitter.Panel>
               <EmailDetailInline mailID={activeEmailId || 0} emailMsg={{}} variant={'outline'} size={'small'} />
-            </Col>
-          </Row>
+            </Splitter.Panel>
+          </Splitter>
         </Layout.Content>
 
         <Layout.Sider
           zeroWidthTriggerStyle={{ top: '30px' }}
-          width='280' theme='light' className='overflow-y-auto'
+          width='280'
+          theme='light'
+          className='overflow-y-auto'
           style={{
-            height: 'calc(100vh - 166px)'
+            height: 'calc(100vh - 166px)',
           }}
           collapsible
           collapsed={collapsed}
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 51b6d2a..be6c0c8 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -2,9 +2,10 @@ import { useCallback, useEffect, useState } from 'react'
 import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, StarOutlined, RightOutlined, LeftOutlined } from '@ant-design/icons'
 import { Flex, Button, Tooltip, List, Form, Row, Col, Drawer, Dropdown, Input, Checkbox, DatePicker, Select, Breadcrumb } from 'antd'
 import dayjs from 'dayjs'
+import { useEmailList } from '@/hooks/useEmail';
 
 const { RangePicker } = DatePicker
-const MailBox = (props) => {
+const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
   const DATE_RANGE_PRESETS = [
     {
       label: '本周',
@@ -34,6 +35,8 @@ const MailBox = (props) => {
   const [openOrder, setOpenOrder] = useState(false)
   const [form] = Form.useForm()
 
+  const { mailList, isLoading, error } = useEmailList(mailboxDir);
+
   return (
     <>
       <div className='bg-white h-auto px-1 flex gap-1 items-center'>
@@ -145,7 +148,7 @@ const MailBox = (props) => {
           itemLayout='vertical'
           size='large'
           pagination={false}
-          dataSource={props.dataSource}
+          dataSource={mailList}
           renderItem={(item) => (
             <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2'>
               <div className=''>
diff --git a/src/views/orders/components/MailboxDirIcon.jsx b/src/views/orders/components/MailboxDirIcon.jsx
new file mode 100644
index 0000000..d042e27
--- /dev/null
+++ b/src/views/orders/components/MailboxDirIcon.jsx
@@ -0,0 +1,27 @@
+import { StarTwoTone, CalendarTwoTone, FolderOutlined, DeleteOutlined, ClockCircleOutlined, FormOutlined, DatabaseOutlined } from '@ant-design/icons'
+import { InboxIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
+
+const EmailDirTypeIcons = {
+  0: { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
+  1: { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
+  3: { component: InboxIcon, color: '', className: 'text-indigo-500' },
+  17: { component: InboxIcon, color: '', className: 'text-indigo-500' },
+  11: { component: MailUnreadIcon, color: '', className: 'text-indigo-500' },
+  4: { component: SendPlaneFillIcon, color: '', className: 'text-primary' },
+  2: { component: ClockCircleOutlined, color: '', className: 'text-yellow-500' },
+  5: { component: FormOutlined, color: '', className: 'text-blue-500' },
+  7: { component: DeleteOutlined, color: '', className: 'text-red-500' },
+  // '3': { component: MailCheckIcon, color: '', className: 'text-yellow-600' },
+  12: { component: DatabaseOutlined, color: '', className: 'text-blue-600' },
+  13: { component: () => null, color: '', className: '' },
+  14: { component: () => '❗', color: '', className: '' }, // 240002 较重要/高品牌价值客户
+  15: { component: () => '❣️', color: '', className: '' }, // 240003 很重要/高订单价值客户
+}
+
+export const MailboxDirIcon = ({ type }) => {
+  const Icon = EmailDirTypeIcons[type || '13']?.component || EmailDirTypeIcons['13'].component
+  const className = EmailDirTypeIcons[type || '13']?.className || EmailDirTypeIcons['13'].className
+  return <Icon className={className} />
+}
+
+export default MailboxDirIcon

From 62615cfb98adbb899d4c0c7a345cc24f8d02b701 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 6 Jun 2025 14:25:02 +0800
Subject: [PATCH 049/143] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E6=90=9C=E7=B4=A2=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx | 37 +++++++++++++++++++------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 546ff2a..b65407d 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from 'react'
-import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, StarOutlined, RightOutlined, LeftOutlined } from '@ant-design/icons'
-import { Flex, Button, Tooltip, List, Form, Row, Col, Drawer, Dropdown, Input, Checkbox, DatePicker, Select, Breadcrumb } from 'antd'
+import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, StarOutlined, RightOutlined, LeftOutlined, ExpandOutlined, AppstoreOutlined } from '@ant-design/icons'
+import { Flex, Button, Tooltip, List, Form, Row, Col, Drawer, Dropdown, Input, Checkbox, DatePicker, Switch, Breadcrumb } from 'antd'
 import dayjs from 'dayjs'
 import { useEmailList } from '@/hooks/useEmail';
 
@@ -106,12 +106,33 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
           }}
           placeholder={`邮件主题`}
         />
-        <Button
-          onClick={() => {
-            setOpenOrder(true)
-          }}>
-          高级搜索
-        </Button>
+        <Switch checkedChildren={<AppstoreOutlined />}
+      unCheckedChildren={<ExpandOutlined />} defaultChecked={false} />
+      </div>
+      <div className='bg-white h-auto p-1 flex gap-1 items-center hidden'>
+        <Form
+          form={form}
+          initialValues={{}}
+          // onFinish={handleSubmit}
+        >
+          <Row justify='start' gutter={16}>
+            <Col span={8}>
+              <Form.Item label='订单号' name='orderNumber'>
+                <Input placeholder='订单号' allowClear />
+              </Form.Item>
+            </Col>
+            <Col span={10}>
+              <Form.Item label='日期' name='confirmDateRange'>
+                <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
+              </Form.Item>
+            </Col>
+            <Col span={1} offset={1}>
+              <Button type='primary' htmlType='submit'>
+                搜索
+              </Button>
+            </Col>
+          </Row>
+        </Form>
       </div>
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>

From 32fd97ce91a27d69c84b955c3c04eeef2e843754 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 6 Jun 2025 14:51:59 +0800
Subject: [PATCH 050/143] =?UTF-8?q?style:=20=E8=AE=A2=E5=8D=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA:=20=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 6a2a71a..219a6b1 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -2,8 +2,8 @@ import useAuthStore from '@/stores/AuthStore'
 import useFormStore from '@/stores/FormStore'
 import { useOrderStore } from '@/stores/OrderStore'
 import { isEmpty, groupBy, buildTree, readIndexDB, writeIndexDB, pick } from '@/utils/commons'
-import { StarTwoTone, CalendarTwoTone, FolderOutlined, DeleteOutlined, ClockCircleOutlined, FormOutlined, DatabaseOutlined } from '@ant-design/icons'
-import { Flex, Drawer, Radio, Divider, Segmented, Tree, Typography, Checkbox, Layout, Row, Col, Empty, Splitter } from 'antd'
+import { StarTwoTone, CalendarTwoTone, FolderOutlined, DeleteOutlined, ClockCircleOutlined, FormOutlined, DatabaseOutlined, UnorderedListOutlined, LeftOutlined } from '@ant-design/icons'
+import { Flex, Drawer, Radio, Divider, Segmented, Tree, Typography, Checkbox, Layout, Row, Col, Empty, Splitter, Button } from 'antd'
 import { useEffect, useMemo, useState } from 'react'
 import { InboxIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
 import { useShallow } from 'zustand/react/shallow'
@@ -189,7 +189,7 @@ function Follow() {
   return (
     <>
       <Layout>
-        <Layout.Sider width='300' theme='light' style={{ height: 'calc(100vh - 166px)' }}>
+        <Layout.Sider width='300' theme='light' style={{ height: 'calc(100vh - 166px)' }} className=' relative'>
           <Flex justify='start' align='start' vertical className='h-full'>
             <Segmented className='w-full' block shape='round' options={accountDEI} value={currentMailboxDEI} onChange={handleSwitchAccount} />
             <div className='overflow-y-auto flex-auto w-full [&_.ant-tree-switcher]:me-0 [&_.ant-tree-node-content-wrapper]:px-0 [&_.ant-tree-node-content-wrapper]:text-ellipsis [&_.ant-tree-node-content-wrapper]:overflow-hidden [&_.ant-tree-node-content-wrapper]:whitespace-nowrap'>
@@ -222,8 +222,8 @@ function Follow() {
           </Splitter>
         </Layout.Content>
 
+        <Button icon={collapsed ? <LeftOutlined /> : <UnorderedListOutlined />} onClick={() => setCollapsed(!collapsed)} className={`absolute top-20 z-10 rounded-none rounded-l ${collapsed ? 'right-1' : 'right-8 '}`} />
         <Layout.Sider
-          zeroWidthTriggerStyle={{ top: '30px' }}
           width='280'
           theme='light'
           className='overflow-y-auto'
@@ -234,6 +234,7 @@ function Follow() {
           collapsed={collapsed}
           onCollapse={(value) => setCollapsed(value)}
           collapsedWidth={0}
+          trigger={null}
           reverseArrow={true}>
           <OrderProfile />
         </Layout.Sider>

From 716776f96b3c67912fac112e10c8131b3e48b56f Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 6 Jun 2025 15:35:04 +0800
Subject: [PATCH 051/143] =?UTF-8?q?perf:=20=E8=AE=A1=E7=AE=97mailbox=20?=
 =?UTF-8?q?=E7=9A=84title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/EmailSlice.js                      |  5 ++--
 src/utils/commons.js                          |  7 +++--
 src/views/orders/Follow.jsx                   | 29 ++++++++++++++-----
 src/views/orders/components/MailBox.jsx       |  2 +-
 .../orders/components/MailboxDirIcon.jsx      |  2 ++
 5 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index 8cbec4f..04328c7 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -108,8 +108,9 @@ const emailSlice = (set, get) => ({
     let isNeedRefresh = false
     if (!isEmpty(readCache)) {
       setMailboxNestedDirsActive(readCache?.tree || [])
-      isNeedRefresh = Date.now() - readCache.timestamp > 4 * 60 * 60 * 1000
-    } else if (isEmpty(readCache) || isNeedRefresh) {
+      isNeedRefresh = true; // Date.now() - readCache.timestamp > 4 * 60 * 60 * 1000 // test: 0
+    }
+    if (isEmpty(readCache) || isNeedRefresh) {
       // > {4} 更新
       const x = await getEmailDirAction({ opi_sn })
       const mailboxSort = x //.sort(sortBy('MDR_Order'));
diff --git a/src/utils/commons.js b/src/utils/commons.js
index 7c5f9c4..d027cf4 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -620,11 +620,12 @@ function createTreeNode(key, name, parent = null, keyMap={}, _raw={}) {
         key: key,
         title: name,
         parent: parent,
-        parentTitle: '',
         icon: _raw?.icon,
         iconIndex: _raw?.[keyMap.iconIndex],
         _raw: _raw,
-        children: []
+        children: [],
+        parentTitle: '',
+        parentIconIndex: '',
     };
 }
 /**
@@ -656,12 +657,14 @@ export const buildTree = (list, keyMap={ rootKeys: [], ignoreKeys: [] }) => {
         node.rawParent = node.parent;
         node.parent = parentNode.parent;
         node.parentTitle = parentNode.title;
+        node.parentIconIndex = parentNode.iconIndex;
         grandParentNode.children.push(node)
       } else if (keyMap.ignoreKeys.includes(item[keyMap.key])) {
         //
       }
       else if (parentNode) {
         node.parentTitle = parentNode.title;
+        node.parentIconIndex = parentNode.iconIndex;
         parentNode.children.push(node)
       } else {
         console.warn(`Parent with key '${item[keyMap.parent]}' not found for node '${item[keyMap.key]}'. This node will be treated as a root.`)
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 219a6b1..8cceef6 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -81,14 +81,14 @@ function Follow() {
           {
             title: '今日任务',
             key: ele.OPI_DEI_SN + '-today',
-            getMails: false,
+            getMails: false, iconIndex: 'star',
             icon: <StarTwoTone />,
             children: [], COLI_SN: 0,
           },
           {
             title: '待办任务',
             key: ele.OPI_DEI_SN + '-todo',
-            getMails: false,
+            getMails: false, iconIndex: 'calendar',
             icon: <CalendarTwoTone />,
             children: [], COLI_SN: 0,
           },
@@ -104,6 +104,15 @@ function Follow() {
   const [mailboxActiveNode, setMailboxActiveNode] = useConversationStore(state => [state.mailboxActiveNode, state.setMailboxActiveNode]);
   const [activeEmailId, setActiveEmailId] = useConversationStore(state => [state.mailboxActiveMAI, state.setMailboxActiveMAI]);
 
+  const computedBreadcrumb = useMemo(() => {
+    const { title, iconIndex, parentTitle, parentIconIndex } = mailboxActiveNode
+    const x = [
+      { title: parentTitle, iconIndex: parentIconIndex },
+      { title, iconIndex },
+    ].filter((ele) => ele.title)
+    return x
+  }, [mailboxActiveNode.VKey])
+
   // const [activeEmailId, setActiveEmailId] = useState(0)
 
   const [deiStickyTree, setDeiStickyTree] = useState({})
@@ -123,7 +132,7 @@ function Follow() {
 
   const handleTreeSelectGetMails = (selectedKeys, { node }) => {
     // console.info('selectedTreeKeys: ', node)
-    const treeNode = pick(node, ['key', 'parent', 'getMails', 'title', 'parentTitle', ]);
+    const treeNode = pick(node, ['key', 'parent', 'iconIndex', 'getMails', 'title', 'parentTitle', 'parentIconIndex' ]);
     setMailboxActiveNode({...treeNode, ...node._raw, OPI_SN: currentMailboxOPI});
     // const { COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = node?._raw || {}
     setActiveEmailId(0);
@@ -150,26 +159,30 @@ function Follow() {
         {
           title: '今日任务',
           key: key + '-today',
-          getMails: false,
+          getMails: false,iconIndex: 'star',
           icon: <StarTwoTone />, _raw: {COLI_SN: 0},
           children: (sticky[0] || []).map((o) => ({
             key: `today-${o.COLI_SN}`,
             title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
+            iconIndex: 13,
             parent: key + '-today',
             parentTitle: '今日任务',
+            parentIconIndex: 'star',
             _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
           })),
         },
         {
           title: '待办任务',
           key: key + '-todo',
-          getMails: false,
+          getMails: false,iconIndex: 'calendar',
           icon: <CalendarTwoTone />,_raw: {COLI_SN: 0},
           children: (sticky[1] || []).map((o) => ({
             key: `todo-${o.COLI_SN}`,
             title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
+            iconIndex: 13,
             parent: key + '-todo',
             parentTitle: '待办任务',
+            parentIconIndex: 'calendar',
             _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
           })),
         },
@@ -214,7 +227,7 @@ function Follow() {
         <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
           <Splitter>
             <Splitter.Panel defaultSize='40%' min={580} max='70%'>
-              <Mailbox mailboxDir={mailboxActiveNode} onMailItemClick={(id) => setActiveEmailId(id)} />
+              <Mailbox breadcrumb={computedBreadcrumb} mailboxDir={mailboxActiveNode} onMailItemClick={(id) => setActiveEmailId(id)} />
             </Splitter.Panel>
             <Splitter.Panel>
               <EmailDetailInline mailID={activeEmailId || 0} emailMsg={{}} variant={'outline'} size={'small'} />
@@ -222,7 +235,7 @@ function Follow() {
           </Splitter>
         </Layout.Content>
 
-        <Button icon={collapsed ? <LeftOutlined /> : <UnorderedListOutlined />} onClick={() => setCollapsed(!collapsed)} className={`absolute top-20 z-10 rounded-none rounded-l ${collapsed ? 'right-1' : 'right-8 '}`} />
+        <Button icon={collapsed ? <LeftOutlined /> : <UnorderedListOutlined />} onClick={() => setCollapsed(!collapsed)} className={`absolute z-10 rounded-none rounded-l ${collapsed ? 'right-1 top-36' : 'right-8 top-20'}`} />
         <Layout.Sider
           width='280'
           theme='light'
@@ -236,7 +249,7 @@ function Follow() {
           collapsedWidth={0}
           trigger={null}
           reverseArrow={true}>
-          <OrderProfile />
+          <OrderProfile coliSN={mailboxActiveNode.COLI_SN} />
         </Layout.Sider>
       </Layout>
     </>
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index b65407d..fb39504 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -171,7 +171,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
           pagination={false}
           dataSource={mailList}
           renderItem={(item) => (
-            <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2'>
+            <li onClick={() => onMailItemClick(item.MAI_SN)} className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2'>
               <div className=''>
                 <Checkbox></Checkbox>
               </div>
diff --git a/src/views/orders/components/MailboxDirIcon.jsx b/src/views/orders/components/MailboxDirIcon.jsx
index d042e27..c0d3ef1 100644
--- a/src/views/orders/components/MailboxDirIcon.jsx
+++ b/src/views/orders/components/MailboxDirIcon.jsx
@@ -2,6 +2,8 @@ import { StarTwoTone, CalendarTwoTone, FolderOutlined, DeleteOutlined, ClockCirc
 import { InboxIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
 
 const EmailDirTypeIcons = {
+  'star': { component: StarTwoTone, color: '', className: '' },
+  'calendar': { component: CalendarTwoTone, color: '', className: '' },
   0: { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
   1: { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
   3: { component: InboxIcon, color: '', className: 'text-indigo-500' },

From a6cb136ccff474c7bbdeedcf75c90bdac0f21cd3 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 6 Jun 2025 16:04:08 +0800
Subject: [PATCH 052/143] =?UTF-8?q?perf:=20=E9=82=AE=E7=AE=B1=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95:=20=E5=9B=BA=E5=AE=9A=E7=9A=84=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E4=B8=8D=E8=A7=A6=E5=8F=91=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx |  2 +-
 src/views/orders/Follow.jsx     | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index 60b6303..87aef9b 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -20,7 +20,7 @@ import {
 import { InboxIcon, MailCheckIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
 import { useOrderStore, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions, fetchSetRemindStateAction, remindStatusOptionsMapped } from "@/stores/OrderStore";
 import { copy, isEmpty } from "@/utils/commons";
-const OrderProfile = (props) => {
+const OrderProfile = ({coliSN, ...props}) => {
 
     const orderLabelOptions = copy(OrderLabelDefaultOptions);
     orderLabelOptions.unshift({ value: 0, label: "未设置", disabled: true });
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 8cceef6..544736a 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -133,9 +133,11 @@ function Follow() {
   const handleTreeSelectGetMails = (selectedKeys, { node }) => {
     // console.info('selectedTreeKeys: ', node)
     const treeNode = pick(node, ['key', 'parent', 'iconIndex', 'getMails', 'title', 'parentTitle', 'parentIconIndex' ]);
-    setMailboxActiveNode({...treeNode, ...node._raw, OPI_SN: currentMailboxOPI});
-    // const { COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = node?._raw || {}
-    setActiveEmailId(0);
+    const { COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = node?._raw || {}
+    if (VKey && !(!IsTrue && !COLI_SN)) {
+      setMailboxActiveNode({...treeNode, ...node._raw, OPI_SN: currentMailboxOPI});
+      setActiveEmailId(0);
+    }
   }
 
   useEffect(() => {
@@ -160,7 +162,7 @@ function Follow() {
           title: '今日任务',
           key: key + '-today',
           getMails: false,iconIndex: 'star',
-          icon: <StarTwoTone />, _raw: {COLI_SN: 0},
+          icon: <StarTwoTone />, _raw: {COLI_SN: 0, IsTrue: 0,},
           children: (sticky[0] || []).map((o) => ({
             key: `today-${o.COLI_SN}`,
             title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
@@ -175,7 +177,7 @@ function Follow() {
           title: '待办任务',
           key: key + '-todo',
           getMails: false,iconIndex: 'calendar',
-          icon: <CalendarTwoTone />,_raw: {COLI_SN: 0},
+          icon: <CalendarTwoTone />,_raw: {COLI_SN: 0, IsTrue: 0,},
           children: (sticky[1] || []).map((o) => ({
             key: `todo-${o.COLI_SN}`,
             title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,

From 6db05883de546bd3bb092db64324f07e0b1fffba Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 6 Jun 2025 15:45:34 +0800
Subject: [PATCH 053/143] =?UTF-8?q?perf:=20=E6=B2=A1=E6=9C=89=E5=9B=A2?=
 =?UTF-8?q?=E5=8F=B7=E3=80=81=E5=9B=BD=E7=B1=8D=E6=97=B6=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx | 84 ++++++++++---------------
 1 file changed, 32 insertions(+), 52 deletions(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index fb39504..7c165de 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -3,6 +3,7 @@ import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, StarOutlined, RightO
 import { Flex, Button, Tooltip, List, Form, Row, Col, Drawer, Dropdown, Input, Checkbox, DatePicker, Switch, Breadcrumb } from 'antd'
 import dayjs from 'dayjs'
 import { useEmailList } from '@/hooks/useEmail';
+import { isEmpty } from '@/utils/commons';
 
 const { RangePicker } = DatePicker
 const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
@@ -37,6 +38,30 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
 
   const { mailList, isLoading, error } = useEmailList(mailboxDir);
 
+  console.info('mailboxDir: ', mailboxDir)
+
+  const mailItemRender = (item) => {
+    const orderNumber = isEmpty(item.MAI_COLI_ID) ? '' : (item.MAI_COLI_ID + ' - ')
+    const countryName = isEmpty(item.CountryCN) ? '' : ('[' + (item.CountryCN === null ? 'USA' : item.CountryCN) + '] ')
+    const mailStateClass = item.MOI_ReadState === 0 ? 'font-bold' : ''
+    return (
+      <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2' onClick={() => {
+        console.info('item: ', item)
+        onMailItemClick(item.MAI_SN)
+      }}>
+        <div className=''>
+          <Checkbox></Checkbox>
+        </div>
+        <div className='flex-1 pl-2'>
+          <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
+            <div>{orderNumber}<span className={mailStateClass}>{item.MAI_Subject}</span></div>
+            <span className='text-neutral-500 text-wrap break-words break-all '>{countryName + item.SenderReceiver + ' ' + item.SRDate}</span>
+          </Flex>
+        </div>
+      </li>
+    )
+  }
+
   return (
     <>
       <div className='bg-white h-auto px-1 flex gap-1 items-center'>
@@ -106,8 +131,10 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
           }}
           placeholder={`邮件主题`}
         />
-        <Switch checkedChildren={<AppstoreOutlined />}
+          <Tooltip title='高级搜索'>
+        <Switch checkedChildren={<ExpandOutlined />}
       unCheckedChildren={<ExpandOutlined />} defaultChecked={false} />
+      </Tooltip>
       </div>
       <div className='bg-white h-auto p-1 flex gap-1 items-center hidden'>
         <Form
@@ -136,7 +163,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
       </div>
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
-        <List
+        <List loading={isLoading}
           header={
             <Flex align='center' justify="space-between">
             <Breadcrumb
@@ -145,14 +172,14 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
                   title: (
                     <>
                       <StarOutlined />
-                      <span>今日任务</span>
+                      <span>{mailboxDir.parentTitle}</span>
                     </>
                   ),
                 },
                 {
                   title: (
                     <>
-                      <span>lyj20210810144702</span>
+                      <span>{mailboxDir.title}</span>
                     </>
                   ),
                 },
@@ -167,58 +194,11 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
           </Flex>
           }
           itemLayout='vertical'
-          size='large'
           pagination={false}
           dataSource={mailList}
-          renderItem={(item) => (
-            <li onClick={() => onMailItemClick(item.MAI_SN)} className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2'>
-              <div className=''>
-                <Checkbox></Checkbox>
-              </div>
-              <div className='flex-1 pl-2'>
-                <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
-                  <div>{item.orderNo + ' - '}<span className='font-bold'>{item.title}</span></div>
-                  <span className='text-neutral-500 text-wrap break-words break-all '>{'[' + (item.country === null ? '' : item.country) + '] ' + item.description + ' ' + item.mailDate}</span>
-                </Flex>
-              </div>
-            </li>
-          )}
+          renderItem={mailItemRender}
         />
       </div>
-
-      {/* <Drawer title={'高级搜索'} placement='top'  size={'large'} mask={true} maskClosable={true} open={openOrder} onClose={() => setOpenOrder(false)}>
-        <Form
-          layout={'vertical'}
-          form={form}
-          initialValues={{}}
-          // onFinish={handleSubmit}
-        >
-          <Row justify='start' gutter={16}>
-            <Col span={4}>
-              <Form.Item label='订单号' name='orderNumber'>
-                <Input placeholder='订单号' allowClear />
-              </Form.Item>
-            </Col>
-            <Col span={4}>
-              <Form.Item label='出发日期' name='startDateRange'>
-                <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
-              </Form.Item>
-            </Col>
-            <Col span={4}>
-              <Form.Item label='确认日期' name='confirmDateRange'>
-                <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
-              </Form.Item>
-            </Col>
-          </Row>
-          <Row justify='start' align='middle' gutter={16}>
-            <Col span={1} offset={1}>
-              <Button type='primary' htmlType='submit'>
-                搜索
-              </Button>
-            </Col>
-          </Row>
-        </Form>
-      </Drawer> */}
     </>
   )
 }

From ad142df23221f5bd24b357fc5599604ea7b6bd1e Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 6 Jun 2025 16:38:06 +0800
Subject: [PATCH 054/143] =?UTF-8?q?feat:=20=E9=80=89=E6=8B=A9=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E9=82=AE=E4=BB=B6=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=B7=EF=BC=9B=E9=9D=A2=E5=8C=85=E5=B1=91?=
 =?UTF-8?q?=E5=92=8C=E6=A0=91=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx | 36 +++++++++++--------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 7c165de..8345375 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -4,6 +4,7 @@ import { Flex, Button, Tooltip, List, Form, Row, Col, Drawer, Dropdown, Input, C
 import dayjs from 'dayjs'
 import { useEmailList } from '@/hooks/useEmail';
 import { isEmpty } from '@/utils/commons';
+import { MailboxDirIcon } from './MailboxDirIcon'
 
 const { RangePicker } = DatePicker
 const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
@@ -33,15 +34,16 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
       value: [dayjs().startOf('y'), dayjs().endOf('y')],
     },
   ]
-  const [openOrder, setOpenOrder] = useState(false)
   const [form] = Form.useForm()
 
   const { mailList, isLoading, error } = useEmailList(mailboxDir);
 
-  console.info('mailboxDir: ', mailboxDir)
+  console.info('props.breadcrumb: ', props.breadcrumb)
+  console.info('props.mailboxDir: ', mailboxDir)
 
   const mailItemRender = (item) => {
-    const orderNumber = isEmpty(item.MAI_COLI_ID) ? '' : (item.MAI_COLI_ID + ' - ')
+    const isOrderNode = mailboxDir.COLI_SN > 0
+    const orderNumber = (isEmpty(item.MAI_COLI_ID) || isOrderNode) ? '' : (item.MAI_COLI_ID + ' - ')
     const countryName = isEmpty(item.CountryCN) ? '' : ('[' + (item.CountryCN === null ? 'USA' : item.CountryCN) + '] ')
     const mailStateClass = item.MOI_ReadState === 0 ? 'font-bold' : ''
     return (
@@ -167,23 +169,17 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
           header={
             <Flex align='center' justify="space-between">
             <Breadcrumb
-              items={[
-                {
-                  title: (
-                    <>
-                      <StarOutlined />
-                      <span>{mailboxDir.parentTitle}</span>
-                    </>
-                  ),
-                },
-                {
-                  title: (
-                    <>
-                      <span>{mailboxDir.title}</span>
-                    </>
-                  ),
-                },
-              ]}
+              items={
+                props.breadcrumb.map(bc  => {
+                  return {
+                    title: (
+                      <>
+                      <MailboxDirIcon type={bc?.iconIndex} />
+                        <span>{bc.title}</span>
+                      </>
+                    ),
+                  }
+                })}
             />
             <Flex align="center" justify="space-between">
               <span>51-100 of 562</span>

From 9a7db21d743887346d0e94eacebaa973b81baa07 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 6 Jun 2025 17:01:36 +0800
Subject: [PATCH 055/143] =?UTF-8?q?perf:=20=E6=98=BE=E7=A4=BA=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 8345375..12cc66c 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -182,7 +182,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
                 })}
             />
             <Flex align="center" justify="space-between">
-              <span>51-100 of 562</span>
+              <span>1-50 of {mailList.length}</span>
             <Button icon={<LeftOutlined />} type="text" iconPosition={'end'}></Button>
             <Button icon={<RightOutlined />} type="text" iconPosition={'end'}></Button>
             </Flex>

From 3df24ab6ba14f2e2463b272dc434a99c25e2b7b1 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 6 Jun 2025 17:16:03 +0800
Subject: [PATCH 056/143] =?UTF-8?q?perf:=20=E9=82=AE=E7=AE=B1=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95:=20=E4=BF=9D=E7=95=99=E9=80=89=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js | 2 +-
 src/views/orders/Follow.jsx | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 451aba8..a25b286 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -151,7 +151,7 @@ export const fetchEmailBindOrderAction = async (params) => {
  * @param {object} { opi_sn }
  */
 export const getEmailDirAction = async (params = { opi_sn: '' }) => {
-  const defaultParams = { opi_sn: 0, year: dayjs().year() }
+  const defaultParams = { opi_sn: 0, year: dayjs().year(), by_start_date: 1, by_success: -1, important: -1, if_want_book: -1, if_thinking: -1 }
   const { errcode, result } = await fetchJSON(`http://202.103.68.144:8889/v3/email_dir`, { ...defaultParams, ...params })
   return errcode === 0 ? result : [];
 } ;
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 544736a..bed65ca 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -135,7 +135,7 @@ function Follow() {
     const treeNode = pick(node, ['key', 'parent', 'iconIndex', 'getMails', 'title', 'parentTitle', 'parentIconIndex' ]);
     const { COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = node?._raw || {}
     if (VKey && !(!IsTrue && !COLI_SN)) {
-      setMailboxActiveNode({...treeNode, ...node._raw, OPI_SN: currentMailboxOPI});
+      setMailboxActiveNode({...treeNode, ...node._raw, key: treeNode.key, OPI_SN: currentMailboxOPI});
       setActiveEmailId(0);
     }
   }
@@ -195,7 +195,7 @@ function Follow() {
     // console.log('tree 0', byState);
     setDeiStickyTree(byState)
     const first = currentMailboxDEI || accountDEI[0].value
-    setExpandTree([`${first}-today`, `${first}-todo`])
+    setExpandTree([`${first}-today`, `${first}-todo`, mailboxActiveNode.key])
     setStickyTree(byState[first] || [])
 
     return () => {}
@@ -212,9 +212,10 @@ function Follow() {
                 key='sticky-today'
                 blockNode
                 showIcon
-                showLine
+                showLine autoExpandParent={true}
                 expandAction={'doubleClick'}
                 onSelect={handleTreeSelectGetMails}
+                selectedKeys={[mailboxActiveNode.key]}
                 onExpand={(expandedKeys) => setExpandTree(expandedKeys)}
                 expandedKeys={expandTree}
                 defaultExpandedKeys={expandTree}

From c622138c7d5db78df0b5dcbffb927ca98e063329 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 9 Jun 2025 09:17:38 +0800
Subject: [PATCH 057/143] style:

---
 src/views/orders/Follow.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index bed65ca..d84e47d 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -238,7 +238,7 @@ function Follow() {
           </Splitter>
         </Layout.Content>
 
-        <Button icon={collapsed ? <LeftOutlined /> : <UnorderedListOutlined />} onClick={() => setCollapsed(!collapsed)} className={`absolute z-10 rounded-none rounded-l ${collapsed ? 'right-1 top-36' : 'right-8 top-20'}`} />
+        <Button icon={collapsed ? <LeftOutlined /> : <UnorderedListOutlined />} onClick={() => setCollapsed(!collapsed)} className={`absolute z-10 rounded-none  ${collapsed ? 'right-1 top-36 rounded-l-xl' : 'right-8 top-20 rounded-l'}`} size={collapsed ? 'small' : 'middle'} />
         <Layout.Sider
           width='280'
           theme='light'

From 0860a7054def1eb24597586d1e26e4f7415329b2 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 9 Jun 2025 09:21:25 +0800
Subject: [PATCH 058/143] =?UTF-8?q?perf:=20mailbox=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index d84e47d..288581f 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -230,7 +230,7 @@ function Follow() {
         <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
           <Splitter>
             <Splitter.Panel defaultSize='40%' min={580} max='70%'>
-              <Mailbox breadcrumb={computedBreadcrumb} mailboxDir={mailboxActiveNode} onMailItemClick={(id) => setActiveEmailId(id)} />
+              <Mailbox breadcrumb={computedBreadcrumb} mailboxDir={mailboxActiveNode} onMailItemClick={(id) => setActiveEmailId(id)} currentActiveMailItem={activeEmailId} />
             </Splitter.Panel>
             <Splitter.Panel>
               <EmailDetailInline mailID={activeEmailId || 0} emailMsg={{}} variant={'outline'} size={'small'} />

From 1e9f84665ed26cb23903dc8e3c13d2645c02b066 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 9 Jun 2025 09:32:14 +0800
Subject: [PATCH 059/143] =?UTF-8?q?perf:=20email=20list=20=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E9=9C=80=E8=A6=81=E9=87=8D=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useEmail.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 1c06f17..4f19fb3 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -144,11 +144,6 @@ export const useEmailList = (mailboxDirNode) => {
       const _x = readCache.data.map((ele) => ({
         ...ele,
         key: ele.MAI_SN,
-        title: ele.MAI_Subject,
-        description: ele.SenderReceiver,
-        mailDate: ele.SRDate,
-        orderNo: ele.MAI_COLI_ID || '',
-        country: ele.CountryCN || '',
       }))
       setMailList(_x)
     }
@@ -159,11 +154,6 @@ export const useEmailList = (mailboxDirNode) => {
       const _x = x.map((ele) => ({
         ...ele,
         key: ele.MAI_SN,
-        title: ele.MAI_Subject,
-        description: ele.SenderReceiver,
-        mailDate: ele.SRDate,
-        orderNo: ele.MAI_COLI_ID || '',
-        country: ele.CountryCN || '',
       }))
       setMailList(_x)
     } catch (networkError) {

From 0da3ea58af9b4b42a3480bb65a6e932d5af476b9 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Mon, 9 Jun 2025 10:59:47 +0800
Subject: [PATCH 060/143] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E5=88=86=E9=A1=B5=EF=BC=8C=E6=9A=82?=
 =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E7=AC=AC=E4=B8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 12cc66c..cd2aa6f 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -37,6 +37,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
   const [form] = Form.useForm()
 
   const { mailList, isLoading, error } = useEmailList(mailboxDir);
+  const pagedList = mailList.length === 0 ? [] : mailList.slice(0, 50)
 
   console.info('props.breadcrumb: ', props.breadcrumb)
   console.info('props.mailboxDir: ', mailboxDir)
@@ -191,7 +192,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
           }
           itemLayout='vertical'
           pagination={false}
-          dataSource={mailList}
+          dataSource={pagedList}
           renderItem={mailItemRender}
         />
       </div>

From a61ed7eb82865cb9b1bd2a75e57439fa34dc29db Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 9 Jun 2025 11:05:31 +0800
Subject: [PATCH 061/143] =?UTF-8?q?perf:=20=E9=82=AE=E7=AE=B1=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95:=20=E6=9F=A5=E8=AF=A2=E4=B8=8D=E9=9C=80`=E5=87=BA?=
 =?UTF-8?q?=E5=8F=91=E6=97=A5=E6=9C=9F`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index a25b286..c55c1c4 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -151,7 +151,7 @@ export const fetchEmailBindOrderAction = async (params) => {
  * @param {object} { opi_sn }
  */
 export const getEmailDirAction = async (params = { opi_sn: '' }) => {
-  const defaultParams = { opi_sn: 0, year: dayjs().year(), by_start_date: 1, by_success: -1, important: -1, if_want_book: -1, if_thinking: -1 }
+  const defaultParams = { opi_sn: 0, year: dayjs().year(), by_start_date: -1, by_success: -1, important: -1, if_want_book: -1, if_thinking: -1 }
   const { errcode, result } = await fetchJSON(`http://202.103.68.144:8889/v3/email_dir`, { ...defaultParams, ...params })
   return errcode === 0 ? result : [];
 } ;

From c7d72d01f3c63567c77d83c9301d9f7989eb3add Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 9 Jun 2025 14:46:51 +0800
Subject: [PATCH 062/143] =?UTF-8?q?perf:=20=E5=BE=85=E5=8A=9E=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95+=E9=82=AE=E7=AE=B1=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                   | 123 +++++++++++++++++-
 src/stores/ConversationStore.js               |   2 +-
 src/stores/EmailSlice.js                      |  23 ++--
 src/views/orders/Follow.jsx                   | 122 ++---------------
 .../orders/components/MailboxDirIcon.jsx      |   3 +-
 5 files changed, 142 insertions(+), 131 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index c55c1c4..a769ee6 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -1,6 +1,6 @@
 import { fetchJSON, postForm, postJSON } from '@/utils/request';
 import { API_HOST, DATE_FORMAT, DATEEND_FORMAT, DATETIME_FORMAT, EMAIL_HOST } from '@/config';
-import { buildTree, isEmpty, objectMapper, omitEmpty, readIndexDB, uniqWith, writeIndexDB } from '@/utils/commons';
+import { buildTree, groupBy, isEmpty, objectMapper, omitEmpty, readIndexDB, uniqWith, writeIndexDB } from '@/utils/commons';
 import dayjs from 'dayjs';
 
 const parseHTMLString = (html, needText = false) => {
@@ -146,6 +146,18 @@ export const fetchEmailBindOrderAction = async (params) => {
   return errcode === 0 ? true : false;
 }
 
+
+const todoTypes = {
+  // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
+  1: '新订单',
+  2: '未读',
+  3: '一催',
+  4: '二催',
+  5: '三催',
+  6: '未处理',
+  7: '入境提醒',
+  8: '余款提醒',
+}
 /**
  * 顾问的邮箱目录
  * @param {object} { opi_sn }
@@ -153,8 +165,113 @@ export const fetchEmailBindOrderAction = async (params) => {
 export const getEmailDirAction = async (params = { opi_sn: '' }) => {
   const defaultParams = { opi_sn: 0, year: dayjs().year(), by_start_date: -1, by_success: -1, important: -1, if_want_book: -1, if_thinking: -1 }
   const { errcode, result } = await fetchJSON(`http://202.103.68.144:8889/v3/email_dir`, { ...defaultParams, ...params })
-  return errcode === 0 ? result : [];
-} ;
+  const mailboxSort = result //.sort(sortBy('MDR_Order'));
+  let tree = buildTree(mailboxSort, { key: 'VKey', parent: 'VParent', name: 'VName', iconIndex: 'ImageIndex', rootKeys: [1], ignoreKeys: [-227001, -227002] })
+  tree = tree.filter((ele) => ele.key !== 1)
+  return errcode === 0 ? tree : [];
+};
+export const getTodoOrdersAction = async (params) => {
+  const opi_arr = params.opisn.split(',');
+  const defaultStickyTree = opi_arr.reduce(
+    (a, ele) => ({
+      ...a,
+      [ele]: [
+        {
+          key: ele + '-today',
+          title: '今日任务',
+          getMails: false,
+          iconIndex: 'star',
+          children: [],
+          COLI_SN: 0,
+        },
+        {
+          key: ele + '-todo',
+          title: '待办任务',
+          getMails: false,
+          iconIndex: 'calendar',
+          children: [],
+          COLI_SN: 0,
+        },
+        // {
+          //   key: ele.OPI_DEI_SN + '-reminder',
+        //   title: '催信',
+        //   getMails: false,iconIndex: 'reminder',
+        //   icon: <BellTwoTone />,
+        //   children: [], COLI_SN: 0,
+        // },
+      ],
+    }),
+    {},
+  )
+  const { errcode, result } = await fetchJSON(`${API_HOST}/getwlorder`, params)
+  const orderList = errcode === 0 ? result : [];
+      const byOPI = groupBy(orderList, 'OPI_SN');
+    const byState = Object.keys(byOPI).reduce((acc, key) => {
+      const sticky = groupBy(byOPI[key], (ele) => ([1, 2, 6].includes(ele.coli_ordertype) ? 0 : ([3,4,5].includes(ele.coli_ordertype) ? 1 : 2)))
+      const treeNode = [
+        {
+          key: key + '-today',
+          title: '今日任务',
+          getMails: false,iconIndex: 'star',
+          _raw: {COLI_SN: 0, IsTrue: 0,},
+          children: (sticky[0] || []).map((o) => ({
+            key: `today-${o.COLI_SN}`,
+            title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
+            iconIndex: 13,
+            parent: key + '-today',
+            parentTitle: '今日任务',
+            parentIconIndex: 'star',
+            _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
+          })),
+        },
+        {
+          key: key + '-todo',
+          title: '待办任务',
+          getMails: false,iconIndex: 'calendar',
+          _raw: {COLI_SN: 0, IsTrue: 0,},
+          children: (sticky[2] || []).map((o) => ({
+            key: `todo-${o.COLI_SN}`,
+            title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
+            iconIndex: 13,
+            parent: key + '-todo',
+            parentTitle: '待办任务',
+            parentIconIndex: 'calendar',
+            _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
+          })),
+        },
+        {
+          key: key + '-reminder',
+          title: '催信',
+          getMails: false,iconIndex: 'reminder',
+          _raw: {COLI_SN: 0, IsTrue: 0,},
+          children: (sticky[1] || []).map((o) => ({
+            key: `reminder-${o.COLI_SN}`,
+            title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
+            iconIndex: 13,
+            parent: key + '-reminder',
+            parentTitle: '催信',
+            parentIconIndex: 'reminder',
+            _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
+          })),
+        },
+      ]
+      return { ...acc, [key]: treeNode }
+    }, defaultStickyTree)
+  return errcode === 0 ? byState : defaultStickyTree;
+};
+/**
+ * 获取待办目录和邮箱目录
+ * @param {object} params { opi_sn, userIdStr }
+ * @param {number} params.opi_sn
+ * @param {string} params.userIdStr - 用户ID字符串，默认为空
+ */
+export const getRootMailboxDirAction = async ({ opi_sn = 0, userIdStr = '' } = {}) => {
+  const [stickyTree, mailboxDir] = await Promise.all([getTodoOrdersAction({ opisn: userIdStr || String(opi_sn), otype: 'today' }), getEmailDirAction({ opi_sn: opi_sn })])
+  const rootTree = Object.keys(stickyTree).map((opi) => ({ key: Number(opi), tree: [...stickyTree[opi], ...mailboxDir] }))
+  writeIndexDB(rootTree, 'dirs', 'mailbox')
+  const _mapped = groupBy(rootTree, 'key')
+  return _mapped[opi_sn]?.[0]?.tree || []
+}
 
 /**
  * 获取邮件列表
diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js
index c6fc272..05a2e23 100644
--- a/src/stores/ConversationStore.js
+++ b/src/stores/ConversationStore.js
@@ -577,7 +577,7 @@ export const useConversationStore = create(
       const { addToConversationList, setTemplates, setInitial, setTags,
         initMailbox } = get();
 
-      initMailbox({ userId, dei_sn: loginUser.accountList[0].OPI_DEI_SN, opi_sn: loginUser.accountList[0].OPI_SN })
+      initMailbox({ userId, dei_sn: loginUser.accountList[0].OPI_DEI_SN, opi_sn: loginUser.accountList[0].OPI_SN, userIdStr: loginUser.userIdStr })
 
       const conversationsList = await fetchConversationsList({ opisn: userId });
       addToConversationList(conversationsList);
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index 04328c7..3df4770 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -1,4 +1,4 @@
-import { getEmailDirAction } from '@/actions/EmailActions'
+import { getEmailDirAction, getRootMailboxDirAction } from '@/actions/EmailActions'
 import { buildTree, isEmpty, readIndexDB, writeIndexDB, createIndexedDBStore } from '@/utils/commons'
 
 /**
@@ -99,36 +99,33 @@ const emailSlice = (set, get) => ({
     return set(() => ({ mailboxActiveMAI: mai }))
   },
 
-  getOPIEmailDir: async (opi_sn = 0) => {
+  getOPIEmailDir: async (opi_sn = 0, userIdStr='') => {
     // console.log('🌐requesting opi dir', opi_sn, typeof opi_sn)
     const { setMailboxNestedDirsActive } = get()
     const readCache = await readIndexDB(Number(opi_sn), 'dirs', 'mailbox')
     // console.log(readCache);
-    // setMailboxNestedDirs(Number(opi_sn), readCache.tree)
     let isNeedRefresh = false
     if (!isEmpty(readCache)) {
       setMailboxNestedDirsActive(readCache?.tree || [])
-      isNeedRefresh = true; // Date.now() - readCache.timestamp > 4 * 60 * 60 * 1000 // test: 0
+      isNeedRefresh = Date.now() - readCache.timestamp > 4 * 60 * 60 * 1000
+      isNeedRefresh = true; // test: 0
     }
     if (isEmpty(readCache) || isNeedRefresh) {
       // > {4} 更新
-      const x = await getEmailDirAction({ opi_sn })
-      const mailboxSort = x //.sort(sortBy('MDR_Order'));
-      let tree = buildTree(mailboxSort, { key: 'VKey', parent: 'VParent', name: 'VName', iconIndex: 'ImageIndex', rootKeys: [1], ignoreKeys: [-227001, -227002] })
-      tree = tree.filter((ele) => ele.key !== 1)
-      writeIndexDB([{ key: Number(opi_sn), tree }], 'dirs', 'mailbox')
-      // setMailboxNestedDirs(Number(opi_sn), tree)
-      setMailboxNestedDirsActive(tree)
+      const rootTree = await getRootMailboxDirAction({ opi_sn, userIdStr  })
+      setMailboxNestedDirsActive(rootTree)
     }
     return false
   },
 
-  async initMailbox({ opi_sn, dei_sn, userId }) {
+  async initMailbox({ opi_sn, dei_sn, userId, userIdStr }) {
     const { setCurrentMailboxOPI, setCurrentMailboxDEI, getOPIEmailDir } = get()
     createIndexedDBStore(['dirs', 'maillist', 'mailinfo'], 'mailbox')
     setCurrentMailboxOPI(opi_sn)
     setCurrentMailboxDEI(dei_sn)
-    getOPIEmailDir(userId)
+    getOPIEmailDir(userId, userIdStr)
+    // 登录后, 执行一下清除缓存
+    // clean7DaysMailboxLog();
   },
 
 })
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 288581f..a343e2a 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -1,33 +1,14 @@
 import useAuthStore from '@/stores/AuthStore'
-import useFormStore from '@/stores/FormStore'
-import { useOrderStore } from '@/stores/OrderStore'
-import { isEmpty, groupBy, buildTree, readIndexDB, writeIndexDB, pick } from '@/utils/commons'
-import { StarTwoTone, CalendarTwoTone, FolderOutlined, DeleteOutlined, ClockCircleOutlined, FormOutlined, DatabaseOutlined, UnorderedListOutlined, LeftOutlined } from '@ant-design/icons'
-import { Flex, Drawer, Radio, Divider, Segmented, Tree, Typography, Checkbox, Layout, Row, Col, Empty, Splitter, Button } from 'antd'
+import { pick } from '@/utils/commons'
+import { UnorderedListOutlined, LeftOutlined } from '@ant-design/icons'
+import { Flex, Segmented, Tree, Typography, Layout, Splitter, Button } from 'antd'
 import { useEffect, useMemo, useState } from 'react'
-import { InboxIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
-import { useShallow } from 'zustand/react/shallow'
 import EmailDetailInline from '../Conversations/Online/Components/EmailDetailInline'
-import { getEmailDirAction, queryEmailListAction } from '@/actions/EmailActions'
 import OrderProfile from '@/components/OrderProfile'
 import Mailbox from './components/Mailbox'
 import useConversationStore from '@/stores/ConversationStore';
-import dayjs from 'dayjs'
-import { DATE_FORMAT, DATETIME_FORMAT } from '@/config'
 import { MailboxDirIcon } from './components/MailboxDirIcon'
 
-const todoTypes = {
-  // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
-  1: '新订单',
-  2: '未读',
-  3: '一催',
-  4: '二催',
-  5: '三催',
-  6: '未处理',
-  7: '入境提醒',
-  8: '余款提醒',
-}
-
 const deptMap = new Map([
   ['1', 'CH'], // CH直销组
   ['2', 'CH大客户组'],
@@ -62,8 +43,6 @@ const deptMap = new Map([
 ])
 
 function Follow() {
-  const orderList = useOrderStore((state) => state.orderList)
-  const fetchOrderList = useOrderStore((state) => state.fetchOrderList)
 
   const [collapsed, setCollapsed] = useState(false)
 
@@ -73,30 +52,6 @@ function Follow() {
   const accountDEI = useMemo(() => {
     return accountList.map((ele) => ({ key: ele.OPI_DEI_SN, value: ele.OPI_DEI_SN, label: deptMap.get(`${ele.OPI_DEI_SN}`) }))
   }, [accountList])
-  const defaultStickyTree = useMemo(() => {
-    return accountList.reduce(
-      (a, ele) => ({
-        ...a,
-        [ele.OPI_DEI_SN]: [
-          {
-            title: '今日任务',
-            key: ele.OPI_DEI_SN + '-today',
-            getMails: false, iconIndex: 'star',
-            icon: <StarTwoTone />,
-            children: [], COLI_SN: 0,
-          },
-          {
-            title: '待办任务',
-            key: ele.OPI_DEI_SN + '-todo',
-            getMails: false, iconIndex: 'calendar',
-            icon: <CalendarTwoTone />,
-            children: [], COLI_SN: 0,
-          },
-        ],
-      }),
-      {},
-    )
-  }, [accountList])
 
   const [getOPIEmailDir] = useConversationStore(state => [state.getOPIEmailDir]);
   const [currentMailboxDEI, setCurrentMailboxDEI, mailboxNestedDirsActive] = useConversationStore(state => [state.currentMailboxDEI, state.setCurrentMailboxDEI, state.mailboxNestedDirsActive]);
@@ -113,18 +68,12 @@ function Follow() {
     return x
   }, [mailboxActiveNode.VKey])
 
-  // const [activeEmailId, setActiveEmailId] = useState(0)
-
-  const [deiStickyTree, setDeiStickyTree] = useState({})
-  const [stickyTree, setStickyTree] = useState([])
   const [expandTree, setExpandTree] = useState([])
 
   const handleSwitchAccount = (value) => {
     setActiveEmailId(0);
 
     setCurrentMailboxDEI(value)
-    setStickyTree(deiStickyTree[value] || [])
-    setExpandTree([`${value}-today`, `${value}-todo`])
     const opi = accountListDEIMapped[value].OPI_SN
     getOPIEmailDir(opi)
     setCurrentMailboxOPI(opi);
@@ -140,66 +89,14 @@ function Follow() {
     }
   }
 
-  useEffect(() => {
-    fetchOrderList({ type: 'today' }, loginUser)
-    return () => {}
-  }, [])
-
   // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
   useEffect(() => {
-    console.log('orderList render', currentMailboxDEI, currentMailboxOPI)
-    const byDEI = groupBy(orderList, 'OPI_DEI_SN')
-    // console.log(byDEI, 'byDEI')
-    const byState = Object.keys(byDEI).reduce((acc, key) => {
-      // const stickyIndex0 = byDEI[key].filter(ele => [1, 2, 6].includes(ele.COLI_StateCode))
-      // const stickyIndex1 = byDEI[key].filter(ele => ![1, 2, 6].includes(ele.COLI_StateCode))
-      const sticky = groupBy(byDEI[key], (ele) => ([1, 2, 6].includes(ele.coli_ordertype) ? 0 : 1))
-      // const sticky = groupBy(byDEI[key], ele => [1, 2, 6].includes(ele.COLI_StateCode) ? 'today' : 'todo');
-      // console.log(sticky, ';;;;');
-      // const deiName = deptMap.get(`${key}`);
-      const treeNode = [
-        {
-          title: '今日任务',
-          key: key + '-today',
-          getMails: false,iconIndex: 'star',
-          icon: <StarTwoTone />, _raw: {COLI_SN: 0, IsTrue: 0,},
-          children: (sticky[0] || []).map((o) => ({
-            key: `today-${o.COLI_SN}`,
-            title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
-            iconIndex: 13,
-            parent: key + '-today',
-            parentTitle: '今日任务',
-            parentIconIndex: 'star',
-            _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
-          })),
-        },
-        {
-          title: '待办任务',
-          key: key + '-todo',
-          getMails: false,iconIndex: 'calendar',
-          icon: <CalendarTwoTone />,_raw: {COLI_SN: 0, IsTrue: 0,},
-          children: (sticky[1] || []).map((o) => ({
-            key: `todo-${o.COLI_SN}`,
-            title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
-            iconIndex: 13,
-            parent: key + '-todo',
-            parentTitle: '待办任务',
-            parentIconIndex: 'calendar',
-            _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
-          })),
-        },
-      ]
-      // { key, title: deiName, children: sticky[0] };
-      return { ...acc, [key]: treeNode }
-    }, defaultStickyTree)
-    // console.log('tree 0', byState);
-    setDeiStickyTree(byState)
     const first = currentMailboxDEI || accountDEI[0].value
-    setExpandTree([`${first}-today`, `${first}-todo`, mailboxActiveNode.key])
-    setStickyTree(byState[first] || [])
+    const opi = accountListDEIMapped[first].OPI_SN
+    setExpandTree([`${opi}-today`, `${opi}-todo`])
 
     return () => {}
-  }, [orderList])
+  }, [currentMailboxDEI, mailboxNestedDirsActive])
 
   return (
     <>
@@ -208,7 +105,7 @@ function Follow() {
           <Flex justify='start' align='start' vertical className='h-full'>
             <Segmented className='w-full' block shape='round' options={accountDEI} value={currentMailboxDEI} onChange={handleSwitchAccount} />
             <div className='overflow-y-auto flex-auto w-full [&_.ant-tree-switcher]:me-0 [&_.ant-tree-node-content-wrapper]:px-0 [&_.ant-tree-node-content-wrapper]:text-ellipsis [&_.ant-tree-node-content-wrapper]:overflow-hidden [&_.ant-tree-node-content-wrapper]:whitespace-nowrap'>
-              <Tree
+              <Tree className='[&_.ant-typography-ellipsis]:max-w-44 [&_.ant-typography-ellipsis]:min-w-36'
                 key='sticky-today'
                 blockNode
                 showIcon
@@ -219,10 +116,9 @@ function Follow() {
                 onExpand={(expandedKeys) => setExpandTree(expandedKeys)}
                 expandedKeys={expandTree}
                 defaultExpandedKeys={expandTree}
-                treeData={[...(stickyTree || []), ...mailboxNestedDirsActive]}
-                // treeData={mergedTree}
+                treeData={mailboxNestedDirsActive}
                 icon={(node) => <MailboxDirIcon type={node?.iconIndex} />}
-                titleRender={(node) => <Typography.Text ellipsis={{ tooltip: node.title }}>{node.title}</Typography.Text>}
+                titleRender={(node) => <Typography.Text ellipsis={{ tooltip: node.title }} className={`${node?._raw?.IsSuccess===1 ? 'text-primary' : ''}`}>{node.title}</Typography.Text>}
               />
             </div>
           </Flex>
diff --git a/src/views/orders/components/MailboxDirIcon.jsx b/src/views/orders/components/MailboxDirIcon.jsx
index c0d3ef1..05b2428 100644
--- a/src/views/orders/components/MailboxDirIcon.jsx
+++ b/src/views/orders/components/MailboxDirIcon.jsx
@@ -1,9 +1,10 @@
-import { StarTwoTone, CalendarTwoTone, FolderOutlined, DeleteOutlined, ClockCircleOutlined, FormOutlined, DatabaseOutlined } from '@ant-design/icons'
+import { StarTwoTone, CalendarTwoTone, FolderOutlined, DeleteOutlined, ClockCircleOutlined, FormOutlined, DatabaseOutlined, BellTwoTone } from '@ant-design/icons'
 import { InboxIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
 
 const EmailDirTypeIcons = {
   'star': { component: StarTwoTone, color: '', className: '' },
   'calendar': { component: CalendarTwoTone, color: '', className: '' },
+  'reminder': { component: BellTwoTone, color: '', className: '' },
   0: { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
   1: { component: FolderOutlined, color: '#ffe78f', className: 'text-blue-500' },
   3: { component: InboxIcon, color: '', className: 'text-indigo-500' },

From d881778d788c916eda23cef7c38a07f42b17185a Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 9 Jun 2025 15:18:02 +0800
Subject: [PATCH 063/143] =?UTF-8?q?feat:=20mailbox=20=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/EmailSlice.js |   4 +-
 src/utils/commons.js     | 134 +++++++++++++++++++++------------------
 2 files changed, 73 insertions(+), 65 deletions(-)

diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index 3df4770..71bfe87 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -1,5 +1,5 @@
 import { getEmailDirAction, getRootMailboxDirAction } from '@/actions/EmailActions'
-import { buildTree, isEmpty, readIndexDB, writeIndexDB, createIndexedDBStore } from '@/utils/commons'
+import { buildTree, isEmpty, readIndexDB, writeIndexDB, createIndexedDBStore, clean7DaysMailboxLog } from '@/utils/commons'
 
 /**
  * Email
@@ -125,7 +125,7 @@ const emailSlice = (set, get) => ({
     setCurrentMailboxDEI(dei_sn)
     getOPIEmailDir(userId, userIdStr)
     // 登录后, 执行一下清除缓存
-    // clean7DaysMailboxLog();
+    clean7DaysMailboxLog();
   },
 
 })
diff --git a/src/utils/commons.js b/src/utils/commons.js
index d027cf4..463d8cd 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -919,7 +919,7 @@ export const deleteIndexDBbyKey = (key, table, database) => {
   }
 };
 
-function cleanOldData(database, storeName, dateKey = 'timestamp') {
+function cleanOldData(database, storeNames=[], dateKey = 'timestamp') {
   return function (daysToKeep = 7) {
     return new Promise((resolve, reject) => {
       let deletedCount = 0
@@ -927,85 +927,92 @@ function cleanOldData(database, storeName, dateKey = 'timestamp') {
 
       let openRequest = indexedDB.open(database, INDEXED_DB_VERSION)
       openRequest.onupgradeneeded = function () {
-        var db = openRequest.result
+        // var db = openRequest.result
         // 数据库是否存在
-        if (!db.objectStoreNames.contains(storeName)) {
-          var store = db.createObjectStore(storeName, { keyPath: 'id', autoIncrement: true })
-          store.createIndex('timestamp', 'timestamp', { unique: false })
-        } else {
-          const logStore = openRequest.transaction.objectStore(storeName)
-          if (!logStore.indexNames.contains('timestamp')) {
-            logStore.createIndex('timestamp', 'timestamp', { unique: false })
-          }
-        }
+        // if (!db.objectStoreNames.contains(storeName)) {
+        //   var store = db.createObjectStore(storeName, { keyPath: 'id', autoIncrement: true })
+        //   store.createIndex('timestamp', 'timestamp', { unique: false })
+        // } else {
+        //   const logStore = openRequest.transaction.objectStore(storeName)
+        //   if (!logStore.indexNames.contains('timestamp')) {
+        //     logStore.createIndex('timestamp', 'timestamp', { unique: false })
+        //   }
+        // }
       }
       openRequest.onsuccess = function (e) {
         let db = e.target.result
         // 数据库是否存在
-        if (!db.objectStoreNames.contains(storeName)) {
-          resolve('Database does not exist.')
-          return
-        }
+        // if (!db.objectStoreNames.contains(storeName)) {
+        //   resolve('Database does not exist.')
+        //   return
+        // }
 
         // Calculate the cutoff timestamp for "X days ago"
         const cutoffTimestamp = Date.now() - daysToKeep * 24 * 60 * 60 * 1000
 
-        // Identify old data using the date index and primary key ID
-        const readTransaction = db.transaction([storeName], 'readwrite')
-        const objectStore = readTransaction.objectStore(storeName)
+        const objectStoreNames = isEmpty(storeNames) ? db.objectStoreNames : storeNames
 
-        if (!objectStore.indexNames.contains(`${dateKey}`)) {
-          // Clear the store
-          let clearRequest = objectStore.clear()
-          console.log(`Cleanup complete. clear ${storeName} records.`)
-          resolve();
-          clearRequest.onerror = function (e) {}
-          clearRequest.onsuccess = function (e) {}
-          return
-        }
-        // Get records older than 'daysToKeep' using the index
-        const dateIndex = objectStore.index(`${dateKey}`)
-        const dateRange = IDBKeyRange.upperBound(cutoffTimestamp, false) // Get keys < cutoffTimestamp (strictly older)
+        if (!isEmpty(objectStoreNames)) {
+          const objectStores = Array.from(objectStoreNames).map((storeName) => db.transaction([storeName], 'readwrite').objectStore(storeName))
 
-        const dateCursorRequest = dateIndex.openCursor(dateRange)
-
-        dateCursorRequest.onsuccess = (event) => {
-          const cursor = event.target.result
-          if (cursor) {
-            recordsToDelete.add(cursor.primaryKey) // Add the primary key of the record to the set
-            cursor.continue()
-          } else {
-            // Delete identified data in a new transaction
-            const deleteTransaction = db.transaction([storeName], 'readwrite')
-            const deleteObjectStore = deleteTransaction.objectStore(storeName)
+          for (const objectStore of objectStores) {
+            // Identify old data using the date index and primary key ID
 
-            deleteTransaction.oncomplete = () => {
-              console.log(`Cleanup complete. Deleted ${deletedCount} records.`)
-              resolve(deletedCount)
+            if (!objectStore.indexNames.contains(`${dateKey}`)) {
+              // Clear the store
+              let clearRequest = objectStore.clear()
+              console.log(`Cleanup complete. clear ${objectStore.name} records.`)
+              resolve()
+              clearRequest.onerror = function (e) {}
+              clearRequest.onsuccess = function (e) {}
+              return
+            }
+            // Get records older than 'daysToKeep' using the index
+            const dateIndex = objectStore.index(`${dateKey}`)
+            const dateRange = IDBKeyRange.upperBound(cutoffTimestamp, false) // Get keys < cutoffTimestamp (strictly older)
+
+            const dateCursorRequest = dateIndex.openCursor(dateRange)
+
+            dateCursorRequest.onsuccess = (event) => {
+              const cursor = event.target.result
+              if (cursor) {
+                recordsToDelete.add(cursor.primaryKey) // Add the primary key of the record to the set
+                cursor.continue()
+              } else {
+                const storeName = objectStore.name;
+                // Delete identified data in a new transaction
+                const deleteTransaction = db.transaction([storeName], 'readwrite')
+                const deleteObjectStore = deleteTransaction.objectStore(storeName)
+
+                deleteTransaction.oncomplete = () => {
+                  console.log(`Cleanup complete. Deleted ${deletedCount} records in ${database}.${storeName}.`)
+                  resolve(deletedCount)
+                }
+
+                deleteTransaction.onerror = (event) => {
+                  console.error('Deletion transaction error:', event.target.error)
+                  reject(event.target.error)
+                }
+
+                // Convert Set to Array for forEach
+                Array.from(recordsToDelete).forEach((key) => {
+                  const deleteRequest = deleteObjectStore.delete(key)
+                  deleteRequest.onsuccess = () => {
+                    deletedCount++
+                  }
+                  deleteRequest.onerror = (event) => {
+                    console.warn(`Failed to delete record with key ${key}:`, event.target.error)
+                  }
+                })
+              }
             }
 
-            deleteTransaction.onerror = (event) => {
-              console.error('Deletion transaction error:', event.target.error)
+            dateCursorRequest.onerror = (event) => {
+              console.error('Error opening date cursor for deletion:', event.target.error)
               reject(event.target.error)
             }
-
-            // Convert Set to Array for forEach
-            Array.from(recordsToDelete).forEach((key) => {
-              const deleteRequest = deleteObjectStore.delete(key)
-              deleteRequest.onsuccess = () => {
-                deletedCount++
-              }
-              deleteRequest.onerror = (event) => {
-                console.warn(`Failed to delete record with key ${key}:`, event.target.error)
-              }
-            })
           }
         }
-
-        dateCursorRequest.onerror = (event) => {
-          console.error('Error opening date cursor for deletion:', event.target.error)
-          reject(event.target.error)
-        }
       }
       openRequest.onerror = function (e) {
         reject('Error opening database:'+database, e)
@@ -1014,4 +1021,5 @@ function cleanOldData(database, storeName, dateKey = 'timestamp') {
   }
 }
 
-export const clean7DaysWebsocketLog = cleanOldData('LogWebsocketData', 'LogStore');
+export const clean7DaysWebsocketLog = cleanOldData('LogWebsocketData', ['LogStore']);
+export const clean7DaysMailboxLog = cleanOldData('mailbox');

From fdfd633ecf2c5490544d751b260fe8965d04d62b Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 9 Jun 2025 15:20:33 +0800
Subject: [PATCH 064/143] =?UTF-8?q?perf:=20=E5=BE=85=E5=8A=9E=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95+=E9=82=AE=E7=AE=B1=E7=9B=AE=E5=BD=95;=20`=E5=82=AC?=
 =?UTF-8?q?=E4=BF=A1`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index a769ee6..cd2a0de 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -239,7 +239,7 @@ export const getTodoOrdersAction = async (params) => {
             _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
           })),
         },
-        {
+        ...(!isEmpty(sticky[1] || []) ? [{
           key: key + '-reminder',
           title: '催信',
           getMails: false,iconIndex: 'reminder',
@@ -253,7 +253,7 @@ export const getTodoOrdersAction = async (params) => {
             parentIconIndex: 'reminder',
             _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
           })),
-        },
+        }] : []),
       ]
       return { ...acc, [key]: treeNode }
     }, defaultStickyTree)

From 12b793d277726660f5782c3746cafd8423b1d276 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Mon, 9 Jun 2025 16:27:58 +0800
Subject: [PATCH 065/143] =?UTF-8?q?feat:=20=E9=82=AE=E4=BB=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx | 69 +++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 5 deletions(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index cd2aa6f..5f970c5 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -5,8 +5,12 @@ import dayjs from 'dayjs'
 import { useEmailList } from '@/hooks/useEmail';
 import { isEmpty } from '@/utils/commons';
 import { MailboxDirIcon } from './MailboxDirIcon'
+import { endWith } from 'rxjs';
 
 const { RangePicker } = DatePicker
+
+const PAGE_SIZE = 50; // 每页显示条数
+
 const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
   const DATE_RANGE_PRESETS = [
     {
@@ -37,7 +41,56 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
   const [form] = Form.useForm()
 
   const { mailList, isLoading, error } = useEmailList(mailboxDir);
-  const pagedList = mailList.length === 0 ? [] : mailList.slice(0, 50)
+
+   const [pagination, setPagination] = useState({
+    current: 1,
+    pageSize: PAGE_SIZE,
+    total: 0,
+    pagedList: []
+  });
+
+  useEffect(() => {
+    if (mailList) {
+      const total = mailList.length;
+      const pageCount = Math.ceil(total / PAGE_SIZE);
+
+      setPagination(prev => ({
+        ...prev,
+        total,
+        pageCount,
+        current: 1, // 重置到第一页
+        pagedList: getPagedData(mailList, 1)
+      }));
+    }
+  }, [mailList]);
+
+  const getPagedData = (data, currentPage) => {
+    const startIndex = (currentPage - 1) * PAGE_SIZE;
+    const endIndex = Math.min(startIndex + PAGE_SIZE, data.length);
+    return data.slice(startIndex, endIndex);
+  };
+
+  const prePage = () => {
+    if (pagination.current > 1) {
+      const newCurrent = pagination.current - 1;
+      setPagination(prev => ({
+        ...prev,
+        current: newCurrent,
+        pagedList: getPagedData(mailList, newCurrent)
+      }));
+    }
+  };
+
+  const nextPage = () => {
+    if (pagination.current < Math.ceil(pagination.total / PAGE_SIZE)) {
+      const newCurrent = pagination.current + 1;
+      setPagination(prev => ({
+        ...prev,
+        current: newCurrent,
+        pagedList: getPagedData(mailList, newCurrent)
+      }));
+    }
+  };
 
   console.info('props.breadcrumb: ', props.breadcrumb)
   console.info('props.mailboxDir: ', mailboxDir)
@@ -183,16 +236,22 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
                 })}
             />
             <Flex align="center" justify="space-between">
-              <span>1-50 of {mailList.length}</span>
-            <Button icon={<LeftOutlined />} type="text" iconPosition={'end'}></Button>
-            <Button icon={<RightOutlined />} type="text" iconPosition={'end'}></Button>
+               <span>
+          {((pagination.current - 1) * PAGE_SIZE + 1)}-{Math.min(pagination.current * PAGE_SIZE, pagination.total)} of {pagination.total}
+        </span>
+            <Button icon={<LeftOutlined />} type="text" onClick={() => {
+              prePage()
+            }} iconPosition={'end'}></Button>
+            <Button icon={<RightOutlined />} type="text" onClick={() => {
+              nextPage()
+            }} iconPosition={'end'}></Button>
             </Flex>
 
           </Flex>
           }
           itemLayout='vertical'
           pagination={false}
-          dataSource={pagedList}
+          dataSource={pagination.pagedList}
           renderItem={mailItemRender}
         />
       </div>

From f1bc44da072289f2129ecb5c47a71840e3546083 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 9 Jun 2025 17:09:18 +0800
Subject: [PATCH 066/143] =?UTF-8?q?perf:=20=E5=BE=85=E5=8A=9E=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95:=20=E5=A4=84=E7=90=86=E8=AE=A2=E5=8D=95=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js | 120 +++++++++++++++++++-----------------
 1 file changed, 64 insertions(+), 56 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index cd2a0de..7ae5bef 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -171,7 +171,7 @@ export const getEmailDirAction = async (params = { opi_sn: '' }) => {
   return errcode === 0 ? tree : [];
 };
 export const getTodoOrdersAction = async (params) => {
-  const opi_arr = params.opisn.split(',');
+  const opi_arr = params.opisn.split(',')
   const defaultStickyTree = opi_arr.reduce(
     (a, ele) => ({
       ...a,
@@ -193,7 +193,7 @@ export const getTodoOrdersAction = async (params) => {
           COLI_SN: 0,
         },
         // {
-          //   key: ele.OPI_DEI_SN + '-reminder',
+        //   key: ele.OPI_DEI_SN + '-reminder',
         //   title: '催信',
         //   getMails: false,iconIndex: 'reminder',
         //   icon: <BellTwoTone />,
@@ -204,60 +204,68 @@ export const getTodoOrdersAction = async (params) => {
     {},
   )
   const { errcode, result } = await fetchJSON(`${API_HOST}/getwlorder`, params)
-  const orderList = errcode === 0 ? result : [];
-      const byOPI = groupBy(orderList, 'OPI_SN');
-    const byState = Object.keys(byOPI).reduce((acc, key) => {
-      const sticky = groupBy(byOPI[key], (ele) => ([1, 2, 6].includes(ele.coli_ordertype) ? 0 : ([3,4,5].includes(ele.coli_ordertype) ? 1 : 2)))
-      const treeNode = [
-        {
-          key: key + '-today',
-          title: '今日任务',
-          getMails: false,iconIndex: 'star',
-          _raw: {COLI_SN: 0, IsTrue: 0,},
-          children: (sticky[0] || []).map((o) => ({
-            key: `today-${o.COLI_SN}`,
-            title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
-            iconIndex: 13,
-            parent: key + '-today',
-            parentTitle: '今日任务',
-            parentIconIndex: 'star',
-            _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
-          })),
-        },
-        {
-          key: key + '-todo',
-          title: '待办任务',
-          getMails: false,iconIndex: 'calendar',
-          _raw: {COLI_SN: 0, IsTrue: 0,},
-          children: (sticky[2] || []).map((o) => ({
-            key: `todo-${o.COLI_SN}`,
-            title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
-            iconIndex: 13,
-            parent: key + '-todo',
-            parentTitle: '待办任务',
-            parentIconIndex: 'calendar',
-            _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
-          })),
-        },
-        ...(!isEmpty(sticky[1] || []) ? [{
-          key: key + '-reminder',
-          title: '催信',
-          getMails: false,iconIndex: 'reminder',
-          _raw: {COLI_SN: 0, IsTrue: 0,},
-          children: (sticky[1] || []).map((o) => ({
-            key: `reminder-${o.COLI_SN}`,
-            title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
-            iconIndex: 13,
-            parent: key + '-reminder',
-            parentTitle: '催信',
-            parentIconIndex: 'reminder',
-            _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent:-1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
-          })),
-        }] : []),
-      ]
-      return { ...acc, [key]: treeNode }
-    }, defaultStickyTree)
-  return errcode === 0 ? byState : defaultStickyTree;
+  const _result_unique = uniqWith(result, (a, b) => a.COLI_SN === b.COLI_SN)
+  const orderList = errcode === 0 ? _result_unique : []
+  const byOPI = groupBy(orderList, 'OPI_SN')
+  const byState = Object.keys(byOPI).reduce((acc, key) => {
+    const sticky = groupBy(byOPI[key], (ele) => ([1, 2, 6].includes(ele.coli_ordertype) ? 0 : [3, 4, 5].includes(ele.coli_ordertype) ? 1 : 2))
+    const treeNode = [
+      {
+        key: key + '-today',
+        title: '今日任务',
+        getMails: false,
+        iconIndex: 'star',
+        _raw: { COLI_SN: 0, IsTrue: 0 },
+        children: (sticky[0] || []).map((o) => ({
+          key: `today-${o.COLI_SN}`,
+          title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
+          iconIndex: 13,
+          parent: key + '-today',
+          parentTitle: '今日任务',
+          parentIconIndex: 'star',
+          _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: -1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
+        })),
+      },
+      {
+        key: key + '-todo',
+        title: '待办任务',
+        getMails: false,
+        iconIndex: 'calendar',
+        _raw: { COLI_SN: 0, IsTrue: 0 },
+        children: (sticky[2] || []).map((o) => ({
+          key: `todo-${o.COLI_SN}`,
+          title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
+          iconIndex: 13,
+          parent: key + '-todo',
+          parentTitle: '待办任务',
+          parentIconIndex: 'calendar',
+          _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: -1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
+        })),
+      },
+      ...(!isEmpty(sticky[1] || [])
+        ? [
+            {
+              key: key + '-reminder',
+              title: '催信',
+              getMails: false,
+              iconIndex: 'reminder',
+              _raw: { COLI_SN: 0, IsTrue: 0 },
+              children: (sticky[1] || []).map((o) => ({
+                key: `reminder-${o.COLI_SN}`,
+                title: `(${todoTypes[o.coli_ordertype] || o.COLI_State}) ${o.COLI_ID}`,
+                iconIndex: 13,
+                parent: key + '-reminder',
+                parentTitle: '催信',
+                parentIconIndex: 'reminder',
+                _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: -1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
+              })),
+            },
+          ]
+        : []),
+    ]
+    return { ...acc, [key]: treeNode }
+  }, defaultStickyTree)
+  return errcode === 0 ? byState : defaultStickyTree
 };
 /**
  * 获取待办目录和邮箱目录

From 496861bcaabd2019eb0619781d7657f30f990dc1 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 9 Jun 2025 17:10:30 +0800
Subject: [PATCH 067/143] =?UTF-8?q?perf:=20MailBox=20=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx             | 27 +++++++++++++++++++++++--
 src/views/orders/components/MailBox.jsx |  2 +-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index a343e2a..32938b0 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -89,6 +89,29 @@ function Follow() {
     }
   }
 
+  const [selectedEmail, setSelectedEmail] = useState({});
+  const onClickEmailItem = (emailItem) => {
+    const mai_sn = emailItem.MAI_SN;
+    setActiveEmailId(mai_sn);
+    const emailMsg = {
+      conversationid: '',
+      order_opi: currentMailboxOPI,
+      coli_sn: 'oid',
+      id: emailItem.MAI_SN,
+      MAI_SN: emailItem.MAI_SN,
+      msgOrigin: {
+        from: '',
+        to: '',
+        ...(emailItem?.msgOrigin || {}),
+        id: emailItem.MAI_SN,
+        email: { mai_sn: emailItem.MAI_SN, subject: emailItem.MAI_Subject, id: emailItem.MAI_SN },
+        subject: emailItem.MAI_Subject,
+      },
+    }
+    console.log('emailItem', emailItem);
+    setSelectedEmail(emailMsg)
+  };
+
   // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
   useEffect(() => {
     const first = currentMailboxDEI || accountDEI[0].value
@@ -126,10 +149,10 @@ function Follow() {
         <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
           <Splitter>
             <Splitter.Panel defaultSize='40%' min={580} max='70%'>
-              <Mailbox breadcrumb={computedBreadcrumb} mailboxDir={mailboxActiveNode} onMailItemClick={(id) => setActiveEmailId(id)} currentActiveMailItem={activeEmailId} />
+              <Mailbox breadcrumb={computedBreadcrumb} mailboxDir={mailboxActiveNode} onMailItemClick={(item) => onClickEmailItem(item)} currentActiveMailItem={activeEmailId} />
             </Splitter.Panel>
             <Splitter.Panel>
-              <EmailDetailInline mailID={activeEmailId || 0} emailMsg={{}} variant={'outline'} size={'small'} />
+              <EmailDetailInline mailID={activeEmailId || 0} emailMsg={selectedEmail} variant={'outline'} size={'small'} />
             </Splitter.Panel>
           </Splitter>
         </Layout.Content>
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 5f970c5..7df2c7f 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -103,7 +103,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
     return (
       <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2' onClick={() => {
         console.info('item: ', item)
-        onMailItemClick(item.MAI_SN)
+        onMailItemClick(item)
       }}>
         <div className=''>
           <Checkbox></Checkbox>

From af5dd4efdcaf57319bb357aa6eb1d6f26ad07153 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Jun 2025 10:39:15 +0800
Subject: [PATCH 068/143] =?UTF-8?q?perf:=20=E9=82=AE=E7=AE=B1=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E6=93=8D=E4=BD=9C;=20perf:=20=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E9=99=84=E4=BB=B6;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js | 2 +-
 src/views/orders/Follow.jsx | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 7ae5bef..34c4673 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -98,7 +98,7 @@ export const getEmailDetailAction = async (params) => {
 
   const { html, bodyContent, bodyText } = mailType === 'text/html' ? parseHTMLString(cleanContent, true) : { html: '', bodyContent: '', bodyText: '' };
 
-  const attachments = (isEmpty(result?.AttachList) ? [] : result.AttachList).filter(ele => isEmpty(ele.ATI_ContentID));
+  const attachments = (isEmpty(result?.AttachList) ? [] : result.AttachList).filter(ele => isEmpty(ele.ATI_ContentID) || !ele.ATI_Name.includes('ContentFile'));
 
   const ret = {
     info: { ...encodeEmailInfo(result.MailInfo?.[0] || {}), mailType },
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 32938b0..7b47ec1 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -86,6 +86,9 @@ function Follow() {
     if (VKey && !(!IsTrue && !COLI_SN)) {
       setMailboxActiveNode({...treeNode, ...node._raw, key: treeNode.key, OPI_SN: currentMailboxOPI});
       setActiveEmailId(0);
+    } else {
+      const _expandTree = expandTree.includes(node.key) ? expandTree.filter(ele => ele !== node.key) : [...expandTree, ...selectedKeys]
+      setExpandTree(_expandTree)
     }
   }
 

From c4dd6b01478adb136be4a40868614c9cf6021997 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Jun 2025 11:10:43 +0800
Subject: [PATCH 069/143] feat: useEmailList + refresh

---
 src/hooks/useEmail.js                   | 12 +++++++++---
 src/views/orders/components/MailBox.jsx |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 4f19fb3..5033622 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -114,7 +114,7 @@ export const useEmailDetail = (mai_sn, data) => {
 }
 
 export const EmailBuilder = ({subject, content}) => {
-  return `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><title>${subject}</title><meta http-equiv="Content-Type" content="text/html charset=UTF-8" /><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="telephone=no,address=no,email=no,date=no,url=no" name="format-detection"><meta content="light" name="color-scheme"><meta content="light" name="supported-color-schemes"><style id="font">body#highlights-email{ font-family: Verdana, sans-serif;} table{ border-collapse: collapse; border-spacing: 0;} </style></head><body id="highlights-email" style="margin: 0 auto; padding: 0; width: 900px; background-color: #fcfcfc;">${content}</body></html>`;
+  return `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><title></title><meta http-equiv="Content-Type" content="text/html charset=UTF-8" /><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="telephone=no,address=no,email=no,date=no,url=no" name="format-detection"><meta content="light" name="color-scheme"><meta content="light" name="supported-color-schemes"><style id="font">body#highlights-email{ font-family: Verdana, sans-serif;} table{ border-collapse: collapse; border-spacing: 0;} </style></head><body id="highlights-email" style="margin: 0 auto; padding: 0; width: 900px; background-color: #fcfcfc;">${content}</body></html>`;
 }
 
 export const useEmailList = (mailboxDirNode) => {
@@ -122,6 +122,12 @@ export const useEmailList = (mailboxDirNode) => {
   const [mailList, setMailList] = useState([])
   const [error, setError] = useState(null)
   const [isFreshData, setIsFreshData] = useState(false)
+  const [refreshTrigger, setRefreshTrigger] = useState(0);
+
+  const refresh = useCallback(() => {
+    setRefreshTrigger(prev => prev + 1);
+  }, []);
+
   const { OPI_SN: opi_sn, COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = mailboxDirNode
 
   const getMailList = useCallback(async () => {
@@ -161,11 +167,11 @@ export const useEmailList = (mailboxDirNode) => {
     } finally {
       setLoading(false)
     }
-  }, [VKey])
+  }, [VKey, refreshTrigger])
 
   useEffect(() => {
     getMailList()
   }, [getMailList])
 
-  return { loading, isFreshData, error, mailList }
+  return { loading, isFreshData, error, mailList, refresh }
 }
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 7df2c7f..0726341 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -40,7 +40,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
   ]
   const [form] = Form.useForm()
 
-  const { mailList, isLoading, error } = useEmailList(mailboxDir);
+  const { mailList, loading, error, refresh } = useEmailList(mailboxDir);
 
    const [pagination, setPagination] = useState({
     current: 1,
@@ -175,7 +175,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
             <Button shape='circle' type='text' size='small' icon={<CheckSquareOutlined />} />
           </Tooltip>
           <Tooltip title='刷新'>
-            <Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} />
+            <Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} onClick={refresh} />
           </Tooltip>
         </Flex>
         <Input.Search
@@ -219,7 +219,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
       </div>
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
-        <List loading={isLoading}
+        <List loading={loading}
           header={
             <Flex align='center' justify="space-between">
             <Breadcrumb

From ef3e55eefb58affa6d81aa824477a6e3ace1e22f Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Jun 2025 11:35:02 +0800
Subject: [PATCH 070/143] =?UTF-8?q?perf:=20=E9=82=AE=E4=BB=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useEmail.js                         |  5 +++++
 .../Online/Components/EmailContent.jsx        | 12 ++++++++++--
 .../Online/Components/EmailDetailInline.jsx   | 19 +++++++++++++------
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 5033622..4666fa3 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -4,6 +4,7 @@ import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, g
 import { App } from 'antd'
 import useConversationStore from '@/stores/ConversationStore';
 import { msgStatusRenderMapped } from '@/channel/bubbleMsgUtils';
+import { POPUP_FEATURES } from '@/config';
 
 export const useEmailSignature = (opi_sn) => {
 
@@ -117,6 +118,10 @@ export const EmailBuilder = ({subject, content}) => {
   return `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><title></title><meta http-equiv="Content-Type" content="text/html charset=UTF-8" /><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="telephone=no,address=no,email=no,date=no,url=no" name="format-detection"><meta content="light" name="color-scheme"><meta content="light" name="supported-color-schemes"><style id="font">body#highlights-email{ font-family: Verdana, sans-serif;} table{ border-collapse: collapse; border-spacing: 0;} </style></head><body id="highlights-email" style="margin: 0 auto; padding: 0; width: 900px; background-color: #fcfcfc;">${content}</body></html>`;
 }
 
+export const openPopup = (url, target,) => {
+  window.open(url, target, POPUP_FEATURES);
+};
+
 export const useEmailList = (mailboxDirNode) => {
   const [loading, setLoading] = useState(false)
   const [mailList, setMailList] = useState([])
diff --git a/src/views/Conversations/Online/Components/EmailContent.jsx b/src/views/Conversations/Online/Components/EmailContent.jsx
index b2f2cf9..1874903 100644
--- a/src/views/Conversations/Online/Components/EmailContent.jsx
+++ b/src/views/Conversations/Online/Components/EmailContent.jsx
@@ -53,6 +53,14 @@ const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
         const body = doc.body
 
         if (body) {
+          try {
+            const links = doc.querySelectorAll('a')
+            links.forEach((link) => {
+              link.setAttribute('target', '_blank')
+            })
+          } catch (e) {
+            // console.error('Could not access iframe content due to Same-Origin Policy or other error:', e)
+          }
           requestAnimationFrame(() => {
             const newHeight = Math.max(body.scrollHeight, body.offsetHeight, body.clientHeight)
 
@@ -60,7 +68,7 @@ const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
             // console.log('body.offsetHeight: ', body.offsetHeight)
             // console.log('body.clientHeight: ', body.clientHeight)
 
-            const addMore = Math.max(Math.ceil(newHeight*0.05), 120);
+            const addMore = Math.max(Math.ceil(newHeight * 0.05), 120)
             // console.log('Calculated height:', newHeight, addMore)
             setIframeHeight(newHeight + addMore)
           })
@@ -117,7 +125,7 @@ const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
             border: 'none',
             display: 'block',
           }}
-          sandbox='allow-scripts allow-same-origin'
+          sandbox='allow-scripts allow-same-origin allow-popups'
         />
       </div>
     </div>
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index dea7317..fa03a62 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef } from 'react'
+import { useState, useEffect, useRef, useMemo } from 'react'
 import { App, Button, Divider, Avatar, List, Flex, Typography, Tooltip, Empty } from 'antd'
 import { LoadingOutlined, ApiOutlined, FilePdfOutlined, FileOutlined, FileWordOutlined, FileExcelOutlined, FileJpgOutlined, FileImageOutlined, FileTextOutlined, FileGifOutlined, GlobalOutlined, FileZipOutlined } from '@ant-design/icons'
 import { EditIcon, MailCheckIcon, ReplyAllIcon, ReplyIcon, ResendIcon, ShareForwardIcon, SendPlaneFillIcon, InboxIcon } from '@/components/Icons'
@@ -6,7 +6,7 @@ import { isEmpty, TagColorStyle } from '@/utils/commons'
 import EmailEditorPopup from '../Input/EmailEditorPopup'
 import DnDModal from '@/components/DnDModal'
 import useStyleStore from '@/stores/StyleStore'
-import { useEmailDetail } from '@/hooks/useEmail'
+import { openPopup, useEmailDetail } from '@/hooks/useEmail'
 import { EMAIL_ATTA_HOST, POPUP_FEATURES } from '@/config'
 import EmailBindFormModal from './EmailBind'
 import EmailContent from './EmailContent'
@@ -38,11 +38,18 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
   useEffect(() => {
     if (componentRef.current) {
       // console.log(componentRef.current.getBoundingClientRect().width);
-      setCompactBtn(componentRef.current.offsetWidth < 769);
+      setCompactBtn(componentRef.current.offsetWidth < 800);
     }
     return () => {}
   }, [])
 
+  // const NEW_EMAIL_CONFIG = useMemo(() => {
+  //   return ['new', 'edit', 'reply', 'replyall', 'forward'].reduce((a, action) => ({...a, [`${action}-${mailID || 0}`]: {
+  //     url: `/email/${action}/${mailID || 0}`,
+  //     name: `${action}-${mailID || 0}`,
+  //     features: POPUP_FEATURES,
+  //   }}), {});
+  // }, [mailID]);
 
   const { notification, message } = App.useApp()
 
@@ -190,7 +197,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
           <ActionBtns key='actions' className={'ml-auto'}/>
           </div>
           <Divider className='my-2' />
-          <div className={['flex flex-wrap justify-end', window.innerWidth < 600 ? 'flex-col' : 'flex-row '].join(' ')}>
+          <div className={['flex flex-wrap justify-end', window.innerWidth < 800 ? 'flex-col' : 'flex-row '].join(' ')}>
             <div className=' flex-auto basis-0 flex flex-wrap gap-2 mb-2 items-center'>
               <Avatar className='' style={TagColorStyle(mailData.info?.MAI_From, true)}>
                 {(mailData.info?.MAI_From || '').substring(0, 1)}
@@ -245,9 +252,9 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
                   <List.Item>
                     <FileTypeIcon fileName={atta.ATI_Name} />
                     <Typography.Text ellipsis={{ tooltip: { title: atta.ATI_Name, placement: 'left' } }} className='text-inherit'>
-                      <a href={`${EMAIL_ATTA_HOST}${atta.ATI_ServerFile}`} key={atta.ATI_SN} target='_blank' rel='noreferrer'>
+                      <span key={atta.ATI_SN} onClick={() => openPopup(`${EMAIL_ATTA_HOST}${atta.ATI_ServerFile}`, atta.ATI_SN, POPUP_FEATURES)} size='small' className='text-blue-500 cursor-pointer'>
                         {atta.ATI_Name}
-                      </a>
+                      </span>
                     </Typography.Text>
                   </List.Item>
                 )}

From e9d7bd1e8f3af5b206a107fca52a729a5d50d3f1 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 10 Jun 2025 14:46:05 +0800
Subject: [PATCH 071/143] =?UTF-8?q?feat=EF=BC=9A=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=BB=E5=8F=96=E5=AE=A2=E4=BA=BA=E3=80=81?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BF=A1=E6=81=AF=EF=BC=9B=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E6=8A=A5=E4=BB=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx         |  72 ++++++++----
 src/stores/OrderStore.js                |   8 +-
 src/views/orders/components/MailBox.jsx | 140 +++++++++++++-----------
 3 files changed, 129 insertions(+), 91 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index 87aef9b..5db5b7a 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -26,20 +26,47 @@ const OrderProfile = ({coliSN, ...props}) => {
     orderLabelOptions.unshift({ value: 0, label: "未设置", disabled: true });
 
 	const orderStatusOptions = copy(OrderStatusDefaultOptions);
+  const [
+    orderDetail, customerDetail, lastQuotation, quotationList, fetchOrderDetail, setOrderPropValue, appendOrderComment, fetchOtherEmail, otherEmailList, fetchHistoryOrder
+   ] = useOrderStore(s => [
+    s.orderDetail, s.customerDetail, s.lastQuotation, s.quotationList, s.fetchOrderDetail, s.setOrderPropValue, s.appendOrderComment, s.fetchOtherEmail, s.otherEmailList, s.fetchHistoryOrder
+  ])
+
+  useEffect(() => {
+		if (coliSN) {
+			// setLoading(true);
+			fetchOrderDetail(coliSN)
+        .then(result => {
+          console.info(result)
+        })
+				// .finally(() => setLoading(false))
+				// .catch(reason => {
+				// 	notification.error({
+				// 		message: "查询出错",
+				// 		description: reason.message,
+				// 		placement: "top",
+				// 		duration: 60,
+				// 	});
+				// });
+		}
+    return () => {}
+	}, [coliSN]);
+
+  const regularText = () => {
+    if (orderDetail.buytime > 0) return "(R" + orderDetail.buytime + ")"
+  }
+
 
-    const [openOrder, setOpenOrder] = useState(false)
   return (
     <>
       <Flex gap='small' vertical={true} justify='space-between'>
         <Typography.Text>
           <FieldNumberOutlined className='pr-1' />
-          LSS250501006
-          <HeartTwoTone twoToneColor='#eb2f96' />
-          <MoneyCollectTwoTone twoToneColor='#eb2f96' />
+          {orderDetail.order_no}
         </Typography.Text>
         <Typography.Text>
           <UserOutlined className=' pr-1' />
-          Jorgina(R1)
+          {customerDetail.name + regularText()}
         </Typography.Text>
         <Typography.Text>
           <CompassOutlined className=' pr-1' />
@@ -48,34 +75,40 @@ const OrderProfile = ({coliSN, ...props}) => {
         <Typography.Text>
           <PhoneOutlined className=' pr-1' />
           <Button type='link' size={'small'} onClick={() => {}}>
-            6596823833
+            {customerDetail.phone}
           </Button>
         </Typography.Text>
         <Typography.Text>
           <MailOutlined className=' pr-1' />
-          Jorgina@gmail.com
+          {customerDetail.email}
         </Typography.Text>
         <Typography.Text>
           <WhatsAppOutlined className='pr-1' />
           <Button type='link' size={'small'} onClick={() => {}}>
-            6596826951
+            {customerDetail.whatsapp_phone_number}
           </Button>
         </Typography.Text>
         <Typography.Text>
           <CalendarOutlined className='pr-1' />
           <span>出发日期：</span>2025-09-18，已下计划
         </Typography.Text>
+
+        <Divider orientation="left">
+            <Typography.Text strong>特殊要求</Typography.Text>
+          </Divider>
         <Typography.Text>
-          <span>特殊要求：</span>
-          在华城市 桂林 对酒店和房型要求 5-star
+          {orderDetail.customer_request}
         </Typography.Text>
+        <Divider orientation="left">
+            <Typography.Text strong>外联备注</Typography.Text>
+          </Divider>
         <Typography.Text>
-          <span>外联备注：</span>
-          泰国马来水灯节
+          {orderDetail.wl_memo}
         </Typography.Text>
         <Divider orientation="left">
             <Typography.Text strong>订单状态</Typography.Text>
           </Divider>
+          <Flex gap='small' vertical={true} justify='space-between'>
       <Select className={`[&_.ant-select-selection-item]:text-gray-950`}
 								key={"orderlabel"}
 								size="small"
@@ -85,10 +118,9 @@ const OrderProfile = ({coliSN, ...props}) => {
 								variant="underlined"
 								onSelect={value => {
 								}}
-								value={0}
+								value={orderDetail.tags}
 								options={orderLabelOptions}
 							/>
-
               <Select className={`[&_.ant-select-selection-item]:text-gray-950`}
 								key={"orderstatus"}
 								size="small"
@@ -98,9 +130,10 @@ const OrderProfile = ({coliSN, ...props}) => {
 								variant="underlined"
 								onSelect={value => {
 								}}
-								value={1}
+								value={orderDetail.states}
 								options={orderStatusOptions}
 							/>
+              </Flex>
 
       </Flex>
               <Divider orientation="left">
@@ -114,12 +147,7 @@ const OrderProfile = ({coliSN, ...props}) => {
         <FileAddOutlined className='pl-1' />
         </Tooltip>
       </Divider>
-      <p
-        className='p-2 overflow-auto m-0 break-words whitespace-pre-wrap'
-        dangerouslySetInnerHTML={{
-          __html:
-            'orderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detailorderDetail.order_detail',
-        }}></p>
+      <p className="p-2 overflow-auto m-0 break-words whitespace-pre-wrap" dangerouslySetInnerHTML={{ __html: orderDetail.order_detail }}></p>
 
       <Divider orientation='left'>
         <Typography.Text strong>附加信息</Typography.Text>
@@ -129,7 +157,7 @@ const OrderProfile = ({coliSN, ...props}) => {
       </Divider>
       <Typography.Text>
           泰国马来水灯节
-        </Typography.Text>
+      </Typography.Text>
     </>
   )
 }
diff --git a/src/stores/OrderStore.js b/src/stores/OrderStore.js
index 5db191f..09f66dd 100644
--- a/src/stores/OrderStore.js
+++ b/src/stores/OrderStore.js
@@ -65,14 +65,14 @@ export const useOrderStore = create(devtools((set, get) => ({
           set(() => ({
             orderDetail: {...orderResult, coli_sn: colisn },
             customerDetail: orderResult.contact.length > 0 ? orderResult.contact[0] : {},
-            lastQuotation: orderResult.quotes.length > 0 ? orderResult.quotes[0] : {},
-            quotationList: orderResult.quotes,
+            // lastQuotation: orderResult.quotes.length > 0 ? orderResult.quotes[0] : {},
+            // quotationList: orderResult.quotes,
           }))
           return {
             orderDetail: {...orderResult, coli_sn: colisn },
             customerDetail: orderResult.contact.length > 0 ? orderResult.contact[0] : {},
-            lastQuotation: orderResult.quotes.length > 0 ? orderResult.quotes[0] : {},
-            quotationList: orderResult.quotes,
+            // lastQuotation: orderResult.quotes.length > 0 ? orderResult.quotes[0] : {},
+            // quotationList: orderResult.quotes,
           }
         } else {
           throw new Error(json?.errmsg + ': ' + json.errcode)
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 0726341..716ab1b 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -1,17 +1,16 @@
-import { useCallback, useEffect, useState } from 'react'
-import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, StarOutlined, RightOutlined, LeftOutlined, ExpandOutlined, AppstoreOutlined } from '@ant-design/icons'
-import { Flex, Button, Tooltip, List, Form, Row, Col, Drawer, Dropdown, Input, Checkbox, DatePicker, Switch, Breadcrumb } from 'antd'
+import { useEffect, useState } from 'react'
+import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, RightOutlined, LeftOutlined, ExpandOutlined } from '@ant-design/icons'
+import { Flex, Button, Tooltip, List, Form, Row, Col, Dropdown, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton } from 'antd'
 import dayjs from 'dayjs'
-import { useEmailList } from '@/hooks/useEmail';
-import { isEmpty } from '@/utils/commons';
+import { useEmailList } from '@/hooks/useEmail'
+import { isEmpty } from '@/utils/commons'
 import { MailboxDirIcon } from './MailboxDirIcon'
-import { endWith } from 'rxjs';
 
 const { RangePicker } = DatePicker
 
-const PAGE_SIZE = 50; // 每页显示条数
+const PAGE_SIZE = 50 // 每页显示条数
 
-const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
+const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
   const DATE_RANGE_PRESETS = [
     {
       label: '本周',
@@ -40,77 +39,80 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
   ]
   const [form] = Form.useForm()
 
+  const { mailList, isLoading, error } = useEmailList(mailboxDir)
   const { mailList, loading, error, refresh } = useEmailList(mailboxDir);
 
-   const [pagination, setPagination] = useState({
+  const [pagination, setPagination] = useState({
     current: 1,
     pageSize: PAGE_SIZE,
     total: 0,
-    pagedList: []
-  });
+    pagedList: [],
+  })
 
   useEffect(() => {
     if (mailList) {
-      const total = mailList.length;
-      const pageCount = Math.ceil(total / PAGE_SIZE);
+      const total = mailList.length
+      const pageCount = Math.ceil(total / PAGE_SIZE)
 
-      setPagination(prev => ({
+      setPagination((prev) => ({
         ...prev,
         total,
         pageCount,
         current: 1, // 重置到第一页
-        pagedList: getPagedData(mailList, 1)
-      }));
+        pagedList: getPagedData(mailList, 1),
+      }))
     }
-  }, [mailList]);
+  }, [mailList])
 
   const getPagedData = (data, currentPage) => {
-    const startIndex = (currentPage - 1) * PAGE_SIZE;
-    const endIndex = Math.min(startIndex + PAGE_SIZE, data.length);
-    return data.slice(startIndex, endIndex);
-  };
+    const startIndex = (currentPage - 1) * PAGE_SIZE
+    const endIndex = Math.min(startIndex + PAGE_SIZE, data.length)
+    return data.slice(startIndex, endIndex)
+  }
 
   const prePage = () => {
     if (pagination.current > 1) {
-      const newCurrent = pagination.current - 1;
-      setPagination(prev => ({
+      const newCurrent = pagination.current - 1
+      setPagination((prev) => ({
         ...prev,
         current: newCurrent,
-        pagedList: getPagedData(mailList, newCurrent)
-      }));
+        pagedList: getPagedData(mailList, newCurrent),
+      }))
     }
-  };
+  }
 
   const nextPage = () => {
     if (pagination.current < Math.ceil(pagination.total / PAGE_SIZE)) {
-      const newCurrent = pagination.current + 1;
-      setPagination(prev => ({
+      const newCurrent = pagination.current + 1
+      setPagination((prev) => ({
         ...prev,
         current: newCurrent,
-        pagedList: getPagedData(mailList, newCurrent)
-      }));
+        pagedList: getPagedData(mailList, newCurrent),
+      }))
     }
-  };
-
-  console.info('props.breadcrumb: ', props.breadcrumb)
-  console.info('props.mailboxDir: ', mailboxDir)
+  }
 
   const mailItemRender = (item) => {
     const isOrderNode = mailboxDir.COLI_SN > 0
-    const orderNumber = (isEmpty(item.MAI_COLI_ID) || isOrderNode) ? '' : (item.MAI_COLI_ID + ' - ')
-    const countryName = isEmpty(item.CountryCN) ? '' : ('[' + (item.CountryCN === null ? 'USA' : item.CountryCN) + '] ')
+    const orderNumber = isEmpty(item.MAI_COLI_ID) || isOrderNode ? '' : item.MAI_COLI_ID + ' - '
+    const countryName = isEmpty(item.CountryCN) ? '' : '[' + item.CountryCN + '] '
     const mailStateClass = item.MOI_ReadState === 0 ? 'font-bold' : ''
     return (
-      <li className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2' onClick={() => {
-        console.info('item: ', item)
-        onMailItemClick(item)
-      }}>
+      <li
+        className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2'>
         <div className=''>
           <Checkbox></Checkbox>
         </div>
-        <div className='flex-1 pl-2'>
+        <div className='flex-1 pl-2'
+        onClick={() => {
+          console.info('item: ', item)
+          onMailItemClick(item)
+        }}>
           <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
-            <div>{orderNumber}<span className={mailStateClass}>{item.MAI_Subject}</span></div>
+            <div>
+              {orderNumber}
+              <span className={mailStateClass}>{item.MAI_Subject}</span>
+            </div>
             <span className='text-neutral-500 text-wrap break-words break-all '>{countryName + item.SenderReceiver + ' ' + item.SRDate}</span>
           </Flex>
         </div>
@@ -187,10 +189,9 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
           }}
           placeholder={`邮件主题`}
         />
-          <Tooltip title='高级搜索'>
-        <Switch checkedChildren={<ExpandOutlined />}
-      unCheckedChildren={<ExpandOutlined />} defaultChecked={false} />
-      </Tooltip>
+        <Tooltip title='高级搜索'>
+          <Switch checkedChildren={<ExpandOutlined />} unCheckedChildren={<ExpandOutlined />} defaultChecked={false} />
+        </Tooltip>
       </div>
       <div className='bg-white h-auto p-1 flex gap-1 items-center hidden'>
         <Form
@@ -219,41 +220,50 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props}) => {
       </div>
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
-        <List loading={loading}
+        <Skeleton active loading={isLoading}>
+        <List
+          loading={isLoading}
           header={
-            <Flex align='center' justify="space-between">
-            <Breadcrumb
-              items={
-                props.breadcrumb.map(bc  => {
+            <Flex align='center' justify='space-between'>
+              <Breadcrumb
+                items={props.breadcrumb.map((bc) => {
                   return {
                     title: (
                       <>
-                      <MailboxDirIcon type={bc?.iconIndex} />
+                        <MailboxDirIcon type={bc?.iconIndex} />
                         <span>{bc.title}</span>
                       </>
                     ),
                   }
                 })}
-            />
-            <Flex align="center" justify="space-between">
-               <span>
-          {((pagination.current - 1) * PAGE_SIZE + 1)}-{Math.min(pagination.current * PAGE_SIZE, pagination.total)} of {pagination.total}
-        </span>
-            <Button icon={<LeftOutlined />} type="text" onClick={() => {
-              prePage()
-            }} iconPosition={'end'}></Button>
-            <Button icon={<RightOutlined />} type="text" onClick={() => {
-              nextPage()
-            }} iconPosition={'end'}></Button>
+              />
+              <Flex align='center' justify='space-between'>
+                <span>
+                  {(pagination.current - 1) * PAGE_SIZE + 1}-{Math.min(pagination.current * PAGE_SIZE, pagination.total)} of {pagination.total}
+                </span>
+                <Button
+                  icon={<LeftOutlined />}
+                  type='text'
+                  onClick={() => {
+                    prePage()
+                  }}
+                  iconPosition={'end'}></Button>
+                <Button
+                  icon={<RightOutlined />}
+                  type='text'
+                  onClick={() => {
+                    nextPage()
+                  }}
+                  iconPosition={'end'}></Button>
+              </Flex>
             </Flex>
-
-          </Flex>
           }
           itemLayout='vertical'
           pagination={false}
           dataSource={pagination.pagedList}
           renderItem={mailItemRender}
         />
+        </Skeleton>
       </div>
     </>
   )

From d733303ec31e451e583f95fb320973ce5e7a8a94 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 10 Jun 2025 14:49:39 +0800
Subject: [PATCH 072/143] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx         | 1 +
 src/views/orders/components/MailBox.jsx | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index 5db5b7a..c2d5302 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -54,6 +54,7 @@ const OrderProfile = ({coliSN, ...props}) => {
 
   const regularText = () => {
     if (orderDetail.buytime > 0) return "(R" + orderDetail.buytime + ")"
+    return ''
   }
 
 
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 716ab1b..8690d5c 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -39,7 +39,6 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
   ]
   const [form] = Form.useForm()
 
-  const { mailList, isLoading, error } = useEmailList(mailboxDir)
   const { mailList, loading, error, refresh } = useEmailList(mailboxDir);
 
   const [pagination, setPagination] = useState({
@@ -220,9 +219,9 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
       </div>
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
-        <Skeleton active loading={isLoading}>
+        <Skeleton active loading={loading}>
         <List
-          loading={isLoading}
+          loading={loading}
           header={
             <Flex align='center' justify='space-between'>
               <Breadcrumb

From dd9e6e9e3af76f0727be86a457275a8f624aafe0 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 10 Jun 2025 14:59:06 +0800
Subject: [PATCH 073/143] =?UTF-8?q?perf=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E4=BF=A1=E6=81=AF=E9=A1=BA=E5=BA=8F=EF=BC=9B?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=AA=A8=E6=9E=B6=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx | 41 ++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index c2d5302..b6eb710 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -15,13 +15,14 @@ import { useCallback, useEffect, useState } from 'react'
 import {
   Flex,Select,Tooltip,
   Button, Space, Divider, Typography,
-  Input, Radio,Drawer,Checkbox,
+  Input, Radio,Skeleton ,Checkbox,
 } from 'antd'
 import { InboxIcon, MailCheckIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
 import { useOrderStore, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions, fetchSetRemindStateAction, remindStatusOptionsMapped } from "@/stores/OrderStore";
 import { copy, isEmpty } from "@/utils/commons";
 const OrderProfile = ({coliSN, ...props}) => {
 
+	const [loading, setLoading] = useState(false);
     const orderLabelOptions = copy(OrderLabelDefaultOptions);
     orderLabelOptions.unshift({ value: 0, label: "未设置", disabled: true });
 
@@ -34,12 +35,12 @@ const OrderProfile = ({coliSN, ...props}) => {
 
   useEffect(() => {
 		if (coliSN) {
-			// setLoading(true);
+			setLoading(true);
 			fetchOrderDetail(coliSN)
         .then(result => {
           console.info(result)
         })
-				// .finally(() => setLoading(false))
+				.finally(() => setLoading(false))
 				// .catch(reason => {
 				// 	notification.error({
 				// 		message: "查询出错",
@@ -60,6 +61,7 @@ const OrderProfile = ({coliSN, ...props}) => {
 
   return (
     <>
+    <Skeleton active loading={loading}>
       <Flex gap='small' vertical={true} justify='space-between'>
         <Typography.Text>
           <FieldNumberOutlined className='pr-1' />
@@ -94,19 +96,8 @@ const OrderProfile = ({coliSN, ...props}) => {
           <span>出发日期：</span>2025-09-18，已下计划
         </Typography.Text>
 
-        <Divider orientation="left">
-            <Typography.Text strong>特殊要求</Typography.Text>
-          </Divider>
-        <Typography.Text>
-          {orderDetail.customer_request}
-        </Typography.Text>
-        <Divider orientation="left">
-            <Typography.Text strong>外联备注</Typography.Text>
-          </Divider>
-        <Typography.Text>
-          {orderDetail.wl_memo}
-        </Typography.Text>
-        <Divider orientation="left">
+      </Flex>
+      <Divider orientation="left">
             <Typography.Text strong>订单状态</Typography.Text>
           </Divider>
           <Flex gap='small' vertical={true} justify='space-between'>
@@ -136,13 +127,12 @@ const OrderProfile = ({coliSN, ...props}) => {
 							/>
               </Flex>
 
-      </Flex>
               <Divider orientation="left">
             <Typography.Text strong>催信</Typography.Text>
           </Divider>
           <Checkbox.Group key='substatus' className="px-2"  options={remindStatusOptions}  />
 
-      <Divider orientation='left'>
+<Divider orientation='left'>
         <Typography.Text strong>表单信息</Typography.Text>
         <Tooltip title='添加'>
         <FileAddOutlined className='pl-1' />
@@ -150,6 +140,20 @@ const OrderProfile = ({coliSN, ...props}) => {
       </Divider>
       <p className="p-2 overflow-auto m-0 break-words whitespace-pre-wrap" dangerouslySetInnerHTML={{ __html: orderDetail.order_detail }}></p>
 
+        <Divider orientation="left">
+            <Typography.Text strong>特殊要求</Typography.Text>
+          </Divider>
+        <Typography.Text>
+          {orderDetail.customer_request}
+        </Typography.Text>
+        <Divider orientation="left">
+            <Typography.Text strong>外联备注</Typography.Text>
+          </Divider>
+        <Typography.Text>
+          {orderDetail.wl_memo}
+        </Typography.Text>
+
+
       <Divider orientation='left'>
         <Typography.Text strong>附加信息</Typography.Text>
         <Tooltip title='修改'>
@@ -159,6 +163,7 @@ const OrderProfile = ({coliSN, ...props}) => {
       <Typography.Text>
           泰国马来水灯节
       </Typography.Text>
+      </Skeleton>
     </>
   )
 }

From e113c33fc60b8843bc8ff437bff97bf3ccad2502 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Jun 2025 15:01:06 +0800
Subject: [PATCH 074/143] =?UTF-8?q?=E2=8F=B3=E6=96=B0=E7=AA=97=E5=8F=A3:?=
 =?UTF-8?q?=20=E9=82=AE=E4=BB=B6=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js |   2 +-
 src/stores/EmailSlice.js    |   4 +-
 src/utils/commons.js        |   2 +-
 src/views/NewEmail.jsx      | 109 ++++++++++++++++++++++++++++--------
 4 files changed, 91 insertions(+), 26 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 34c4673..a133a94 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -3,7 +3,7 @@ import { API_HOST, DATE_FORMAT, DATEEND_FORMAT, DATETIME_FORMAT, EMAIL_HOST } fr
 import { buildTree, groupBy, isEmpty, objectMapper, omitEmpty, readIndexDB, uniqWith, writeIndexDB } from '@/utils/commons';
 import dayjs from 'dayjs';
 
-const parseHTMLString = (html, needText = false) => {
+export const parseHTMLString = (html, needText = false) => {
   const parser = new DOMParser()
   const doc = parser.parseFromString(html, 'text/html')
   let bodyContent = doc.body.innerHTML
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index 71bfe87..170b1e7 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -108,7 +108,7 @@ const emailSlice = (set, get) => ({
     if (!isEmpty(readCache)) {
       setMailboxNestedDirsActive(readCache?.tree || [])
       isNeedRefresh = Date.now() - readCache.timestamp > 4 * 60 * 60 * 1000
-      isNeedRefresh = true; // test: 0
+      // isNeedRefresh = true; // test: 0
     }
     if (isEmpty(readCache) || isNeedRefresh) {
       // > {4} 更新
@@ -120,7 +120,7 @@ const emailSlice = (set, get) => ({
 
   async initMailbox({ opi_sn, dei_sn, userId, userIdStr }) {
     const { setCurrentMailboxOPI, setCurrentMailboxDEI, getOPIEmailDir } = get()
-    createIndexedDBStore(['dirs', 'maillist', 'mailinfo'], 'mailbox')
+    createIndexedDBStore(['dirs', 'maillist', 'mailinfo', 'draft'], 'mailbox')
     setCurrentMailboxOPI(opi_sn)
     setCurrentMailboxDEI(dei_sn)
     getOPIEmailDir(userId, userIdStr)
diff --git a/src/utils/commons.js b/src/utils/commons.js
index 463d8cd..80ceed4 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -862,7 +862,7 @@ export const readIndexDB = (key=null, table, database) => {
       getRequest.onsuccess = (event) => {
         const result = event.target.result
         if (result) {
-          console.log(`Found record with key ${key}:`, result)
+          console.log(`💾Found record with key ${key}:`, result)
           resolve(result)
         } else {
           console.log(`No record found with key ${key}.`)
diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index 5658204..6097a1f 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -3,7 +3,6 @@ import { useParams, useNavigate, useLocation } from 'react-router-dom';
 import { App, ConfigProvider, Button, Form, Input, Flex, Checkbox, Popconfirm, Select, Space, Upload, Divider, Modal, Tabs, Radio } from 'antd'
 import { UploadOutlined, LoadingOutlined, SaveOutlined, SendOutlined, CheckCircleOutlined } from '@ant-design/icons'
 import '@dckj/react-better-modal/dist/index.css'
-import DnDModal from '@/components/DnDModal'
 import useStyleStore from '@/stores/StyleStore'
 // import useConversationStore from '@/stores/ConversationStore'
 import useAuthStore from '@/stores/AuthStore'
@@ -11,9 +10,9 @@ import useAuthStore from '@/stores/AuthStore'
 import LexicalEditor from '@/components/LexicalEditor'
 
 import { v4 as uuid } from 'uuid'
-import { cloneDeep, debounce, isEmpty, writeIndexDB } from '@/utils/commons'
+import { cloneDeep, debounce, isEmpty, writeIndexDB, readIndexDB, deleteIndexDBbyKey } from '@/utils/commons'
 import '@/views/Conversations/Online/Input/EmailEditor.css'
-import { postSendEmail } from '@/actions/EmailActions'
+import { parseHTMLString, postSendEmail } from '@/actions/EmailActions'
 import { sentMsgTypeMapped } from '@/channel/bubbleMsgUtils'
 import { EmailBuilder, useEmailDetail, useEmailSignature } from '@/hooks/useEmail'
 import useSnippetStore from '@/stores/SnippetStore'
@@ -74,7 +73,7 @@ const generateMailContent = (mailData) => `<br><br><p>${mailData.content}</p>`
 /**
  * ! 无状态管理
  */
-const NewEmail = ({ ...props }) => {
+const NewEmail = () => {
   const pageParam = useParams();
   const editorKey = pageParam.action==='new' ? `new-${Date.now().toString(32)}` : `${pageParam.action}-${pageParam.quoteid}`
 
@@ -121,18 +120,49 @@ const NewEmail = ({ ...props }) => {
   }
 
   const [contentPrefix, setContentPrefix] = useState('')
+  const [localDraft, setLocalDraft] = useState();
+
+  const readMailboxLocalCache = async () => {
+    const readCache = await readIndexDB(editorKey, 'draft', 'mailbox')
+    if (readCache) {
+      const btn = (
+        <Space>
+          <Button type='link' size='small' onClick={() => notification.destroy()}>
+            关闭
+          </Button>
+          {/* <Button type="primary" size="small" onClick={() => notification.destroy()}>
+          Confirm
+        </Button> */}
+        </Space>
+      )
+      // notification.open({
+      //   key: editorKey,
+      //   placement: 'top',
+      //   // message: '提示',
+      //   description: '已从本地缓存中读取邮件内容',
+      //   duration: 0,
+      //   actions: btn,
+      // })
+      setLocalDraft(readCache);
+    }
+  }
+  useEffect(() => {
+    readMailboxLocalCache()
+
+    return () => {}
+  }, [])
+
+
 
-  // const [stickToCid, setStickToCid] = useState(pageParam.conversationid)
   useEffect(() => {
     console.log('useeffect\n', orderDetail.order_no);
-    // const propsObj = { ...activeEdit, mai: activeEdit.mailData?.info?.MAI_MAT_SN }
 
     setContentPrefix(orderDetail.order_no ? `<p>Dear Mr./Ms. ${orderDetail.contact?.[0]?.name || ''}</p><p>Reference Number: ${orderDetail.order_no}</p>` : '')
 
     return () => {}
-  }, [orderDetail.order_no])
+  }, [orderDetail.order_no, editorKey])
 
-  const handleSwitchEmail = (labelValue) => {
+  const handleSwitchEmail  = (labelValue) => {
     const { value } = labelValue
     setNewFromEmail(value)
     const _findMat = emailListAddrMapped?.[value]
@@ -162,11 +192,18 @@ const NewEmail = ({ ...props }) => {
     setHtmlContent(htmlContent)
     setTextContent(textContent)
     form.setFieldValue('content', htmlContent)
+    const { bodyText: abstract } = parseHTMLString(htmlContent, true);
+    const body = {
+      from: newFromEmail,
+      attaList: fileList,
+      opi_sn: emailOPI,
+      mat_sn: emailMat,
+      coli_sn: emailOrder || '',
+    }
     // form.setFieldValue('abstract', getAbstract(textContent))
-    debouncedSave({ htmlContent, ...form.getFieldsValue() })
+    debouncedSave({ ...form.getFieldsValue(), ...body, htmlContent, abstract,  })
   }
 
-  const [initialForm, setInitialForm] = useState({})
   const [initialContent, setInitialContent] = useState('')
   const [showQuoteContent, setShowQuoteContent] = useState(false)
   const [mergeQuote, setMergeQuote] = useState(true)
@@ -176,9 +213,29 @@ const NewEmail = ({ ...props }) => {
 
   useEffect(() => {
     console.log('useEffect 2---- \nform.setFieldsValue ');
+    const docTitle = localDraft?.subject || mailData.info?.MAI_Subject || 'New Email-';
     setTimeout(() => {
-      document.title = mailData.info?.MAI_Subject || 'New Email-'
+      document.title = docTitle
     }, 1500);
+
+    if (!isEmpty(localDraft)) {
+      const {htmlContent, ...draftFormsValues} = localDraft;
+
+      const _findMatOld = emailListMatMapped?.[draftFormsValues.mat_sn]
+      const _from = draftFormsValues?.from || _findMatOld?.email || ''
+
+      form.setFieldsValue(draftFormsValues);
+      setNewFromEmail(_from);
+      setEmailOPI(draftFormsValues.opi_sn)
+      setEmailMat(draftFormsValues.mat_sn)
+      setEmailOrder(draftFormsValues.coli_sn)
+      requestAnimationFrame(() => {
+        setInitialContent(htmlContent);
+      });
+
+      return () => {};
+    }
+
     // 没有引用邮件
     if (isEmpty(pageParam.quoteid)) {
 
@@ -241,7 +298,6 @@ const NewEmail = ({ ...props }) => {
         subject: `Re: ${info.MAI_Subject || ''}`,
       }
       form.setFieldsValue(_formValues)
-      setInitialForm(_formValues)
     } else if (pageParam.action === 'replyall') {
       const _formValues = {
         to: info?.replyToAll || newFromEmail,
@@ -250,10 +306,8 @@ const NewEmail = ({ ...props }) => {
         subject: `Re: ${info.MAI_Subject || ''}`,
       }
       form.setFieldsValue(_formValues)
-      setInitialForm(_formValues)
     } else if (pageParam.action === 'forward') {
       form.setFieldsValue(forwardValues)
-      setInitialForm(forwardValues)
     } else if (pageParam.action === 'edit') {
       const thisFormValues = {
         to: info?.MAI_To || '',
@@ -261,20 +315,19 @@ const NewEmail = ({ ...props }) => {
         subject: info?.MAI_Subject || '',
       }
       form.setFieldsValue(thisFormValues)
-      setInitialForm(thisFormValues)
       const thisBody = generateMailContent(mailData)
       // console.log('thisBody', thisBody);
 
       setInitialContent(thisBody)
     } else if (pageParam.action === 'new') {
-      const newEmail = { to: newToEmail, subject: pageParam.draft?.subject || '' }
+      // todo: 附件
+      const newEmail = { to: newToEmail, subject: '' }
       form.setFieldsValue(newEmail)
-      setInitialForm(newEmail)
-      setInitialContent((pageParam.draft?.content || contentPrefix || '') + signatureBody)
+      setInitialContent((contentPrefix || '') + signatureBody)
     }
 
     return () => {}
-  }, [ mailData.info, signature, newToEmail])
+  }, [ mailData.info, signature, newToEmail, contentPrefix, localDraft])
 
   const [openPlainTextConfirm, setOpenPlainTextConfirm] = useState(false)
   const handlePlainTextOpenChange = ({ target }) => {
@@ -463,13 +516,25 @@ const NewEmail = ({ ...props }) => {
       bubbleMsg.email.mai_sn = mailSavedId
       // console.log('invokeEmailMessage', bubbleMsg);
 
-      invokeEmailMessage(bubbleMsg)
+      // invokeEmailMessage(bubbleMsg)
 
       // setSendLoading(false);
 
+      notification.success({
+        key: editorKey,
+        message: '成功',
+        // description: error.message,
+        placement: 'top',
+        duration: 2,
+        onClose: () => {
+          deleteIndexDBbyKey(editorKey, 'draft', 'mailbox');
+          window.close();
+        },
+      })
       // setOpen(false)
     } catch (error) {
       notification.error({
+        key: editorKey,
         message: '邮件保存失败',
         description: error.message,
         placement: 'top',
@@ -489,7 +554,7 @@ const NewEmail = ({ ...props }) => {
     debounce((data) => {
       idleCallbackId.current = window.requestIdleCallback(() => {
         console.log('Saving data (idle, debounced):', data)
-        writeIndexDB([{ ...data, key: editorKey }], 'draft', 'EmailEditor')
+        writeIndexDB([{ ...data, key: editorKey }], 'draft', 'mailbox')
       })
     }, 1500), //  1.5s
     [],
@@ -604,7 +669,7 @@ const NewEmail = ({ ...props }) => {
           </Form.Item>
         </Form>
         <LexicalEditor {...{ isRichText }} onChange={handleEditorChange} defaultValue={initialContent} />
-        {pageParam.quoteid && !showQuoteContent && (
+        {pageParam.quoteid && pageParam.action!=='edit' && !showQuoteContent && (
           <div className='flex justify-start items-center ml-2'>
             <Button className='flex gap-2 ' type='link' onClick={() => setShowQuoteContent(!showQuoteContent)}>
               显示引用内容 ↓ {/*(不可更改)*/}

From 4d4e6fe1d300e5bea13f0b825f998f7030218024 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Jun 2025 15:14:40 +0800
Subject: [PATCH 075/143] =?UTF-8?q?style:=20=E9=82=AE=E4=BB=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Conversations/Online/Components/EmailContent.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Conversations/Online/Components/EmailContent.jsx b/src/views/Conversations/Online/Components/EmailContent.jsx
index 1874903..d4cdf8a 100644
--- a/src/views/Conversations/Online/Components/EmailContent.jsx
+++ b/src/views/Conversations/Online/Components/EmailContent.jsx
@@ -34,7 +34,7 @@ const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
               img {
                 max-width: 90%;
                 height: auto;
-                /*object-fit: contain;*/
+                object-fit: contain;
               }
             </style>
         </head>

From 01dbcabdd7e1b5ab11f0cf4109213bbc7130f4ee Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Jun 2025 15:24:18 +0800
Subject: [PATCH 076/143] =?UTF-8?q?perf:=20=E9=82=AE=E7=AE=B1=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js | 13 +++++++++----
 src/stores/EmailSlice.js    |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index a133a94..f3ce211 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -168,7 +168,7 @@ export const getEmailDirAction = async (params = { opi_sn: '' }) => {
   const mailboxSort = result //.sort(sortBy('MDR_Order'));
   let tree = buildTree(mailboxSort, { key: 'VKey', parent: 'VParent', name: 'VName', iconIndex: 'ImageIndex', rootKeys: [1], ignoreKeys: [-227001, -227002] })
   tree = tree.filter((ele) => ele.key !== 1)
-  return errcode === 0 ? tree : [];
+  return errcode === 0 ? { [`${params.opi_sn}`]: tree } : { [`${params.opi_sn}`]: [] }
 };
 export const getTodoOrdersAction = async (params) => {
   const opi_arr = params.opisn.split(',')
@@ -204,7 +204,8 @@ export const getTodoOrdersAction = async (params) => {
     {},
   )
   const { errcode, result } = await fetchJSON(`${API_HOST}/getwlorder`, params)
-  const _result_unique = uniqWith(result, (a, b) => a.COLI_SN === b.COLI_SN)
+  // 取后一个状态, 因此翻转两次
+  const _result_unique = uniqWith(result.reverse(), (a, b) => a.COLI_SN === b.COLI_SN).reverse();
   const orderList = errcode === 0 ? _result_unique : []
   const byOPI = groupBy(orderList, 'OPI_SN')
   const byState = Object.keys(byOPI).reduce((acc, key) => {
@@ -274,8 +275,12 @@ export const getTodoOrdersAction = async (params) => {
  * @param {string} params.userIdStr - 用户ID字符串，默认为空
  */
 export const getRootMailboxDirAction = async ({ opi_sn = 0, userIdStr = '' } = {}) => {
-  const [stickyTree, mailboxDir] = await Promise.all([getTodoOrdersAction({ opisn: userIdStr || String(opi_sn), otype: 'today' }), getEmailDirAction({ opi_sn: opi_sn })])
-  const rootTree = Object.keys(stickyTree).map((opi) => ({ key: Number(opi), tree: [...stickyTree[opi], ...mailboxDir] }))
+  const [stickyTree, ...mailboxDir] = await Promise.all([
+    getTodoOrdersAction({ opisn: userIdStr || String(opi_sn), otype: 'today' }),
+    ...(userIdStr.split(',').map(_opi => getEmailDirAction({ opi_sn: _opi }))),
+  ])
+  const mailboxDirByOPI = mailboxDir.reduce((a, c) => ({...a, ...c}), {});
+  const rootTree = Object.keys(stickyTree).map((opi) => ({ key: Number(opi), tree: [...stickyTree[opi], ...(mailboxDirByOPI?.[opi] || [])] }))
   writeIndexDB(rootTree, 'dirs', 'mailbox')
   const _mapped = groupBy(rootTree, 'key')
   return _mapped[opi_sn]?.[0]?.tree || []
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index 170b1e7..0722403 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -123,7 +123,7 @@ const emailSlice = (set, get) => ({
     createIndexedDBStore(['dirs', 'maillist', 'mailinfo', 'draft'], 'mailbox')
     setCurrentMailboxOPI(opi_sn)
     setCurrentMailboxDEI(dei_sn)
-    getOPIEmailDir(userId, userIdStr)
+    getOPIEmailDir(opi_sn, userIdStr)
     // 登录后, 执行一下清除缓存
     clean7DaysMailboxLog();
   },

From 0b37f1a9a07bc80db8292bd2da3efec35b08ad03 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Tue, 10 Jun 2025 16:59:02 +0800
Subject: [PATCH 077/143] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E3=80=81WA=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx | 290 ++++++++++++++++----------------
 1 file changed, 147 insertions(+), 143 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index b6eb710..dc150fd 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -1,168 +1,172 @@
-import {
-  WhatsAppOutlined, FileAddOutlined, MailOutlined,
-  PhoneOutlined,
-  UserOutlined,
-  FieldNumberOutlined,
-  SaveOutlined, CompassOutlined, CalendarOutlined,
-  HeartTwoTone,
-  MoneyCollectTwoTone,
-  FolderOutlined,
-  DeleteOutlined, EditOutlined,
-  FormOutlined
-} from '@ant-design/icons'
+import { WhatsAppOutlined, FileAddOutlined, MailOutlined, PhoneOutlined, UserOutlined, FieldNumberOutlined, CompassOutlined, CalendarOutlined, EditOutlined, CheckOutlined } from '@ant-design/icons'
 
-import { useCallback, useEffect, useState } from 'react'
-import {
-  Flex,Select,Tooltip,
-  Button, Space, Divider, Typography,
-  Input, Radio,Skeleton ,Checkbox,
-} from 'antd'
-import { InboxIcon, MailCheckIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
-import { useOrderStore, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions, fetchSetRemindStateAction, remindStatusOptionsMapped } from "@/stores/OrderStore";
-import { copy, isEmpty } from "@/utils/commons";
-const OrderProfile = ({coliSN, ...props}) => {
+import { useEffect, useState } from 'react'
+import { App, Flex, Select, Tooltip, Tabs, Button, Divider, Typography, Skeleton, Checkbox } from 'antd'
+import { useOrderStore, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore'
+import { copy } from '@/utils/commons'
+const OrderProfile = ({ coliSN, ...props }) => {
+  const { notification, message } = App.useApp()
 
-	const [loading, setLoading] = useState(false);
-    const orderLabelOptions = copy(OrderLabelDefaultOptions);
-    orderLabelOptions.unshift({ value: 0, label: "未设置", disabled: true });
+  const [loading, setLoading] = useState(false)
+  const orderLabelOptions = copy(OrderLabelDefaultOptions)
+  orderLabelOptions.unshift({ value: 0, label: '未设置', disabled: true })
 
-	const orderStatusOptions = copy(OrderStatusDefaultOptions);
-  const [
-    orderDetail, customerDetail, lastQuotation, quotationList, fetchOrderDetail, setOrderPropValue, appendOrderComment, fetchOtherEmail, otherEmailList, fetchHistoryOrder
-   ] = useOrderStore(s => [
-    s.orderDetail, s.customerDetail, s.lastQuotation, s.quotationList, s.fetchOrderDetail, s.setOrderPropValue, s.appendOrderComment, s.fetchOtherEmail, s.otherEmailList, s.fetchHistoryOrder
+  const orderStatusOptions = copy(OrderStatusDefaultOptions)
+  const [orderDetail, customerDetail, fetchOrderDetail, setOrderPropValue, appendOrderComment] = useOrderStore((s) => [
+    s.orderDetail,
+    s.customerDetail,
+    s.fetchOrderDetail,
+    s.setOrderPropValue,
+    s.appendOrderComment,
   ])
 
   useEffect(() => {
-		if (coliSN) {
-			setLoading(true);
-			fetchOrderDetail(coliSN)
-        .then(result => {
+    if (coliSN) {
+      setLoading(true)
+      fetchOrderDetail(coliSN)
+        .then((result) => {
           console.info(result)
         })
-				.finally(() => setLoading(false))
-				// .catch(reason => {
-				// 	notification.error({
-				// 		message: "查询出错",
-				// 		description: reason.message,
-				// 		placement: "top",
-				// 		duration: 60,
-				// 	});
-				// });
-		}
+        .finally(() => setLoading(false))
+        .catch((reason) => {
+          notification.error({
+            message: '查询出错',
+            description: reason.message,
+            placement: 'top',
+            duration: 60,
+          })
+        })
+    }
     return () => {}
-	}, [coliSN]);
+  }, [coliSN])
 
   const regularText = () => {
-    if (orderDetail.buytime > 0) return "(R" + orderDetail.buytime + ")"
+    if (orderDetail.buytime > 0) return '(R' + orderDetail.buytime + ')'
     return ''
   }
 
-
   return (
     <>
-    <Skeleton active loading={loading}>
-      <Flex gap='small' vertical={true} justify='space-between'>
-        <Typography.Text>
-          <FieldNumberOutlined className='pr-1' />
-          {orderDetail.order_no}
-        </Typography.Text>
-        <Typography.Text>
-          <UserOutlined className=' pr-1' />
-          {customerDetail.name + regularText()}
-        </Typography.Text>
-        <Typography.Text>
-          <CompassOutlined className=' pr-1' />
-          Thailand
-        </Typography.Text>
-        <Typography.Text>
-          <PhoneOutlined className=' pr-1' />
-          <Button type='link' size={'small'} onClick={() => {}}>
+      {/* <Tabs
+        tabPosition={'right'}
+        onTabClick={(key) => {
+          console.info(key)
+        }}
+        items={Array.from({ length: 3 }).map((_, i) => {
+          const id = String(i + 1)
+          return {
+            label: `Tab ${id}`,
+            key: id,
+            children: `Content of Tab ${id}`,
+          }
+        })}
+      /> */}
+      <Skeleton active loading={loading}>
+        <Flex gap='small' vertical={true} justify='space-between'>
+          <Typography.Text>
+            <FieldNumberOutlined className='pr-1' />
+            {orderDetail.order_no}
+          </Typography.Text>
+          <Typography.Text>
+            <UserOutlined className=' pr-1' />
+            {customerDetail.name + regularText()}
+          </Typography.Text>
+          <Typography.Text>
+            <CompassOutlined className=' pr-1' />
+            Thailand
+          </Typography.Text>
+
+          <Typography.Link href={'/callcenter/call/' + customerDetail.phone}>
+            <PhoneOutlined className=' pr-1' />
             {customerDetail.phone}
-          </Button>
-        </Typography.Text>
-        <Typography.Text>
-          <MailOutlined className=' pr-1' />
-          {customerDetail.email}
-        </Typography.Text>
-        <Typography.Text>
-          <WhatsAppOutlined className='pr-1' />
-          <Button type='link' size={'small'} onClick={() => {}}>
+          </Typography.Link>
+          <Typography.Text>
+            <MailOutlined className='pr-1' />
+            {customerDetail.email}
+          </Typography.Text>
+          <Typography.Link
+            href='#'
+            onClick={() => {
+              console.info('whatsapp clicked.')
+            }}>
+            <WhatsAppOutlined className=' pr-1' />
             {customerDetail.whatsapp_phone_number}
-          </Button>
-        </Typography.Text>
-        <Typography.Text>
-          <CalendarOutlined className='pr-1' />
-          <span>出发日期：</span>2025-09-18，已下计划
-        </Typography.Text>
-
-      </Flex>
-      <Divider orientation="left">
-            <Typography.Text strong>订单状态</Typography.Text>
-          </Divider>
-          <Flex gap='small' vertical={true} justify='space-between'>
-      <Select className={`[&_.ant-select-selection-item]:text-gray-950`}
-								key={"orderlabel"}
-								size="small"
-								style={{
-									width: "100%",
-								}}
-								variant="underlined"
-								onSelect={value => {
-								}}
-								value={orderDetail.tags}
-								options={orderLabelOptions}
-							/>
-              <Select className={`[&_.ant-select-selection-item]:text-gray-950`}
-								key={"orderstatus"}
-								size="small"
-								style={{
-									width: "100%",
-								}}
-								variant="underlined"
-								onSelect={value => {
-								}}
-								value={orderDetail.states}
-								options={orderStatusOptions}
-							/>
-              </Flex>
-
-              <Divider orientation="left">
-            <Typography.Text strong>催信</Typography.Text>
-          </Divider>
-          <Checkbox.Group key='substatus' className="px-2"  options={remindStatusOptions}  />
+          </Typography.Link>
+          <Typography.Text>
+            <Tooltip title='出发日期'>
+              <CalendarOutlined className='pr-1' />
+              2025-09-18
+            </Tooltip>
+          </Typography.Text>
+          <Typography.Text>
+            <Tooltip title='计划'>
+              <CheckOutlined className='pr-1' />
+              已下计划
+            </Tooltip>
+          </Typography.Text>
+        </Flex>
+        <Divider orientation='left'>
+          <Typography.Text strong>订单状态</Typography.Text>
+        </Divider>
+        <Flex gap='small' vertical={false} justify='space-between'>
+          <Select
+            className={`[&_.ant-select-selection-item]:text-gray-950`}
+            key={'orderlabel'}
+            size='small'
+            style={{
+              width: '100%',
+            }}
+            variant='underlined'
+            onSelect={(value) => {}}
+            value={orderDetail.tags}
+            options={orderLabelOptions}
+          />
+          <Select
+            className={`[&_.ant-select-selection-item]:text-gray-950`}
+            key={'orderstatus'}
+            size='small'
+            style={{
+              width: '100%',
+            }}
+            variant='underlined'
+            onSelect={(value) => {}}
+            value={orderDetail.states}
+            options={orderStatusOptions}
+          />
+        </Flex>
 
-<Divider orientation='left'>
-        <Typography.Text strong>表单信息</Typography.Text>
-        <Tooltip title='添加'>
-        <FileAddOutlined className='pl-1' />
-        </Tooltip>
-      </Divider>
-      <p className="p-2 overflow-auto m-0 break-words whitespace-pre-wrap" dangerouslySetInnerHTML={{ __html: orderDetail.order_detail }}></p>
+        <Divider orientation='left'>
+          <Typography.Text strong>催信</Typography.Text>
+        </Divider>
+        <Checkbox.Group key='substatus' className='px-2' options={remindStatusOptions} />
 
-        <Divider orientation="left">
-            <Typography.Text strong>特殊要求</Typography.Text>
-          </Divider>
-        <Typography.Text>
-          {orderDetail.customer_request}
-        </Typography.Text>
-        <Divider orientation="left">
-            <Typography.Text strong>外联备注</Typography.Text>
-          </Divider>
-        <Typography.Text>
-          {orderDetail.wl_memo}
-        </Typography.Text>
+        <Divider orientation='left'>
+          <Typography.Text strong>表单信息</Typography.Text>
+          <Tooltip title='添加'>
+            <FileAddOutlined className='pl-1' />
+          </Tooltip>
+        </Divider>
+        <p className='p-2 overflow-auto m-0 break-words whitespace-pre-wrap' dangerouslySetInnerHTML={{ __html: orderDetail.order_detail }}></p>
 
+        <Divider orientation='left'>
+          <Typography.Text strong>特殊要求</Typography.Text>
+        </Divider>
+        <Typography.Text>{orderDetail.customer_request}</Typography.Text>
+        <Divider orientation='left'>
+          <Typography.Text strong>外联备注</Typography.Text>
+          <Tooltip title='修改'>
+            <EditOutlined className='pl-1' />
+          </Tooltip>
+        </Divider>
+        <Typography.Text>{orderDetail.wl_memo}</Typography.Text>
 
-      <Divider orientation='left'>
-        <Typography.Text strong>附加信息</Typography.Text>
-        <Tooltip title='修改'>
-        <EditOutlined className='pl-1' />
-        </Tooltip>
-      </Divider>
-      <Typography.Text>
-          泰国马来水灯节
-      </Typography.Text>
+        <Divider orientation='left'>
+          <Typography.Text strong>附加信息</Typography.Text>
+          <Tooltip title='修改'>
+            <EditOutlined className='pl-1' />
+          </Tooltip>
+        </Divider>
+        <Typography.Text>泰国马来水灯节</Typography.Text>
       </Skeleton>
     </>
   )

From fe3cde0c8974dd92e322b07ee9c6690720cf5026 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 10 Jun 2025 17:03:20 +0800
Subject: [PATCH 078/143] =?UTF-8?q?feat:=20=E4=BF=9D=E5=AD=98=E8=8D=89?=
 =?UTF-8?q?=E7=A8=BF;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js |  9 +++++----
 src/hooks/useEmail.js       |  1 +
 src/views/NewEmail.jsx      | 22 +++++++++++++++-------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index f3ce211..117bcd7 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -164,7 +164,7 @@ const todoTypes = {
  */
 export const getEmailDirAction = async (params = { opi_sn: '' }) => {
   const defaultParams = { opi_sn: 0, year: dayjs().year(), by_start_date: -1, by_success: -1, important: -1, if_want_book: -1, if_thinking: -1 }
-  const { errcode, result } = await fetchJSON(`http://202.103.68.144:8889/v3/email_dir`, { ...defaultParams, ...params })
+  const { errcode, result } = await fetchJSON(`${API_HOST}/v3/email_dir`, { ...defaultParams, ...params })
   const mailboxSort = result //.sort(sortBy('MDR_Order'));
   let tree = buildTree(mailboxSort, { key: 'VKey', parent: 'VParent', name: 'VName', iconIndex: 'ImageIndex', rootKeys: [1], ignoreKeys: [-227001, -227002] })
   tree = tree.filter((ele) => ele.key !== 1)
@@ -306,7 +306,7 @@ export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id
   }
   _params.mai_senddate1 = dayjs(_params.mai_senddate1).format(DATE_FORMAT)
   const cacheKey = isEmpty(_params.coli_sn) ? `dir-${node.vkey}` : `order-${node.vkey}`;
-  const { errcode, result } = await fetchJSON(`http://202.103.68.144:8889/v3/mail_list`, _params)
+  const { errcode, result } = await fetchJSON(`${API_HOST}/v3/mail_list`, _params)
   const ret = errcode === 0 ? result : []
   if (!isEmpty(ret)) {
     writeIndexDB([{key: cacheKey, data: ret}], 'maillist', 'mailbox')
@@ -333,7 +333,8 @@ export const getEmailTemplateAction = async (template_name, params = { coli_sn:
 /**
  * 保存邮件草稿
  */
-export const saveEmailDraftAction = async (body) => {
+export const saveEmailDraftOrSendAction = async (body, isDraft = false) => {
+  const url = isDraft !== false ? `${API_HOST}/v3/email_draft_save` : `${EMAIL_HOST}/sendmail`;
   const { attaList=[], atta, content, ...bodyData } = body;
   bodyData.ordertype = 227001;
   const formData = new FormData();
@@ -343,7 +344,7 @@ export const saveEmailDraftAction = async (body) => {
   attaList.forEach(function (item) {
     formData.append('attachment', item);
   });
-  const { result } = await postForm(`${EMAIL_HOST}/email-draft/save`, formData);
+  const { result } = await postForm(url, formData);
   return result;
 };
 
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 4666fa3..ddd77b4 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -157,6 +157,7 @@ export const useEmailList = (mailboxDirNode) => {
         key: ele.MAI_SN,
       }))
       setMailList(_x)
+      setLoading(false)
     }
     try {
       const nodeParam = { coli_sn: COLI_SN, order_source_type: OrderSourceType, vkey: VKey, vparent: VParent, mai_senddate1: ApplyDate }
diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index 6097a1f..d41938e 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -12,14 +12,13 @@ import LexicalEditor from '@/components/LexicalEditor'
 import { v4 as uuid } from 'uuid'
 import { cloneDeep, debounce, isEmpty, writeIndexDB, readIndexDB, deleteIndexDBbyKey } from '@/utils/commons'
 import '@/views/Conversations/Online/Input/EmailEditor.css'
-import { parseHTMLString, postSendEmail } from '@/actions/EmailActions'
+import { parseHTMLString, postSendEmail, saveEmailDraftOrSendAction } from '@/actions/EmailActions'
 import { sentMsgTypeMapped } from '@/channel/bubbleMsgUtils'
 import { EmailBuilder, useEmailDetail, useEmailSignature } from '@/hooks/useEmail'
 import useSnippetStore from '@/stores/SnippetStore'
 // import { useOrderStore } from '@/stores/OrderStore'
 import PaymentlinkBtn from '@/views/Conversations/Online/Input/PaymentlinkBtn'
 import { TextIcon } from '@/components/Icons';
-import GenerateAutoDocDrawer from './Conversations/Online/Components/GenerateAutoDocDrawer';
 import { POPUP_FEATURES } from '@/config';
 
 // 禁止上传的附件类型
@@ -68,7 +67,7 @@ const generateQuoteContent = (mailData, isRichText = true) => {
   return isRichText ? html : parseHTMLText(html)
 }
 
-const generateMailContent = (mailData) => `<br><br><p>${mailData.content}</p>`
+const generateMailContent = (mailData) => `<br><p>${mailData.content}</p><br>`
 
 /**
  * ! 无状态管理
@@ -313,6 +312,7 @@ const NewEmail = () => {
         to: info?.MAI_To || '',
         cc: info?.MAI_CS || '',
         subject: info?.MAI_Subject || '',
+        id: pageParam.quoteid,
       }
       form.setFieldsValue(thisFormValues)
       const thisBody = generateMailContent(mailData)
@@ -468,10 +468,12 @@ const NewEmail = () => {
 
   const [sendLoading, setSendLoading] = useState(false)
 
-  const onHandleSend = async () => {
+  const onHandleSaveOrSend = async (isDraft = false) => {
     // console.log('onSend callback', '\nisRichText', isRichText);
     // console.log(form.getFieldsValue());
     const body = structuredClone(form.getFieldsValue())
+    body.mailtype = ''; // todo: 邮件类型
+    // body.id = ''; // todo: 已保存的草稿
     body.from = newFromEmail
     body.attaList = fileList
     body.opi_sn = emailOPI
@@ -511,7 +513,8 @@ const NewEmail = () => {
 
       // console.log('postSendEmail', body, '\n', msgObj);
       // return;
-      const result = await postSendEmail(body)
+      // todo: 保存后不在草稿箱, 在待发目录
+      const result = await saveEmailDraftOrSendAction(body, isDraft)
       const mailSavedId = result.id || ''
       bubbleMsg.email.mai_sn = mailSavedId
       // console.log('invokeEmailMessage', bubbleMsg);
@@ -526,6 +529,8 @@ const NewEmail = () => {
         // description: error.message,
         placement: 'top',
         duration: 2,
+        showProgress: true,
+        pauseOnHover: true,
         onClose: () => {
           deleteIndexDBbyKey(editorKey, 'draft', 'mailbox');
           window.close();
@@ -578,7 +583,7 @@ const NewEmail = () => {
     <>
       <ConfigProvider theme={{ token: { colorPrimary: '#6366f1' } }}>
             <div className='w-full flex gap-4 justify-start items-center text-indigo-600 pb-1 mb-2 border-x-0 border-t-0 border-b border-solid border-neutral-200'>
-              <Button type='primary' onClick={onHandleSend} loading={sendLoading} icon={<SendOutlined />}>
+              <Button type='primary' onClick={onHandleSaveOrSend} loading={sendLoading} icon={<SendOutlined />}>
                 发送
               </Button>
               <Select labelInValue options={emailListOption} value={{ key: newFromEmail, value: newFromEmail, label: newFromEmail }} onChange={handleSwitchEmail} labelRender={item => `发件人: ${item.label || '选择'}`} variant={'borderless'} className='[&_.ant-select-selection-item]:font-bold' />
@@ -594,7 +599,7 @@ const NewEmail = () => {
                 {/* <Button type='link' size='small' icon={<TextIcon />} className=' ' >纯文本</Button> */}
                 <Radio.Group options={[{label: '纯文本', value: false}, {label: '富文本', value: true}]} optionType="button" buttonStyle="solid" onChange={handlePlainTextOpenChange} value={isRichText} size='small' />
               </Popconfirm>
-              <Button type='dashed' icon={<SaveOutlined />} size='small' className='' >存草稿</Button>
+              <Button onClick={() => onHandleSaveOrSend(true)} type='dashed' icon={<SaveOutlined />} size='small' className='' >存草稿</Button>
             </div>
         <Form
           form={form}
@@ -667,6 +672,9 @@ const NewEmail = () => {
           <Form.Item name='abstract' hidden>
             <Input />
           </Form.Item>
+          <Form.Item name='id' hidden>
+            <Input />
+          </Form.Item>
         </Form>
         <LexicalEditor {...{ isRichText }} onChange={handleEditorChange} defaultValue={initialContent} />
         {pageParam.quoteid && pageParam.action!=='edit' && !showQuoteContent && (

From be2f85a0dabf26094735e769a009adfa645e7814 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 11 Jun 2025 09:15:50 +0800
Subject: [PATCH 079/143] style:

---
 src/views/orders/components/MailBox.jsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 8690d5c..604af1e 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -5,6 +5,7 @@ import dayjs from 'dayjs'
 import { useEmailList } from '@/hooks/useEmail'
 import { isEmpty } from '@/utils/commons'
 import { MailboxDirIcon } from './MailboxDirIcon'
+import { AttachmentIcon } from '@/components/Icons'
 
 const { RangePicker } = DatePicker
 
@@ -96,11 +97,12 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
     const orderNumber = isEmpty(item.MAI_COLI_ID) || isOrderNode ? '' : item.MAI_COLI_ID + ' - '
     const countryName = isEmpty(item.CountryCN) ? '' : '[' + item.CountryCN + '] '
     const mailStateClass = item.MOI_ReadState === 0 ? 'font-bold' : ''
+    const hasAtta = item.MAI_Attachment !== 0 ? <AttachmentIcon className='text-blue-500' /> : null
     return (
       <li
-        className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2'>
-        <div className=''>
-          <Checkbox></Checkbox>
+        className={`flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 active:bg-gray-200 p-2 ${props.currentActiveMailItem === item.key ? 'bg-gray-200' : ''}`}>
+        <div className='flex flex-col gap-1'>
+          <Checkbox></Checkbox>{hasAtta}
         </div>
         <div className='flex-1 pl-2'
         onClick={() => {

From 1393bf9899af9bc407a21c5dea92fff7fa007d31 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 11 Jun 2025 10:13:40 +0800
Subject: [PATCH 080/143] =?UTF-8?q?perf:=20=E9=82=AE=E4=BB=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85:=20=E9=99=84=E4=BB=B6=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                   |  3 +++
 src/hooks/useEmail.js                         |  6 +++++-
 .../Online/Components/EmailDetailInline.jsx   | 20 ++++++++++++-------
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 117bcd7..0884573 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -99,12 +99,15 @@ export const getEmailDetailAction = async (params) => {
   const { html, bodyContent, bodyText } = mailType === 'text/html' ? parseHTMLString(cleanContent, true) : { html: '', bodyContent: '', bodyText: '' };
 
   const attachments = (isEmpty(result?.AttachList) ? [] : result.AttachList).filter(ele => isEmpty(ele.ATI_ContentID) || !ele.ATI_Name.includes('ContentFile'));
+  const insideAttachments = (isEmpty(result?.AttachList) ? [] : result.AttachList).filter(ele => !isEmpty(ele.ATI_ContentID) && ele.ATI_Name.includes('ContentFile'));
 
   const ret = {
     info: { ...encodeEmailInfo(result.MailInfo?.[0] || {}), mailType },
     content: mailType === 'text/html' ? html : result.MailContent || '',
     abstract: bodyText || result.MailContent || '',
     attachments,
+    insideAttachments,
+    AttachList: isEmpty(result?.AttachList) ? [] : result.AttachList,
   }
   // writeIndexDB([{key: cacheKey, data: ret}], 'mailinfo', 'mailbox')
   return ret;
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index ddd77b4..ef0c7c5 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -38,7 +38,7 @@ export const useEmailSignature = (opi_sn) => {
 export const useEmailDetail = (mai_sn, data) => {
   const {notification} = App.useApp()
   const [loading, setLoading] = useState(false)
-  const [mailData, setMailData] = useState({ loading, info: {}, content: '', attachments: [] })
+  const [mailData, setMailData] = useState({ loading, info: {}, content: '', attachments: [], AttachList: [] })
   const [coliSN, setColiSN] = useState('');
   const [orderDetail, setOrderDetail] = useState({});
 
@@ -181,3 +181,7 @@ export const useEmailList = (mailboxDirNode) => {
 
   return { loading, isFreshData, error, mailList, refresh }
 }
+
+export const emailTemplates = [
+  { key: '', value: '', label: ''},
+];
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index fa03a62..4a451b2 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef, useMemo } from 'react'
 import { App, Button, Divider, Avatar, List, Flex, Typography, Tooltip, Empty } from 'antd'
-import { LoadingOutlined, ApiOutlined, FilePdfOutlined, FileOutlined, FileWordOutlined, FileExcelOutlined, FileJpgOutlined, FileImageOutlined, FileTextOutlined, FileGifOutlined, GlobalOutlined, FileZipOutlined } from '@ant-design/icons'
+import { LoadingOutlined, ApiOutlined, FilePdfOutlined, FileOutlined, FileWordOutlined, FileExcelOutlined, FileJpgOutlined, FileImageOutlined, FileTextOutlined, FileGifOutlined, GlobalOutlined, FileZipOutlined, DeleteOutlined } from '@ant-design/icons'
 import { EditIcon, MailCheckIcon, ReplyAllIcon, ReplyIcon, ResendIcon, ShareForwardIcon, SendPlaneFillIcon, InboxIcon } from '@/components/Icons'
 import { isEmpty, TagColorStyle } from '@/utils/commons'
 import EmailEditorPopup from '../Input/EmailEditorPopup'
@@ -158,8 +158,11 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
         break
       case 'failed':
         btns.push(
-          <Tooltip key='resend-t' title='重发'>
-          <Button key={'resend'} onClick={() => handleResend()} size='small' type='text' icon={<ResendIcon className='text-orange-500' />}>{compactBtn ? '' : '重发'}</Button></Tooltip>,
+          <Tooltip key='delete-t' title='删除'>
+          <Button key={'delete'} danger onClick={() => alert('todo')} size='small' type='text' icon={<DeleteOutlined className='text-red-500' />}>{compactBtn ? '' : '删除'}</Button></Tooltip>,
+
+          <Tooltip key='resend-t' title='发送'>
+          <Button key={'resend'} onClick={() => handleResend()} size='small' type='text' icon={<SendPlaneFillIcon className='text-orange-500' />}>{compactBtn ? '' : '发送'}</Button></Tooltip>,
         )
         btns.push(
           <Tooltip key='edit-t' title='编辑'>
@@ -209,7 +212,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
             </div>
             <div className=' ml-auto flex flex-col justify-start gap-1 items-end'>
               {/* <ActionBtns /> */}
-              <div className='text-xs '>{mailData.info?.MAI_SendDate || emailMsg.localDate}{mailData.info.MAI_Direction === 1 ? <SendPlaneFillIcon className='text-primary' /> : <InboxIcon className='text-indigo-500' />}</div>
+              <div className='text-xs '>{mailData.info?.MAI_SendDate || emailMsg.localDate}</div>
             </div>
           </div>
           <div className='text-sm'>
@@ -240,10 +243,11 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
             {mailData.info?.mailType === 'text/html' ? (
               <EmailContent content={mailData.content} id={mailID} key={mailID} />
             ) : (
-              <div className='mt-2 whitespace-pre-wrap' dangerouslySetInnerHTML={{ __html: mailData.content }}></div>
+              <div className='mt-2 whitespace-pre-wrap flex-auto' dangerouslySetInnerHTML={{ __html: mailData.content }}></div>
             )}
-            {mailData.attachments.length > 0 && (
+            {mailData.AttachList.length > 0 && (
             <div className={`${compactBtn === false ? 'w-48' : 'border-b border-t-0'} overflow-hidden`}>
+            {mailData.attachments.length > 0 && (<>
               <span>&nbsp;附件 ({mailData.attachments.length})</span>
               <List
                 dataSource={mailData.attachments || []}
@@ -258,7 +262,9 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
                     </Typography.Text>
                   </List.Item>
                 )}
-              />
+              /></>
+            )}
+              {mailData.insideAttachments.length > 0 && <span className='text-gray-500 italic'>&nbsp;文内附件 ({mailData.insideAttachments.length}) 已在正文显示</span>}
             </div>
             )}
           </Flex>

From 7a45245437de7572a2b32535ce2ad30b2c00c9a5 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 11 Jun 2025 15:42:09 +0800
Subject: [PATCH 081/143] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E3=80=81=E5=85=A8=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx         |  2 +-
 src/views/orders/components/MailBox.jsx | 42 ++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index dc150fd..54a719f 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -101,7 +101,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
           <Typography.Text>
             <Tooltip title='计划'>
               <CheckOutlined className='pr-1' />
-              已下计划
+              已做计划
             </Tooltip>
           </Typography.Text>
         </Flex>
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 604af1e..4332e48 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -11,7 +11,7 @@ const { RangePicker } = DatePicker
 
 const PAGE_SIZE = 50 // 每页显示条数
 
-const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
+const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
   const DATE_RANGE_PRESETS = [
     {
       label: '本周',
@@ -39,8 +39,8 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
     },
   ]
   const [form] = Form.useForm()
-
-  const { mailList, loading, error, refresh } = useEmailList(mailboxDir);
+  const [selectedItems, setSelectedItems] = useState([])
+  const { mailList, loading, error, refresh } = useEmailList(mailboxDir)
 
   const [pagination, setPagination] = useState({
     current: 1,
@@ -103,6 +103,20 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
         className={`flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 active:bg-gray-200 p-2 ${props.currentActiveMailItem === item.key ? 'bg-gray-200' : ''}`}>
         <div className='flex flex-col gap-1'>
           <Checkbox></Checkbox>{hasAtta}
+        className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2'>
+        <div className=''>
+          <Checkbox
+          checked={selectedItems.some((i) => i.MAI_SN === item.MAI_SN)}
+            onClick={e => {
+            console.info(item, 'checked: ' + e.target.checked)
+            const isChecked = e.target.checked;
+            const updatedSelection = isChecked
+              ? [...selectedItems, item]
+              : selectedItems.filter((item) => item.MAI_SN !== item.MAI_SN)
+            setSelectedItems(updatedSelection)
+            console.info('selectedItems: ', updatedSelection)
+            }
+          }></Checkbox>
         </div>
         <div className='flex-1 pl-2'
         onClick={() => {
@@ -169,7 +183,26 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
         </Dropdown.Button>
         <Flex wrap gap='middle' justify={'center'} className='min-w-40'>
           <Tooltip title='全选'>
-            <Checkbox></Checkbox>
+            <Checkbox
+            indeterminate={
+                selectedItems.length > 0 &&
+                selectedItems.length < pagination.pagedList.length
+              }
+              checked={pagination.pagedList.every((item) =>
+                selectedItems.some((selected) => selected.MAI_SN === item.MAI_SN)
+              )}
+            onChange={(e) => {
+                const isChecked = e.target.checked;
+                if (isChecked) {
+                  setSelectedItems((prev) => [
+                    ...prev,
+                    ...pagination.pagedList,
+                  ]);
+                } else {
+                  setSelectedItems([]);
+                }
+              }}
+            ></Checkbox>
           </Tooltip>
           <Tooltip title='标记已读'>
             <Button shape='circle' type='text' size='small' icon={<ReadOutlined />} />
@@ -239,6 +272,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
                 })}
               />
               <Flex align='center' justify='space-between'>
+                <span>已选: {selectedItems.length} 项；</span>
                 <span>
                   {(pagination.current - 1) * PAGE_SIZE + 1}-{Math.min(pagination.current * PAGE_SIZE, pagination.total)} of {pagination.total}
                 </span>

From d265f03a6ec4a1a6679df60c8e40fb4ba0854d1e Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 11 Jun 2025 16:32:19 +0800
Subject: [PATCH 082/143] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E6=A0=B7=E5=BC=8F=E3=80=81=E9=99=84=E4=BB=B6=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 4332e48..afc7164 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -100,11 +100,8 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
     const hasAtta = item.MAI_Attachment !== 0 ? <AttachmentIcon className='text-blue-500' /> : null
     return (
       <li
-        className={`flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 active:bg-gray-200 p-2 ${props.currentActiveMailItem === item.key ? 'bg-gray-200' : ''}`}>
-        <div className='flex flex-col gap-1'>
-          <Checkbox></Checkbox>{hasAtta}
-        className='flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 p-2'>
-        <div className=''>
+        className={`flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 active:bg-gray-200 p-2 ${props.currentActiveMailItem === item.key ? 'bg-neutral-100' : ''}`}>
+          <div className=''>
           <Checkbox
           checked={selectedItems.some((i) => i.MAI_SN === item.MAI_SN)}
             onClick={e => {
@@ -117,7 +114,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
             console.info('selectedItems: ', updatedSelection)
             }
           }></Checkbox>
-        </div>
+          </div>
         <div className='flex-1 pl-2'
         onClick={() => {
           console.info('item: ', item)
@@ -127,6 +124,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
             <div>
               {orderNumber}
               <span className={mailStateClass}>{item.MAI_Subject}</span>
+              {hasAtta}
             </div>
             <span className='text-neutral-500 text-wrap break-words break-all '>{countryName + item.SenderReceiver + ' ' + item.SRDate}</span>
           </Flex>

From e51581202d773274c4ce1072a8a56ec27f51e6f5 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 11 Jun 2025 17:09:28 +0800
Subject: [PATCH 083/143] =?UTF-8?q?=E2=8F=B3=20=E5=8A=A0=E8=BD=BD=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                   |  15 +-
 src/config.js                                 |   4 +-
 src/hooks/useEmail.js                         | 131 ++++-
 src/main.jsx                                  |   4 +-
 src/views/NewEmail.jsx                        | 555 +++++++++++-------
 src/views/orders/components/MailBox.jsx       |  49 +-
 .../orders/components/NewEmailButton.jsx      |  38 ++
 7 files changed, 537 insertions(+), 259 deletions(-)
 create mode 100644 src/views/orders/components/NewEmailButton.jsx

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 0884573..af05f1b 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -327,14 +327,23 @@ export const updateEmailAction = async (params = { mai_sn_list: [], set: {} }) =
 
 /**
  * 获取邮件模板
+ * @param {object} params - Parameters for the email template request.
+ * @param {number} [params.coli_sn] - Customer order line item serial number.
+ * @param {number} [params.lgc] - Language code.
+ * @param {number} [params.opi_sn] - Order product item serial number.
+ * @param {string} [params.remind_type] - Type of reminder.
+ * @param {number} [params.remind_index] - Index of the reminder.
  */
-export const getEmailTemplateAction = async (template_name, params = { coli_sn: 0, lgc: 1 }) => {
-  const { errcode, result } = await fetchJSON(`${EMAIL_HOST}/email/template/${template_name}`, params)
-  return errcode === 0 ? {} : result
+export const getEmailTemplateAction = async (params = { coli_sn: 0, lgc: 1, opi_sn: 0, remind_type: '', remind_index: 0 }) => {
+  const { errcode, result } = await fetchJSON(`${API_HOST}/v3/reminder_letter`, params)
+  const { html, bodyContent, bodyText } = parseHTMLString(result?.MailContent, true) ;
+  return errcode === 0 ? {...result, bodyContent }: {}
 }
 
 /**
  * 保存邮件草稿
+ * @param {object} body - The body of the email.
+ * @param {boolean} [isDraft=false] - Whether the email is a draft.
  */
 export const saveEmailDraftOrSendAction = async (body, isDraft = false) => {
   const url = isDraft !== false ? `${API_HOST}/v3/email_draft_save` : `${EMAIL_HOST}/sendmail`;
diff --git a/src/config.js b/src/config.js
index 43dbbde..0a8df09 100644
--- a/src/config.js
+++ b/src/config.js
@@ -6,7 +6,7 @@
 // export const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_144'; // prod: Slave
 
 // debug:
-// export const API_HOST = 'http://202.103.68.144:8889/v2';
+export const API_HOST = 'http://202.103.68.144:8889/v2';
 // export const WS_URL = 'ws://202.103.68.144:8888';
 // export const EMAIL_HOST = 'http://202.103.68.231:888/service-mail';
 // export const WAI_HOST = 'http://47.83.248.120/api/v1'; // 香港服务器
@@ -18,7 +18,7 @@ export const EMAIL_ATTA_HOST = 'https://p9axztuwd7x8a7.mycht.cn/attachment'; //
 // prod:
 // export const WAI_HOST = 'https://wai-server-qq4qmtq7wc9he4.mycht.cn/api/v1';
 export const EMAIL_HOST = 'https://p9axztuwd7x8a7.mycht.cn/mail-server/service-mail';
-export const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/v2';
+// export const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/v2';
 export const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_server'; // prod:
 export const VONAGE_URL = 'https://p9axztuwd7x8a7.mycht.cn/vonage-server'; // 语音和视频接口:
 export const HT3 =  process.env.NODE_ENV === 'production' ? 'https://p9axztuwd7x8a7.mycht.cn/ht3' : 'https://p9axztuwd7x8a7.mycht.cn/ht3';
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index ef0c7c5..b77018e 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -1,6 +1,6 @@
 import { useState, useEffect, useCallback } from 'react'
-import { isEmpty, readIndexDB, } from '@/utils/commons'
-import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction } from '@/actions/EmailActions'
+import { isEmpty, objectMapper, olog, readIndexDB, } from '@/utils/commons'
+import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction, getEmailTemplateAction } from '@/actions/EmailActions'
 import { App } from 'antd'
 import useConversationStore from '@/stores/ConversationStore';
 import { msgStatusRenderMapped } from '@/channel/bubbleMsgUtils';
@@ -11,7 +11,7 @@ export const useEmailSignature = (opi_sn) => {
   const [signature, setSignature] = useState('')
 
   const getSignature = useCallback(async () => {
-    if (isEmpty(opi_sn)) {
+    if (isEmpty(Number(opi_sn))) {
       return false
     }
     try {
@@ -24,9 +24,9 @@ export const useEmailSignature = (opi_sn) => {
 
   useEffect(() => {
     getSignature()
-  }, [opi_sn])
+  }, [getSignature])
 
-  return { signature, getSignature }
+  return { signature }
 
 }
 
@@ -35,18 +35,18 @@ export const useEmailSignature = (opi_sn) => {
  * @param data 直接传递, 不重复获取
  * * 在详情点击`回复`呼出编辑时
  */
-export const useEmailDetail = (mai_sn, data) => {
+export const useEmailDetail = (mai_sn, data={}, oid=0) => {
   const {notification} = App.useApp()
   const [loading, setLoading] = useState(false)
-  const [mailData, setMailData] = useState({ loading, info: {}, content: '', attachments: [], AttachList: [] })
-  const [coliSN, setColiSN] = useState('');
+  const [mailData, setMailData] = useState({ loading, info: { MAI_COLI_SN: 0 }, content: '', attachments: [], AttachList: [] })
+  const [coliSN, setColiSN] = useState(oid);
   const [orderDetail, setOrderDetail] = useState({});
 
   const [updateMessageItem] = useConversationStore(state => [state.updateMessageItem]);
 
   useEffect(() => {
     const getEmailDetail = async () => {
-      if (isEmpty(mai_sn)) {
+      if (isEmpty(Number(mai_sn))) {
         return false
       }
       try {
@@ -182,6 +182,117 @@ export const useEmailList = (mailboxDirNode) => {
   return { loading, isFreshData, error, mailList, refresh }
 }
 
+const orderMailTypes = new Map([
+  ['48001', '发送一催'],
+  ['48002', '发送二催'],
+  ['48003', '发送三催'],
+  ['48004', '发送已收客人付款通知'],
+  ['48005', '发送FAQ及PreSurvey'],
+  ['48006', '发送降价邮件'],
+  ['48007', '发送亚马逊津贴'],
+  ['48008', '发送报价信'],
+  ['48009', '提交调度'],
+  ['48010', '发送确认信'],
+  ['48011', '发送余款提醒信'],
+  ['48012', '发送入境提醒'],
+  ['48013', '首站关怀'],
+  ['48014', '抵桂面谈'],
+  ['48015', '末站关怀'],
+  ['48016', '发送计划'],
+  ['48017', '报价中'],
+  ['48018', '以后联系'],
+  ['48019', '成行'],
+  ['48020', '团款收讫'],
+  ['48021', '取消'],
+  ['48022', '丢失'],
+  ['48023', '已做计划'],
+  ['48024', '一催回复'],
+  ['48025', '二催回复'],
+  ['48026', '第一次报价回复'],
+  ['48027', '发送商务感谢信'],
+  ['48028', '商务酒店房满邮件'],
+  ['48029', '商务预订传真'],
+  ['48030', '商务取消邮件'],
+  ['48031', '商务单团财务表'],
+  ['48032', '商务收款单'],
+  ['48033', '商务退款单'],
+  ['48034', '商务财务转帐申请'],
+  ['48035', '商务未订先确认'],
+  ['48036', '商务等待确认'],
+  ['48037', '商务已确认'],
+  ['48038', '商务已付款'],
+  ['48039', '商务成功订单'],
+  ['48040', '商务取消订单'],
+  ['48041', '商务不成行订单'],
+  ['48042', '商务已付款未出票'],
+  ['48043', '商务已付款并出票'],
+  ['48044', '商务无效订单'],
+  ['48045', '问候提醒'],
+  ['48046', '发送邮件'],
+  ['48047', '来华一周年问候'],
+  ['48048', '来华二周年提醒'],
+  ['48049', 'CH Phone询问邮件'],
+  ['48050', '订单电话销售'],
+  ['48051', '等待付订金'],
+  ['48052', '商务订单预订中'],
+  ['48053', '客户需求调查'],
+  ['48054', '发送TourCredits通知邮件'],
+  ['48055', 'GH海外PostSurvey'],
+])
 export const emailTemplates = [
-  { key: '', value: '', label: ''},
+  { type: 'RemindOneWL', index: 1, key: '1@RemindOneWL', value: '1@RemindOneWL', label: '一催模板一，询问客人是否收到报价信' },
+  { type: 'RemindOneWL', index: 2, key: '2@RemindOneWL', value: '2@RemindOneWL', label: '一催模板二，询问客人是否修改行程' },
+  { type: 'divider' },
+  { type: 'RemindTwoWL', index: 1, key: '1@RemindTwoWL', value: '1@RemindTwoWL', label: '二催模板一，询问客人对行程的看法' },
+  { type: 'RemindTwoWL', index: 2, key: '2@RemindTwoWL', value: '2@RemindTwoWL', label: '二催模板二，表达服务的意识' },
+  { type: 'divider' },
+  { type: 'RemindThreeWL', index: 1, key: '1@RemindThreeWL', value: '1@RemindThreeWL', label: '三催模板三，强调价格有效期' },
 ];
+export const emailTemplateMap = emailTemplates.reduce((acc, cur) => {
+  if (cur.type === 'divider') {
+    return acc
+  }
+  acc[cur.key] = cur
+  return acc
+}, {});
+
+/**
+ *
+ * @param {object} params - Parameters for the email template request.
+ * @param {number} [params.coli_sn] - Customer order line item serial number.
+ * @param {number} [params.lgc] - Language code.
+ * @param {number} [params.opi_sn] - Order product item serial number.
+ */
+export const useEmailTemplate = (templateKey, params) => {
+  const [loading, setLoading] = useState(false)
+  const [error, setError] = useState(null)
+  const [templateContent, setTemplateContent] = useState({ mailtype: '', mailtypeName: '', subject: '', mailcontent: '' })
+
+  const getTemplateContent = useCallback(async () => {
+    if  (!templateKey || !Number(params.coli_sn) || !Number(params.opi_sn)) {
+      setTemplateContent({ mailtype: '', mailtypeName: '', subject: '', mailcontent: '' })
+      setLoading(false)
+      setError(null)
+      return
+    }
+    setLoading(true)
+    setError(null)
+    try {
+      const { index: remind_index, type: remind_type } = emailTemplateMap[templateKey] || {};
+      const _params = { ...params, remind_index, remind_type};
+      const x = await getEmailTemplateAction(_params)
+      const lowerCaseShallow = Object.keys(x).reduce((acc, key) => ({...acc, [key.toLowerCase()]: x[key]}), {})
+      setTemplateContent({...lowerCaseShallow, mailtypeName: orderMailTypes.get(lowerCaseShallow.mailtype)})
+    } catch (networkError) {
+      setError(new Error(`Failed to get template content: ${networkError.message}.`))
+    } finally {
+      setLoading(false)
+    }
+  }, [templateKey, params.opi_sn, params.coli_sn, params.lgc])
+
+  useEffect(() => {
+    getTemplateContent()
+  }, [getTemplateContent])
+
+  return { loading, error, templateContent };
+}
diff --git a/src/main.jsx b/src/main.jsx
index 3b95ab8..9b99f35 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -87,8 +87,10 @@ const router = createBrowserRouter([
               { path: 'customer_relation/index', element: <CustomerRelation /> },
             ],
           },
+          { path: 'email/:action/:quoteid/:oid/:templateKey', element: <NewEmail />},
+          { path: 'email/:action/:quoteid/:oid', element: <NewEmail />},
           { path: 'email/:action/:quoteid', element: <NewEmail />},
-          { path: 'email/new', element: <NewEmail />},
+          // { path: 'email/new/0/:oid', element: <NewEmail />},
         ],
   },
   {
diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index d41938e..e1fe20f 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -1,6 +1,6 @@
-import { useEffect, useState, useRef, useCallback } from 'react'
+import { useEffect, useState, useRef, useCallback, useMemo } from 'react'
 import { useParams, useNavigate, useLocation } from 'react-router-dom';
-import { App, ConfigProvider, Button, Form, Input, Flex, Checkbox, Popconfirm, Select, Space, Upload, Divider, Modal, Tabs, Radio } from 'antd'
+import { App, ConfigProvider, Button, Form, Input, Flex, Checkbox, Popconfirm, Select, Space, Upload, Divider, Modal, Tabs, Radio, Typography } from 'antd'
 import { UploadOutlined, LoadingOutlined, SaveOutlined, SendOutlined, CheckCircleOutlined } from '@ant-design/icons'
 import '@dckj/react-better-modal/dist/index.css'
 import useStyleStore from '@/stores/StyleStore'
@@ -10,11 +10,11 @@ import useAuthStore from '@/stores/AuthStore'
 import LexicalEditor from '@/components/LexicalEditor'
 
 import { v4 as uuid } from 'uuid'
-import { cloneDeep, debounce, isEmpty, writeIndexDB, readIndexDB, deleteIndexDBbyKey } from '@/utils/commons'
+import { cloneDeep, debounce, isEmpty, writeIndexDB, readIndexDB, deleteIndexDBbyKey, olog } from '@/utils/commons'
 import '@/views/Conversations/Online/Input/EmailEditor.css'
 import { parseHTMLString, postSendEmail, saveEmailDraftOrSendAction } from '@/actions/EmailActions'
 import { sentMsgTypeMapped } from '@/channel/bubbleMsgUtils'
-import { EmailBuilder, useEmailDetail, useEmailSignature } from '@/hooks/useEmail'
+import { EmailBuilder, useEmailDetail, useEmailSignature, useEmailTemplate } from '@/hooks/useEmail'
 import useSnippetStore from '@/stores/SnippetStore'
 // import { useOrderStore } from '@/stores/OrderStore'
 import PaymentlinkBtn from '@/views/Conversations/Online/Input/PaymentlinkBtn'
@@ -70,39 +70,31 @@ const generateQuoteContent = (mailData, isRichText = true) => {
 const generateMailContent = (mailData) => `<br><p>${mailData.content}</p><br>`
 
 /**
+ * 独立窗口编辑器
+ *
+ * - 从销售平台进入: 自动复制 storage, 可读取loginUser
+ *
  * ! 无状态管理
  */
 const NewEmail = () => {
   const pageParam = useParams();
-  const editorKey = pageParam.action==='new' ? `new-${Date.now().toString(32)}` : `${pageParam.action}-${pageParam.quoteid}`
+  const { templateKey } = pageParam
+  const editorKey = pageParam.action==='new' ? `new-0-${pageParam.oid}` : `${pageParam.action}-${pageParam.quoteid}`
 
   const { notification, message } = App.useApp()
   const [form] = Form.useForm()
   const [mobile] = useStyleStore((state) => [state.mobile])
   const [userId, username, emailList] = useAuthStore((state) => [state.loginUser.userId, state.loginUser.username, state.loginUser.emailList])
-  const emailListOption = emailList?.map((ele) => ({ ...ele, label: ele.email, key: ele.email, value: ele.email })) || []
-  // const emailListMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.opi_sn]: v }), {});
-  const emailListAddrMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.email]: v }), {})
-  const emailListMatMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.mat_sn]: v }), {})
+  const emailListOption = useMemo(() => emailList?.map((ele) => ({ ...ele, label: ele.email, key: ele.email, value: ele.email })) || [], [emailList])
+  const emailListOPIMapped = useMemo(() => emailListOption?.reduce((r, v) => ({ ...r, [v.opi_sn]: v }), {}), [emailListOption]);
+  const emailListAddrMapped = useMemo(() => emailListOption?.reduce((r, v) => ({ ...r, [v.email]: v }), {}), [emailListOption])
+  const emailListMatMapped = useMemo(() => emailListOption?.reduce((r, v) => ({ ...r, [v.mat_sn]: v }), {}), [emailListOption])
   // console.log('emailListMapped', emailListOption, emailListAddrMapped);
 
-  // const emailEdiorProps = useConversationStore((state) => state.emailEdiorProps)
-  // const [open, setOpen, closeEditor1, currentEditKey, setCurrentEditKey] = useConversationStore((state) => [
-  //   state.editorOpen,
-  //   state.setEditorOpen,
-  //   state.closeEditor1,
-  //   state.currentEditKey,
-  //   state.setCurrentEditKey,
-  // ])
-
-  // const propsKeysArr = Array.from(emailEdiorProps.keys())
-  // const propsArr = Array.from(emailEdiorProps.values())
-
-  // const [activeEdit, setActiveEdit] = useState(emailEdiorProps.get(editorKey) || {})
-  // const { fromEmail, fromUser, fromOrder, oid, toEmail, conversationid, quoteid, initial = {}, mailData: _mailData, action = 'reply', draft = {}, receiverName, ...props } = emailEdiorProps.get(currentEditKey) || {};
-
   const mai_sn = pageParam.quoteid // activeEdit.quoteid
-  const { loading: getLoading, mailData, orderDetail } = useEmailDetail(mai_sn)
+  const { loading: quoteLoading, mailData, orderDetail } = useEmailDetail(mai_sn, null, pageParam.oid)
+  const { loading: loadingTamplate, templateContent }  = useEmailTemplate(templateKey, {coli_sn: pageParam.oid, opi_sn: orderDetail.opi_sn || mailData.info?.MAI_OPI_SN || 0, lgc: 1});
+  const { signature } = useEmailSignature(orderDetail.opi_sn || mailData.info?.MAI_OPI_SN || 0)
 
   const [newFromEmail, setNewFromEmail] = useState('')
   const [newToEmail, setNewToEmail] = useState('')
@@ -121,35 +113,198 @@ const NewEmail = () => {
   const [contentPrefix, setContentPrefix] = useState('')
   const [localDraft, setLocalDraft] = useState();
 
-  const readMailboxLocalCache = async () => {
-    const readCache = await readIndexDB(editorKey, 'draft', 'mailbox')
-    if (readCache) {
-      const btn = (
-        <Space>
-          <Button type='link' size='small' onClick={() => notification.destroy()}>
-            关闭
-          </Button>
-          {/* <Button type="primary" size="small" onClick={() => notification.destroy()}>
-          Confirm
-        </Button> */}
-        </Space>
-      )
-      // notification.open({
-      //   key: editorKey,
-      //   placement: 'top',
-      //   // message: '提示',
-      //   description: '已从本地缓存中读取邮件内容',
-      //   duration: 0,
-      //   actions: btn,
-      // })
-      setLocalDraft(readCache);
+  // const readMailboxLocalCache = async () => {
+  //   console.log('===============', 'readMailboxLocalCache')
+  //   const readCache = await readIndexDB(editorKey, 'draft', 'mailbox')
+  //   if (readCache) {
+  //     const btn = (
+  //       <Space>
+  //         <Button type='link' size='small' onClick={() => notification.destroy()}>
+  //           关闭
+  //         </Button>
+  //         {/* <Button type="primary" size="small" onClick={() => notification.destroy()}>
+  //         Confirm
+  //       </Button> */}
+  //       </Space>
+  //     )
+  //     // notification.open({
+  //     //   key: editorKey,
+  //     //   placement: 'top',
+  //     //   // message: '提示',
+  //     //   description: '已从本地缓存中读取邮件内容',
+  //     //   duration: 0,
+  //     //   actions: btn,
+  //     // })
+  //     setLocalDraft(readCache)
+
+  //     if (!isEmpty(localDraft)) {
+  //       const { htmlContent, ...draftFormsValues } = localDraft
+
+  //       const _findMatOld = emailListMatMapped?.[draftFormsValues.mat_sn]
+  //       const _from = draftFormsValues?.from || _findMatOld?.email || ''
+
+  //       form.setFieldsValue(draftFormsValues)
+  //       setNewFromEmail(_from)
+  //       setEmailOPI(draftFormsValues.opi_sn)
+  //       setEmailMat(draftFormsValues.mat_sn)
+  //       setEmailOrder(draftFormsValues.coli_sn)
+  //       requestAnimationFrame(() => {
+  //         setInitialContent(htmlContent)
+  //       })
+
+  //       return false
+  //     }
+  //   }
+  // }
+  // useEffect(() => {
+  //   readMailboxLocalCache()
+  //   return () => {}
+  // }, [])
+
+  // 填充表单
+  // - 从原邮件内容
+  // - 从订单
+  useEffect(() => {
+    console.log('useEffect 1---- \nform.setFieldsValue ');
+    if (isEmpty(mailData.content) && isEmpty(orderDetail.order_no)) {
+      return () => {}
     }
-  }
+    const docTitle = mailData.info?.MAI_Subject || 'New Email-';
+    document.title = docTitle
+
+    const { info } = mailData
+    const { ...templateFormValues } = templateContent;
+
+    const orderReceiver = orderDetail.contact?.[0]?.email || ''
+
+    const _findMatOld = emailListOPIMapped?.[orderDetail.opi_sn]
+    const orderSender = _findMatOld?.email || ''
+
+    const _findMatOldE = emailListMatMapped?.[info.MAI_MAT_SN]
+    const quotedMailSender = _findMatOldE?.email || ''
+
+
+    const sender = quotedMailSender || orderSender
+    const quotedMailSenderObj = sender; // { key: sender, label: sender, value: sender }
+    const defaultMAT = emailListAddrMapped?.[sender]?.mat_sn || ''
+
+    const _form2 = {
+      coli_sn: pageParam.oid || info?.coli_sn || '',
+      mat_sn: info?.MAI_MAT_SN || defaultMAT,
+      opi_sn: info?.MAI_OPI_SN || orderDetail.opi_sn || '',
+    }
+
+    let readyToInitialContent = '';
+    let _formValues = {};
+
+    // setShowCc(!isEmpty(mailData.info?.MAI_CS));
+
+    const signatureBody = generateMailContent({ content: signature })
+
+    // const preQuoteBody = generateQuoteContent(mailData)
+
+    // const _initialContent = isEmpty(mailData.info) ? signatureBody : signatureBody+preQuoteBody
+
+    if (!isEmpty(mailData.info) && !['edit', 'new'].includes(pageParam.action)) {
+      readyToInitialContent = contentPrefix + signatureBody
+    }
+    switch (pageParam.action) {
+      case 'reply':
+        _formValues = {
+          from: quotedMailSenderObj,
+          to: info?.replyTo || orderReceiver,
+          cc: info?.MAI_CS || '',
+          // bcc: quote.bcc || '',
+          subject: `Re: ${info.MAI_Subject || ''}`,
+          ..._form2
+        }
+        break
+      case 'replyall':
+        _formValues = {
+          from: quotedMailSenderObj,
+          to: info?.replyToAll || orderReceiver,
+          cc: info?.MAI_CS || '',
+          // bcc: quote.bcc || '',
+          subject: `Re: ${info.MAI_Subject || ''}`,
+          ..._form2
+        }
+        break
+      case 'forward':
+        _formValues = {
+          from: quotedMailSenderObj,
+          subject: `Fw: ${info.MAI_Subject || ''}`,
+          // coli_sn: pageParam.oid,
+          ..._form2
+        }
+        break
+      case 'edit':
+        _formValues = {
+          from: quotedMailSenderObj,
+          to: info?.MAI_To || '',
+          cc: info?.MAI_CS || '',
+          subject: `Fw: ${info.MAI_Subject || ''}`,
+          id: pageParam.quoteid,
+          mai_sn: pageParam.quoteid,
+          ..._form2
+        }
+        readyToInitialContent = generateMailContent(mailData)
+        break
+      case 'new':
+        _formValues = {
+          ...templateFormValues,
+          from: quotedMailSenderObj,
+          to: orderReceiver,
+          ..._form2
+        }
+        readyToInitialContent = generateMailContent({ content: templateContent.bodycontent })
+        break
+
+      default:
+        break
+    }
+    olog('222', _formValues, pageParam.action)
+    form.setFieldsValue(_formValues) // todo: from
+    setInitialContent(readyToInitialContent);
+
+    return () => {}
+  }, [orderDetail.order_no, quoteLoading, loadingTamplate])
+
+
+  // const readFromTemplate = () => {
+  //   const { mailcontent, ...templateFormValues } = templateContent;
+  //   if (mailcontent) {
+  //     const _findMatOld = emailListOPIMapped?.[orderDetail.opi_sn]
+  //     const _from = _findMatOld?.email || ''
+  //     form.setFieldsValue({...templateFormValues, to: orderDetail?.contact?.[0]?.email || '', from1: { key: _from, value: _from, label: _from}});
+  //     // setNewFromEmail(_from);
+  //     // setEmailOPI(draftFormsValues.opi_sn)
+  //     requestAnimationFrame(() => {
+  //       setInitialContent(mailcontent);
+  //     });
+  //   }
+  // }
+
   useEffect(() => {
-    readMailboxLocalCache()
+    // readMailboxLocalCache()
+    if (loadingTamplate) {
+      notification.open({
+        key: editorKey,
+        placement: 'top',
+        // message: '提示',
+        description: '正在加载邮件模板...',
+        duration: 0,
+        icon: <LoadingOutlined />,
+        // actions: btn,
+        // closeIcon: null,
+        closable: false,
+      })
+    } else {
+      notification.destroy(editorKey)
+    }
+    // readFromTemplate();
 
     return () => {}
-  }, [])
+  }, [loadingTamplate])
 
 
 
@@ -157,6 +312,8 @@ const NewEmail = () => {
     console.log('useeffect\n', orderDetail.order_no);
 
     setContentPrefix(orderDetail.order_no ? `<p>Dear Mr./Ms. ${orderDetail.contact?.[0]?.name || ''}</p><p>Reference Number: ${orderDetail.order_no}</p>` : '')
+    // form.setFieldsValue({ to: orderDetail.contact?.[0]?.email || '' })
+    setNewToEmail(orderDetail.contact?.[0]?.email || '')
 
     return () => {}
   }, [orderDetail.order_no, editorKey])
@@ -169,7 +326,6 @@ const NewEmail = () => {
     setEmailOPI(_findMat?.opi_sn)
   }
 
-  const { signature } = useEmailSignature(emailOPI)
 
   const [isRichText, setIsRichText] = useState(mobile === false)
   // const [isRichText, setIsRichText] = useState(false); // 默认纯文本
@@ -193,11 +349,11 @@ const NewEmail = () => {
     form.setFieldValue('content', htmlContent)
     const { bodyText: abstract } = parseHTMLString(htmlContent, true);
     const body = {
-      from: newFromEmail,
-      attaList: fileList,
-      opi_sn: emailOPI,
-      mat_sn: emailMat,
-      coli_sn: emailOrder || '',
+      // from: newFromEmail,
+      // attaList: fileList,
+      // opi_sn: emailOPI,
+      // mat_sn: emailMat,
+      // coli_sn: emailOrder || '',
     }
     // form.setFieldValue('abstract', getAbstract(textContent))
     debouncedSave({ ...form.getFieldsValue(), ...body, htmlContent, abstract,  })
@@ -205,129 +361,111 @@ const NewEmail = () => {
 
   const [initialContent, setInitialContent] = useState('')
   const [showQuoteContent, setShowQuoteContent] = useState(false)
-  const [mergeQuote, setMergeQuote] = useState(true)
+  // const [mergeQuote, setMergeQuote] = useState(true)
   const [quoteContent, setQuoteContent] = useState('')
 
-  const setPreFillInProperty = () => {  };
-
-  useEffect(() => {
-    console.log('useEffect 2---- \nform.setFieldsValue ');
-    const docTitle = localDraft?.subject || mailData.info?.MAI_Subject || 'New Email-';
-    setTimeout(() => {
-      document.title = docTitle
-    }, 1500);
-
-    if (!isEmpty(localDraft)) {
-      const {htmlContent, ...draftFormsValues} = localDraft;
-
-      const _findMatOld = emailListMatMapped?.[draftFormsValues.mat_sn]
-      const _from = draftFormsValues?.from || _findMatOld?.email || ''
-
-      form.setFieldsValue(draftFormsValues);
-      setNewFromEmail(_from);
-      setEmailOPI(draftFormsValues.opi_sn)
-      setEmailMat(draftFormsValues.mat_sn)
-      setEmailOrder(draftFormsValues.coli_sn)
-      requestAnimationFrame(() => {
-        setInitialContent(htmlContent);
-      });
-
-      return () => {};
-    }
-
-    // 没有引用邮件
-    if (isEmpty(pageParam.quoteid)) {
-
-      // setEmailOrder(orderDetail.order_no)
-      // setEmailOPI(orderDetail.opi_sn)
-      // setNewFromEmail(activeEdit.fromEmail)
-      // setNewToEmail(activeEdit.toEmail)
-
-      // const _findMat = emailListAddrMapped?.[activeEdit.fromEmail]?.mat_sn
-      // setEmailMat(_findMat)
-
-      // if (open !== true) {
-      // form.resetFields()
-      // }
-    }
-    // 转发/回复时, 使用详情的账户信息
-    if (mailData.info?.MAI_MAT_SN) {
-      const reEmailO = mailData.info?.MAI_COLI_SN
-      const reEmailUser = mailData.info?.MAI_OPI_SN
-      const reEmailUserMat = mailData.info?.MAI_MAT_SN
-
-      setEmailOrder((prev) => reEmailO || prev ) // activeEdit.fromOrder
-      setEmailOPI((prev) => reEmailUser || prev)
-      setEmailMat((prev) => reEmailUserMat || prev)
-
-      const _findMatOld = emailListMatMapped?.[reEmailUserMat]
-      if (_findMatOld) {
-        setNewFromEmail(_findMatOld.email)
-        setEmailOPI(_findMatOld.opi_sn)
-        setEmailMat(_findMatOld.mat_sn)
-      }
-    }
-    setShowQuoteContent(false)
-    setMergeQuote(true)
-    setQuoteContent('')
-
-
-    if (isEmpty(pageParam.quoteid) && pageParam.action !== 'new') {
-      return () => {}
-    }
-    const { info } = mailData
-    // setShowCc(!isEmpty(mailData.info?.MAI_CS));
-
-    const signatureBody = generateMailContent({ content: signature })
-
-    // const preQuoteBody = generateQuoteContent(mailData)
-
-    // const _initialContent = isEmpty(mailData.info) ? signatureBody : signatureBody+preQuoteBody
-
-    if (!isEmpty(mailData.info) && pageParam.action !== 'edit') {
-      setInitialContent(contentPrefix + signatureBody)
-    }
-
-    const forwardValues = { from: newFromEmail, subject: `Fw: ${info.MAI_Subject || ''}` }
-    if (pageParam.action === 'reply') {
-      const _formValues = {
-        to: info?.replyTo || newFromEmail,
-        cc: info?.MAI_CS || '',
-        // bcc: quote.bcc || '',
-        subject: `Re: ${info.MAI_Subject || ''}`,
-      }
-      form.setFieldsValue(_formValues)
-    } else if (pageParam.action === 'replyall') {
-      const _formValues = {
-        to: info?.replyToAll || newFromEmail,
-        cc: info?.MAI_CS || '',
-        // bcc: quote.bcc || '',
-        subject: `Re: ${info.MAI_Subject || ''}`,
-      }
-      form.setFieldsValue(_formValues)
-    } else if (pageParam.action === 'forward') {
-      form.setFieldsValue(forwardValues)
-    } else if (pageParam.action === 'edit') {
-      const thisFormValues = {
-        to: info?.MAI_To || '',
-        cc: info?.MAI_CS || '',
-        subject: info?.MAI_Subject || '',
-        id: pageParam.quoteid,
-      }
-      form.setFieldsValue(thisFormValues)
-      const thisBody = generateMailContent(mailData)
-      // console.log('thisBody', thisBody);
-
-      setInitialContent(thisBody)
-    } else if (pageParam.action === 'new') {
-      // todo: 附件
-      const newEmail = { to: newToEmail, subject: '' }
-      form.setFieldsValue(newEmail)
-      setInitialContent((contentPrefix || '') + signatureBody)
-    }
-
-    return () => {}
-  }, [ mailData.info, signature, newToEmail, contentPrefix, localDraft])
+  // const setPreFillInProperty = () => {  };
+
+  // useEffect(() => {
+  //   console.log('useEffect 2---- \nform.setFieldsValue ');
+  //   const docTitle = localDraft?.subject || mailData.info?.MAI_Subject || 'New Email-';
+  //   setTimeout(() => {
+  //     document.title = docTitle
+  //   }, 1500);
+
+  //   // 没有引用邮件
+  //   if (isEmpty(pageParam.quoteid)) {
+
+  //     // setEmailOrder(orderDetail.order_no)
+  //     // setEmailOPI(orderDetail.opi_sn)
+  //     // setNewFromEmail(activeEdit.fromEmail)
+  //     // setNewToEmail(activeEdit.toEmail)
+
+  //     // const _findMat = emailListAddrMapped?.[activeEdit.fromEmail]?.mat_sn
+  //     // setEmailMat(_findMat)
+
+  //     // if (open !== true) {
+  //     // form.resetFields()
+  //     // }
+  //   }
+  //   // 转发/回复时, 使用详情的账户信息
+  //   if (mailData.info?.MAI_MAT_SN) {
+  //     const reEmailO = mailData.info?.MAI_COLI_SN
+  //     const reEmailUser = mailData.info?.MAI_OPI_SN
+  //     const reEmailUserMat = mailData.info?.MAI_MAT_SN
+
+  //     setEmailOrder((prev) => reEmailO || prev ) // activeEdit.fromOrder
+  //     setEmailOPI((prev) => reEmailUser || prev)
+  //     setEmailMat((prev) => reEmailUserMat || prev)
+
+  //     const _findMatOld = emailListMatMapped?.[reEmailUserMat]
+  //     if (_findMatOld) {
+  //       setNewFromEmail(_findMatOld.email)
+  //       setEmailOPI(_findMatOld.opi_sn)
+  //       setEmailMat(_findMatOld.mat_sn)
+  //     }
+  //   }
+  //   setShowQuoteContent(false)
+  //   // setMergeQuote(true)
+  //   setQuoteContent('')
+
+
+  //   if (isEmpty(pageParam.quoteid) && pageParam.action !== 'new') {
+  //     return () => {}
+  //   }
+  //   const { info } = mailData
+  //   // setShowCc(!isEmpty(mailData.info?.MAI_CS));
+
+  //   const signatureBody = generateMailContent({ content: signature })
+
+  //   // const preQuoteBody = generateQuoteContent(mailData)
+
+  //   // const _initialContent = isEmpty(mailData.info) ? signatureBody : signatureBody+preQuoteBody
+
+  //   if (!isEmpty(mailData.info) && pageParam.action !== 'edit') {
+  //     setInitialContent(contentPrefix + signatureBody)
+  //   }
+
+  //   const forwardValues = { from: newFromEmail, subject: `Fw: ${info.MAI_Subject || ''}` }
+  //   if (pageParam.action === 'reply') {
+  //     const _formValues = {
+  //       to: info?.replyTo || newFromEmail,
+  //       cc: info?.MAI_CS || '',
+  //       // bcc: quote.bcc || '',
+  //       subject: `Re: ${info.MAI_Subject || ''}`,
+  //     }
+  //     form.setFieldsValue(_formValues)
+  //   } else if (pageParam.action === 'replyall') {
+  //     const _formValues = {
+  //       to: info?.replyToAll || newFromEmail,
+  //       cc: info?.MAI_CS || '',
+  //       // bcc: quote.bcc || '',
+  //       subject: `Re: ${info.MAI_Subject || ''}`,
+  //     }
+  //     form.setFieldsValue(_formValues)
+  //   } else if (pageParam.action === 'forward') {
+  //     form.setFieldsValue(forwardValues)
+  //   } else if (pageParam.action === 'edit') {
+  //     const thisFormValues = {
+  //       to: info?.MAI_To || '',
+  //       cc: info?.MAI_CS || '',
+  //       subject: info?.MAI_Subject || '',
+  //       id: pageParam.quoteid,
+  //     }
+  //     form.setFieldsValue(thisFormValues)
+  //     const thisBody = generateMailContent(mailData)
+  //     // console.log('thisBody', thisBody);
+
+  //     setInitialContent(thisBody)
+  //   } else if (pageParam.action === 'new') {
+  //     // todo: 附件
+  //     const newEmail = { to: newToEmail, subject: '' }
+  //     // form.setFieldsValue(newEmail)
+  //     // setInitialContent((contentPrefix || '') + signatureBody)
+  //   }
+
+  //   return () => {}
+  // }, [ mailData.info, signature, newToEmail, contentPrefix])
 
   const [openPlainTextConfirm, setOpenPlainTextConfirm] = useState(false)
   const handlePlainTextOpenChange = ({ target }) => {
@@ -470,11 +608,11 @@ const NewEmail = () => {
 
   const onHandleSaveOrSend = async (isDraft = false) => {
     // console.log('onSend callback', '\nisRichText', isRichText);
-    // console.log(form.getFieldsValue());
+    console.log(form.getFieldsValue());
     const body = structuredClone(form.getFieldsValue())
-    body.mailtype = ''; // todo: 邮件类型
+    // body.mailtype = ''; // todo: 邮件类型
     // body.id = ''; // todo: 已保存的草稿
-    body.from = newFromEmail
+    // body.from = newFromEmail // todo:
     body.attaList = fileList
     body.opi_sn = emailOPI
     body.mat_sn = emailMat
@@ -513,7 +651,7 @@ const NewEmail = () => {
 
       // console.log('postSendEmail', body, '\n', msgObj);
       // return;
-      // todo: 保存后不在草稿箱, 在待发目录
+      // todo: 保存后不在草稿箱, 在待发目录; 传了ID但每次都新增
       const result = await saveEmailDraftOrSendAction(body, isDraft)
       const mailSavedId = result.id || ''
       bubbleMsg.email.mai_sn = mailSavedId
@@ -582,12 +720,32 @@ const NewEmail = () => {
   return (
     <>
       <ConfigProvider theme={{ token: { colorPrimary: '#6366f1' } }}>
+        <Form
+          form={form}
+          onValuesChange={onEditChange}
+          // onFinishFailed={onFinishFailed}
+          preserve={false}
+          name={`email_max_form`}
+          size='small'
+          layout={'inline'}
+          variant={'borderless'}
+          // initialValues={{}}
+          // onFinish={() => {}}
+          className='email-editor-wrapper *:mb-2 *:border-b *:border-t-0 *:border-x-0 *:border-indigo-100 *:border-solid '
+          requiredMark={false}
+          // labelCol={{ span: 3 }}
+        >
             <div className='w-full flex gap-4 justify-start items-center text-indigo-600 pb-1 mb-2 border-x-0 border-t-0 border-b border-solid border-neutral-200'>
-              <Button type='primary' onClick={onHandleSaveOrSend} loading={sendLoading} icon={<SendOutlined />}>
+              <Button type='primary' size='middle' onClick={onHandleSaveOrSend} loading={sendLoading} icon={<SendOutlined />}>
                 发送
               </Button>
-              <Select labelInValue options={emailListOption} value={{ key: newFromEmail, value: newFromEmail, label: newFromEmail }} onChange={handleSwitchEmail} labelRender={item => `发件人: ${item.label || '选择'}`} variant={'borderless'} className='[&_.ant-select-selection-item]:font-bold' />
+              <Form.Item noStyle name={'from'} rules={[{ required: true, message: '请选择发件地址' }]}>
+              <Select labelInValue={false} options={emailListOption} labelRender={item => `发件人: ${item?.label || '选择'}`} variant={'borderless'} placeholder='发件人: 选择' className='[&_.ant-select-selection-item]:font-bold [&_.ant-select-selection-placeholder]:font-bold [&_.ant-select-selection-placeholder]:text-black' classNames={{popup: {root:'min-w-60'}}} />
+                <div className="ant-form-item-explain-error text-red-500" >请选择发件地址</div>
+              </Form.Item>
               <div className='ml-auto'></div>
+              <span>{orderDetail.order_no}</span>
+              <span>{templateContent.mailtypeName}</span>
               <Popconfirm trigger1={['hover', 'click']}
                 description='切换内容为纯文本格式将丢失信件和签名的格式, 确定使用纯文本?'
                 onConfirm={confirmPlainText}
@@ -601,20 +759,6 @@ const NewEmail = () => {
               </Popconfirm>
               <Button onClick={() => onHandleSaveOrSend(true)} type='dashed' icon={<SaveOutlined />} size='small' className='' >存草稿</Button>
             </div>
-        <Form
-          form={form}
-          onValuesChange={onEditChange}
-          preserve={false}
-          name={`email_max_form-${Date.now().toString(32)}`}
-          size='small'
-          layout={'inline'}
-          variant={'borderless'}
-          // initialValues={{}}
-          // onFinish={() => {}}
-          className='email-editor-wrapper *:mb-2 *:border-b *:border-t-0 *:border-x-0 *:border-indigo-100 *:border-solid '
-          requiredMark={false}
-          // labelCol={{ span: 3 }}
-        >
           <Form.Item className='w-full'>
             <Space.Compact className='w-full'>
               <Form.Item name={'to'} label='收件人' rules={[{ required: true }]} className='!flex-1'>
@@ -675,9 +819,24 @@ const NewEmail = () => {
           <Form.Item name='id' hidden>
             <Input />
           </Form.Item>
+          <Form.Item name='mai_sn' hidden>
+            <Input />
+          </Form.Item>
+          <Form.Item name='mat_sn' hidden>
+            <Input />
+          </Form.Item>
+          <Form.Item name='coli_sn' hidden>
+            <Input />
+          </Form.Item>
+          <Form.Item name='opi_sn' hidden>
+            <Input />
+          </Form.Item>
+          <Form.Item name='mailtype' hidden>
+            <Input />
+          </Form.Item>
         </Form>
         <LexicalEditor {...{ isRichText }} onChange={handleEditorChange} defaultValue={initialContent} />
-        {pageParam.quoteid && pageParam.action!=='edit' && !showQuoteContent && (
+        {!isEmpty(Number(pageParam.quoteid)) && pageParam.action!=='edit' && !showQuoteContent && (
           <div className='flex justify-start items-center ml-2'>
             <Button className='flex gap-2 ' type='link' onClick={() => setShowQuoteContent(!showQuoteContent)}>
               显示引用内容 ↓ {/*(不可更改)*/}
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 604af1e..814630a 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -5,7 +5,8 @@ import dayjs from 'dayjs'
 import { useEmailList } from '@/hooks/useEmail'
 import { isEmpty } from '@/utils/commons'
 import { MailboxDirIcon } from './MailboxDirIcon'
-import { AttachmentIcon } from '@/components/Icons'
+import { AttachmentIcon, MailCheckIcon } from '@/components/Icons'
+import NewEmailButton from './NewEmailButton'
 
 const { RangePicker } = DatePicker
 
@@ -124,49 +125,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
   return (
     <>
       <div className='bg-white h-auto px-1 flex gap-1 items-center'>
-        <Dropdown.Button
-          className='w-auto'
-          placement='bottom'
-          arrow
-          type={'primary'}
-          menu={{
-            items: [
-              {
-                key: '1',
-                label: '一催模板一，询问客人是否收到报价信',
-              },
-              {
-                key: '2',
-                label: '一催模板二，询问客人是否修改行程',
-              },
-              {
-                type: 'divider',
-              },
-              {
-                key: '3',
-                label: '二催模板一，询问客人对行程的看法',
-              },
-              {
-                key: '4',
-                label: '二催模板二，表达服务的意识',
-              },
-              {
-                type: 'divider',
-              },
-              {
-                key: '5',
-                label: '三催模板三，强调价格有效期',
-              },
-            ],
-            onClick: (item) => {
-              console.info('menu', item)
-            },
-          }}
-          onClick={() => {
-            console.info('新邮件')
-          }}>
-          新邮件
-        </Dropdown.Button>
+        <NewEmailButton />
         <Flex wrap gap='middle' justify={'center'} className='min-w-40'>
           <Tooltip title='全选'>
             <Checkbox></Checkbox>
@@ -175,7 +134,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
             <Button shape='circle' type='text' size='small' icon={<ReadOutlined />} />
           </Tooltip>
           <Tooltip title='已处理'>
-            <Button shape='circle' type='text' size='small' icon={<CheckSquareOutlined />} />
+            <Button shape='circle' type='text' size='small' icon={<MailCheckIcon />} />
           </Tooltip>
           <Tooltip title='刷新'>
             <Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} onClick={refresh} />
diff --git a/src/views/orders/components/NewEmailButton.jsx b/src/views/orders/components/NewEmailButton.jsx
new file mode 100644
index 0000000..579bca6
--- /dev/null
+++ b/src/views/orders/components/NewEmailButton.jsx
@@ -0,0 +1,38 @@
+import { createContext, useEffect, useMemo, useState } from 'react'
+import { Flex, Button, Tooltip, List, Form, Row, Col, Dropdown, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton } from 'antd'
+import useConversationStore from '@/stores/ConversationStore'
+import { emailTemplates, openPopup, useEmailTemplate } from '@/hooks/useEmail';
+import { POPUP_FEATURES } from '@/config';
+
+const NewEmailButton = ({ ...props }) => {
+  const [mailboxActiveNode, setMailboxActiveNode] = useConversationStore((state) => [state.mailboxActiveNode, state.setMailboxActiveNode])
+
+  const COLI_SN = useMemo(() => mailboxActiveNode?.COLI_SN || 0, [mailboxActiveNode.COLI_SN])
+  const handleTemplateDropdown = ({ key, domEvent }) => {
+    console.log(key)
+    openPopup(`/email/new/0/${COLI_SN}/${key}`, `new-0-${COLI_SN}-${key}`, POPUP_FEATURES)
+  };
+
+  const handleNewEmail = () => {
+    console.info('新邮件')
+    openPopup(`/email/new/0/${COLI_SN}`, `new-0-${COLI_SN}`, POPUP_FEATURES)
+  }
+
+  return (
+    <>
+      <Dropdown.Button
+        className={`w-auto ${props.className}`}
+        placement='bottom'
+        arrow
+        type={'primary'}
+        menu={{
+          items: emailTemplates,
+          onClick: handleTemplateDropdown,
+        }}
+        onClick={handleNewEmail}>
+        新邮件
+      </Dropdown.Button>
+    </>
+  )
+}
+export default NewEmailButton

From ad1f934d3b582d79a0ca6d687f7b1a02cbad8826 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 12 Jun 2025 09:33:21 +0800
Subject: [PATCH 084/143] =?UTF-8?q?perf:=20=E4=B8=8B=E7=BA=BF=20Vonage=20V?=
 =?UTF-8?q?oice=EF=BC=8C=E4=BB=B7=E6=A0=BC=E6=B2=A1=E6=9C=89=E8=B0=88?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/AuthApp.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/AuthApp.jsx b/src/views/AuthApp.jsx
index efa4fe5..db22305 100644
--- a/src/views/AuthApp.jsx
+++ b/src/views/AuthApp.jsx
@@ -160,7 +160,6 @@ function AuthApp() {
             }}
             icon={<CustomerServiceOutlined />}
           >
-            <FloatButton icon={<AudioTwoTone />} tooltip={<div>语音通话</div>} onClick={() => navigate('/callcenter/call')} />
             <EmailFetch />
             <FloatButton icon={<BugOutlined />} tooltip={<div>上传日志给研发部</div>} onClick={() => uploadLog()} />
             <FloatButton.BackTop />

From 7d7334ffe25a08ff4dc5558a894054e6625b61d2 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 12 Jun 2025 09:35:01 +0800
Subject: [PATCH 085/143] =?UTF-8?q?perf:=20=E4=B8=8D=E8=83=BD=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E5=8F=B7=E7=A0=81=E6=8B=A8=E6=89=93=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index 54a719f..d6bbe29 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -76,10 +76,10 @@ const OrderProfile = ({ coliSN, ...props }) => {
             Thailand
           </Typography.Text>
 
-          <Typography.Link href={'/callcenter/call/' + customerDetail.phone}>
+          <Typography.Text href={'/callcenter/call/' + customerDetail.phone}>
             <PhoneOutlined className=' pr-1' />
             {customerDetail.phone}
-          </Typography.Link>
+          </Typography.Text>
           <Typography.Text>
             <MailOutlined className='pr-1' />
             {customerDetail.email}

From 5ce589654af2ab080bd0989fb25efd94b9f1e395 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 12 Jun 2025 09:50:10 +0800
Subject: [PATCH 086/143] =?UTF-8?q?perf:=20maillist=20=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js |   4 +-
 src/hooks/useEmail.js       |  10 ++-
 src/stores/EmailSlice.js    |   5 +-
 src/utils/commons.js        | 124 +++++++++++++++++++++++++-----------
 4 files changed, 98 insertions(+), 45 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index af05f1b..c32e40e 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -312,7 +312,9 @@ export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id
   const { errcode, result } = await fetchJSON(`${API_HOST}/v3/mail_list`, _params)
   const ret = errcode === 0 ? result : []
   if (!isEmpty(ret)) {
-    writeIndexDB([{key: cacheKey, data: ret}], 'maillist', 'mailbox')
+    const listids = [...new Set(ret.map(ele => ele.MAI_SN))];
+    writeIndexDB([{key: cacheKey, data: listids}], 'maillist', 'mailbox')
+    writeIndexDB(ret.map(ele => ({ data: ele, key: ele.MAI_SN})), 'listrow', 'mailbox')
   }
   return ret;
 }
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index b77018e..face4af 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -150,12 +150,10 @@ export const useEmailList = (mailboxDirNode) => {
     setIsFreshData(false)
 
     const cacheKey = isEmpty(COLI_SN) ? `dir-${VKey}` : `order-${VKey}`
-    const readCache = await readIndexDB(cacheKey, 'maillist', 'mailbox')
-    if (!isEmpty(readCache)) {
-      const _x = readCache.data.map((ele) => ({
-        ...ele,
-        key: ele.MAI_SN,
-      }))
+    const readCacheIDList = await readIndexDB(cacheKey, 'maillist', 'mailbox')
+    const readCacheListRowsMap = await readIndexDB(readCacheIDList.data, 'listrow', 'mailbox')
+    if (!isEmpty(readCacheIDList)) {
+      const _x = readCacheIDList.data.map((ele) => readCacheListRowsMap.get(ele).data || {})
       setMailList(_x)
       setLoading(false)
     }
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index 0722403..5fa5ec8 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -107,12 +107,13 @@ const emailSlice = (set, get) => ({
     let isNeedRefresh = false
     if (!isEmpty(readCache)) {
       setMailboxNestedDirsActive(readCache?.tree || [])
-      isNeedRefresh = Date.now() - readCache.timestamp > 4 * 60 * 60 * 1000
+      isNeedRefresh = Date.now() - readCache.timestamp > 1 * 60 * 60 * 1000
       // isNeedRefresh = true; // test: 0
     }
     if (isEmpty(readCache) || isNeedRefresh) {
       // > {4} 更新
       const rootTree = await getRootMailboxDirAction({ opi_sn, userIdStr  })
+      console.log('empty', opi_sn, userIdStr, isEmpty(readCache), isNeedRefresh, rootTree);
       setMailboxNestedDirsActive(rootTree)
     }
     return false
@@ -120,7 +121,7 @@ const emailSlice = (set, get) => ({
 
   async initMailbox({ opi_sn, dei_sn, userId, userIdStr }) {
     const { setCurrentMailboxOPI, setCurrentMailboxDEI, getOPIEmailDir } = get()
-    createIndexedDBStore(['dirs', 'maillist', 'mailinfo', 'draft'], 'mailbox')
+    createIndexedDBStore(['dirs', 'maillist', 'listrow', 'mailinfo', 'draft'], 'mailbox')
     setCurrentMailboxOPI(opi_sn)
     setCurrentMailboxDEI(dei_sn)
     getOPIEmailDir(opi_sn, userIdStr)
diff --git a/src/utils/commons.js b/src/utils/commons.js
index 80ceed4..7c587cd 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -827,7 +827,23 @@ export const writeIndexDB = (rows, table, database) => {
   }
 };
 
-export const readIndexDB = (key=null, table, database) => {
+/**
+ * Reads data from an IndexedDB object store.
+ * It can read a single record by key, multiple records by an array of keys, or all records.
+ *
+ * @param {string|string[]|null} keys - The key(s) to read.
+ * - If `string`: Reads a single record and returns the data object directly.
+ * - If `string[]`: Reads multiple records and returns a Map of `rowkey` to `data` objects.
+ * - If `null` or `undefined` or `empty string/array`: Reads all records and returns a Map of `rowkey` to `data` objects.
+ * @param {string} table - The name of the IndexedDB object store (table).
+ * @param {string} database - The name of the IndexedDB database.
+ * @returns {Promise<any|Map<string, any>>} A promise that resolves with the data.
+ * - Single key: Resolves with the data object or `undefined` if not found.
+ * - Array of keys or All records: Resolves with a `Map` where keys are rowkeys and values are data objects.
+ * The Map will be empty if no records are found.
+ * - Rejects if there's an error opening the database or during the transaction.
+ */
+export const readIndexDB = (keys=null, table, database) => {
   return new Promise((resolve, reject) => {
     let openRequest = indexedDB.open(database)
     openRequest.onupgradeneeded = function () {
@@ -858,44 +874,80 @@ export const readIndexDB = (key=null, table, database) => {
       let transaction = db.transaction(table, 'readonly')
       let store = transaction.objectStore(table)
       // read by key
-      const getRequest = isEmpty(key) ? store.all() : store.get(key);
-      getRequest.onsuccess = (event) => {
-        const result = event.target.result
-        if (result) {
-          console.log(`💾Found record with key ${key}:`, result)
-          resolve(result)
-        } else {
-          console.log(`No record found with key ${key}.`)
-          resolve();
-        }
-      }
+      // Handle array of keys
+      if (Array.isArray(keys) && keys.length > 0) {
+        const promises = keys.map(key => {
+          return new Promise((innerResolve) => {
+            const getRequest = store.get(key);
+            getRequest.onsuccess = (event) => {
+              const result = event.target.result;
+              if (result) {
+                // console.log(`💾Found record with key ${key}:`, result);
+                innerResolve([key, result]); // Resolve with [key, data] tuple
+              } else {
+                console.log(`No record found with key ${key}.`);
+                innerResolve(void 0); // Resolve with undefined for non-existent keys
+              }
+            };
+            getRequest.onerror = (event) => {
+              console.error(`Error getting record with key ${key}:`, event.target.error);
+              innerResolve(undefined); // Resolve with undefined on error, or innerReject if you want to fail fast
+            };
+          });
+        });
 
-      getRequest.onerror = (event) => {
-        console.error(`Error getting record with key ${key}:`, event.target.error)
+        Promise.all(promises)
+          .then(results => {
+            const resultMap = new Map();
+            results.forEach(item => {
+              if (item !== undefined) {
+                resultMap.set(item[0], item[1]); // item[0] is key, item[1] is data
+              }
+            });
+            resolve(resultMap);
+          })
+          .catch(error => {
+            console.error('Error during batch read:', error);
+            reject(error); // Reject the main promise if Promise.all encounters an error
+          });
+      } else if (!isEmpty(keys)) { // Handle single key
+        const getRequest = store.get(keys);
+        getRequest.onsuccess = (event) => {
+          const result = event.target.result;
+          if (result) {
+            console.log(`💾Found record with key ${keys}:`, result);
+            resolve(result);
+          } else {
+            console.log(`No record found with key ${keys}.`);
+            resolve();
+          }
+        };
+        getRequest.onerror = (event) => {
+          console.error(`Error getting record with key ${keys}:`, event.target.error);
+          reject(event.target.error);
+        };
+      } else { // Handle read all
+        const getAllRequest = store.getAll();
+        getAllRequest.onsuccess = (event) => {
+          const allData = event.target.result;
+          const resultMap = new Map();
+          if (allData && allData.length > 0) {
+            allData.forEach(item => {
+              resultMap.set(item.key, item);
+            });
+            console.log(`💾Found all records:`, resultMap);
+            resolve(resultMap);
+          } else {
+            console.log(`No records found.`);
+            resolve(resultMap); // Resolve with an empty Map if no records
+          }
+        };
+        getAllRequest.onerror = (event) => {
+          console.error(`Error getting all records:`, event.target.error);
+          reject(event.target.error);
+        };
       }
 
-      // const request = store.openCursor(null, 'prev'); // 从后往前
-      // const results = [];
-      // let count = 0;
-      // request.onerror = function (e) {
-      //   reject('Error getting records.')
-      // }
-      // request.onsuccess = function (e) {
-      //   const cursor = e.target.result
-      //   if (cursor) {
-      //     if (count < limit) {
-      //       results.unshift(cursor.value)
-      //       count++
-      //       cursor.continue()
-      //     } else {
-      //       console.log(JSON.stringify(results))
-      //       resolve(results)
-      //     }
-      //   } else {
-      //     console.log(JSON.stringify(results))
-      //     resolve(results)
-      //   }
-      // }
     }
   })
 };

From e38d136cc4c2915562568f232720dbcd7c73857e Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 12 Jun 2025 10:07:13 +0800
Subject: [PATCH 087/143] =?UTF-8?q?perf:=20maillist=20=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useEmail.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index face4af..af6aabe 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -151,8 +151,8 @@ export const useEmailList = (mailboxDirNode) => {
 
     const cacheKey = isEmpty(COLI_SN) ? `dir-${VKey}` : `order-${VKey}`
     const readCacheIDList = await readIndexDB(cacheKey, 'maillist', 'mailbox')
-    const readCacheListRowsMap = await readIndexDB(readCacheIDList.data, 'listrow', 'mailbox')
     if (!isEmpty(readCacheIDList)) {
+      const readCacheListRowsMap = await readIndexDB(readCacheIDList.data, 'listrow', 'mailbox')
       const _x = readCacheIDList.data.map((ele) => readCacheListRowsMap.get(ele).data || {})
       setMailList(_x)
       setLoading(false)

From fdfe4d3083866da6d63b2c55fefba77773bb04e6 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 12 Jun 2025 10:51:06 +0800
Subject: [PATCH 088/143] #

---
 src/utils/commons.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/commons.js b/src/utils/commons.js
index 7c587cd..5e59a9b 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -699,7 +699,7 @@ export const logWebsocket = (message, direction) => {
     var db = open.result
     var tx = db.transaction('LogStore', 'readwrite')
     var store = tx.objectStore('LogStore')
-    store.put({ direction, message, date: new Date().toLocaleString(), timestamp: Date.now() })
+    store.put({ direction, message, _date: new Date().toLocaleString(), timestamp: Date.now() })
     tx.oncomplete = function () {
       db.close()
     }

From 46fa96694f3683cb20150a02c45d53bec35353c1 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 12 Jun 2025 11:08:09 +0800
Subject: [PATCH 089/143] =?UTF-8?q?perf:=20=E6=A8=A1=E6=9D=BF=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useEmail.js                          | 2 +-
 src/views/orders/components/NewEmailButton.jsx | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index af6aabe..3d626d5 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -80,7 +80,7 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => {
   useEffect(() => {
     console.log(coliSN, '====colisn======')
     const getOrderDetail = async () => {
-      if (isEmpty(coliSN)) {
+      if (isEmpty(Number(coliSN))) {
         return false
       }
       try {
diff --git a/src/views/orders/components/NewEmailButton.jsx b/src/views/orders/components/NewEmailButton.jsx
index 579bca6..526c4bb 100644
--- a/src/views/orders/components/NewEmailButton.jsx
+++ b/src/views/orders/components/NewEmailButton.jsx
@@ -1,15 +1,20 @@
 import { createContext, useEffect, useMemo, useState } from 'react'
-import { Flex, Button, Tooltip, List, Form, Row, Col, Dropdown, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton } from 'antd'
+import { App, Flex, Button, Tooltip, List, Form, Row, Col, Dropdown, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton } from 'antd'
 import useConversationStore from '@/stores/ConversationStore'
 import { emailTemplates, openPopup, useEmailTemplate } from '@/hooks/useEmail';
 import { POPUP_FEATURES } from '@/config';
+import { isEmpty } from '@/utils/commons';
 
 const NewEmailButton = ({ ...props }) => {
+  const { notification } = App.useApp();
   const [mailboxActiveNode, setMailboxActiveNode] = useConversationStore((state) => [state.mailboxActiveNode, state.setMailboxActiveNode])
 
   const COLI_SN = useMemo(() => mailboxActiveNode?.COLI_SN || 0, [mailboxActiveNode.COLI_SN])
   const handleTemplateDropdown = ({ key, domEvent }) => {
-    console.log(key)
+    if (isEmpty(COLI_SN)) {
+      notification.warning({ message: '请选择到订单目录', placement: 'top' })
+      return false
+    }
     openPopup(`/email/new/0/${COLI_SN}/${key}`, `new-0-${COLI_SN}-${key}`, POPUP_FEATURES)
   };
 

From 1a0328303d89f615488f951541da621961ea6ad4 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 12 Jun 2025 11:28:08 +0800
Subject: [PATCH 090/143] =?UTF-8?q?perf:=20=E9=82=AE=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useEmail.js                                      | 7 ++++++-
 src/stores/EmailSlice.js                                   | 4 ++++
 .../Conversations/Online/Components/EmailDetailInline.jsx  | 2 +-
 src/views/orders/Follow.jsx                                | 5 ++++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 3d626d5..e8045fc 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -31,9 +31,14 @@ export const useEmailSignature = (opi_sn) => {
 }
 
 /**
+ * 邮件详情
+ *
  * @param mai_sn 邮件编号ID
  * @param data 直接传递, 不重复获取
  * * 在详情点击`回复`呼出编辑时
+ * @param {number|boolean} oid 订单ID
+ * - If `number`: 直接传递, 直接获取订单详情
+ * - If `false`: 不需要获取订单信息
  */
 export const useEmailDetail = (mai_sn, data={}, oid=0) => {
   const {notification} = App.useApp()
@@ -54,7 +59,7 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => {
         const data = await getEmailDetailAction({ mai_sn })
         // console.log(data)
         setMailData(data)
-        setColiSN(data.info.MAI_COLI_SN)
+        setColiSN(oid===false ? 0 : data.info.MAI_COLI_SN)
         // if (!isEmpty(data.info.MAI_COLI_SN)) {
         //   const orderData = await getEmailOrderAction({ colisn: data.info.MAI_COLI_SN })
         //   setOrderDetail(orderData)
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index 5fa5ec8..fae232d 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -98,6 +98,10 @@ const emailSlice = (set, get) => ({
   setMailboxActiveMAI: (mai) => {
     return set(() => ({ mailboxActiveMAI: mai }))
   },
+  mailboxActiveCOLI: 0,
+  setMailboxActiveCOLI: (coli) => {
+    return set(() => ({ mailboxActiveCOLI: coli }))
+  },
 
   getOPIEmailDir: async (opi_sn = 0, userIdStr='') => {
     // console.log('🌐requesting opi dir', opi_sn, typeof opi_sn)
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 4a451b2..9bebb6b 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -82,7 +82,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
     }
   }
 
-  const { loading, mailData, orderDetail, postEmailResend } = useEmailDetail(mailID)
+  const { loading, mailData, orderDetail, postEmailResend } = useEmailDetail(mailID, null, false)
   const [showBindBtn, setShowBindBtn] = useState(false)
   useEffect(() => {
     setShowBindBtn(mailID ? isEmpty(mailData.info?.MAI_COLI_SN) : false)
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 7b47ec1..b277957 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -58,6 +58,7 @@ function Follow() {
   const [currentMailboxOPI, setCurrentMailboxOPI] = useConversationStore(state => [state.currentMailboxOPI, state.setCurrentMailboxOPI]);
   const [mailboxActiveNode, setMailboxActiveNode] = useConversationStore(state => [state.mailboxActiveNode, state.setMailboxActiveNode]);
   const [activeEmailId, setActiveEmailId] = useConversationStore(state => [state.mailboxActiveMAI, state.setMailboxActiveMAI]);
+  const [mailboxActiveCOLI, setMailboxActiveCOLI] = useConversationStore(state => [state.mailboxActiveCOLI, state.setMailboxActiveCOLI]);
 
   const computedBreadcrumb = useMemo(() => {
     const { title, iconIndex, parentTitle, parentIconIndex } = mailboxActiveNode
@@ -86,6 +87,7 @@ function Follow() {
     if (VKey && !(!IsTrue && !COLI_SN)) {
       setMailboxActiveNode({...treeNode, ...node._raw, key: treeNode.key, OPI_SN: currentMailboxOPI});
       setActiveEmailId(0);
+      setMailboxActiveCOLI(COLI_SN);
     } else {
       const _expandTree = expandTree.includes(node.key) ? expandTree.filter(ele => ele !== node.key) : [...expandTree, ...selectedKeys]
       setExpandTree(_expandTree)
@@ -96,6 +98,7 @@ function Follow() {
   const onClickEmailItem = (emailItem) => {
     const mai_sn = emailItem.MAI_SN;
     setActiveEmailId(mai_sn);
+    setMailboxActiveCOLI(emailItem.MAI_COLI_SN || 0)
     const emailMsg = {
       conversationid: '',
       order_opi: currentMailboxOPI,
@@ -174,7 +177,7 @@ function Follow() {
           collapsedWidth={0}
           trigger={null}
           reverseArrow={true}>
-          <OrderProfile coliSN={mailboxActiveNode.COLI_SN} />
+          <OrderProfile coliSN={mailboxActiveCOLI} />
         </Layout.Sider>
       </Layout>
     </>

From aeb0672002b544a5395395d3587100101e95865b Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 12 Jun 2025 14:51:17 +0800
Subject: [PATCH 091/143] conf: indexedDB version upgrade

---
 src/utils/commons.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/commons.js b/src/utils/commons.js
index 5e59a9b..ef297e1 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -679,7 +679,7 @@ export const buildTree = (list, keyMap={ rootKeys: [], ignoreKeys: [] }) => {
 /**
  *
  */
-const INDEXED_DB_VERSION = 3;
+const INDEXED_DB_VERSION = 4;
 export const logWebsocket = (message, direction) => {
   var open = indexedDB.open('LogWebsocketData', INDEXED_DB_VERSION)
   open.onupgradeneeded = function () {

From 05a22161cd40575dd9ab7f4b0f3a5d6db7499afa Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 12 Jun 2025 16:11:46 +0800
Subject: [PATCH 092/143] =?UTF-8?q?feat:=20=E4=BF=9D=E5=AD=98=E8=8D=89?=
 =?UTF-8?q?=E7=A8=BF:=20=E9=99=84=E4=BB=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                   |  25 +-
 src/config.js                                 |   2 +-
 src/hooks/useEmail.js                         | 127 +++---
 .../Online/Components/EmailDetailInline.jsx   |   6 +-
 src/views/NewEmail.jsx                        | 369 ++++++------------
 src/views/orders/Follow.jsx                   |   2 +-
 .../orders/components/NewEmailButton.jsx      |  11 +-
 7 files changed, 207 insertions(+), 335 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index c32e40e..8908968 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -167,7 +167,7 @@ const todoTypes = {
  */
 export const getEmailDirAction = async (params = { opi_sn: '' }) => {
   const defaultParams = { opi_sn: 0, year: dayjs().year(), by_start_date: -1, by_success: -1, important: -1, if_want_book: -1, if_thinking: -1 }
-  const { errcode, result } = await fetchJSON(`${API_HOST}/v3/email_dir`, { ...defaultParams, ...params })
+  const { errcode, result } = await fetchJSON(`${API_HOST}/email_dir`, { ...defaultParams, ...params })
   const mailboxSort = result //.sort(sortBy('MDR_Order'));
   let tree = buildTree(mailboxSort, { key: 'VKey', parent: 'VParent', name: 'VName', iconIndex: 'ImageIndex', rootKeys: [1], ignoreKeys: [-227001, -227002] })
   tree = tree.filter((ele) => ele.key !== 1)
@@ -309,7 +309,7 @@ export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id
   }
   _params.mai_senddate1 = dayjs(_params.mai_senddate1).format(DATE_FORMAT)
   const cacheKey = isEmpty(_params.coli_sn) ? `dir-${node.vkey}` : `order-${node.vkey}`;
-  const { errcode, result } = await fetchJSON(`${API_HOST}/v3/mail_list`, _params)
+  const { errcode, result } = await fetchJSON(`${API_HOST}/mail_list`, _params)
   const ret = errcode === 0 ? result : []
   if (!isEmpty(ret)) {
     const listids = [...new Set(ret.map(ele => ele.MAI_SN))];
@@ -337,7 +337,7 @@ export const updateEmailAction = async (params = { mai_sn_list: [], set: {} }) =
  * @param {number} [params.remind_index] - Index of the reminder.
  */
 export const getEmailTemplateAction = async (params = { coli_sn: 0, lgc: 1, opi_sn: 0, remind_type: '', remind_index: 0 }) => {
-  const { errcode, result } = await fetchJSON(`${API_HOST}/v3/reminder_letter`, params)
+  const { errcode, result } = await fetchJSON(`${API_HOST}/reminder_letter`, params)
   const { html, bodyContent, bodyText } = parseHTMLString(result?.MailContent, true) ;
   return errcode === 0 ? {...result, bodyContent }: {}
 }
@@ -348,24 +348,25 @@ export const getEmailTemplateAction = async (params = { coli_sn: 0, lgc: 1, opi_
  * @param {boolean} [isDraft=false] - Whether the email is a draft.
  */
 export const saveEmailDraftOrSendAction = async (body, isDraft = false) => {
-  const url = isDraft !== false ? `${API_HOST}/v3/email_draft_save` : `${EMAIL_HOST}/sendmail`;
+  const url = isDraft !== false ? `${API_HOST}/email_draft_save` : `${EMAIL_HOST}/sendmail`;
   const { attaList=[], atta, content, ...bodyData } = body;
   bodyData.ordertype = 227001;
   const formData = new FormData();
   Object.keys(bodyData).forEach(function (key) {
-    formData.append(key, bodyData[key]);
+    formData.append(key, bodyData[key] || '');
   });
-  attaList.forEach(function (item) {
+  // 附件只传新增的
+  attaList.filter(ele => !ele.fullPath).forEach(function (item) {
     formData.append('attachment', item);
   });
-  const { result } = await postForm(url, formData);
-  return result;
+  const { errcode, result } = await postForm(url, formData);
+  return errcode === 0 ? (result || {}) : {}
 };
 
 /**
- * 删除邮件草稿
+ * 删除邮件附件
  */
-export const deleteEmailDraftAction = async (id) => {
-  const { errcode, result } = await postJSON(`${EMAIL_HOST}/email-draft/delete`, { id })
-  return errcode === 0 ? {} : result
+export const deleteEmailAttachmentAction = async (ati_sn_list) => {
+  const { errcode, result } = await postJSON(`${API_HOST}/mail_attachment_delete`, { ati_sn_list })
+  return errcode === 0 ? result : {}
 };
diff --git a/src/config.js b/src/config.js
index 0a8df09..1df0504 100644
--- a/src/config.js
+++ b/src/config.js
@@ -6,7 +6,7 @@
 // export const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_144'; // prod: Slave
 
 // debug:
-export const API_HOST = 'http://202.103.68.144:8889/v2';
+export const API_HOST = 'http://202.103.68.144:8889/v3';
 // export const WS_URL = 'ws://202.103.68.144:8888';
 // export const EMAIL_HOST = 'http://202.103.68.231:888/service-mail';
 // export const WAI_HOST = 'http://47.83.248.120/api/v1'; // 香港服务器
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index e8045fc..8d4addb 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -1,6 +1,6 @@
 import { useState, useEffect, useCallback } from 'react'
 import { isEmpty, objectMapper, olog, readIndexDB, } from '@/utils/commons'
-import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction, getEmailTemplateAction } from '@/actions/EmailActions'
+import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction, getEmailTemplateAction, saveEmailDraftOrSendAction } from '@/actions/EmailActions'
 import { App } from 'antd'
 import useConversationStore from '@/stores/ConversationStore';
 import { msgStatusRenderMapped } from '@/channel/bubbleMsgUtils';
@@ -44,79 +44,96 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => {
   const {notification} = App.useApp()
   const [loading, setLoading] = useState(false)
   const [mailData, setMailData] = useState({ loading, info: { MAI_COLI_SN: 0 }, content: '', attachments: [], AttachList: [] })
+  const [maiSN, setMaiSN] = useState(mai_sn);
   const [coliSN, setColiSN] = useState(oid);
   const [orderDetail, setOrderDetail] = useState({});
 
-  const [updateMessageItem] = useConversationStore(state => [state.updateMessageItem]);
+  const [refreshTrigger, setRefreshTrigger] = useState(0);
+  const refresh = useCallback(() => {
+    setRefreshTrigger(prev => prev + 1);
+  }, []);
 
-  useEffect(() => {
-    const getEmailDetail = async () => {
-      if (isEmpty(Number(mai_sn))) {
-        return false
-      }
-      try {
-        setLoading(true)
-        const data = await getEmailDetailAction({ mai_sn })
-        // console.log(data)
-        setMailData(data)
-        setColiSN(oid===false ? 0 : data.info.MAI_COLI_SN)
-        // if (!isEmpty(data.info.MAI_COLI_SN)) {
-        //   const orderData = await getEmailOrderAction({ colisn: data.info.MAI_COLI_SN })
-        //   setOrderDetail(orderData)
-        //   // console.log(orderData)
-        // }
-        setLoading(false)
-      } catch (err) {
-        setLoading(false)
-        notification.error({
-          message: "请求失败",
-          description: err.message || '网络异常',
-          placement: "top",
-          duration: 3,
-        });
-      }
+  // const [updateMessageItem] = useConversationStore(state => [state.updateMessageItem]);
+
+  const getEmailDetail = useCallback(async () => {
+    if (isEmpty(Number(maiSN)) && isEmpty(Number(mai_sn))) {
+      return false
     }
 
-    if (isEmpty(data)) getEmailDetail()
-    else setMailData(data)
-  }, [mai_sn])
+    if (!isEmpty(data)) {
+      setMailData(data)
+      return false
+    }
 
+    try {
+      setLoading(true)
+      const data = await getEmailDetailAction({ mai_sn: maiSN || mai_sn })
+      // console.log(data)
+      setMailData(data)
+      setColiSN(oid === false ? 0 : data.info.MAI_COLI_SN)
+      setLoading(false)
+    } catch (err) {
+      setLoading(false)
+      notification.error({
+        message: '请求失败',
+        description: err.message || '网络异常',
+        placement: 'top',
+        duration: 3,
+      })
+    }
+  }, [mai_sn, maiSN, refreshTrigger])
 
-  useEffect(() => {
-    console.log(coliSN, '====colisn======')
-    const getOrderDetail = async () => {
-      if (isEmpty(Number(coliSN))) {
-        return false
-      }
-      try {
-        setLoading(true)
-        const data = await getEmailOrderAction({ colisn: coliSN })
-        setOrderDetail(data)
-        setLoading(false)
-      } catch (err) {
-        setLoading(false)
-        notification.error({
-          message: "请求失败",
-          description: err.message || '网络异常',
-          placement: "top",
-          duration: 3,
-        });
-      }
+
+  const getOrderDetail = useCallback(async () => {
+    // console.log(coliSN, '====colisn======')
+    if (isEmpty(Number(coliSN))) {
+      return false
+    }
+    try {
+      setLoading(true)
+      const data = await getEmailOrderAction({ colisn: coliSN })
+      setOrderDetail(data)
+      setLoading(false)
+    } catch (err) {
+      setLoading(false)
+      notification.error({
+        message: '请求失败',
+        description: err.message || '网络异常',
+        placement: 'top',
+        duration: 3,
+      })
     }
+  }, [coliSN])
 
+  useEffect(() => {
+    getEmailDetail();
+  }, [getEmailDetail])
+
+  useEffect(() => {
     getOrderDetail()
-  }, [coliSN])
+  }, [getOrderDetail])
 
   const postEmailResend = async ({ mai_sn, conversationid: externalid, actionId: actionid, ...body }) => {
-    if (isEmpty(mai_sn)) {
+    if (isEmpty(Number(mai_sn))) {
       return false
     }
     await postResendEmailAction({ mai_sn, externalid, actionid, token: 0 })
     // 重发没有状态返回值, 此处前端处理为'待发送', todo: 刷新页面后消息仍为上一个状态'失败'
-    updateMessageItem({ conversationid: externalid, actionid, id: actionid, status: msgStatusRenderMapped['accepted'] })
+    // updateMessageItem({ conversationid: externalid, actionid, id: actionid, status: msgStatusRenderMapped['accepted'] })
   }
 
-  return { loading, mailData, orderDetail, postEmailResend }
+  const postEmailSaveOrSend = async (body, isDraft) => {
+    try {
+      const { id: savedID } = await saveEmailDraftOrSendAction(body, isDraft)
+      setMaiSN(savedID)
+      refresh()
+      return savedID
+    } catch (error) {
+      console.error(error);
+    }
+  };
+
+  return { loading, mailData, orderDetail, postEmailResend, postEmailSaveOrSend }
 }
 
 export const EmailBuilder = ({subject, content}) => {
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 9bebb6b..d16bdf4 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -68,9 +68,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
   }, [mailID])
 
   const onOpenEditor = (msgOrigin, action='reply') => {
-    window.open(`/email/${action}/${mailID || 0}`, `${action}-${mailID || 0}`,POPUP_FEATURES)
-    console.log('first000', emailMsg)
-    console.log('first', msgOrigin)
+    openPopup(`/email/${action}/${mailID || 0}`, `${action}-${mailID || 0}`)
     if (typeof props.onOpenEditor === 'function') {
       props.onOpenEditor(msgOrigin, action);
     } else {
@@ -256,7 +254,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
                   <List.Item>
                     <FileTypeIcon fileName={atta.ATI_Name} />
                     <Typography.Text ellipsis={{ tooltip: { title: atta.ATI_Name, placement: 'left' } }} className='text-inherit'>
-                      <span key={atta.ATI_SN} onClick={() => openPopup(`${EMAIL_ATTA_HOST}${atta.ATI_ServerFile}`, atta.ATI_SN, POPUP_FEATURES)} size='small' className='text-blue-500 cursor-pointer'>
+                      <span key={atta.ATI_SN} onClick={() => openPopup(`${EMAIL_ATTA_HOST}${atta.ATI_ServerFile}`, atta.ATI_SN)} size='small' className='text-blue-500 cursor-pointer'>
                         {atta.ATI_Name}
                       </span>
                     </Typography.Text>
diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index e1fe20f..8de9a68 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -10,16 +10,16 @@ import useAuthStore from '@/stores/AuthStore'
 import LexicalEditor from '@/components/LexicalEditor'
 
 import { v4 as uuid } from 'uuid'
-import { cloneDeep, debounce, isEmpty, writeIndexDB, readIndexDB, deleteIndexDBbyKey, olog } from '@/utils/commons'
+import { cloneDeep, debounce, isEmpty, writeIndexDB, readIndexDB, deleteIndexDBbyKey, olog, omitEmpty } from '@/utils/commons'
 import '@/views/Conversations/Online/Input/EmailEditor.css'
-import { parseHTMLString, postSendEmail, saveEmailDraftOrSendAction } from '@/actions/EmailActions'
+import { deleteEmailAttachmentAction, parseHTMLString, postSendEmail, saveEmailDraftOrSendAction } from '@/actions/EmailActions'
 import { sentMsgTypeMapped } from '@/channel/bubbleMsgUtils'
-import { EmailBuilder, useEmailDetail, useEmailSignature, useEmailTemplate } from '@/hooks/useEmail'
+import { EmailBuilder, openPopup, useEmailDetail, useEmailSignature, useEmailTemplate } from '@/hooks/useEmail'
 import useSnippetStore from '@/stores/SnippetStore'
 // import { useOrderStore } from '@/stores/OrderStore'
 import PaymentlinkBtn from '@/views/Conversations/Online/Input/PaymentlinkBtn'
 import { TextIcon } from '@/components/Icons';
-import { POPUP_FEATURES } from '@/config';
+import { EMAIL_ATTA_HOST, POPUP_FEATURES } from '@/config';
 
 // 禁止上传的附件类型
 // .application, .exe, .app
@@ -92,23 +92,16 @@ const NewEmail = () => {
   // console.log('emailListMapped', emailListOption, emailListAddrMapped);
 
   const mai_sn = pageParam.quoteid // activeEdit.quoteid
-  const { loading: quoteLoading, mailData, orderDetail } = useEmailDetail(mai_sn, null, pageParam.oid)
+  const { loading: quoteLoading, mailData, orderDetail, postEmailSaveOrSend } = useEmailDetail(mai_sn, null, pageParam.oid)
   const { loading: loadingTamplate, templateContent }  = useEmailTemplate(templateKey, {coli_sn: pageParam.oid, opi_sn: orderDetail.opi_sn || mailData.info?.MAI_OPI_SN || 0, lgc: 1});
   const { signature } = useEmailSignature(orderDetail.opi_sn || mailData.info?.MAI_OPI_SN || 0)
 
-  const [newFromEmail, setNewFromEmail] = useState('')
-  const [newToEmail, setNewToEmail] = useState('')
-  const [emailOPI, setEmailOPI] = useState('')
-  const [emailOrder, setEmailOrder] = useState('')
-  const [emailOrderSN, setEmailOrderSN] = useState('')
-  const [emailMat, setEmailMat] = useState('')
-
-  const stateReset = () => {
-    setEmailOrder('')
-    setEmailOPI('')
-    setNewFromEmail('')
-    setNewToEmail('')
-  }
+  // const [newFromEmail, setNewFromEmail] = useState('')
+  // const [newToEmail, setNewToEmail] = useState('')
+  // const [emailOPI, setEmailOPI] = useState('')
+  // const [emailOrder, setEmailOrder] = useState('')
+  // const [emailOrderSN, setEmailOrderSN] = useState('')
+  // const [emailMat, setEmailMat] = useState('')
 
   const [contentPrefix, setContentPrefix] = useState('')
   const [localDraft, setLocalDraft] = useState();
@@ -165,13 +158,16 @@ const NewEmail = () => {
   // - 从原邮件内容
   // - 从订单
   useEffect(() => {
-    console.log('useEffect 1---- \nform.setFieldsValue ');
+    // console.log('useEffect 1---- \nform.setFieldsValue ');
     if (isEmpty(mailData.content) && isEmpty(orderDetail.order_no)) {
       return () => {}
     }
     const docTitle = mailData.info?.MAI_Subject || 'New Email-';
     document.title = docTitle
 
+    const { order_no } = orderDetail
+    setContentPrefix(order_no ? `<p>Dear Mr./Ms. ${orderDetail.contact?.[0]?.name || ''}</p><p>Reference Number: ${order_no}</p>` : '')
+
     const { info } = mailData
     const { ...templateFormValues } = templateContent;
 
@@ -183,13 +179,12 @@ const NewEmail = () => {
     const _findMatOldE = emailListMatMapped?.[info.MAI_MAT_SN]
     const quotedMailSender = _findMatOldE?.email || ''
 
-
     const sender = quotedMailSender || orderSender
     const quotedMailSenderObj = sender; // { key: sender, label: sender, value: sender }
     const defaultMAT = emailListAddrMapped?.[sender]?.mat_sn || ''
 
     const _form2 = {
-      coli_sn: pageParam.oid || info?.coli_sn || '',
+      coli_sn: Number(pageParam.oid) || info?.MAI_COLI_SN || '',
       mat_sn: info?.MAI_MAT_SN || defaultMAT,
       opi_sn: info?.MAI_OPI_SN || orderDetail.opi_sn || '',
     }
@@ -248,21 +243,24 @@ const NewEmail = () => {
           ..._form2
         }
         readyToInitialContent = generateMailContent(mailData)
+        setFileList(mailData.attachments.map(ele => ({ uid: ele.ATI_SN, name: ele.ATI_Name, url: ele.ATI_ServerFile, fullPath: `${EMAIL_ATTA_HOST}${ele.ATI_ServerFile}` })))
         break
       case 'new':
         _formValues = {
           ...templateFormValues,
           from: quotedMailSenderObj,
-          to: orderReceiver,
-          ..._form2
+          to: orderReceiver || info?.MAI_To || '',
+          subject: `${info.MAI_Subject || ''}`,
+          ..._form2,
         }
-        readyToInitialContent = generateMailContent({ content: templateContent.bodycontent })
+        readyToInitialContent = generateMailContent({ content: templateContent.bodycontent || '' })
+        setFileList(mailData.attachments.map(ele => ({ uid: ele.ATI_SN, name: ele.ATI_Name, url: ele.ATI_ServerFile, fullPath: `${EMAIL_ATTA_HOST}${ele.ATI_ServerFile}` })))
         break
 
       default:
         break
     }
-    olog('222', _formValues, pageParam.action)
+    // olog('222', _formValues, pageParam.action)
     form.setFieldsValue(_formValues) // todo: from
     setInitialContent(readyToInitialContent);
 
@@ -306,27 +304,13 @@ const NewEmail = () => {
     return () => {}
   }, [loadingTamplate])
 
-
-
-  useEffect(() => {
-    console.log('useeffect\n', orderDetail.order_no);
-
-    setContentPrefix(orderDetail.order_no ? `<p>Dear Mr./Ms. ${orderDetail.contact?.[0]?.name || ''}</p><p>Reference Number: ${orderDetail.order_no}</p>` : '')
-    // form.setFieldsValue({ to: orderDetail.contact?.[0]?.email || '' })
-    setNewToEmail(orderDetail.contact?.[0]?.email || '')
-
-    return () => {}
-  }, [orderDetail.order_no, editorKey])
-
-  const handleSwitchEmail  = (labelValue) => {
-    const { value } = labelValue
-    setNewFromEmail(value)
+  const handleSwitchEmail  = (value) => {
+    // const { value } = labelValue
+    // setNewFromEmail(value)
     const _findMat = emailListAddrMapped?.[value]
-    setEmailMat(_findMat?.mat_sn)
-    setEmailOPI(_findMat?.opi_sn)
+    form.setFieldsValue({ mat_sn: _findMat?.mat_sn, opi_sn: _findMat?.opi_sn })
   }
 
-
   const [isRichText, setIsRichText] = useState(mobile === false)
   // const [isRichText, setIsRichText] = useState(false); // 默认纯文本
   const [htmlContent, setHtmlContent] = useState('')
@@ -348,125 +332,17 @@ const NewEmail = () => {
     setTextContent(textContent)
     form.setFieldValue('content', htmlContent)
     const { bodyText: abstract } = parseHTMLString(htmlContent, true);
-    const body = {
-      // from: newFromEmail,
-      // attaList: fileList,
-      // opi_sn: emailOPI,
-      // mat_sn: emailMat,
-      // coli_sn: emailOrder || '',
-    }
     // form.setFieldValue('abstract', getAbstract(textContent))
-    debouncedSave({ ...form.getFieldsValue(), ...body, htmlContent, abstract,  })
+    const formValues = omitEmpty(form.getFieldsValue());
+    if (!isEmpty(formValues)) {
+      debouncedSave({ ...form.getFieldsValue(), htmlContent, abstract,  })
+    }
   }
 
   const [initialContent, setInitialContent] = useState('')
   const [showQuoteContent, setShowQuoteContent] = useState(false)
-  // const [mergeQuote, setMergeQuote] = useState(true)
   const [quoteContent, setQuoteContent] = useState('')
 
-  // const setPreFillInProperty = () => {  };
-
-  // useEffect(() => {
-  //   console.log('useEffect 2---- \nform.setFieldsValue ');
-  //   const docTitle = localDraft?.subject || mailData.info?.MAI_Subject || 'New Email-';
-  //   setTimeout(() => {
-  //     document.title = docTitle
-  //   }, 1500);
-
-  //   // 没有引用邮件
-  //   if (isEmpty(pageParam.quoteid)) {
-
-  //     // setEmailOrder(orderDetail.order_no)
-  //     // setEmailOPI(orderDetail.opi_sn)
-  //     // setNewFromEmail(activeEdit.fromEmail)
-  //     // setNewToEmail(activeEdit.toEmail)
-
-  //     // const _findMat = emailListAddrMapped?.[activeEdit.fromEmail]?.mat_sn
-  //     // setEmailMat(_findMat)
-
-  //     // if (open !== true) {
-  //     // form.resetFields()
-  //     // }
-  //   }
-  //   // 转发/回复时, 使用详情的账户信息
-  //   if (mailData.info?.MAI_MAT_SN) {
-  //     const reEmailO = mailData.info?.MAI_COLI_SN
-  //     const reEmailUser = mailData.info?.MAI_OPI_SN
-  //     const reEmailUserMat = mailData.info?.MAI_MAT_SN
-
-  //     setEmailOrder((prev) => reEmailO || prev ) // activeEdit.fromOrder
-  //     setEmailOPI((prev) => reEmailUser || prev)
-  //     setEmailMat((prev) => reEmailUserMat || prev)
-
-  //     const _findMatOld = emailListMatMapped?.[reEmailUserMat]
-  //     if (_findMatOld) {
-  //       setNewFromEmail(_findMatOld.email)
-  //       setEmailOPI(_findMatOld.opi_sn)
-  //       setEmailMat(_findMatOld.mat_sn)
-  //     }
-  //   }
-  //   setShowQuoteContent(false)
-  //   // setMergeQuote(true)
-  //   setQuoteContent('')
-
-
-  //   if (isEmpty(pageParam.quoteid) && pageParam.action !== 'new') {
-  //     return () => {}
-  //   }
-  //   const { info } = mailData
-  //   // setShowCc(!isEmpty(mailData.info?.MAI_CS));
-
-  //   const signatureBody = generateMailContent({ content: signature })
-
-  //   // const preQuoteBody = generateQuoteContent(mailData)
-
-  //   // const _initialContent = isEmpty(mailData.info) ? signatureBody : signatureBody+preQuoteBody
-
-  //   if (!isEmpty(mailData.info) && pageParam.action !== 'edit') {
-  //     setInitialContent(contentPrefix + signatureBody)
-  //   }
-
-  //   const forwardValues = { from: newFromEmail, subject: `Fw: ${info.MAI_Subject || ''}` }
-  //   if (pageParam.action === 'reply') {
-  //     const _formValues = {
-  //       to: info?.replyTo || newFromEmail,
-  //       cc: info?.MAI_CS || '',
-  //       // bcc: quote.bcc || '',
-  //       subject: `Re: ${info.MAI_Subject || ''}`,
-  //     }
-  //     form.setFieldsValue(_formValues)
-  //   } else if (pageParam.action === 'replyall') {
-  //     const _formValues = {
-  //       to: info?.replyToAll || newFromEmail,
-  //       cc: info?.MAI_CS || '',
-  //       // bcc: quote.bcc || '',
-  //       subject: `Re: ${info.MAI_Subject || ''}`,
-  //     }
-  //     form.setFieldsValue(_formValues)
-  //   } else if (pageParam.action === 'forward') {
-  //     form.setFieldsValue(forwardValues)
-  //   } else if (pageParam.action === 'edit') {
-  //     const thisFormValues = {
-  //       to: info?.MAI_To || '',
-  //       cc: info?.MAI_CS || '',
-  //       subject: info?.MAI_Subject || '',
-  //       id: pageParam.quoteid,
-  //     }
-  //     form.setFieldsValue(thisFormValues)
-  //     const thisBody = generateMailContent(mailData)
-  //     // console.log('thisBody', thisBody);
-
-  //     setInitialContent(thisBody)
-  //   } else if (pageParam.action === 'new') {
-  //     // todo: 附件
-  //     const newEmail = { to: newToEmail, subject: '' }
-  //     // form.setFieldsValue(newEmail)
-  //     // setInitialContent((contentPrefix || '') + signatureBody)
-  //   }
-
-  //   return () => {}
-  // }, [ mailData.info, signature, newToEmail, contentPrefix])
-
   const [openPlainTextConfirm, setOpenPlainTextConfirm] = useState(false)
   const handlePlainTextOpenChange = ({ target }) => {
     const { value: newChecked } = target
@@ -486,18 +362,18 @@ const NewEmail = () => {
   // 1. ~直接上传返回地址~
   // 2. 发送文件信息
   const [fileList, setFileList] = useState([])
-  const handleChange = (info) => {
-    let newFileList = [...info.fileList]
-    // 2. Read from response and show file link
-    newFileList = newFileList.map((file) => {
-      if (file.response) {
-        // Component will show file.url as link
-        file.url = file.response.url
-      }
-      return file
-    })
-    setFileList(newFileList)
-  }
+  // const handleChange = (info) => {
+  //   let newFileList = [...info.fileList]
+  //   // 2. Read from response and show file link
+  //   newFileList = newFileList.map((file) => {
+  //     if (file.response) {
+  //       // Component will show file.url as link
+  //       file.url = file.response.url
+  //     }
+  //     return file
+  //   })
+  //   setFileList(newFileList)
+  // }
   const normFile = (e) => {
     // console.log('Upload event:', e);
     if (Array.isArray(e)) {
@@ -522,7 +398,24 @@ const NewEmail = () => {
       setFileList((prev) => [...prev, file])
       return false // 阻止默认上传, 附件不上传阿里云
     },
-    onRemove: (file) => {
+    onRemove: async (file) => {
+      console.log('onRomove', file)
+      if (file.fullPath) {
+        try {
+          const x = await deleteEmailAttachmentAction([file.uid]);
+          message.success(`已删除 ${file.name}`, 2)
+        } catch (error) {
+          console.error(error)
+          notification.error({
+            key: editorKey,
+            message: '删除失败',
+            description: error.message,
+            placement: 'top',
+            duration: 3,
+          })
+          return false;
+        }
+      }
       const index = fileList.indexOf(file)
       const newFileList = fileList.slice()
       newFileList.splice(index, 1)
@@ -569,7 +462,10 @@ const NewEmail = () => {
           // win.document.write("<iframe src='" + dataURL + "' width='100%' height='100%' style=\"border:none\"></iframe>");
           resolve(reader.result)
         }
-        if (file.type.startsWith('text/') || file.type === 'application/html' || file.type === 'application/xhtml+xml') {
+        if (file.fullPath) {
+          openPopup(file.fullPath, file.uid)
+        }
+          else if (file.type.startsWith('text/') || file.type === 'application/html' || file.type === 'application/xhtml+xml') {
           reader.readAsText(file)
         } else {
           reader.readAsDataURL(file)
@@ -580,102 +476,65 @@ const NewEmail = () => {
     },
   }
 
-  /**
-   * 保存成功, 推一个气泡
-   * 再从异步通知更新消息发送状态
-   */
-  // const sentOrReceivedNewMessage = useConversationStore((state) => state.sentOrReceivedNewMessage)
-  const invokeEmailMessage = (msgObj) => {
-    const msgObjMerge = {
-      sender: 'me',
-      senderName: 'me',
-      // to: currentConversation.whatsapp_phone_number,
-      date: new Date(),
-      status: 'waiting', // accepted
-      ...msgObj,
-      // id: `${currentConversation.sn}.${msgObj.id}`,
-      // id: `${stickToCid}.${msgObj.id}`,
-      // conversationid: stickToCid,
-      msg_source: 'email',
-    }
-    // olog('invoke upload', msgObjMerge)
-    const contentToRender = sentMsgTypeMapped[msgObjMerge.type].contentToRender(msgObjMerge)
-    // console.log(contentToRender, 'contentToRender  sendMessage------------------');
-    // sentOrReceivedNewMessage(contentToRender.conversationid, contentToRender)
-  }
-
   const [sendLoading, setSendLoading] = useState(false)
 
   const onHandleSaveOrSend = async (isDraft = false) => {
     // console.log('onSend callback', '\nisRichText', isRichText);
-    console.log(form.getFieldsValue());
+    // console.log(form.getFieldsValue());
     const body = structuredClone(form.getFieldsValue())
-    // body.mailtype = ''; // todo: 邮件类型
-    // body.id = ''; // todo: 已保存的草稿
-    // body.from = newFromEmail // todo:
-    body.attaList = fileList
-    body.opi_sn = emailOPI
-    body.mat_sn = emailMat
-    body.coli_sn = emailOrder || ''
-    // console.log('body', body, '\n', emailOrder);
+    body.attaList = fileList;
+    // console.log('body', body, '\n', fileList);
     const values = await form.validateFields()
     const preQuoteBody = pageParam.quoteid ? (quoteContent ? quoteContent : generateQuoteContent(mailData, isRichText)) : ''
     body.mailcontent = isRichText ? EmailBuilder({ subject: values.subject, content: htmlContent + preQuoteBody }) : textContent + preQuoteBody
     body.cc = values.cc || ''
     body.bcc = values.bcc || ''
-    const msgObj = {
-      type: 'email',
-      id: uuid(),
-      from: body.from,
-      to: values.to,
-      cc: values.cc || '',
-      bcc: values.bcc || '',
-      subject: values.subject,
-      content: body.mailcontent,
-      email: {
-        subject: values.subject,
-        content: body.mailcontent,
-      },
-      coli_id: orderDetail.order_no || (emailOrder ? `{${emailOrder}}` : ''),
-    }
-    setSendLoading(true)
+    body.bcc = values.mailtype || ''
+    setSendLoading(!isDraft)
+    notification.open({
+      key: editorKey,
+      placement: 'top',
+      // message: '提示',
+      description: '正在保存...',
+      duration: 0,
+      icon: <LoadingOutlined className='text-primary' />,
+      closable: false,
+    })
     // body.externalID = stickToCid
     // body.actionID = `${stickToCid}.${msgObj.id}`
     body.contenttype = isRichText ? 'text/html' : 'text/plain'
     try {
-      const bubbleMsg = cloneDeep(msgObj)
-      // bubbleMsg.id = `${stickToCid}.${msgObj.id}`
-      // bubbleMsg.email.mai_sn = '';
-      bubbleMsg.content = undefined
-      // invokeEmailMessage(bubbleMsg);
 
       // console.log('postSendEmail', body, '\n', msgObj);
       // return;
       // todo: 保存后不在草稿箱, 在待发目录; 传了ID但每次都新增
-      const result = await saveEmailDraftOrSendAction(body, isDraft)
-      const mailSavedId = result.id || ''
-      bubbleMsg.email.mai_sn = mailSavedId
-      // console.log('invokeEmailMessage', bubbleMsg);
-
-      // invokeEmailMessage(bubbleMsg)
+      const mailSavedId = await postEmailSaveOrSend(body, isDraft)
+      form.setFieldsValue({
+        mai_sn: mailSavedId,
+        id: mailSavedId,
+      })
+      // bubbleMsg.email.mai_sn = mailSavedId
 
       // setSendLoading(false);
 
-      notification.success({
-        key: editorKey,
-        message: '成功',
-        // description: error.message,
-        placement: 'top',
-        duration: 2,
-        showProgress: true,
-        pauseOnHover: true,
-        onClose: () => {
-          deleteIndexDBbyKey(editorKey, 'draft', 'mailbox');
-          window.close();
-        },
-      })
+      if (!isDraft) {
+        notification.success({
+          key: editorKey,
+          message: '成功',
+          description: isDraft ? '' : '窗口将自动关闭...',
+          placement: 'top',
+          duration: 2,
+          showProgress: true,
+          pauseOnHover: true,
+          onClose: () => {
+            deleteIndexDBbyKey(editorKey, 'draft', 'mailbox');
+            isDraft ? false : window.close();
+          },
+        })
+      } else { notification.destroy(editorKey) }
       // setOpen(false)
     } catch (error) {
+      console.error(error)
       notification.error({
         key: editorKey,
         message: '邮件保存失败',
@@ -689,9 +548,7 @@ const NewEmail = () => {
   }
 
   const [openDrawerSnippet] = useSnippetStore((state) => [state.openDrawer])
-  // const [openPaymentDrawer] = useOrderStore((state) => [state.openDrawer])
 
-  const [bakData, setBakData] = useState({})
   const idleCallbackId = useRef(null)
   const debouncedSave = useCallback(
     debounce((data) => {
@@ -702,13 +559,6 @@ const NewEmail = () => {
     }, 1500), //  1.5s
     [],
   )
-  const onEditChange = (changedValues, allValues) => {
-    console.log('onEditChange', changedValues, '\n', allValues)
-    // const { name, value } = e.target;
-    // setBakData(prevData => ({ ...prevData, [name]: value }));
-    // debouncedSave(bakData);
-  }
-
   useEffect(() => {
     return () => {
       if (idleCallbackId.current && window.cancelIdleCallback) {
@@ -716,6 +566,13 @@ const NewEmail = () => {
       }
     }
   }, [debouncedSave])
+  const onEditChange = (changedValues, allValues) => {
+    // console.log('onEditChange', changedValues, '\n', allValues)
+    if ('from' in changedValues) {
+      handleSwitchEmail(allValues.from);
+    }
+  }
+
 
   return (
     <>
@@ -735,14 +592,14 @@ const NewEmail = () => {
           requiredMark={false}
           // labelCol={{ span: 3 }}
         >
-            <div className='w-full flex gap-4 justify-start items-center text-indigo-600 pb-1 mb-2 border-x-0 border-t-0 border-b border-solid border-neutral-200'>
+            <div className='w-full flex flex-wrap gap-2 justify-start items-center text-indigo-600 pb-1 mb-2 border-x-0 border-t-0 border-b border-solid border-neutral-200'>
               <Button type='primary' size='middle' onClick={onHandleSaveOrSend} loading={sendLoading} icon={<SendOutlined />}>
                 发送
               </Button>
-              <Form.Item noStyle name={'from'} rules={[{ required: true, message: '请选择发件地址' }]}>
-              <Select labelInValue={false} options={emailListOption} labelRender={item => `发件人: ${item?.label || '选择'}`} variant={'borderless'} placeholder='发件人: 选择' className='[&_.ant-select-selection-item]:font-bold [&_.ant-select-selection-placeholder]:font-bold [&_.ant-select-selection-placeholder]:text-black' classNames={{popup: {root:'min-w-60'}}} />
-                <div className="ant-form-item-explain-error text-red-500" >请选择发件地址</div>
+              <Form.Item name={'from'} rules={[{ required: true, message: '请选择发件地址' }]} >
+                <Select labelInValue={false} options={emailListOption} labelRender={item => `发件人: ${item?.label || '选择'}`} variant={'borderless'} placeholder='发件人: 选择' className='[&_.ant-select-selection-item]:font-bold [&_.ant-select-selection-placeholder]:font-bold [&_.ant-select-selection-placeholder]:text-black' classNames={{popup: {root:'min-w-60'}}} />
               </Form.Item>
+              {/* <div className="ant-form-item-explain-error text-red-500" >请选择发件地址</div> */}
               <div className='ml-auto'></div>
               <span>{orderDetail.order_no}</span>
               <span>{templateContent.mailtypeName}</span>
@@ -789,7 +646,7 @@ const NewEmail = () => {
           </Form.Item>
           <Form.Item name='atta' label='' className='w-full py-1 border-b-0' valuePropName='fileList' getValueFromEvent={normFile}>
             <Flex justify='space-between'>
-              <Upload {...uploadProps} name='file' className='w-full'>
+              <Upload {...uploadProps} name='file' className='w-full [&_.ant-upload-list-item-name]:cursor-pointer'>
                 <Button icon={<UploadOutlined />}>附件</Button>
               </Upload>
               <Flex align={'center'} className='absolute right-0'>
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index b277957..8dfe200 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -114,7 +114,7 @@ function Follow() {
         subject: emailItem.MAI_Subject,
       },
     }
-    console.log('emailItem', emailItem);
+    // console.log('emailItem', emailItem);
     setSelectedEmail(emailMsg)
   };
 
diff --git a/src/views/orders/components/NewEmailButton.jsx b/src/views/orders/components/NewEmailButton.jsx
index 526c4bb..eb69f70 100644
--- a/src/views/orders/components/NewEmailButton.jsx
+++ b/src/views/orders/components/NewEmailButton.jsx
@@ -1,8 +1,7 @@
-import { createContext, useEffect, useMemo, useState } from 'react'
-import { App, Flex, Button, Tooltip, List, Form, Row, Col, Dropdown, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton } from 'antd'
+import { useMemo } from 'react'
+import { App, Dropdown } from 'antd'
 import useConversationStore from '@/stores/ConversationStore'
-import { emailTemplates, openPopup, useEmailTemplate } from '@/hooks/useEmail';
-import { POPUP_FEATURES } from '@/config';
+import { emailTemplates, openPopup } from '@/hooks/useEmail';
 import { isEmpty } from '@/utils/commons';
 
 const NewEmailButton = ({ ...props }) => {
@@ -15,12 +14,12 @@ const NewEmailButton = ({ ...props }) => {
       notification.warning({ message: '请选择到订单目录', placement: 'top' })
       return false
     }
-    openPopup(`/email/new/0/${COLI_SN}/${key}`, `new-0-${COLI_SN}-${key}`, POPUP_FEATURES)
+    openPopup(`/email/new/0/${COLI_SN}/${key}`, `new-0-${COLI_SN}-${key}`)
   };
 
   const handleNewEmail = () => {
     console.info('新邮件')
-    openPopup(`/email/new/0/${COLI_SN}`, `new-0-${COLI_SN}`, POPUP_FEATURES)
+    openPopup(`/email/new/0/${COLI_SN}`, `new-0-${COLI_SN}`)
   }
 
   return (

From cc471d93c8bbab4dcac2d3665616c1bcefd384b1 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 12 Jun 2025 16:28:52 +0800
Subject: [PATCH 093/143] =?UTF-8?q?conf:=20api=20v3=20=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js | 16 ++++++++--------
 src/config.js               |  5 +++--
 src/hooks/useEmail.js       | 13 +++++++++++--
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 8908968..8355652 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -1,5 +1,5 @@
 import { fetchJSON, postForm, postJSON } from '@/utils/request';
-import { API_HOST, DATE_FORMAT, DATEEND_FORMAT, DATETIME_FORMAT, EMAIL_HOST } from '@/config';
+import { API_HOST, API_HOST_V3, DATE_FORMAT, DATEEND_FORMAT, DATETIME_FORMAT, EMAIL_HOST } from '@/config';
 import { buildTree, groupBy, isEmpty, objectMapper, omitEmpty, readIndexDB, uniqWith, writeIndexDB } from '@/utils/commons';
 import dayjs from 'dayjs';
 
@@ -167,7 +167,7 @@ const todoTypes = {
  */
 export const getEmailDirAction = async (params = { opi_sn: '' }) => {
   const defaultParams = { opi_sn: 0, year: dayjs().year(), by_start_date: -1, by_success: -1, important: -1, if_want_book: -1, if_thinking: -1 }
-  const { errcode, result } = await fetchJSON(`${API_HOST}/email_dir`, { ...defaultParams, ...params })
+  const { errcode, result } = await fetchJSON(`${API_HOST_V3}/email_dir`, { ...defaultParams, ...params })
   const mailboxSort = result //.sort(sortBy('MDR_Order'));
   let tree = buildTree(mailboxSort, { key: 'VKey', parent: 'VParent', name: 'VName', iconIndex: 'ImageIndex', rootKeys: [1], ignoreKeys: [-227001, -227002] })
   tree = tree.filter((ele) => ele.key !== 1)
@@ -309,7 +309,7 @@ export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id
   }
   _params.mai_senddate1 = dayjs(_params.mai_senddate1).format(DATE_FORMAT)
   const cacheKey = isEmpty(_params.coli_sn) ? `dir-${node.vkey}` : `order-${node.vkey}`;
-  const { errcode, result } = await fetchJSON(`${API_HOST}/mail_list`, _params)
+  const { errcode, result } = await fetchJSON(`${API_HOST_V3}/mail_list`, _params)
   const ret = errcode === 0 ? result : []
   if (!isEmpty(ret)) {
     const listids = [...new Set(ret.map(ele => ele.MAI_SN))];
@@ -322,8 +322,8 @@ export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id
 /**
  * 更新邮件属性
  */
-export const updateEmailAction = async (params = { mai_sn_list: [], set: {} }) => {
-  const { errcode, result } = await postJSON(`${EMAIL_HOST}/email/update`, params)
+export const updateEmailAction = async (params = { opi_sn: '', mai_sn_list: [], set: {} }) => {
+  const { errcode, result } = await postJSON(`${API_HOST_V3}/mail_update`, params)
   return errcode === 0 ? {} : result
 }
 
@@ -337,7 +337,7 @@ export const updateEmailAction = async (params = { mai_sn_list: [], set: {} }) =
  * @param {number} [params.remind_index] - Index of the reminder.
  */
 export const getEmailTemplateAction = async (params = { coli_sn: 0, lgc: 1, opi_sn: 0, remind_type: '', remind_index: 0 }) => {
-  const { errcode, result } = await fetchJSON(`${API_HOST}/reminder_letter`, params)
+  const { errcode, result } = await fetchJSON(`${API_HOST_V3}/reminder_letter`, params)
   const { html, bodyContent, bodyText } = parseHTMLString(result?.MailContent, true) ;
   return errcode === 0 ? {...result, bodyContent }: {}
 }
@@ -348,7 +348,7 @@ export const getEmailTemplateAction = async (params = { coli_sn: 0, lgc: 1, opi_
  * @param {boolean} [isDraft=false] - Whether the email is a draft.
  */
 export const saveEmailDraftOrSendAction = async (body, isDraft = false) => {
-  const url = isDraft !== false ? `${API_HOST}/email_draft_save` : `${EMAIL_HOST}/sendmail`;
+  const url = isDraft !== false ? `${API_HOST_V3}/email_draft_save` : `${EMAIL_HOST}/sendmail`;
   const { attaList=[], atta, content, ...bodyData } = body;
   bodyData.ordertype = 227001;
   const formData = new FormData();
@@ -367,6 +367,6 @@ export const saveEmailDraftOrSendAction = async (body, isDraft = false) => {
  * 删除邮件附件
  */
 export const deleteEmailAttachmentAction = async (ati_sn_list) => {
-  const { errcode, result } = await postJSON(`${API_HOST}/mail_attachment_delete`, { ati_sn_list })
+  const { errcode, result } = await postJSON(`${API_HOST_V3}/mail_attachment_delete`, { ati_sn_list })
   return errcode === 0 ? result : {}
 };
diff --git a/src/config.js b/src/config.js
index 1df0504..59415f1 100644
--- a/src/config.js
+++ b/src/config.js
@@ -6,7 +6,8 @@
 // export const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_144'; // prod: Slave
 
 // debug:
-export const API_HOST = 'http://202.103.68.144:8889/v3';
+// export const API_HOST = 'http://202.103.68.144:8889/v2';
+export const API_HOST_V3 = 'http://202.103.68.144:8889/v3';
 // export const WS_URL = 'ws://202.103.68.144:8888';
 // export const EMAIL_HOST = 'http://202.103.68.231:888/service-mail';
 // export const WAI_HOST = 'http://47.83.248.120/api/v1'; // 香港服务器
@@ -18,7 +19,7 @@ export const EMAIL_ATTA_HOST = 'https://p9axztuwd7x8a7.mycht.cn/attachment'; //
 // prod:
 // export const WAI_HOST = 'https://wai-server-qq4qmtq7wc9he4.mycht.cn/api/v1';
 export const EMAIL_HOST = 'https://p9axztuwd7x8a7.mycht.cn/mail-server/service-mail';
-// export const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/v2';
+export const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/v2';
 export const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_server'; // prod:
 export const VONAGE_URL = 'https://p9axztuwd7x8a7.mycht.cn/vonage-server'; // 语音和视频接口:
 export const HT3 =  process.env.NODE_ENV === 'production' ? 'https://p9axztuwd7x8a7.mycht.cn/ht3' : 'https://p9axztuwd7x8a7.mycht.cn/ht3';
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 8d4addb..e7fc158 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -1,6 +1,6 @@
 import { useState, useEffect, useCallback } from 'react'
 import { isEmpty, objectMapper, olog, readIndexDB, } from '@/utils/commons'
-import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction, getEmailTemplateAction, saveEmailDraftOrSendAction } from '@/actions/EmailActions'
+import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction, getEmailTemplateAction, saveEmailDraftOrSendAction, updateEmailAction } from '@/actions/EmailActions'
 import { App } from 'antd'
 import useConversationStore from '@/stores/ConversationStore';
 import { msgStatusRenderMapped } from '@/channel/bubbleMsgUtils';
@@ -133,7 +133,16 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => {
     }
   };
 
-  return { loading, mailData, orderDetail, postEmailResend, postEmailSaveOrSend }
+  const updateEmailProcessed = async (params) => {
+    try {
+      const x = await updateEmailAction(params);
+      refresh()
+    } catch (error) {
+      console.error(error)
+    }
+  }
+
+  return { loading, mailData, orderDetail, postEmailResend, postEmailSaveOrSend, updateEmailProcessed }
 }
 
 export const EmailBuilder = ({subject, content}) => {

From 85c2622213d2cc1bbb9655c965d6c6dd31ce7af1 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 12 Jun 2025 14:32:48 +0800
Subject: [PATCH 094/143] =?UTF-8?q?perf:=20=E5=88=A0=E9=99=A4=E6=8B=A8?=
 =?UTF-8?q?=E6=89=93=E7=94=B5=E8=AF=9D=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index d6bbe29..2b286e7 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -75,8 +75,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
             <CompassOutlined className=' pr-1' />
             Thailand
           </Typography.Text>
-
-          <Typography.Text href={'/callcenter/call/' + customerDetail.phone}>
+          <Typography.Text>
             <PhoneOutlined className=' pr-1' />
             {customerDetail.phone}
           </Typography.Text>

From 645c85a59af2a9b5fcbaa675bc50cc2bc78be213 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 12 Jun 2025 16:34:04 +0800
Subject: [PATCH 095/143] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=82=AE=E4=BB=B6=E5=B7=B2=E8=AF=BB=E3=80=81=E5=B7=B2?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js             |  2 +-
 src/hooks/useEmail.js                   | 18 +++++++++++++++++-
 src/views/orders/components/MailBox.jsx | 21 +++++++++++++++------
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 8355652..39c5f6b 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -322,7 +322,7 @@ export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id
 /**
  * 更新邮件属性
  */
-export const updateEmailAction = async (params = { opi_sn: '', mai_sn_list: [], set: {} }) => {
+export const updateEmailAction = async (params = { opi_sn: 0, mai_sn_list: [], set: {} }) => {
   const { errcode, result } = await postJSON(`${API_HOST_V3}/mail_update`, params)
   return errcode === 0 ? {} : result
 }
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index e7fc158..985f53d 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -166,6 +166,22 @@ export const useEmailList = (mailboxDirNode) => {
 
   const { OPI_SN: opi_sn, COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = mailboxDirNode
 
+  const markAsRead = useCallback((sn_list) => {
+    updateEmailAction({
+      opi_sn: opi_sn,
+      mai_sn_list: sn_list,
+      set: { read: 1}
+    });
+  }, []);
+
+  const markAsProcessed = useCallback((sn_list) => {
+    updateEmailAction({
+      opi_sn: opi_sn,
+      mai_sn_list: sn_list,
+      set: { processed: 1}
+    });
+  }, []);
+
   const getMailList = useCallback(async () => {
     console.log('getMailList', mailboxDirNode)
     if (!opi_sn || !VKey || (!IsTrue && !COLI_SN)) {
@@ -208,7 +224,7 @@ export const useEmailList = (mailboxDirNode) => {
     getMailList()
   }, [getMailList])
 
-  return { loading, isFreshData, error, mailList, refresh }
+  return { loading, isFreshData, error, mailList, refresh, markAsRead, markAsProcessed }
 }
 
 const orderMailTypes = new Map([
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index f01e0ee..562fa49 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -41,7 +41,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
   ]
   const [form] = Form.useForm()
   const [selectedItems, setSelectedItems] = useState([])
-  const { mailList, loading, error, refresh } = useEmailList(mailboxDir)
+  const { mailList, loading, error, refresh, markAsRead, markAsProcessed } = useEmailList(mailboxDir)
 
   const [pagination, setPagination] = useState({
     current: 1,
@@ -145,7 +145,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
                 selectedItems.length > 0 &&
                 selectedItems.length < pagination.pagedList.length
               }
-              checked={pagination.pagedList.every((item) =>
+              checked={pagination.pagedList.length === 0 ? false : pagination.pagedList.every((item) =>
                 selectedItems.some((selected) => selected.MAI_SN === item.MAI_SN)
               )}
             onChange={(e) => {
@@ -162,10 +162,19 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
             ></Checkbox>
           </Tooltip>
           <Tooltip title='标记已读'>
-            <Button shape='circle' type='text' size='small' icon={<ReadOutlined />} />
+            <Button shape='circle' type='text' size='small' icon={<ReadOutlined />}
+            onClick={() => {
+              console.info('markAsRead: ', selectedItems.map((item) => item.MAI_SN))
+              markAsRead(selectedItems.map((item) => item.MAI_SN))
+            }}
+            />
           </Tooltip>
           <Tooltip title='已处理'>
-            <Button shape='circle' type='text' size='small' icon={<MailCheckIcon />} />
+            <Button shape='circle' type='text' size='small' icon={<MailCheckIcon />}
+            onClick={() => {
+              console.info('markAsProcessed: ', selectedItems.map((item) => item.MAI_SN))
+              markAsProcessed(selectedItems.map((item) => item.MAI_SN))
+            }} />
           </Tooltip>
           <Tooltip title='刷新'>
             <Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} onClick={refresh} />
@@ -191,12 +200,12 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
           // onFinish={handleSubmit}
         >
           <Row justify='start' gutter={16}>
-            <Col span={8}>
+            <Col span={10}>
               <Form.Item label='订单号' name='orderNumber'>
                 <Input placeholder='订单号' allowClear />
               </Form.Item>
             </Col>
-            <Col span={10}>
+            <Col span={12}>
               <Form.Item label='日期' name='confirmDateRange'>
                 <RangePicker allowClear={true} inputReadOnly={true} presets={DATE_RANGE_PRESETS} />
               </Form.Item>

From 17993f348c6086f4d64d59ce393b0320c947046a Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Thu, 12 Jun 2025 16:40:17 +0800
Subject: [PATCH 096/143] =?UTF-8?q?perf:=20=E5=B7=B2=E8=AF=BB=E3=80=81?=
 =?UTF-8?q?=E5=B7=B2=E5=A4=84=E7=90=86=E5=90=8E=E6=9B=B4=E6=96=B0=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useEmail.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 985f53d..01c4b4a 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -172,6 +172,7 @@ export const useEmailList = (mailboxDirNode) => {
       mai_sn_list: sn_list,
       set: { read: 1}
     });
+    refresh()
   }, []);
 
   const markAsProcessed = useCallback((sn_list) => {
@@ -180,6 +181,7 @@ export const useEmailList = (mailboxDirNode) => {
       mai_sn_list: sn_list,
       set: { processed: 1}
     });
+    refresh()
   }, []);
 
   const getMailList = useCallback(async () => {

From 4dd404167b4ad4d7b9c36e9e6c9504dc90cd7958 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 12 Jun 2025 17:00:50 +0800
Subject: [PATCH 097/143] =?UTF-8?q?fix:=20=E9=82=AE=E4=BB=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useEmail.js                         | 14 +++--------
 .../Online/Components/EmailDetailInline.jsx   | 24 +++++++++++++++----
 src/views/orders/Follow.jsx                   |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index e7fc158..876d618 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -52,6 +52,7 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => {
   const refresh = useCallback(() => {
     setRefreshTrigger(prev => prev + 1);
   }, []);
+  console.log(maiSN, 'mailSN', mai_sn)
 
   // const [updateMessageItem] = useConversationStore(state => [state.updateMessageItem]);
 
@@ -67,7 +68,7 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => {
 
     try {
       setLoading(true)
-      const data = await getEmailDetailAction({ mai_sn: maiSN || mai_sn })
+      const data = await getEmailDetailAction({ mai_sn: Number(mai_sn) || maiSN })
       // console.log(data)
       setMailData(data)
       setColiSN(oid === false ? 0 : data.info.MAI_COLI_SN)
@@ -133,16 +134,7 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => {
     }
   };
 
-  const updateEmailProcessed = async (params) => {
-    try {
-      const x = await updateEmailAction(params);
-      refresh()
-    } catch (error) {
-      console.error(error)
-    }
-  }
-
-  return { loading, mailData, orderDetail, postEmailResend, postEmailSaveOrSend, updateEmailProcessed }
+  return { loading, mailData, orderDetail, postEmailResend, postEmailSaveOrSend }
 }
 
 export const EmailBuilder = ({subject, content}) => {
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index d16bdf4..a726b78 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -6,7 +6,7 @@ import { isEmpty, TagColorStyle } from '@/utils/commons'
 import EmailEditorPopup from '../Input/EmailEditorPopup'
 import DnDModal from '@/components/DnDModal'
 import useStyleStore from '@/stores/StyleStore'
-import { openPopup, useEmailDetail } from '@/hooks/useEmail'
+import { openPopup, useEmailDetail, useEmailList, } from '@/hooks/useEmail'
 import { EMAIL_ATTA_HOST, POPUP_FEATURES } from '@/config'
 import EmailBindFormModal from './EmailBind'
 import EmailContent from './EmailContent'
@@ -103,6 +103,22 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
       })
     }
   }
+
+  const handleDel = async () => {
+    if (isEmpty(mai_sn)) {
+      return false
+    }
+    try {
+      //
+    } catch (err) {
+      notification.error({
+        message: '请求失败',
+        description: err.message,
+        placement: 'top',
+        duration: 3,
+      })
+    }
+  }
   const FileTypeIcon = ({fileName}) => {
     const ext = fileName.split('.').pop() || 'default';
     const Com = extTypeMapped[ext]?.icon || FileOutlined;
@@ -124,7 +140,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
 
     const showDoneBtn = mailData.info?.MAI_Direction !== 1 ? true : false
     if (showDoneBtn) {
-      btns.push(<Button type='text' key={'set-done'} onClick={() => { alert('todo')}} icon={<MailCheckIcon className={'text-yellow-600'} />} size='small'>已处理</Button>)
+      // btns.push(<Button type='text' key={'set-done'} onClick={() => { alert('todo')}} icon={<MailCheckIcon className={'text-yellow-600'} />} size='small'>已处理</Button>)
     }
     // 没有关联订单的邮件`绑定订单`
     if (showBindBtn) {
@@ -156,8 +172,8 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
         break
       case 'failed':
         btns.push(
-          <Tooltip key='delete-t' title='删除'>
-          <Button key={'delete'} danger onClick={() => alert('todo')} size='small' type='text' icon={<DeleteOutlined className='text-red-500' />}>{compactBtn ? '' : '删除'}</Button></Tooltip>,
+          // <Tooltip key='delete-t' title='删除'>
+          // <Button key={'delete'} danger onClick={() => handleDel()} size='small' type='text' icon={<DeleteOutlined className='text-red-500' />}>{compactBtn ? '' : '删除'}</Button></Tooltip>,
 
           <Tooltip key='resend-t' title='发送'>
           <Button key={'resend'} onClick={() => handleResend()} size='small' type='text' icon={<SendPlaneFillIcon className='text-orange-500' />}>{compactBtn ? '' : '发送'}</Button></Tooltip>,
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 8dfe200..6747652 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -158,7 +158,7 @@ function Follow() {
               <Mailbox breadcrumb={computedBreadcrumb} mailboxDir={mailboxActiveNode} onMailItemClick={(item) => onClickEmailItem(item)} currentActiveMailItem={activeEmailId} />
             </Splitter.Panel>
             <Splitter.Panel>
-              <EmailDetailInline mailID={activeEmailId || 0} emailMsg={selectedEmail} variant={'outline'} size={'small'} />
+              <EmailDetailInline mailID={activeEmailId || 0} emailMsg={selectedEmail} variant={'outline'} size={'small'} onUpdated={(prop) => {}} />
             </Splitter.Panel>
           </Splitter>
         </Layout.Content>

From 10e6b5644698b90fe4c121decae226f7d4dfa974 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 13 Jun 2025 11:54:02 +0800
Subject: [PATCH 098/143] =?UTF-8?q?feat:=20=E7=BC=93=E5=AD=98=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5:=20=E8=87=AA=E5=8A=A8=E6=B8=85=E9=99=A47=E5=A4=A9?=
 =?UTF-8?q?=E5=89=8D=E7=9A=84,=20=E6=AF=8F=E5=A4=A9=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                   |   3 +-
 src/channel/realTimeAPI.js                    |   2 +-
 src/hooks/useEmail.js                         |   3 +-
 src/main.jsx                                  |  12 +
 src/stores/ConversationStore.js               |   5 +-
 src/stores/EmailSlice.js                      |   5 +-
 src/utils/commons.js                          | 400 --------------
 src/utils/indexedDB.js                        | 517 ++++++++++++++++++
 src/utils/pagespy.js                          |   3 +-
 src/views/AuthApp.jsx                         |   2 +-
 .../Online/Components/EmailDetailInline.jsx   |  22 +-
 .../Online/Input/EmailEditorPopup.jsx         |   3 +-
 src/views/NewEmail.jsx                        |   4 +-
 13 files changed, 557 insertions(+), 424 deletions(-)
 create mode 100644 src/utils/indexedDB.js

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 39c5f6b..bad97d2 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -1,6 +1,7 @@
 import { fetchJSON, postForm, postJSON } from '@/utils/request';
 import { API_HOST, API_HOST_V3, DATE_FORMAT, DATEEND_FORMAT, DATETIME_FORMAT, EMAIL_HOST } from '@/config';
-import { buildTree, groupBy, isEmpty, objectMapper, omitEmpty, readIndexDB, uniqWith, writeIndexDB } from '@/utils/commons';
+import { buildTree, groupBy, isEmpty, objectMapper, omitEmpty, uniqWith } from '@/utils/commons';
+import { readIndexDB, writeIndexDB } from '@/utils/indexedDB';
 import dayjs from 'dayjs';
 
 export const parseHTMLString = (html, needText = false) => {
diff --git a/src/channel/realTimeAPI.js b/src/channel/realTimeAPI.js
index 76850a3..6a6526e 100644
--- a/src/channel/realTimeAPI.js
+++ b/src/channel/realTimeAPI.js
@@ -2,7 +2,7 @@ import { webSocket } from 'rxjs/webSocket';
 import { of, timer, concatMap, EMPTY, takeWhile, concat } from 'rxjs';
 import { filter, buffer, map, tap, retryWhen, retry, delay, take, catchError } from 'rxjs/operators';
 import { v4 as uuid } from 'uuid';
-import { logWebsocket } from '@/utils/commons';
+import { logWebsocket } from '@/utils/indexedDB';
 
 export class RealTimeAPI {
   constructor(param, onOpenCallback, onCloseCallback, onRetryCallback) {
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index a2cc727..12968a1 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -1,5 +1,6 @@
 import { useState, useEffect, useCallback } from 'react'
-import { isEmpty, objectMapper, olog, readIndexDB, } from '@/utils/commons'
+import { isEmpty, objectMapper, olog, } from '@/utils/commons'
+import { readIndexDB } from '@/utils/indexedDB'
 import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction, getEmailTemplateAction, saveEmailDraftOrSendAction, updateEmailAction } from '@/actions/EmailActions'
 import { App } from 'antd'
 import useConversationStore from '@/stores/ConversationStore';
diff --git a/src/main.jsx b/src/main.jsx
index 9b99f35..c1c56a4 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -33,6 +33,8 @@ import '@/assets/index.css'
 import CustomerRelation from '@/views/customer_relation/index'
 import NewEmail from './views/NewEmail'
 
+import { executeDailyCleanupTask, setupDailyMidnightCleanupScheduler } from '@/utils/indexedDB'
+
 useAuthStore.getState().loadUserSession()
 
 const isMobileApp =
@@ -140,3 +142,13 @@ createRoot(root).render(
     </ThemeContext.Provider>
   </React.Suspense>,
 )
+
+
+// --- Global Setup After React App Mounts ---
+// This part will run once when the application script is loaded and executed.
+document.addEventListener('DOMContentLoaded', () => {
+  console.log(`[${new Date().toLocaleTimeString()}] Application fully loaded. Initiating global daily cleanup checks.`);
+
+  executeDailyCleanupTask();
+  setupDailyMidnightCleanupScheduler();
+});
diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js
index 05a2e23..a78ae0b 100644
--- a/src/stores/ConversationStore.js
+++ b/src/stores/ConversationStore.js
@@ -1,6 +1,7 @@
 import { create } from 'zustand';
 import { RealTimeAPI } from '@/channel/realTimeAPI';
-import { olog, isEmpty, groupBy, sortArrayByOrder, logWebsocket, pick, sortKeys, omit, sortObjectsByKeysMap, clean7DaysWebsocketLog, createIndexedDBStore } from '@/utils/commons';
+import { olog, isEmpty, groupBy, sortArrayByOrder, pick, sortKeys, omit, sortObjectsByKeysMap } from '@/utils/commons';
+import { logWebsocket, clean7DaysWebsocketLog } from '@/utils/indexedDB'
 import { receivedMsgTypeMapped, handleNotification } from '@/channel/bubbleMsgUtils';
 import { fetchConversationsList, fetchTemplates, fetchConversationsSearch, UNREAD_MARK, fetchTags } from '@/actions/ConversationActions';
 import { devtools } from 'zustand/middleware';
@@ -589,8 +590,6 @@ export const useConversationStore = create(
       setTags(myTags);
 
       setInitial(true);
-      // 登录后, 执行一下清除日志缓存
-      clean7DaysWebsocketLog();
     },
 
     reset: () => set(initialConversationState),
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index fae232d..6234e55 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -1,5 +1,6 @@
 import { getEmailDirAction, getRootMailboxDirAction } from '@/actions/EmailActions'
-import { buildTree, isEmpty, readIndexDB, writeIndexDB, createIndexedDBStore, clean7DaysMailboxLog } from '@/utils/commons'
+import { buildTree, isEmpty  } from '@/utils/commons'
+import { readIndexDB, writeIndexDB, createIndexedDBStore, clean7DaysMailboxLog } from '@/utils/indexedDB';
 
 /**
  * Email
@@ -129,8 +130,6 @@ const emailSlice = (set, get) => ({
     setCurrentMailboxOPI(opi_sn)
     setCurrentMailboxDEI(dei_sn)
     getOPIEmailDir(opi_sn, userIdStr)
-    // 登录后, 执行一下清除缓存
-    clean7DaysMailboxLog();
   },
 
 })
diff --git a/src/utils/commons.js b/src/utils/commons.js
index ef297e1..40e3d7e 100644
--- a/src/utils/commons.js
+++ b/src/utils/commons.js
@@ -675,403 +675,3 @@ export const buildTree = (list, keyMap={ rootKeys: [], ignoreKeys: [] }) => {
 
   return treeRoots
 }
-
-/**
- *
- */
-const INDEXED_DB_VERSION = 4;
-export const logWebsocket = (message, direction) => {
-  var open = indexedDB.open('LogWebsocketData', INDEXED_DB_VERSION)
-  open.onupgradeneeded = function () {
-    var db = open.result
-    // 数据库是否存在
-    if (!db.objectStoreNames.contains('LogStore')) {
-      var store = db.createObjectStore('LogStore', { keyPath: 'id', autoIncrement: true })
-      store.createIndex('timestamp', 'timestamp', { unique: false })
-    } else {
-      const logStore = open.transaction.objectStore('LogStore')
-      if (!logStore.indexNames.contains('timestamp')) {
-        logStore.createIndex('timestamp', 'timestamp', { unique: false })
-      }
-    }
-  }
-  open.onsuccess = function () {
-    var db = open.result
-    var tx = db.transaction('LogStore', 'readwrite')
-    var store = tx.objectStore('LogStore')
-    store.put({ direction, message, _date: new Date().toLocaleString(), timestamp: Date.now() })
-    tx.oncomplete = function () {
-      db.close()
-    }
-  }
-};
-export const readWebsocketLog = (limit = 20) => {
-  return new Promise((resolve, reject) => {
-    let openRequest = indexedDB.open('LogWebsocketData')
-    openRequest.onupgradeneeded = function () {
-      var db = openRequest.result
-      // 数据库是否存在
-      if (!db.objectStoreNames.contains('LogStore')) {
-        var store = db.createObjectStore('LogStore', { keyPath: 'id', autoIncrement: true })
-        store.createIndex('timestamp', 'timestamp', { unique: false })
-      } else {
-        const logStore = openRequest.transaction.objectStore('LogStore')
-        if (!logStore.indexNames.contains('timestamp')) {
-          logStore.createIndex('timestamp', 'timestamp', { unique: false })
-        }
-      }
-    }
-    openRequest.onerror = function (e) {
-      reject('Error opening database.')
-    }
-    openRequest.onsuccess = function (e) {
-      let db = e.target.result
-      // 数据库是否存在
-      if (!db.objectStoreNames.contains('LogStore')) {
-        resolve('Database does not exist.')
-        return
-      }
-      let transaction = db.transaction('LogStore', 'readonly')
-      let store = transaction.objectStore('LogStore')
-      const request = store.openCursor(null, 'prev'); // 从后往前
-      const results = [];
-      let count = 0;
-      request.onerror = function (e) {
-        reject('Error getting records.')
-      }
-      request.onsuccess = function (e) {
-        const cursor = e.target.result
-        if (cursor) {
-          if (count < limit) {
-            results.unshift(cursor.value)
-            count++
-            cursor.continue()
-          } else {
-            console.log(JSON.stringify(results))
-            resolve(results)
-          }
-        } else {
-          console.log(JSON.stringify(results))
-          resolve(results)
-        }
-      }
-    }
-  })
-};
-/**
- * @deprecated
- */
-export const clearWebsocketLog = () => {
-  let openRequest = indexedDB.open('LogWebsocketData')
-  openRequest.onerror = function (e) {}
-  openRequest.onsuccess = function (e) {
-    let db = e.target.result
-    if (!db.objectStoreNames.contains('LogStore')) {
-      return
-    }
-    let transaction = db.transaction('LogStore', 'readwrite')
-    let store = transaction.objectStore('LogStore')
-    // Clear the store
-    let clearRequest = store.clear()
-    clearRequest.onerror = function (e) {}
-    clearRequest.onsuccess = function (e) {}
-  }
-}
-
-export const createIndexedDBStore = (tables, database) => {
-  var open = indexedDB.open(database, INDEXED_DB_VERSION)
-  open.onupgradeneeded = function () {
-    console.log('readIndexDB onupgradeneeded', database, )
-    var db = open.result
-    // 数据库是否存在
-    for (const table of tables) {
-      if (!db.objectStoreNames.contains(table)) {
-        var store = db.createObjectStore(table, { keyPath: 'key' })
-        store.createIndex('timestamp', 'timestamp', { unique: false })
-      } else {
-        const objectStore = open.transaction.objectStore(table)
-        if (!objectStore.indexNames.contains('timestamp')) {
-          objectStore.createIndex('timestamp', 'timestamp', { unique: false })
-        }
-      }
-    }
-  }
-};
-
-export const writeIndexDB = (rows, table, database) => {
-  var open = indexedDB.open(database, INDEXED_DB_VERSION)
-  open.onupgradeneeded = function () {
-    console.log('readIndexDB onupgradeneeded', table, )
-    var db = open.result
-    // 数据库是否存在
-    if (!db.objectStoreNames.contains(table)) {
-      var store = db.createObjectStore(table, { keyPath: 'key' })
-      store.createIndex('timestamp', 'timestamp', { unique: false })
-    } else {
-      const objectStore = open.transaction.objectStore(table)
-      if (!objectStore.indexNames.contains('timestamp')) {
-        objectStore.createIndex('timestamp', 'timestamp', { unique: false })
-      }
-    }
-  }
-  open.onsuccess = function () {
-    var db = open.result
-    var tx = db.transaction(table, 'readwrite')
-    var store = tx.objectStore(table)
-    rows.forEach(row => {
-      store.put({ ...row, _date: new Date().toLocaleString(), timestamp: Date.now() })
-    });
-    tx.oncomplete = function () {
-      db.close()
-    }
-  }
-};
-
-/**
- * Reads data from an IndexedDB object store.
- * It can read a single record by key, multiple records by an array of keys, or all records.
- *
- * @param {string|string[]|null} keys - The key(s) to read.
- * - If `string`: Reads a single record and returns the data object directly.
- * - If `string[]`: Reads multiple records and returns a Map of `rowkey` to `data` objects.
- * - If `null` or `undefined` or `empty string/array`: Reads all records and returns a Map of `rowkey` to `data` objects.
- * @param {string} table - The name of the IndexedDB object store (table).
- * @param {string} database - The name of the IndexedDB database.
- * @returns {Promise<any|Map<string, any>>} A promise that resolves with the data.
- * - Single key: Resolves with the data object or `undefined` if not found.
- * - Array of keys or All records: Resolves with a `Map` where keys are rowkeys and values are data objects.
- * The Map will be empty if no records are found.
- * - Rejects if there's an error opening the database or during the transaction.
- */
-export const readIndexDB = (keys=null, table, database) => {
-  return new Promise((resolve, reject) => {
-    let openRequest = indexedDB.open(database)
-    openRequest.onupgradeneeded = function () {
-      console.log('readIndexDB onupgradeneeded', table, )
-      var db = openRequest.result
-      // 数据库是否存在
-      if (!db.objectStoreNames.contains(table)) {
-        var store = db.createObjectStore(table, { keyPath: 'key' })
-        store.createIndex('timestamp', 'timestamp', { unique: false })
-      } else {
-        const logStore = openRequest.transaction.objectStore(table)
-        if (!logStore.indexNames.contains('timestamp')) {
-          logStore.createIndex('timestamp', 'timestamp', { unique: false })
-        }
-      }
-    }
-    openRequest.onerror = function (e) {
-      console.error(`Error opening database.`, table, e)
-      reject('Error opening database.')
-    }
-    openRequest.onsuccess = function (e) {
-      let db = e.target.result
-      // 数据库是否存在
-      if (!db.objectStoreNames.contains(table)) {
-        resolve('Database does not exist.')
-        return
-      }
-      let transaction = db.transaction(table, 'readonly')
-      let store = transaction.objectStore(table)
-      // read by key
-      // Handle array of keys
-      if (Array.isArray(keys) && keys.length > 0) {
-        const promises = keys.map(key => {
-          return new Promise((innerResolve) => {
-            const getRequest = store.get(key);
-            getRequest.onsuccess = (event) => {
-              const result = event.target.result;
-              if (result) {
-                // console.log(`💾Found record with key ${key}:`, result);
-                innerResolve([key, result]); // Resolve with [key, data] tuple
-              } else {
-                console.log(`No record found with key ${key}.`);
-                innerResolve(void 0); // Resolve with undefined for non-existent keys
-              }
-            };
-            getRequest.onerror = (event) => {
-              console.error(`Error getting record with key ${key}:`, event.target.error);
-              innerResolve(undefined); // Resolve with undefined on error, or innerReject if you want to fail fast
-            };
-          });
-        });
-
-        Promise.all(promises)
-          .then(results => {
-            const resultMap = new Map();
-            results.forEach(item => {
-              if (item !== undefined) {
-                resultMap.set(item[0], item[1]); // item[0] is key, item[1] is data
-              }
-            });
-            resolve(resultMap);
-          })
-          .catch(error => {
-            console.error('Error during batch read:', error);
-            reject(error); // Reject the main promise if Promise.all encounters an error
-          });
-      } else if (!isEmpty(keys)) { // Handle single key
-        const getRequest = store.get(keys);
-        getRequest.onsuccess = (event) => {
-          const result = event.target.result;
-          if (result) {
-            console.log(`💾Found record with key ${keys}:`, result);
-            resolve(result);
-          } else {
-            console.log(`No record found with key ${keys}.`);
-            resolve();
-          }
-        };
-        getRequest.onerror = (event) => {
-          console.error(`Error getting record with key ${keys}:`, event.target.error);
-          reject(event.target.error);
-        };
-      } else { // Handle read all
-        const getAllRequest = store.getAll();
-        getAllRequest.onsuccess = (event) => {
-          const allData = event.target.result;
-          const resultMap = new Map();
-          if (allData && allData.length > 0) {
-            allData.forEach(item => {
-              resultMap.set(item.key, item);
-            });
-            console.log(`💾Found all records:`, resultMap);
-            resolve(resultMap);
-          } else {
-            console.log(`No records found.`);
-            resolve(resultMap); // Resolve with an empty Map if no records
-          }
-        };
-        getAllRequest.onerror = (event) => {
-          console.error(`Error getting all records:`, event.target.error);
-          reject(event.target.error);
-        };
-      }
-
-    }
-  })
-};
-export const deleteIndexDBbyKey = (key, table, database) => {
-  var open = indexedDB.open(database, INDEXED_DB_VERSION)
-  open.onupgradeneeded = function () {
-    // var db = open.result
-    // // 数据库是否存在
-    // if (!db.objectStoreNames.contains(table)) {
-    //   var store = db.createObjectStore(table, { keyPath: 'id', autoIncrement: true })
-    // }
-  }
-  open.onsuccess = function () {
-    var db = open.result
-    var tx = db.transaction(table, 'readwrite')
-    var store = tx.objectStore(table)
-    store.delete(key)
-    tx.oncomplete = function () {
-      db.close()
-    }
-  }
-};
-
-function cleanOldData(database, storeNames=[], dateKey = 'timestamp') {
-  return function (daysToKeep = 7) {
-    return new Promise((resolve, reject) => {
-      let deletedCount = 0
-      const recordsToDelete = new Set()
-
-      let openRequest = indexedDB.open(database, INDEXED_DB_VERSION)
-      openRequest.onupgradeneeded = function () {
-        // var db = openRequest.result
-        // 数据库是否存在
-        // if (!db.objectStoreNames.contains(storeName)) {
-        //   var store = db.createObjectStore(storeName, { keyPath: 'id', autoIncrement: true })
-        //   store.createIndex('timestamp', 'timestamp', { unique: false })
-        // } else {
-        //   const logStore = openRequest.transaction.objectStore(storeName)
-        //   if (!logStore.indexNames.contains('timestamp')) {
-        //     logStore.createIndex('timestamp', 'timestamp', { unique: false })
-        //   }
-        // }
-      }
-      openRequest.onsuccess = function (e) {
-        let db = e.target.result
-        // 数据库是否存在
-        // if (!db.objectStoreNames.contains(storeName)) {
-        //   resolve('Database does not exist.')
-        //   return
-        // }
-
-        // Calculate the cutoff timestamp for "X days ago"
-        const cutoffTimestamp = Date.now() - daysToKeep * 24 * 60 * 60 * 1000
-
-        const objectStoreNames = isEmpty(storeNames) ? db.objectStoreNames : storeNames
-
-        if (!isEmpty(objectStoreNames)) {
-          const objectStores = Array.from(objectStoreNames).map((storeName) => db.transaction([storeName], 'readwrite').objectStore(storeName))
-
-          for (const objectStore of objectStores) {
-            // Identify old data using the date index and primary key ID
-
-            if (!objectStore.indexNames.contains(`${dateKey}`)) {
-              // Clear the store
-              let clearRequest = objectStore.clear()
-              console.log(`Cleanup complete. clear ${objectStore.name} records.`)
-              resolve()
-              clearRequest.onerror = function (e) {}
-              clearRequest.onsuccess = function (e) {}
-              return
-            }
-            // Get records older than 'daysToKeep' using the index
-            const dateIndex = objectStore.index(`${dateKey}`)
-            const dateRange = IDBKeyRange.upperBound(cutoffTimestamp, false) // Get keys < cutoffTimestamp (strictly older)
-
-            const dateCursorRequest = dateIndex.openCursor(dateRange)
-
-            dateCursorRequest.onsuccess = (event) => {
-              const cursor = event.target.result
-              if (cursor) {
-                recordsToDelete.add(cursor.primaryKey) // Add the primary key of the record to the set
-                cursor.continue()
-              } else {
-                const storeName = objectStore.name;
-                // Delete identified data in a new transaction
-                const deleteTransaction = db.transaction([storeName], 'readwrite')
-                const deleteObjectStore = deleteTransaction.objectStore(storeName)
-
-                deleteTransaction.oncomplete = () => {
-                  console.log(`Cleanup complete. Deleted ${deletedCount} records in ${database}.${storeName}.`)
-                  resolve(deletedCount)
-                }
-
-                deleteTransaction.onerror = (event) => {
-                  console.error('Deletion transaction error:', event.target.error)
-                  reject(event.target.error)
-                }
-
-                // Convert Set to Array for forEach
-                Array.from(recordsToDelete).forEach((key) => {
-                  const deleteRequest = deleteObjectStore.delete(key)
-                  deleteRequest.onsuccess = () => {
-                    deletedCount++
-                  }
-                  deleteRequest.onerror = (event) => {
-                    console.warn(`Failed to delete record with key ${key}:`, event.target.error)
-                  }
-                })
-              }
-            }
-
-            dateCursorRequest.onerror = (event) => {
-              console.error('Error opening date cursor for deletion:', event.target.error)
-              reject(event.target.error)
-            }
-          }
-        }
-      }
-      openRequest.onerror = function (e) {
-        reject('Error opening database:'+database, e)
-      }
-    })
-  }
-}
-
-export const clean7DaysWebsocketLog = cleanOldData('LogWebsocketData', ['LogStore']);
-export const clean7DaysMailboxLog = cleanOldData('mailbox');
diff --git a/src/utils/indexedDB.js b/src/utils/indexedDB.js
new file mode 100644
index 0000000..38e2a5c
--- /dev/null
+++ b/src/utils/indexedDB.js
@@ -0,0 +1,517 @@
+import { isEmpty } from './commons';
+/**
+ *
+ */
+const INDEXED_DB_VERSION = 4;
+export const logWebsocket = (message, direction) => {
+  var open = indexedDB.open('LogWebsocketData', INDEXED_DB_VERSION)
+  open.onupgradeneeded = function () {
+    var db = open.result
+    // 数据库是否存在
+    if (!db.objectStoreNames.contains('LogStore')) {
+      var store = db.createObjectStore('LogStore', { keyPath: 'id', autoIncrement: true })
+      store.createIndex('timestamp', 'timestamp', { unique: false })
+    } else {
+      const logStore = open.transaction.objectStore('LogStore')
+      if (!logStore.indexNames.contains('timestamp')) {
+        logStore.createIndex('timestamp', 'timestamp', { unique: false })
+      }
+    }
+  }
+  open.onsuccess = function () {
+    var db = open.result
+    var tx = db.transaction('LogStore', 'readwrite')
+    var store = tx.objectStore('LogStore')
+    store.put({ direction, message, _date: new Date().toLocaleString(), timestamp: Date.now() })
+    tx.oncomplete = function () {
+      db.close()
+    }
+  }
+};
+export const readWebsocketLog = (limit = 20) => {
+  return new Promise((resolve, reject) => {
+    let openRequest = indexedDB.open('LogWebsocketData')
+    openRequest.onupgradeneeded = function () {
+      var db = openRequest.result
+      // 数据库是否存在
+      if (!db.objectStoreNames.contains('LogStore')) {
+        var store = db.createObjectStore('LogStore', { keyPath: 'id', autoIncrement: true })
+        store.createIndex('timestamp', 'timestamp', { unique: false })
+      } else {
+        const logStore = openRequest.transaction.objectStore('LogStore')
+        if (!logStore.indexNames.contains('timestamp')) {
+          logStore.createIndex('timestamp', 'timestamp', { unique: false })
+        }
+      }
+    }
+    openRequest.onerror = function (e) {
+      reject('Error opening database.')
+    }
+    openRequest.onsuccess = function (e) {
+      let db = e.target.result
+      // 数据库是否存在
+      if (!db.objectStoreNames.contains('LogStore')) {
+        resolve('Database does not exist.')
+        return
+      }
+      let transaction = db.transaction('LogStore', 'readonly')
+      let store = transaction.objectStore('LogStore')
+      const request = store.openCursor(null, 'prev'); // 从后往前
+      const results = [];
+      let count = 0;
+      request.onerror = function (e) {
+        reject('Error getting records.')
+      }
+      request.onsuccess = function (e) {
+        const cursor = e.target.result
+        if (cursor) {
+          if (count < limit) {
+            results.unshift(cursor.value)
+            count++
+            cursor.continue()
+          } else {
+            console.log(JSON.stringify(results))
+            resolve(results)
+          }
+        } else {
+          console.log(JSON.stringify(results))
+          resolve(results)
+        }
+      }
+    }
+  })
+};
+/**
+ * @deprecated
+ */
+export const clearWebsocketLog = () => {
+  let openRequest = indexedDB.open('LogWebsocketData')
+  openRequest.onerror = function (e) {}
+  openRequest.onsuccess = function (e) {
+    let db = e.target.result
+    if (!db.objectStoreNames.contains('LogStore')) {
+      return
+    }
+    let transaction = db.transaction('LogStore', 'readwrite')
+    let store = transaction.objectStore('LogStore')
+    // Clear the store
+    let clearRequest = store.clear()
+    clearRequest.onerror = function (e) {}
+    clearRequest.onsuccess = function (e) {}
+  }
+}
+
+export const createIndexedDBStore = (tables, database) => {
+  var open = indexedDB.open(database, INDEXED_DB_VERSION)
+  open.onupgradeneeded = function () {
+    console.log('readIndexDB onupgradeneeded', database, )
+    var db = open.result
+    // 数据库是否存在
+    for (const table of tables) {
+      if (!db.objectStoreNames.contains(table)) {
+        var store = db.createObjectStore(table, { keyPath: 'key' })
+        store.createIndex('timestamp', 'timestamp', { unique: false })
+      } else {
+        const objectStore = open.transaction.objectStore(table)
+        if (!objectStore.indexNames.contains('timestamp')) {
+          objectStore.createIndex('timestamp', 'timestamp', { unique: false })
+        }
+      }
+    }
+  }
+};
+
+export const writeIndexDB = (rows, table, database) => {
+  var open = indexedDB.open(database, INDEXED_DB_VERSION)
+  open.onupgradeneeded = function () {
+    console.log('readIndexDB onupgradeneeded', table, )
+    var db = open.result
+    // 数据库是否存在
+    if (!db.objectStoreNames.contains(table)) {
+      var store = db.createObjectStore(table, { keyPath: 'key' })
+      store.createIndex('timestamp', 'timestamp', { unique: false })
+    } else {
+      const objectStore = open.transaction.objectStore(table)
+      if (!objectStore.indexNames.contains('timestamp')) {
+        objectStore.createIndex('timestamp', 'timestamp', { unique: false })
+      }
+    }
+  }
+  open.onsuccess = function () {
+    var db = open.result
+    var tx = db.transaction(table, 'readwrite')
+    var store = tx.objectStore(table)
+    rows.forEach(row => {
+      store.put({ ...row, _date: new Date().toLocaleString(), timestamp: Date.now() })
+    });
+    tx.oncomplete = function () {
+      db.close()
+    }
+  }
+};
+
+/**
+ * Reads data from an IndexedDB object store.
+ * It can read a single record by key, multiple records by an array of keys, or all records.
+ *
+ * @param {string|string[]|null} keys - The key(s) to read.
+ * - If `string`: Reads a single record and returns the data object directly.
+ * - If `string[]`: Reads multiple records and returns a Map of `rowkey` to `data` objects.
+ * - If `null` or `undefined` or `empty string/array`: Reads all records and returns a Map of `rowkey` to `data` objects.
+ * @param {string} table - The name of the IndexedDB object store (table).
+ * @param {string} database - The name of the IndexedDB database.
+ * @returns {Promise<any|Map<string, any>>} A promise that resolves with the data.
+ * - Single key: Resolves with the data object or `undefined` if not found.
+ * - Array of keys or All records: Resolves with a `Map` where keys are rowkeys and values are data objects.
+ * The Map will be empty if no records are found.
+ * - Rejects if there's an error opening the database or during the transaction.
+ */
+export const readIndexDB = (keys=null, table, database) => {
+  return new Promise((resolve, reject) => {
+    let openRequest = indexedDB.open(database)
+    openRequest.onupgradeneeded = function () {
+      console.log('readIndexDB onupgradeneeded', table, )
+      var db = openRequest.result
+      // 数据库是否存在
+      if (!db.objectStoreNames.contains(table)) {
+        var store = db.createObjectStore(table, { keyPath: 'key' })
+        store.createIndex('timestamp', 'timestamp', { unique: false })
+      } else {
+        const logStore = openRequest.transaction.objectStore(table)
+        if (!logStore.indexNames.contains('timestamp')) {
+          logStore.createIndex('timestamp', 'timestamp', { unique: false })
+        }
+      }
+    }
+    openRequest.onerror = function (e) {
+      console.error(`Error opening database.`, table, e)
+      reject('Error opening database.')
+    }
+    openRequest.onsuccess = function (e) {
+      let db = e.target.result
+      // 数据库是否存在
+      if (!db.objectStoreNames.contains(table)) {
+        resolve('Database does not exist.')
+        return
+      }
+      let transaction = db.transaction(table, 'readonly')
+      let store = transaction.objectStore(table)
+      // read by key
+      // Handle array of keys
+      if (Array.isArray(keys) && keys.length > 0) {
+        const promises = keys.map(key => {
+          return new Promise((innerResolve) => {
+            const getRequest = store.get(key);
+            getRequest.onsuccess = (event) => {
+              const result = event.target.result;
+              if (result) {
+                // console.log(`💾Found record with key ${key}:`, result);
+                innerResolve([key, result]); // Resolve with [key, data] tuple
+              } else {
+                console.log(`No record found with key ${key}.`);
+                innerResolve(void 0); // Resolve with undefined for non-existent keys
+              }
+            };
+            getRequest.onerror = (event) => {
+              console.error(`Error getting record with key ${key}:`, event.target.error);
+              innerResolve(undefined); // Resolve with undefined on error, or innerReject if you want to fail fast
+            };
+          });
+        });
+
+        Promise.all(promises)
+          .then(results => {
+            const resultMap = new Map();
+            results.forEach(item => {
+              if (item !== undefined) {
+                resultMap.set(item[0], item[1]); // item[0] is key, item[1] is data
+              }
+            });
+            resolve(resultMap);
+          })
+          .catch(error => {
+            console.error('Error during batch read:', error);
+            reject(error); // Reject the main promise if Promise.all encounters an error
+          });
+      } else if (!isEmpty(keys)) { // Handle single key
+        const getRequest = store.get(keys);
+        getRequest.onsuccess = (event) => {
+          const result = event.target.result;
+          if (result) {
+            console.log(`💾Found record with key ${keys}:`, result);
+            resolve(result);
+          } else {
+            console.log(`No record found with key ${keys}.`);
+            resolve();
+          }
+        };
+        getRequest.onerror = (event) => {
+          console.error(`Error getting record with key ${keys}:`, event.target.error);
+          reject(event.target.error);
+        };
+      } else { // Handle read all
+        const getAllRequest = store.getAll();
+        getAllRequest.onsuccess = (event) => {
+          const allData = event.target.result;
+          const resultMap = new Map();
+          if (allData && allData.length > 0) {
+            allData.forEach(item => {
+              resultMap.set(item.key, item);
+            });
+            console.log(`💾Found all records:`, resultMap);
+            resolve(resultMap);
+          } else {
+            console.log(`No records found.`);
+            resolve(resultMap); // Resolve with an empty Map if no records
+          }
+        };
+        getAllRequest.onerror = (event) => {
+          console.error(`Error getting all records:`, event.target.error);
+          reject(event.target.error);
+        };
+      }
+
+    }
+  })
+};
+export const deleteIndexDBbyKey = (key, table, database) => {
+  var open = indexedDB.open(database, INDEXED_DB_VERSION)
+  open.onupgradeneeded = function () {
+    // var db = open.result
+    // // 数据库是否存在
+    // if (!db.objectStoreNames.contains(table)) {
+    //   var store = db.createObjectStore(table, { keyPath: 'id', autoIncrement: true })
+    // }
+  }
+  open.onsuccess = function () {
+    var db = open.result
+    var tx = db.transaction(table, 'readwrite')
+    var store = tx.objectStore(table)
+    store.delete(key)
+    tx.oncomplete = function () {
+      db.close()
+    }
+  }
+};
+
+function cleanOldData(database, storeNames=[], dateKey = 'timestamp') {
+  return function (daysToKeep = 7) {
+    return new Promise((resolve, reject) => {
+      let deletedCount = 0
+      const recordsToDelete = new Set()
+
+      let openRequest = indexedDB.open(database, INDEXED_DB_VERSION)
+      openRequest.onupgradeneeded = function () {
+        var db = openRequest.result
+        storeNames.forEach(storeName => {
+          // 数据库是否存在
+          if (!db.objectStoreNames.contains(storeName)) {
+            var store = db.createObjectStore(storeName, { keyPath: 'id', autoIncrement: true })
+            store.createIndex('timestamp', 'timestamp', { unique: false })
+          } else {
+            const logStore = openRequest.transaction.objectStore(storeName)
+            if (!logStore.indexNames.contains('timestamp')) {
+              logStore.createIndex('timestamp', 'timestamp', { unique: false })
+            }
+          }
+        })
+      }
+      openRequest.onsuccess = function (e) {
+        let db = e.target.result
+        // 数据库是否存在
+        // if (!db.objectStoreNames.contains(storeName)) {
+        //   resolve('Database does not exist.')
+        //   return
+        // }
+
+        // Calculate the cutoff timestamp for "X days ago"
+        const cutoffTimestamp = Date.now() - daysToKeep * 24 * 60 * 60 * 1000
+
+        const objectStoreNames = isEmpty(storeNames) ? db.objectStoreNames : storeNames
+
+        if (!isEmpty(objectStoreNames)) {
+          const objectStores = Array.from(objectStoreNames).map((storeName) => db.transaction([storeName], 'readwrite').objectStore(storeName))
+
+          for (const objectStore of objectStores) {
+            // Identify old data using the date index and primary key ID
+
+            if (!objectStore.indexNames.contains(`${dateKey}`)) {
+              // Clear the store
+              let clearRequest = objectStore.clear()
+              console.log(`Cleanup complete. clear ${objectStore.name} records.`)
+              resolve()
+              clearRequest.onerror = function (e) {}
+              clearRequest.onsuccess = function (e) {}
+              return
+            }
+            // Get records older than 'daysToKeep' using the index
+            const dateIndex = objectStore.index(`${dateKey}`)
+            const dateRange = IDBKeyRange.upperBound(cutoffTimestamp, false) // Get keys < cutoffTimestamp (strictly older)
+
+            const dateCursorRequest = dateIndex.openCursor(dateRange)
+
+            dateCursorRequest.onsuccess = (event) => {
+              const cursor = event.target.result
+              if (cursor) {
+                recordsToDelete.add(cursor.primaryKey) // Add the primary key of the record to the set
+                cursor.continue()
+              } else {
+                const storeName = objectStore.name;
+                // Delete identified data in a new transaction
+                const deleteTransaction = db.transaction([storeName], 'readwrite')
+                const deleteObjectStore = deleteTransaction.objectStore(storeName)
+
+                deleteTransaction.oncomplete = () => {
+                  console.log(`Cleanup complete. Deleted ${deletedCount} records in ${database}.${storeName}.`)
+                  resolve(deletedCount)
+                }
+
+                deleteTransaction.onerror = (event) => {
+                  console.error('Deletion transaction error:', event.target.error)
+                  reject(event.target.error)
+                }
+
+                // Convert Set to Array for forEach
+                Array.from(recordsToDelete).forEach((key) => {
+                  const deleteRequest = deleteObjectStore.delete(key)
+                  deleteRequest.onsuccess = () => {
+                    deletedCount++
+                  }
+                  deleteRequest.onerror = (event) => {
+                    console.warn(`Failed to delete record with key ${key}:`, event.target.error)
+                  }
+                })
+              }
+            }
+
+            dateCursorRequest.onerror = (event) => {
+              console.error('Error opening date cursor for deletion:', event.target.error)
+              reject(event.target.error)
+            }
+          }
+        }
+      }
+      openRequest.onerror = function (e) {
+        reject('Error opening database:'+database, e)
+      }
+    })
+  }
+}
+
+export const clean7DaysWebsocketLog = cleanOldData('LogWebsocketData', ['LogStore']);
+export const clean7DaysMailboxLog = cleanOldData('mailbox');
+
+
+/**
+ * 缓存清除策略: 清理7天前的
+ * - 每次进入
+ * - 每天半夜
+ */
+
+export const LAST_SCHEDULED_CLEANUP_DAY_KEY = 'lastScheduledCleanupDay'; // For tracking scheduling
+export const LAST_EXECUTED_CLEANUP_DAY_KEY = 'lastExecutedCleanupDay'; // For tracking actual execution
+let cleanupTimeoutId = null; // To store the ID of the setTimeout
+
+/**
+ * Determines if the cleanup needs to be scheduled for today.
+ * This is based on when it was *last scheduled* to prevent re-scheduling
+ * if the app was merely refreshed within the same day.
+ * @returns {boolean} True if a new schedule for today is needed.
+ */
+function shouldScheduleForToday() {
+    const lastScheduledDay = localStorage.getItem(LAST_SCHEDULED_CLEANUP_DAY_KEY);
+    const today = new Date().toDateString(); // e.g., "Fri Jun 13 2025"
+
+    return !lastScheduledDay || lastScheduledDay !== today;
+}
+
+/**
+ * Determines if the cleanup was already *executed* today.
+ * This is to prevent running the cleanup task multiple times in one day
+ * if the app stays open past midnight or if it is refreshed.
+ * @returns {boolean} True if the cleanup has not executed today.
+ */
+function hasCleanupExecutedToday() {
+    const lastExecutedDay = localStorage.getItem(LAST_EXECUTED_CLEANUP_DAY_KEY);
+    const today = new Date().toDateString();
+    return lastExecutedDay === today;
+}
+
+
+/**
+ * Executes the cleanup and updates the last execution timestamp.
+ * This function is designed to be called via requestIdleCallback.
+ */
+export async function executeDailyCleanupTask() {
+  // const lastExecutedDay = localStorage.getItem(LAST_EXECUTED_CLEANUP_DAY_KEY)
+  const today = new Date().toDateString()
+
+  if (!hasCleanupExecutedToday()) {
+    if ('requestIdleCallback' in window) {
+      // console.log(`[${new Date().toLocaleTimeString()}] Scheduling cleanup  via requestIdleCallback for execution.`);
+
+      requestIdleCallback(
+        async (deadline) => {
+          console.log(`[${new Date().toLocaleTimeString()}] Running scheduled cleanup. Time remaining: ${deadline.timeRemaining().toFixed(2)}ms, Did timeout: ${deadline.didTimeout}`)
+          try {
+            await clean7DaysMailboxLog()
+            await clean7DaysWebsocketLog()
+            // Mark that cleanup was successfully executed for today
+            localStorage.setItem(LAST_EXECUTED_CLEANUP_DAY_KEY, today)
+            console.log('Daily cleanup marked as executed for today.')
+          } catch (error) {
+            console.error('Error during scheduled cleanup execution:', error)
+          }
+        },
+        { timeout: 5000 },
+      ) // Give it up to 5 seconds to find idle time
+    } else {
+      console.warn('requestIdleCallback not supported. Executing cleanup  directly (might cause jank).')
+      // Fallback for very old browsers: run directly.
+      try {
+        await clean7DaysMailboxLog()
+        await clean7DaysWebsocketLog()
+        localStorage.setItem(LAST_EXECUTED_CLEANUP_DAY_KEY, today)
+        console.log('Daily cleanup marked as executed for today (without rIC).')
+      } catch (error) {
+        console.error('Error during direct cleanup execution:', error)
+      }
+    }
+  } else {
+    console.log(`[${new Date().toLocaleTimeString()}] Cleanup already executed today.`)
+  }
+}
+
+/**
+ * Initiates or re-initiates the daily midnight cleanup scheduler.
+ * This function calls itself recursively to set up the next day's schedule.
+ */
+export function setupDailyMidnightCleanupScheduler() {
+  if (cleanupTimeoutId) {
+    clearTimeout(cleanupTimeoutId)
+    cleanupTimeoutId = null
+  }
+
+  const now = new Date()
+  const midnight = new Date(now)
+
+  // Set to midnight (00:00:00)
+  midnight.setDate(now.getDate() + 1)
+  midnight.setHours(0, 0, 0, 0)
+
+  const msToMidnight = midnight.getTime() - now.getTime()
+
+  console.log(`[${new Date().toLocaleTimeString()}] Scheduling next daily cleanup at ${midnight.toLocaleTimeString()}, in ${msToMidnight / (1000 * 60 * 60)} hours.`)
+
+  // Set the timeout for the next midnight
+  cleanupTimeoutId = setTimeout(async () => {
+    console.log(`[${new Date().toLocaleTimeString()}] Midnight trigger fired.`)
+    if (!hasCleanupExecutedToday()) {
+      await executeDailyCleanupTask()
+    } else {
+      console.log(`[${new Date().toLocaleTimeString()}] Cleanup already executed today, skipping re-execution.`)
+    }
+    setupDailyMidnightCleanupScheduler()
+  }, msToMidnight)
+}
+
diff --git a/src/utils/pagespy.js b/src/utils/pagespy.js
index 44ed588..16e6731 100644
--- a/src/utils/pagespy.js
+++ b/src/utils/pagespy.js
@@ -1,4 +1,5 @@
-import { loadScript, readWebsocketLog } from '@/utils/commons'
+import { loadScript } from '@/utils/commons'
+import { readWebsocketLog } from '@/utils/indexedDB'
 import { BUILD_VERSION, BUILD_DATE } from '@/config'
 
 export const loadPageSpy = (title) => {
diff --git a/src/views/AuthApp.jsx b/src/views/AuthApp.jsx
index db22305..eedf3cb 100644
--- a/src/views/AuthApp.jsx
+++ b/src/views/AuthApp.jsx
@@ -24,7 +24,7 @@ import '@/assets/App.css'
 import 'react-chat-elements/dist/main.css'
 import EmailFetch from './Conversations/Online/Components/EmailFetch'
 import FetchEmailWorker from './../workers/fetchEmailWorker?worker&url'
-import { clearWebsocketLog, readWebsocketLog } from '@/utils/commons'
+import { readWebsocketLog } from '@/utils/indexedDB'
 import { useGlobalNotify } from '@/hooks/useGlobalNotify'
 import GeneratePaymentDrawer from './Conversations/Online/Components/GeneratePaymentDrawer'
 import GenerateAutoDocDrawer from './Conversations/Online/Components/GenerateAutoDocDrawer'
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index a726b78..11f9b1b 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -57,25 +57,25 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
   const { mai_sn, id } = emailMsg.msgOrigin?.email || emailMsg.msgOrigin || {}
   // const mailID = mai_sn || id
 
-  const [action, setAction] = useState('')
+  // const [action, setAction] = useState('')
 
-  const [openEmailEditor, setOpenEmailEditor] = useState(false)
-  const [fromEmail, setFromEmail] = useState('')
-  useEffect(() => {
-    setOpenEmailEditor(false)
+  // const [openEmailEditor, setOpenEmailEditor] = useState(false)
+  // const [fromEmail, setFromEmail] = useState('')
+  // useEffect(() => {
+  //   setOpenEmailEditor(false)
 
-    return () => {}
-  }, [mailID])
+  //   return () => {}
+  // }, [mailID])
 
   const onOpenEditor = (msgOrigin, action='reply') => {
     openPopup(`/email/${action}/${mailID || 0}`, `${action}-${mailID || 0}`)
     if (typeof props.onOpenEditor === 'function') {
       props.onOpenEditor(msgOrigin, action);
     } else {
-      const { from, to } = msgOrigin
-      setOpenEmailEditor(true)
-      setFromEmail(action === 'edit' ? from : to)
-      setAction(action)
+      // const { from, to } = msgOrigin
+      // setOpenEmailEditor(true)
+      // setFromEmail(action === 'edit' ? from : to)
+      // setAction(action)
       // // setOpen(false)
     }
   }
diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
index 284aad2..31ffb49 100644
--- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
+++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
@@ -10,7 +10,8 @@ import useAuthStore from '@/stores/AuthStore';
 import LexicalEditor from '@/components/LexicalEditor';
 
 import { v4 as uuid } from 'uuid';
-import { cloneDeep, debounce, isEmpty, writeIndexDB, } from '@/utils/commons';
+import { cloneDeep, debounce, isEmpty, } from '@/utils/commons';
+import { writeIndexDB } from '@/utils/indexedDB';
 import './EmailEditor.css';
 import { postSendEmail } from '@/actions/EmailActions';
 import { sentMsgTypeMapped,   } from '@/channel/bubbleMsgUtils';
diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index 8de9a68..85f5914 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -10,7 +10,9 @@ import useAuthStore from '@/stores/AuthStore'
 import LexicalEditor from '@/components/LexicalEditor'
 
 import { v4 as uuid } from 'uuid'
-import { cloneDeep, debounce, isEmpty, writeIndexDB, readIndexDB, deleteIndexDBbyKey, olog, omitEmpty } from '@/utils/commons'
+import { cloneDeep, debounce, isEmpty, olog, omitEmpty } from '@/utils/commons'
+import { writeIndexDB, readIndexDB, deleteIndexDBbyKey,  } from '@/utils/indexedDB';
+
 import '@/views/Conversations/Online/Input/EmailEditor.css'
 import { deleteEmailAttachmentAction, parseHTMLString, postSendEmail, saveEmailDraftOrSendAction } from '@/actions/EmailActions'
 import { sentMsgTypeMapped } from '@/channel/bubbleMsgUtils'

From d293e3a1e5304baa5b478752acc9bb858f7f6dfe Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 13 Jun 2025 14:51:25 +0800
Subject: [PATCH 099/143] =?UTF-8?q?perf:=20=E5=AE=8C=E6=88=90=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E3=80=81=E5=82=AC=E4=BF=A1=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx         | 67 ++++++++++++++++++++-----
 src/hooks/useEmail.js                   | 20 ++++++--
 src/views/orders/components/MailBox.jsx |  9 +---
 3 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index 2b286e7..a282797 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -2,12 +2,13 @@ import { WhatsAppOutlined, FileAddOutlined, MailOutlined, PhoneOutlined, UserOut
 
 import { useEffect, useState } from 'react'
 import { App, Flex, Select, Tooltip, Tabs, Button, Divider, Typography, Skeleton, Checkbox } from 'antd'
-import { useOrderStore, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore'
-import { copy } from '@/utils/commons'
+import { useOrderStore, fetchSetRemindStateAction, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore'
+import { copy, isEmpty } from '@/utils/commons'
 const OrderProfile = ({ coliSN, ...props }) => {
   const { notification, message } = App.useApp()
 
   const [loading, setLoading] = useState(false)
+
   const orderLabelOptions = copy(OrderLabelDefaultOptions)
   orderLabelOptions.unshift({ value: 0, label: '未设置', disabled: true })
 
@@ -20,13 +21,11 @@ const OrderProfile = ({ coliSN, ...props }) => {
     s.appendOrderComment,
   ])
 
+  const [orderRemindState, setOrderRemindState] = useState(orderDetail.remindstate);
   useEffect(() => {
     if (coliSN) {
       setLoading(true)
       fetchOrderDetail(coliSN)
-        .then((result) => {
-          console.info(result)
-        })
         .finally(() => setLoading(false))
         .catch((reason) => {
           notification.error({
@@ -40,9 +39,27 @@ const OrderProfile = ({ coliSN, ...props }) => {
     return () => {}
   }, [coliSN])
 
-  const regularText = () => {
-    if (orderDetail.buytime > 0) return '(R' + orderDetail.buytime + ')'
-    return ''
+  const handleSetRemindState = async (checkedValue) => {
+    const state = checkedValue.filter(v => v !== orderRemindState);
+    const oldState = orderRemindState;
+
+    try {
+      if (isEmpty(state)) {
+        setOrderRemindState(null);
+      } else {
+        setOrderRemindState(state[0]);
+      }
+      await fetchSetRemindStateAction({ coli_sn: coliSN, remindstate: state });
+      message.success('设置成功');
+    } catch (error) {
+      notification.warning({ message: '设置失败', description: error.message, placement: 'top', duration: 60 });
+      setOrderRemindState(oldState);
+    }
+  }
+
+  const getCustomerName = () => {
+    if (orderDetail.buytime > 0) return customerDetail.name + '(R' + orderDetail.buytime + ')'
+    return customerDetail.name
   }
 
   return (
@@ -69,7 +86,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
           </Typography.Text>
           <Typography.Text>
             <UserOutlined className=' pr-1' />
-            {customerDetail.name + regularText()}
+            {getCustomerName()}
           </Typography.Text>
           <Typography.Text>
             <CompassOutlined className=' pr-1' />
@@ -116,7 +133,20 @@ const OrderProfile = ({ coliSN, ...props }) => {
               width: '100%',
             }}
             variant='underlined'
-            onSelect={(value) => {}}
+								onSelect={value => {
+									setOrderPropValue(coliSN, "orderlabel", value)
+										.then(() => {
+											message.success("设置成功");
+										})
+										.catch(reason => {
+											notification.error({
+												message: "设置出错",
+												description: reason.message,
+												placement: "top",
+												duration: 60,
+											});
+										});
+								}}
             value={orderDetail.tags}
             options={orderLabelOptions}
           />
@@ -128,7 +158,20 @@ const OrderProfile = ({ coliSN, ...props }) => {
               width: '100%',
             }}
             variant='underlined'
-            onSelect={(value) => {}}
+								onSelect={value => {
+									setOrderPropValue(coliSN, "orderstatus", value)
+										.then(() => {
+											message.success("设置成功");
+										})
+										.catch(reason => {
+											notification.error({
+												message: "设置出错",
+												description: reason.message,
+												placement: "top",
+												duration: 60,
+											});
+										});
+								}}
             value={orderDetail.states}
             options={orderStatusOptions}
           />
@@ -137,7 +180,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
         <Divider orientation='left'>
           <Typography.Text strong>催信</Typography.Text>
         </Divider>
-        <Checkbox.Group key='substatus' className='px-2' options={remindStatusOptions} />
+        <Checkbox.Group key='substatus' className="px-2" value={[orderRemindState]} options={remindStatusOptions} onChange={handleSetRemindState} />
 
         <Divider orientation='left'>
           <Typography.Text strong>表单信息</Typography.Text>
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 12968a1..3c8b81f 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -160,22 +160,34 @@ export const useEmailList = (mailboxDirNode) => {
   const { OPI_SN: opi_sn, COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = mailboxDirNode
 
   const markAsRead = useCallback((sn_list) => {
+    // 优化性能的话，需要更新 mailList 数据，
+    // 但是更新 mailList 会造成页面全部刷新
+    // 所以还是先用 refresh()
+    // const updatedMailList = mailList.map(mail => {
+    //   if (sn_list.includes(mail.MAI_SN)) {
+    //     return { ...mail, MOI_ReadState: 1 };
+    //   }
+    //   return mail;
+    // });
+    // setMailList(updatedMailList);
+    // setLoading(true)
     updateEmailAction({
       opi_sn: opi_sn,
       mai_sn_list: sn_list,
       set: { read: 1}
-    });
+    })
     refresh()
-  }, []);
+  }, [])
 
+  // 优化同上
   const markAsProcessed = useCallback((sn_list) => {
     updateEmailAction({
       opi_sn: opi_sn,
       mai_sn_list: sn_list,
       set: { processed: 1}
-    });
+    })
     refresh()
-  }, []);
+  }, [])
 
   const getMailList = useCallback(async () => {
     console.log('getMailList', mailboxDirNode)
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 562fa49..3b999d2 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -106,20 +106,17 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
           <Checkbox
           checked={selectedItems.some((i) => i.MAI_SN === item.MAI_SN)}
             onClick={e => {
-            console.info(item, 'checked: ' + e.target.checked)
             const isChecked = e.target.checked;
             const updatedSelection = isChecked
               ? [...selectedItems, item]
               : selectedItems.filter((item) => item.MAI_SN !== item.MAI_SN)
             setSelectedItems(updatedSelection)
-            console.info('selectedItems: ', updatedSelection)
             }
           }></Checkbox>
           </div>
         <div className='flex-1 pl-2'
-        onClick={() => {
-          console.info('item: ', item)
-          onMailItemClick(item)
+          onClick={() => {
+            onMailItemClick(item)
         }}>
           <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
             <div>
@@ -164,7 +161,6 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
           <Tooltip title='标记已读'>
             <Button shape='circle' type='text' size='small' icon={<ReadOutlined />}
             onClick={() => {
-              console.info('markAsRead: ', selectedItems.map((item) => item.MAI_SN))
               markAsRead(selectedItems.map((item) => item.MAI_SN))
             }}
             />
@@ -172,7 +168,6 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
           <Tooltip title='已处理'>
             <Button shape='circle' type='text' size='small' icon={<MailCheckIcon />}
             onClick={() => {
-              console.info('markAsProcessed: ', selectedItems.map((item) => item.MAI_SN))
               markAsProcessed(selectedItems.map((item) => item.MAI_SN))
             }} />
           </Tooltip>

From 095a8f3d3bbaa0ba6240f138c8ebea61346c7f47 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 13 Jun 2025 14:58:20 +0800
Subject: [PATCH 100/143] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=20WA=20?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=9C=A8=E7=BA=BF=E8=81=8A=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index a282797..d36682d 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -100,11 +100,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
             <MailOutlined className='pr-1' />
             {customerDetail.email}
           </Typography.Text>
-          <Typography.Link
-            href='#'
-            onClick={() => {
-              console.info('whatsapp clicked.')
-            }}>
+          <Typography.Link href={`/order/chat/${coliSN}`}>
             <WhatsAppOutlined className=' pr-1' />
             {customerDetail.whatsapp_phone_number}
           </Typography.Link>

From 06a3e95e1a20a91b02b35efd0cb4d148e7d2f2de Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Fri, 13 Jun 2025 16:44:20 +0800
Subject: [PATCH 101/143] =?UTF-8?q?perf=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E5=92=8C?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx         |  80 ++++++------
 src/views/orders/components/MailBox.jsx | 165 ++++++++++++------------
 2 files changed, 121 insertions(+), 124 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index d36682d..49eb5de 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -1,7 +1,7 @@
 import { WhatsAppOutlined, FileAddOutlined, MailOutlined, PhoneOutlined, UserOutlined, FieldNumberOutlined, CompassOutlined, CalendarOutlined, EditOutlined, CheckOutlined } from '@ant-design/icons'
 
 import { useEffect, useState } from 'react'
-import { App, Flex, Select, Tooltip, Tabs, Button, Divider, Typography, Skeleton, Checkbox } from 'antd'
+import { App, Flex, Select, Tooltip, Divider, Typography, Skeleton, Checkbox } from 'antd'
 import { useOrderStore, fetchSetRemindStateAction, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore'
 import { copy, isEmpty } from '@/utils/commons'
 const OrderProfile = ({ coliSN, ...props }) => {
@@ -21,7 +21,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
     s.appendOrderComment,
   ])
 
-  const [orderRemindState, setOrderRemindState] = useState(orderDetail.remindstate);
+  const [orderRemindState, setOrderRemindState] = useState(orderDetail.remindstate)
   useEffect(() => {
     if (coliSN) {
       setLoading(true)
@@ -40,20 +40,20 @@ const OrderProfile = ({ coliSN, ...props }) => {
   }, [coliSN])
 
   const handleSetRemindState = async (checkedValue) => {
-    const state = checkedValue.filter(v => v !== orderRemindState);
-    const oldState = orderRemindState;
+    const state = checkedValue.filter((v) => v !== orderRemindState)
+    const oldState = orderRemindState
 
     try {
       if (isEmpty(state)) {
-        setOrderRemindState(null);
+        setOrderRemindState(null)
       } else {
-        setOrderRemindState(state[0]);
+        setOrderRemindState(state[0])
       }
-      await fetchSetRemindStateAction({ coli_sn: coliSN, remindstate: state });
-      message.success('设置成功');
+      await fetchSetRemindStateAction({ coli_sn: coliSN, remindstate: state })
+      message.success('设置成功')
     } catch (error) {
-      notification.warning({ message: '设置失败', description: error.message, placement: 'top', duration: 60 });
-      setOrderRemindState(oldState);
+      notification.warning({ message: '设置失败', description: error.message, placement: 'top', duration: 60 })
+      setOrderRemindState(oldState)
     }
   }
 
@@ -79,7 +79,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
         })}
       /> */}
       <Skeleton active loading={loading}>
-        <Flex gap='small' vertical={true} justify='space-between'>
+        <Flex gap='small' vertical={true} justify='space-between' className='p-2'>
           <Typography.Text>
             <FieldNumberOutlined className='pr-1' />
             {orderDetail.order_no}
@@ -129,20 +129,20 @@ const OrderProfile = ({ coliSN, ...props }) => {
               width: '100%',
             }}
             variant='underlined'
-								onSelect={value => {
-									setOrderPropValue(coliSN, "orderlabel", value)
-										.then(() => {
-											message.success("设置成功");
-										})
-										.catch(reason => {
-											notification.error({
-												message: "设置出错",
-												description: reason.message,
-												placement: "top",
-												duration: 60,
-											});
-										});
-								}}
+            onSelect={(value) => {
+              setOrderPropValue(coliSN, 'orderlabel', value)
+                .then(() => {
+                  message.success('设置成功')
+                })
+                .catch((reason) => {
+                  notification.error({
+                    message: '设置出错',
+                    description: reason.message,
+                    placement: 'top',
+                    duration: 60,
+                  })
+                })
+            }}
             value={orderDetail.tags}
             options={orderLabelOptions}
           />
@@ -154,20 +154,20 @@ const OrderProfile = ({ coliSN, ...props }) => {
               width: '100%',
             }}
             variant='underlined'
-								onSelect={value => {
-									setOrderPropValue(coliSN, "orderstatus", value)
-										.then(() => {
-											message.success("设置成功");
-										})
-										.catch(reason => {
-											notification.error({
-												message: "设置出错",
-												description: reason.message,
-												placement: "top",
-												duration: 60,
-											});
-										});
-								}}
+            onSelect={(value) => {
+              setOrderPropValue(coliSN, 'orderstatus', value)
+                .then(() => {
+                  message.success('设置成功')
+                })
+                .catch((reason) => {
+                  notification.error({
+                    message: '设置出错',
+                    description: reason.message,
+                    placement: 'top',
+                    duration: 60,
+                  })
+                })
+            }}
             value={orderDetail.states}
             options={orderStatusOptions}
           />
@@ -176,7 +176,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
         <Divider orientation='left'>
           <Typography.Text strong>催信</Typography.Text>
         </Divider>
-        <Checkbox.Group key='substatus' className="px-2" value={[orderRemindState]} options={remindStatusOptions} onChange={handleSetRemindState} />
+        <Checkbox.Group key='substatus' className='px-2' value={[orderRemindState]} options={remindStatusOptions} onChange={handleSetRemindState} />
 
         <Divider orientation='left'>
           <Typography.Text strong>表单信息</Typography.Text>
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 3b999d2..c062f7c 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react'
-import { ReloadOutlined, ReadOutlined, CheckSquareOutlined, RightOutlined, LeftOutlined, ExpandOutlined } from '@ant-design/icons'
-import { Flex, Button, Tooltip, List, Form, Row, Col, Dropdown, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton } from 'antd'
+import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, ExpandOutlined } from '@ant-design/icons'
+import { Flex, Button, Tooltip, List, Form, Row, Col, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton } from 'antd'
 import dayjs from 'dayjs'
 import { useEmailList } from '@/hooks/useEmail'
 import { isEmpty } from '@/utils/commons'
@@ -12,7 +12,7 @@ const { RangePicker } = DatePicker
 
 const PAGE_SIZE = 50 // 每页显示条数
 
-const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
+const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
   const DATE_RANGE_PRESETS = [
     {
       label: '本周',
@@ -100,24 +100,21 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
     const mailStateClass = item.MOI_ReadState === 0 ? 'font-bold' : ''
     const hasAtta = item.MAI_Attachment !== 0 ? <AttachmentIcon className='text-blue-500' /> : null
     return (
-      <li
-        className={`flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 active:bg-gray-200 p-2 ${props.currentActiveMailItem === item.key ? 'bg-neutral-100' : ''}`}>
-          <div className=''>
+      <li className={`flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 active:bg-gray-200 p-2 ${props.currentActiveMailItem === item.key ? 'bg-neutral-100' : ''}`}>
+        <div className=''>
           <Checkbox
-          checked={selectedItems.some((i) => i.MAI_SN === item.MAI_SN)}
-            onClick={e => {
-            const isChecked = e.target.checked;
-            const updatedSelection = isChecked
-              ? [...selectedItems, item]
-              : selectedItems.filter((item) => item.MAI_SN !== item.MAI_SN)
-            setSelectedItems(updatedSelection)
-            }
-          }></Checkbox>
-          </div>
-        <div className='flex-1 pl-2'
+            checked={selectedItems.some((i) => i.MAI_SN === item.MAI_SN)}
+            onClick={(e) => {
+              const isChecked = e.target.checked
+              const updatedSelection = isChecked ? [...selectedItems, item] : selectedItems.filter((item) => item.MAI_SN !== item.MAI_SN)
+              setSelectedItems(updatedSelection)
+            }}></Checkbox>
+        </div>
+        <div
+          className='flex-1 pl-2'
           onClick={() => {
             onMailItemClick(item)
-        }}>
+          }}>
           <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
             <div>
               {orderNumber}
@@ -138,38 +135,38 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
         <Flex wrap gap='middle' justify={'center'} className='min-w-40'>
           <Tooltip title='全选'>
             <Checkbox
-            indeterminate={
-                selectedItems.length > 0 &&
-                selectedItems.length < pagination.pagedList.length
-              }
-              checked={pagination.pagedList.length === 0 ? false : pagination.pagedList.every((item) =>
-                selectedItems.some((selected) => selected.MAI_SN === item.MAI_SN)
-              )}
-            onChange={(e) => {
-                const isChecked = e.target.checked;
+              indeterminate={selectedItems.length > 0 && selectedItems.length < pagination.pagedList.length}
+              checked={pagination.pagedList.length === 0 ? false : pagination.pagedList.every((item) => selectedItems.some((selected) => selected.MAI_SN === item.MAI_SN))}
+              onChange={(e) => {
+                const isChecked = e.target.checked
                 if (isChecked) {
-                  setSelectedItems((prev) => [
-                    ...prev,
-                    ...pagination.pagedList,
-                  ]);
+                  setSelectedItems((prev) => [...prev, ...pagination.pagedList])
                 } else {
-                  setSelectedItems([]);
+                  setSelectedItems([])
                 }
-              }}
-            ></Checkbox>
+              }}></Checkbox>
           </Tooltip>
           <Tooltip title='标记已读'>
-            <Button shape='circle' type='text' size='small' icon={<ReadOutlined />}
-            onClick={() => {
-              markAsRead(selectedItems.map((item) => item.MAI_SN))
-            }}
+            <Button
+              shape='circle'
+              type='text'
+              size='small'
+              icon={<ReadOutlined />}
+              onClick={() => {
+                markAsRead(selectedItems.map((item) => item.MAI_SN))
+              }}
             />
           </Tooltip>
           <Tooltip title='已处理'>
-            <Button shape='circle' type='text' size='small' icon={<MailCheckIcon />}
-            onClick={() => {
-              markAsProcessed(selectedItems.map((item) => item.MAI_SN))
-            }} />
+            <Button
+              shape='circle'
+              type='text'
+              size='small'
+              icon={<MailCheckIcon />}
+              onClick={() => {
+                markAsProcessed(selectedItems.map((item) => item.MAI_SN))
+              }}
+            />
           </Tooltip>
           <Tooltip title='刷新'>
             <Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} onClick={refresh} />
@@ -214,51 +211,51 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
         </Form>
       </div>
 
-      <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
+      <div className='bg-white overflow-y-auto px-2' style={{ height: 'calc(100vh - 198px)' }}>
         <Skeleton active loading={loading}>
-        <List
-          loading={loading}
-          header={
-            <Flex align='center' justify='space-between'>
-              <Breadcrumb
-                items={props.breadcrumb.map((bc) => {
-                  return {
-                    title: (
-                      <>
-                        <MailboxDirIcon type={bc?.iconIndex} />
-                        <span>{bc.title}</span>
-                      </>
-                    ),
-                  }
-                })}
-              />
+          <List
+            loading={loading}
+            header={
               <Flex align='center' justify='space-between'>
-                <span>已选: {selectedItems.length} 项；</span>
-                <span>
-                  {(pagination.current - 1) * PAGE_SIZE + 1}-{Math.min(pagination.current * PAGE_SIZE, pagination.total)} of {pagination.total}
-                </span>
-                <Button
-                  icon={<LeftOutlined />}
-                  type='text'
-                  onClick={() => {
-                    prePage()
-                  }}
-                  iconPosition={'end'}></Button>
-                <Button
-                  icon={<RightOutlined />}
-                  type='text'
-                  onClick={() => {
-                    nextPage()
-                  }}
-                  iconPosition={'end'}></Button>
+                <Breadcrumb
+                  items={props.breadcrumb.map((bc) => {
+                    return {
+                      title: (
+                        <>
+                          <MailboxDirIcon type={bc?.iconIndex} />
+                          <span>{bc.title}</span>
+                        </>
+                      ),
+                    }
+                  })}
+                />
+                <Flex align='center' justify='space-between'>
+                  <span>已选: {selectedItems.length} 项；</span>
+                  <span>
+                    {(pagination.current - 1) * PAGE_SIZE + 1}-{Math.min(pagination.current * PAGE_SIZE, pagination.total)} of {pagination.total}
+                  </span>
+                  <Button
+                    icon={<LeftOutlined />}
+                    type='text'
+                    onClick={() => {
+                      prePage()
+                    }}
+                    iconPosition={'end'}></Button>
+                  <Button
+                    icon={<RightOutlined />}
+                    type='text'
+                    onClick={() => {
+                      nextPage()
+                    }}
+                    iconPosition={'end'}></Button>
+                </Flex>
               </Flex>
-            </Flex>
-          }
-          itemLayout='vertical'
-          pagination={false}
-          dataSource={pagination.pagedList}
-          renderItem={mailItemRender}
-        />
+            }
+            itemLayout='vertical'
+            pagination={false}
+            dataSource={pagination.pagedList}
+            renderItem={mailItemRender}
+          />
         </Skeleton>
       </div>
     </>

From 5f657b2618dff5f02539a63d38b9643c97076490 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 13 Jun 2025 17:33:06 +0800
Subject: [PATCH 102/143] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0:=20=E5=B9=BF=E6=92=AD;=20=E4=BA=8B=E4=BB=B6;=20`?=
 =?UTF-8?q?=E5=B7=B2=E8=AF=BB`,=20`=E5=B7=B2=E5=A4=84=E7=90=86`=20?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0=E8=AF=B7=E6=B1=82,=20=E4=BB=85?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                   |  52 +++++++--
 src/hooks/useEmail.js                         | 100 ++++++++++++------
 src/stores/EmailSlice.js                      |   2 +-
 src/utils/EventEmitterService.js              |  20 ++++
 .../Online/Components/EmailDetailInline.jsx   |   8 +-
 src/views/orders/components/MailBox.jsx       |   4 +-
 6 files changed, 143 insertions(+), 43 deletions(-)
 create mode 100644 src/utils/EventEmitterService.js

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index bad97d2..e5444a7 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -3,6 +3,7 @@ import { API_HOST, API_HOST_V3, DATE_FORMAT, DATEEND_FORMAT, DATETIME_FORMAT, EM
 import { buildTree, groupBy, isEmpty, objectMapper, omitEmpty, uniqWith } from '@/utils/commons';
 import { readIndexDB, writeIndexDB } from '@/utils/indexedDB';
 import dayjs from 'dayjs';
+import { internalEventEmitter } from '@/utils/EventEmitterService';
 
 export const parseHTMLString = (html, needText = false) => {
   const parser = new DOMParser()
@@ -152,13 +153,13 @@ export const fetchEmailBindOrderAction = async (params) => {
 
 
 const todoTypes = {
-  // 1新订单；2未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
+  // 1新订单；2WhatsApp未读消息；3需一催；4需二催；5需三催；6未处理邮件；入境提醒coli_ordertype=7，余款提醒coli_ordertype=8
   1: '新订单',
-  2: '未读',
+  2: '未读WhatsApp',
   3: '一催',
   4: '二催',
   5: '三催',
-  6: '未处理',
+  6: '老邮件',
   7: '入境提醒',
   8: '余款提醒',
 }
@@ -213,7 +214,7 @@ export const getTodoOrdersAction = async (params) => {
   const orderList = errcode === 0 ? _result_unique : []
   const byOPI = groupBy(orderList, 'OPI_SN')
   const byState = Object.keys(byOPI).reduce((acc, key) => {
-    const sticky = groupBy(byOPI[key], (ele) => ([1, 2, 6].includes(ele.coli_ordertype) ? 0 : [3, 4, 5].includes(ele.coli_ordertype) ? 1 : 2))
+    const sticky = groupBy(byOPI[key], (ele) => ([1, 6].includes(ele.coli_ordertype) ? 0 : [2, 3, 4, 5].includes(ele.coli_ordertype) ? 1 : 2))
     const treeNode = [
       {
         key: key + '-today',
@@ -315,17 +316,56 @@ export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id
   if (!isEmpty(ret)) {
     const listids = [...new Set(ret.map(ele => ele.MAI_SN))];
     writeIndexDB([{key: cacheKey, data: listids}], 'maillist', 'mailbox')
-    writeIndexDB(ret.map(ele => ({ data: ele, key: ele.MAI_SN})), 'listrow', 'mailbox')
+    writeIndexDB(ret.map(ele => ({ data: {...ele, listKey: cacheKey }, key: ele.MAI_SN})), 'listrow', 'mailbox')
   }
   return ret;
 }
 
+export const EMAIL_CHANNEL_NAME = 'mailbox_changes';
+let emailChangesChannel = null;
+export function getEmailChangesChannel() {
+  if (!emailChangesChannel) {
+    emailChangesChannel = new BroadcastChannel(EMAIL_CHANNEL_NAME)
+  }
+  return emailChangesChannel
+}
+
+const updateEmailKeyMap = { read: 'MOI_ReadState' };
+const updateEmailKeyFun = {
+  read: async (params) => {
+    const readCache = await readIndexDB(params.mai_sn_list, 'listrow', 'mailbox')
+    const updateField = Object.keys(params.set).reduce((a, c) => ({ ...a, [updateEmailKeyMap[c]]: params.set[c] }), {})
+    writeIndexDB(
+      params.mai_sn_list.map((ele) => ({ data: { ...(readCache.get(ele).data || {}), ...updateField }, key: ele })),
+      'listrow',
+      'mailbox',
+    )
+    const listKey = readCache.get(params.mai_sn_list[0])?.data?.listKey || '';
+    // 通知邮件列表数据更新
+    const notificationPayload = { type: 'listrow', listKey, affectKeys: params.mai_sn_list }
+    // - 多个tab
+    const channel = getEmailChangesChannel()
+    channel.postMessage(notificationPayload)
+    // - 当前tab
+    // console.log(`[EmailDetail] Emitted internal`, EMAIL_CHANNEL_NAME, notificationPayload);
+    internalEventEmitter.emit(EMAIL_CHANNEL_NAME, notificationPayload);
+  },
+}
 /**
  * 更新邮件属性
  */
 export const updateEmailAction = async (params = { opi_sn: 0, mai_sn_list: [], set: {} }) => {
+  if  (isEmpty(params.mai_sn_list)) {
+    throw new Error('没有需要更新的邮件');
+  }
   const { errcode, result } = await postJSON(`${API_HOST_V3}/mail_update`, params)
-  return errcode === 0 ? {} : result
+  if (errcode === 0 ) {
+    for (const [key, value] of Object.entries(params.set)) {
+      const updateFun = updateEmailKeyFun[key] || (() => {});
+      updateFun(params)
+    }
+  }
+  return errcode === 0 ? result : {}
 }
 
 /**
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 12968a1..156d93d 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -1,11 +1,12 @@
 import { useState, useEffect, useCallback } from 'react'
 import { isEmpty, objectMapper, olog, } from '@/utils/commons'
 import { readIndexDB } from '@/utils/indexedDB'
-import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction, getEmailTemplateAction, saveEmailDraftOrSendAction, updateEmailAction } from '@/actions/EmailActions'
+import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction, getEmailTemplateAction, saveEmailDraftOrSendAction, updateEmailAction, getEmailChangesChannel, EMAIL_CHANNEL_NAME } from '@/actions/EmailActions'
 import { App } from 'antd'
 import useConversationStore from '@/stores/ConversationStore';
 import { msgStatusRenderMapped } from '@/channel/bubbleMsgUtils';
 import { POPUP_FEATURES } from '@/config';
+import { internalEventEmitter } from '@/utils/EventEmitterService';
 
 export const useEmailSignature = (opi_sn) => {
 
@@ -41,7 +42,7 @@ export const useEmailSignature = (opi_sn) => {
  * - If `number`: 直接传递, 直接获取订单详情
  * - If `false`: 不需要获取订单信息
  */
-export const useEmailDetail = (mai_sn, data={}, oid=0) => {
+export const useEmailDetail = (mai_sn=0, data={}, oid=0) => {
   const {notification} = App.useApp()
   const [loading, setLoading] = useState(false)
   const [mailData, setMailData] = useState({ loading, info: { MAI_COLI_SN: 0 }, content: '', attachments: [], AttachList: [] })
@@ -128,7 +129,9 @@ export const useEmailDetail = (mai_sn, data={}, oid=0) => {
     try {
       const { id: savedID } = await saveEmailDraftOrSendAction(body, isDraft)
       setMaiSN(savedID)
-      refresh()
+      if (isDraft) {
+        refresh()
+      }
       return savedID
     } catch (error) {
       console.error(error);
@@ -151,31 +154,46 @@ export const useEmailList = (mailboxDirNode) => {
   const [mailList, setMailList] = useState([])
   const [error, setError] = useState(null)
   const [isFreshData, setIsFreshData] = useState(false)
-  const [refreshTrigger, setRefreshTrigger] = useState(0);
+  const [refreshTrigger, setRefreshTrigger] = useState(0)
 
   const refresh = useCallback(() => {
-    setRefreshTrigger(prev => prev + 1);
-  }, []);
+    setRefreshTrigger((prev) => prev + 1)
+  }, [])
 
   const { OPI_SN: opi_sn, COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = mailboxDirNode
 
-  const markAsRead = useCallback((sn_list) => {
-    updateEmailAction({
-      opi_sn: opi_sn,
-      mai_sn_list: sn_list,
-      set: { read: 1}
-    });
-    refresh()
-  }, []);
+  const markAsRead = useCallback(
+    async (sn_list) => {
+      await updateEmailAction({
+        opi_sn: opi_sn,
+        mai_sn_list: sn_list,
+        set: { read: 1 },
+      })
+    },
+    [VKey],
+  )
+
+  const markAsProcessed = useCallback(
+    async (sn_list) => {
+      await updateEmailAction({
+        opi_sn: opi_sn,
+        mai_sn_list: sn_list,
+        set: { processed: 1 },
+      })
+    },
+    [VKey],
+  )
 
-  const markAsProcessed = useCallback((sn_list) => {
-    updateEmailAction({
-      opi_sn: opi_sn,
-      mai_sn_list: sn_list,
-      set: { processed: 1}
-    });
-    refresh()
-  }, []);
+  const loadMailListFromCache = useCallback(async (payload) => {
+    const cacheKey = isEmpty(COLI_SN) ? `dir-${VKey}` : `order-${VKey}`
+    const readCacheIDList = await readIndexDB(cacheKey, 'maillist', 'mailbox')
+    if (!isEmpty(readCacheIDList)) {
+      const readCacheListRowsMap = await readIndexDB(readCacheIDList.data, 'listrow', 'mailbox')
+      const _x = readCacheIDList.data.map((ele) => readCacheListRowsMap.get(ele).data || {})
+      setMailList(_x)
+      setLoading(false)
+    }
+  }, [VKey])
 
   const getMailList = useCallback(async () => {
     console.log('getMailList', mailboxDirNode)
@@ -191,15 +209,11 @@ export const useEmailList = (mailboxDirNode) => {
     setError(null)
     setIsFreshData(false)
 
-    const cacheKey = isEmpty(COLI_SN) ? `dir-${VKey}` : `order-${VKey}`
-    const readCacheIDList = await readIndexDB(cacheKey, 'maillist', 'mailbox')
-    if (!isEmpty(readCacheIDList)) {
-      const readCacheListRowsMap = await readIndexDB(readCacheIDList.data, 'listrow', 'mailbox')
-      const _x = readCacheIDList.data.map((ele) => readCacheListRowsMap.get(ele).data || {})
-      setMailList(_x)
-      setLoading(false)
-    }
+    // const cacheKey = isEmpty(COLI_SN) ? `dir-${VKey}` : `order-${VKey}`
     try {
+      // 1. 先从缓存读取
+      await loadMailListFromCache();
+      // 2. 从接口获取最新的列表
       const nodeParam = { coli_sn: COLI_SN, order_source_type: OrderSourceType, vkey: VKey, vparent: VParent, mai_senddate1: ApplyDate }
       const x = await queryEmailListAction({ opi_sn, node: nodeParam })
       // 配合List的结构
@@ -217,6 +231,32 @@ export const useEmailList = (mailboxDirNode) => {
 
   useEffect(() => {
     getMailList()
+    // --- Setup Internal Event Listener ---
+    const handleInternalUpdate = (event) => {
+      console.log(`[useEmailList] Received internal event. `, event.detail)
+      if (event.detail && event.detail.type === 'listrow') {
+        loadMailListFromCache()
+      }
+    }
+    internalEventEmitter.on(EMAIL_CHANNEL_NAME, handleInternalUpdate)
+
+    // --- Setup BroadcastChannel Listener ---
+    const channel = getEmailChangesChannel()
+    const handleMessage = (event) => {
+      console.log(`[useEmailList] Received channel event. `, event.data)
+      const cacheKey = isEmpty(COLI_SN) ? `dir-${VKey}` : `order-${VKey}`
+      if (event.data.type === 'listrow' && cacheKey === event.data.listKey) {
+        // cacheKey 不相同时, 不需要更新; 邮箱目录不相同
+        loadMailListFromCache(event.data)
+      }
+    }
+    channel.addEventListener('message', handleMessage)
+
+    // Cleanup
+    return () => {
+      internalEventEmitter.off(EMAIL_CHANNEL_NAME, handleInternalUpdate)
+      channel.removeEventListener('message', handleMessage)
+    }
   }, [getMailList])
 
   return { loading, isFreshData, error, mailList, refresh, markAsRead, markAsProcessed }
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index 6234e55..a322525 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -118,7 +118,7 @@ const emailSlice = (set, get) => ({
     if (isEmpty(readCache) || isNeedRefresh) {
       // > {4} 更新
       const rootTree = await getRootMailboxDirAction({ opi_sn, userIdStr  })
-      console.log('empty', opi_sn, userIdStr, isEmpty(readCache), isNeedRefresh, rootTree);
+      // console.log('empty', opi_sn, userIdStr, isEmpty(readCache), isNeedRefresh, rootTree);
       setMailboxNestedDirsActive(rootTree)
     }
     return false
diff --git a/src/utils/EventEmitterService.js b/src/utils/EventEmitterService.js
new file mode 100644
index 0000000..df591ed
--- /dev/null
+++ b/src/utils/EventEmitterService.js
@@ -0,0 +1,20 @@
+class EventEmitterService extends EventTarget {
+  constructor() {
+    super();
+    // console.log('Internal EventEmitterService created.'); // For debugging
+  }
+
+  emit(eventName, detail) {
+    this.dispatchEvent(new CustomEvent(eventName, { detail }));
+  }
+
+  on(eventName, handler) {
+    this.addEventListener(eventName, handler);
+  }
+
+  off(eventName, handler) {
+    this.removeEventListener(eventName, handler);
+  }
+}
+
+export const internalEventEmitter = new EventEmitterService();
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 11f9b1b..f6adab1 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -138,10 +138,10 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
 
     let btns = []
 
-    const showDoneBtn = mailData.info?.MAI_Direction !== 1 ? true : false
-    if (showDoneBtn) {
-      // btns.push(<Button type='text' key={'set-done'} onClick={() => { alert('todo')}} icon={<MailCheckIcon className={'text-yellow-600'} />} size='small'>已处理</Button>)
-    }
+    // const showDoneBtn = mailData.info?.MAI_Direction !== 1 ? true : false
+    // if (showDoneBtn) {
+    //   btns.push(<Button type='text' key={'set-done'} onClick={() => { alert('todo')}} icon={<MailCheckIcon className={'text-yellow-600'} />} size='small'>已处理</Button>)
+    // }
     // 没有关联订单的邮件`绑定订单`
     if (showBindBtn) {
       btns.push(<EmailBindFormModal key={'bind'} onBoundSuccess={() => setShowBindBtn(false)} {...{ conversationid, mai_sn, showBindBtn }} />)
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 562fa49..83fab0c 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -165,7 +165,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
             <Button shape='circle' type='text' size='small' icon={<ReadOutlined />}
             onClick={() => {
               console.info('markAsRead: ', selectedItems.map((item) => item.MAI_SN))
-              markAsRead(selectedItems.map((item) => item.MAI_SN))
+              markAsRead(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
             }}
             />
           </Tooltip>
@@ -173,7 +173,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
             <Button shape='circle' type='text' size='small' icon={<MailCheckIcon />}
             onClick={() => {
               console.info('markAsProcessed: ', selectedItems.map((item) => item.MAI_SN))
-              markAsProcessed(selectedItems.map((item) => item.MAI_SN))
+              markAsProcessed(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
             }} />
           </Tooltip>
           <Tooltip title='刷新'>

From db14ce64af8194e0a17cfc171a13c31bdd66b0ad Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 16 Jun 2025 09:39:36 +0800
Subject: [PATCH 103/143] =?UTF-8?q?feat:=20=E9=82=AE=E4=BB=B6:=20=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E8=AF=A6=E6=83=85:=20=E8=AE=BE=E4=B8=BA`=E5=B7=B2?=
 =?UTF-8?q?=E8=AF=BB`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Icons.jsx                      |  2 +
 src/hooks/useEmail.js                         |  6 ++
 .../Online/Components/EmailDetailInline.jsx   | 57 ++++++++++---------
 src/views/orders/components/MailBox.jsx       |  4 +-
 .../orders/components/NewEmailButton.jsx      | 16 +++---
 5 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/src/components/Icons.jsx b/src/components/Icons.jsx
index d09ddf6..553da68 100644
--- a/src/components/Icons.jsx
+++ b/src/components/Icons.jsx
@@ -13,6 +13,7 @@ import SendPlaneLineSVG from '@/assets/icons/send-plane-line.svg?react';
 import ResendLineSVG from '@/assets/icons/reset-left-line.svg?react';
 import EditLineSVG from '@/assets/icons/quill-pen-line.svg?react';
 import MailDownloadLineSVG from '@/assets/icons/mail-download-line.svg?react';
+import MailOpenLineSVG from '@/assets/icons/mail-open-line.svg?react';
 import MailAddLineSVG from '@/assets/icons/mail-add-line.svg?react';
 import MailCheckSVG from '@/assets/icons/mail-check-line.svg?react';
 import MailUnreadSVG from '@/assets/icons/mail-unread-line.svg?react';
@@ -32,6 +33,7 @@ export const SendPlaneLineIcon = (props) => <Icon component={SendPlaneLineSVG} {
 export const ResendIcon = (props) => <Icon component={ResendLineSVG} {...props} />;
 export const EditIcon = (props) => <Icon component={EditLineSVG} {...props} />;
 export const MailDownloadIcon = (props) => <Icon component={MailDownloadLineSVG} {...props} />;
+export const MailOpenIcon = (props) => <Icon component={MailOpenLineSVG} {...props} />;
 export const MailAddloadIcon = (props) => <Icon component={MailAddLineSVG} {...props} />;
 export const MailCheckIcon = (props) => <Icon component={MailCheckSVG} {...props} />;
 export const MailUnreadIcon = (props) => <Icon component={MailUnreadSVG} {...props} />;
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 156d93d..11dbbc2 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -75,6 +75,12 @@ export const useEmailDetail = (mai_sn=0, data={}, oid=0) => {
       setMailData(data)
       setColiSN(oid === false ? 0 : data.info.MAI_COLI_SN)
       setLoading(false)
+      // `已读`
+      updateEmailAction({
+        opi_sn: data.info.MAI_OPI_SN,
+        mai_sn_list: [Number(mai_sn) || maiSN],
+        set: { read: 1 },
+      })
     } catch (err) {
       setLoading(false)
       notification.error({
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index f6adab1..0e6efac 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -6,7 +6,7 @@ import { isEmpty, TagColorStyle } from '@/utils/commons'
 import EmailEditorPopup from '../Input/EmailEditorPopup'
 import DnDModal from '@/components/DnDModal'
 import useStyleStore from '@/stores/StyleStore'
-import { openPopup, useEmailDetail, useEmailList, } from '@/hooks/useEmail'
+import { openPopup, useEmailDetail, } from '@/hooks/useEmail'
 import { EMAIL_ATTA_HOST, POPUP_FEATURES } from '@/config'
 import EmailBindFormModal from './EmailBind'
 import EmailContent from './EmailContent'
@@ -202,16 +202,16 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
     }
   }
 
-  return mailID ?(
+  return mailID ? (
     <>
-      <div ref={componentRef} className={`email-container h-full flex flex-col gap-0 divide-y divide-neutral-200 divide-solid *:p-2 *:border-0 bg-white ${variantCls(variant)}`} >
+      <div ref={componentRef} className={`email-container h-full flex flex-col gap-0 divide-y divide-neutral-200 divide-solid *:p-2 *:border-0 bg-white ${variantCls(variant)}`}>
         <div className=''>
           <div className='flex flex-wrap justify-between'>
-          <span className=' font-bold '>
-            {loading ? <LoadingOutlined className='mr-1' /> : null}
-            {mailData.info?.MAI_Subject || emailMsg?.msgOrigin?.subject}
-          </span>
-          <ActionBtns key='actions' className={'ml-auto'}/>
+            <span className={(mailData.info?.MAI_ReadState || 0) > 0 ? '' : ' font-bold '}>
+              {loading ? <LoadingOutlined className='mr-1' /> : null}
+              {mailData.info?.MAI_Subject || emailMsg?.msgOrigin?.subject}
+            </span>
+            <ActionBtns key='actions' className={'ml-auto'} />
           </div>
           <Divider className='my-2' />
           <div className={['flex flex-wrap justify-end', window.innerWidth < 800 ? 'flex-col' : 'flex-row '].join(' ')}>
@@ -260,26 +260,29 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
               <div className='mt-2 whitespace-pre-wrap flex-auto' dangerouslySetInnerHTML={{ __html: mailData.content }}></div>
             )}
             {mailData.AttachList.length > 0 && (
-            <div className={`${compactBtn === false ? 'w-48' : 'border-b border-t-0'} overflow-hidden`}>
-            {mailData.attachments.length > 0 && (<>
-              <span>&nbsp;附件 ({mailData.attachments.length})</span>
-              <List
-                dataSource={mailData.attachments || []}
-                size='small' className='[&_.ant-list-item]:p-1 [&_.ant-list-item]:justify-start'
-                renderItem={(atta) => (
-                  <List.Item>
-                    <FileTypeIcon fileName={atta.ATI_Name} />
-                    <Typography.Text ellipsis={{ tooltip: { title: atta.ATI_Name, placement: 'left' } }} className='text-inherit'>
-                      <span key={atta.ATI_SN} onClick={() => openPopup(`${EMAIL_ATTA_HOST}${atta.ATI_ServerFile}`, atta.ATI_SN)} size='small' className='text-blue-500 cursor-pointer'>
-                        {atta.ATI_Name}
-                      </span>
-                    </Typography.Text>
-                  </List.Item>
+              <div className={`${compactBtn === false ? 'w-48' : 'border-b border-t-0'} overflow-hidden`}>
+                {mailData.attachments.length > 0 && (
+                  <>
+                    <span>&nbsp;附件 ({mailData.attachments.length})</span>
+                    <List
+                      dataSource={mailData.attachments || []}
+                      size='small'
+                      className='[&_.ant-list-item]:p-1 [&_.ant-list-item]:justify-start'
+                      renderItem={(atta) => (
+                        <List.Item>
+                          <FileTypeIcon fileName={atta.ATI_Name} />
+                          <Typography.Text ellipsis={{ tooltip: { title: atta.ATI_Name, placement: 'left' } }} className='text-inherit'>
+                            <span key={atta.ATI_SN} onClick={() => openPopup(`${EMAIL_ATTA_HOST}${atta.ATI_ServerFile}`, atta.ATI_SN)} size='small' className='text-blue-500 cursor-pointer'>
+                              {atta.ATI_Name}
+                            </span>
+                          </Typography.Text>
+                        </List.Item>
+                      )}
+                    />
+                  </>
                 )}
-              /></>
-            )}
-              {mailData.insideAttachments.length > 0 && <span className='text-gray-500 italic'>&nbsp;文内附件 ({mailData.insideAttachments.length}) 已在正文显示</span>}
-            </div>
+                {mailData.insideAttachments.length > 0 && <span className='text-gray-500 italic'>&nbsp;文内附件 ({mailData.insideAttachments.length}) 已在正文显示</span>}
+              </div>
             )}
           </Flex>
         </div>
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 83fab0c..59a6c71 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -5,7 +5,7 @@ import dayjs from 'dayjs'
 import { useEmailList } from '@/hooks/useEmail'
 import { isEmpty } from '@/utils/commons'
 import { MailboxDirIcon } from './MailboxDirIcon'
-import { AttachmentIcon, MailCheckIcon } from '@/components/Icons'
+import { AttachmentIcon, MailCheckIcon, MailOpenIcon, MailUnreadIcon } from '@/components/Icons'
 import NewEmailButton from './NewEmailButton'
 
 const { RangePicker } = DatePicker
@@ -162,7 +162,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, onSelect, ...props }) => {
             ></Checkbox>
           </Tooltip>
           <Tooltip title='标记已读'>
-            <Button shape='circle' type='text' size='small' icon={<ReadOutlined />}
+            <Button shape='circle' type='text' size='small' icon={<MailOpenIcon />}
             onClick={() => {
               console.info('markAsRead: ', selectedItems.map((item) => item.MAI_SN))
               markAsRead(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
diff --git a/src/views/orders/components/NewEmailButton.jsx b/src/views/orders/components/NewEmailButton.jsx
index eb69f70..7a280b5 100644
--- a/src/views/orders/components/NewEmailButton.jsx
+++ b/src/views/orders/components/NewEmailButton.jsx
@@ -1,24 +1,24 @@
 import { useMemo } from 'react'
 import { App, Dropdown } from 'antd'
 import useConversationStore from '@/stores/ConversationStore'
-import { emailTemplates, openPopup } from '@/hooks/useEmail';
-import { isEmpty } from '@/utils/commons';
+import { emailTemplates, openPopup } from '@/hooks/useEmail'
+import { isEmpty } from '@/utils/commons'
 
 const NewEmailButton = ({ ...props }) => {
-  const { notification } = App.useApp();
-  const [mailboxActiveNode, setMailboxActiveNode] = useConversationStore((state) => [state.mailboxActiveNode, state.setMailboxActiveNode])
+  const { notification } = App.useApp()
+  const [mailboxActiveNode] = useConversationStore((state) => [state.mailboxActiveNode])
+  const [mailboxActiveCOLI] = useConversationStore((state) => [state.mailboxActiveCOLI])
 
-  const COLI_SN = useMemo(() => mailboxActiveNode?.COLI_SN || 0, [mailboxActiveNode.COLI_SN])
+  const COLI_SN = useMemo(() => mailboxActiveCOLI || mailboxActiveNode?.COLI_SN || 0, [mailboxActiveNode.COLI_SN, mailboxActiveCOLI])
   const handleTemplateDropdown = ({ key, domEvent }) => {
     if (isEmpty(COLI_SN)) {
-      notification.warning({ message: '请选择到订单目录', placement: 'top' })
+      notification.warning({ message: '无法绑定订单', description: '请先选择到订单目录或订单邮件', placement: 'top' })
       return false
     }
     openPopup(`/email/new/0/${COLI_SN}/${key}`, `new-0-${COLI_SN}-${key}`)
-  };
+  }
 
   const handleNewEmail = () => {
-    console.info('新邮件')
     openPopup(`/email/new/0/${COLI_SN}`, `new-0-${COLI_SN}`)
   }
 

From df4932f325d9061dce7c179ba70efb744ec1992f Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 16 Jun 2025 10:07:08 +0800
Subject: [PATCH 104/143] #

---
 src/hooks/useEmail.js           |   2 -
 src/stores/ConversationStore.js | 101 +-------------------------------
 src/views/NewEmail.jsx          |   1 -
 3 files changed, 1 insertion(+), 103 deletions(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index a3b94c6..4ed7afd 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -127,8 +127,6 @@ export const useEmailDetail = (mai_sn=0, data={}, oid=0) => {
       return false
     }
     await postResendEmailAction({ mai_sn, externalid, actionid, token: 0 })
-    // 重发没有状态返回值, 此处前端处理为'待发送', todo: 刷新页面后消息仍为上一个状态'失败'
-    // updateMessageItem({ conversationid: externalid, actionid, id: actionid, status: msgStatusRenderMapped['accepted'] })
   }
 
   const postEmailSaveOrSend = async (body, isDraft) => {
diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js
index a78ae0b..b3c747e 100644
--- a/src/stores/ConversationStore.js
+++ b/src/stores/ConversationStore.js
@@ -436,119 +436,20 @@ const messageSlice = (set, get) => ({
       targetMsgs.push(message);
     }
 
-    // const targetIndex = conversationsList.findIndex((ele) => String(ele.sn) === String(targetId));
-    // let newConversations = [];
-    // if (targetIndex !== -1) { // 'delivered'
-    //   // 更新列表的时间
-    //   conversationsList.splice(targetIndex, 1, {
-    //     ...conversationsList[targetIndex],
-    //     last_received_time: message.status === 'received' ? dayjs(message.deliverTime).add(8, 'hours').format(DATETIME_FORMAT) : conversationsList[targetIndex].last_received_time,
-    //     conversation_expiretime: message?.conversation?.expireTime || conversationsList[targetIndex].conversation_expiretime || '', // 保留使用UTC时间
-    //     last_message: { ...message, source: message.msg_source },
-    //   })
-    // } else if (targetIndex === -1) {
-    //   // 当前客户端不存在的会话
-    //   // todo: 设置为当前(在WhatsApp返回号码不一致时)
-    //   const newContact = message.msg_direction === 'outbound' ? message.to : message.from;
-    //   newConversations = [{
-    //     ...conversationRow,
-    //     ...message,
-    //     sn: targetId,
-    //     opi_sn: currentConversation.opi_sn, // todo: coli sn
-    //     last_received_time: message.date,
-    //     unread_msg_count: 0,
-    //     whatsapp_name: newContact, //message?.senderName || message?.sender || '',
-    //     customer_name: newContact, // message?.senderName || message?.sender || '',
-    //     conversation_expiretime: message?.conversation?.expireTime || '', // 保留使用UTC时间
-    //     whatsapp_phone_number: message.type === 'email' ? null : newContact,
-    //     show_default: message?.conversation?.name || newContact || '',
-    //     session_type: message?.conversation?.type === 'group' ? 1 : 0,
-    //     last_message: { ...message, source: message.msg_source },
-    //     channels: {
-    //       "email": message.type === 'email' ? newContact : null,
-    //       "phone_number": message.type === 'email' ? null : newContact,
-    //       "whatsapp_phone_number": message.type === 'email' ? null : newContact,
-    //     },
-    //   }];
-    // }
-    // const mergedList = [...newConversations, ...conversationsList]
     setFilter({ loadNextPage: true });
-    // const { topList, pageList } = sortConversationList(mergedList);
 
     return set({
-      // topList,
-      // pageList,
-      // conversationsList: mergedList,
       activeConversations: { ...activeConversations, [String(targetId)]: targetMsgs },
     });
   },
   sentOrReceivedNewMessage: (targetId, message) => {
     // msgRender:
     // console.log('sentOrReceivedNewMessage', targetId, message)
-    const { activeConversations, conversationsList, currentConversation, totalNotify, setFilter } = get();
+    const { activeConversations, setFilter } = get();
     const targetMsgs = activeConversations[String(targetId)] || [];
-    // const targetIndex = conversationsList.findIndex((ele) => Number(ele.sn) === Number(targetId));
-    // const lastReceivedTime = (message.type !== 'system' && message.sender !== 'me') ? dayjs(message.date).add(8, 'hours').format(DATETIME_FORMAT) : null;
-    // const newContact = message.msg_direction === 'outbound' ? message.to : message.from;
-    // const newConversation =
-    //   targetIndex !== -1
-    //     ? {
-    //         ...conversationsList[targetIndex],
-    //         last_received_time: lastReceivedTime || conversationsList[targetIndex].last_received_time,
-    //         unread_msg_count:
-    //           Number(targetId) !== Number(currentConversation.sn) && message.sender !== 'me'
-    //             ? conversationsList[targetIndex].unread_msg_count + 1
-    //             : conversationsList[targetIndex].unread_msg_count,
-    //         last_message: { ...message, source: message.msg_source },
-    //       }
-    //     : {
-    //         ...conversationRow,
-    //         ...message,
-    //         sn: Number(targetId),
-    //         opi_sn: message.opi_sn || currentConversation.opi_sn, // todo: coli sn
-    //         last_received_time: dayjs(message.date).add(8, 'hours').format(DATETIME_FORMAT),
-    //         unread_msg_count: message.sender === 'me' ? 0 : 1,
-    //         whatsapp_name: message?.senderName || message?.sender || '',
-    //         customer_name: message?.senderName || message?.sender || '',
-    //         whatsapp_phone_number: message.type === 'email' ? null : newContact,
-    //         show_default: message?.conversation?.name || message?.senderName || message?.sender || newContact || '',
-    //         session_type: message?.conversation?.type === 'group' ? 1 : 0,
-    //         last_message: { ...message, source: message.msg_source },
-    //         channels: {
-    //           "email": message.type === 'email' ? newContact : null,
-    //           "phone_number": message.type === 'email' ? null : newContact,
-    //           "whatsapp_phone_number": message.type === 'email' ? null : newContact,
-    //         },
-    //       };
-    // if (targetIndex === -1) {
-    //   conversationsList.unshift(newConversation);
-    // } else {
-    // // if (String(targetId)!== '0') {
-    //   conversationsList.splice(targetIndex, 1);
-    //   conversationsList.unshift(newConversation);
-    // }
-    // console.log('find in list, i:', targetIndex);
-    // console.log('find in list, chat updated and Top: \n', JSON.stringify(newConversation, null, 2));
-    // console.log('list updated : \n', JSON.stringify(conversationsList, null, 2));
     setFilter({ loadNextPage: true });
 
-    const isCurrent = Number(targetId) === Number(currentConversation.sn);
-    const updatedCurrent = isCurrent
-      ? {
-          ...currentConversation,
-          last_received_time: dayjs(message.date).add(8, 'hours').format(DATETIME_FORMAT),
-          conversation_expiretime: dayjs(message.date).add(24, 'hours').format(DATETIME_FORMAT),
-          last_message: { ...message, source: message.msg_source },
-        }
-      : {...currentConversation, last_message: message,};
-
-    // const { topList, pageList } = sortConversationList(conversationsList);
     return set({
-      // currentConversation: updatedCurrent,
-      // topList,
-      // pageList,
-      // conversationsList: [...conversationsList],
-      // totalNotify: totalNotify + (message.sender === 'me' ? 0 : 1),
       activeConversations: { ...activeConversations, [String(targetId)]: [...targetMsgs, message] },
     });
   },
diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index 85f5914..726d28b 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -509,7 +509,6 @@ const NewEmail = () => {
 
       // console.log('postSendEmail', body, '\n', msgObj);
       // return;
-      // todo: 保存后不在草稿箱, 在待发目录; 传了ID但每次都新增
       const mailSavedId = await postEmailSaveOrSend(body, isDraft)
       form.setFieldsValue({
         mai_sn: mailSavedId,

From 49fede675e575f6b2d2b6f9c6c06cd6b3e42a243 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 16 Jun 2025 10:45:33 +0800
Subject: [PATCH 105/143] =?UTF-8?q?perf:=20=E5=82=AC=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/NewEmail.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index 726d28b..3ce5f73 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -252,7 +252,7 @@ const NewEmail = () => {
           ...templateFormValues,
           from: quotedMailSenderObj,
           to: orderReceiver || info?.MAI_To || '',
-          subject: `${info.MAI_Subject || ''}`,
+          subject: `${info.MAI_Subject || templateFormValues.subject || ''}`,
           ..._form2,
         }
         readyToInitialContent = generateMailContent({ content: templateContent.bodycontent || '' })

From f9999e7d062b32162207cb34ee80411706109c5b Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 16 Jun 2025 11:14:40 +0800
Subject: [PATCH 106/143] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js | 2 +-
 src/hooks/useEmail.js       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index e5444a7..cd55d6f 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -377,7 +377,7 @@ export const updateEmailAction = async (params = { opi_sn: 0, mai_sn_list: [], s
  * @param {string} [params.remind_type] - Type of reminder.
  * @param {number} [params.remind_index] - Index of the reminder.
  */
-export const getEmailTemplateAction = async (params = { coli_sn: 0, lgc: 1, opi_sn: 0, remind_type: '', remind_index: 0 }) => {
+export const getReminderEmailTemplateAction = async (params = { coli_sn: 0, lgc: 1, opi_sn: 0, remind_type: '', remind_index: 0 }) => {
   const { errcode, result } = await fetchJSON(`${API_HOST_V3}/reminder_letter`, params)
   const { html, bodyContent, bodyText } = parseHTMLString(result?.MailContent, true) ;
   return errcode === 0 ? {...result, bodyContent }: {}
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 4ed7afd..7f9ad78 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -1,7 +1,7 @@
 import { useState, useEffect, useCallback } from 'react'
 import { isEmpty, objectMapper, olog, } from '@/utils/commons'
 import { readIndexDB } from '@/utils/indexedDB'
-import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction, getEmailTemplateAction, saveEmailDraftOrSendAction, updateEmailAction, getEmailChangesChannel, EMAIL_CHANNEL_NAME } from '@/actions/EmailActions'
+import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction, getReminderEmailTemplateAction, saveEmailDraftOrSendAction, updateEmailAction, getEmailChangesChannel, EMAIL_CHANNEL_NAME } from '@/actions/EmailActions'
 import { App } from 'antd'
 import useConversationStore from '@/stores/ConversationStore';
 import { msgStatusRenderMapped } from '@/channel/bubbleMsgUtils';
@@ -375,7 +375,7 @@ export const useEmailTemplate = (templateKey, params) => {
     try {
       const { index: remind_index, type: remind_type } = emailTemplateMap[templateKey] || {};
       const _params = { ...params, remind_index, remind_type};
-      const x = await getEmailTemplateAction(_params)
+      const x = await getReminderEmailTemplateAction(_params)
       const lowerCaseShallow = Object.keys(x).reduce((acc, key) => ({...acc, [key.toLowerCase()]: x[key]}), {})
       setTemplateContent({...lowerCaseShallow, mailtypeName: orderMailTypes.get(lowerCaseShallow.mailtype)})
     } catch (networkError) {

From d18b8fd5e5e93ce9b897dc30867bac08c63de89a Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 16 Jun 2025 15:27:02 +0800
Subject: [PATCH 107/143] =?UTF-8?q?perf:=20=E5=9C=A8=E7=BA=BF=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9:=20=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Conversations/Online/MessagesHeader.jsx | 1 -
 src/views/orders/components/MailBox.jsx           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/Conversations/Online/MessagesHeader.jsx b/src/views/Conversations/Online/MessagesHeader.jsx
index b2e2d9a..cd1a803 100644
--- a/src/views/Conversations/Online/MessagesHeader.jsx
+++ b/src/views/Conversations/Online/MessagesHeader.jsx
@@ -42,7 +42,6 @@ const MessagesHeader = () => {
                 {currentConversation.sn ? (
                   <div className='flex flex-col'>
                     <Typography.Text>{currentConversation.session_type === 1 ? '' : currentConversation?.channels?.whatsapp_phone_number}</Typography.Text>
-                    <Typography.Text>{currentConversation?.channels?.email}</Typography.Text>
                   </div>
                 ) : (
                   <Typography.Text strong type='danger'>
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 997ae27..7c44db2 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -100,7 +100,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
     const mailStateClass = item.MOI_ReadState === 0 ? 'font-bold' : ''
     const hasAtta = item.MAI_Attachment !== 0 ? <AttachmentIcon className='text-blue-500' /> : null
     return (
-      <li className={`flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 active:bg-gray-200 p-2 ${props.currentActiveMailItem === item.key ? 'bg-neutral-100' : ''}`}>
+      <li className={`flex border border-solid border-t-0 border-x-0 border-gray-200 hover:bg-neutral-50 active:bg-gray-200 p-2 ${props.currentActiveMailItem === item.MAI_SN ? 'bg-neutral-100' : ''}`}>
         <div className=''>
           <Checkbox
             checked={selectedItems.some((i) => i.MAI_SN === item.MAI_SN)}

From 36f237a14a7baa760334126e8c8972b0c5f8ba17 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 16 Jun 2025 16:10:05 +0800
Subject: [PATCH 108/143] =?UTF-8?q?feat:=20=E6=96=B0=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E9=82=AE=E4=BB=B6=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config.js                                 |  2 +-
 src/main.jsx                                  |  4 ++-
 .../Online/Components/EmailDetailInline.jsx   | 22 ++++++++++++++-
 src/views/EmailDetailWindow.jsx               | 28 +++++++++++++++++++
 src/views/orders/Follow.jsx                   |  2 +-
 5 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 src/views/EmailDetailWindow.jsx

diff --git a/src/config.js b/src/config.js
index 59415f1..2d475f2 100644
--- a/src/config.js
+++ b/src/config.js
@@ -42,4 +42,4 @@ const __BUILD_DATE__ = `__BUILD_DATE__`;
 export const BUILD_VERSION = process.env.NODE_ENV === 'production' ? __BUILD_VERSION__ : process.env.NODE_ENV;
 export const BUILD_DATE = process.env.NODE_ENV === 'production' ? __BUILD_DATE__ : new Date().toLocaleString();
 
-export const POPUP_FEATURES = 'left=20,top=20,width=1000,height=800';
+export const POPUP_FEATURES = 'left=20,top=20,width=1000,height=800,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,location=no,status=no';
diff --git a/src/main.jsx b/src/main.jsx
index c1c56a4..5cd3f3e 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -31,7 +31,8 @@ import useAuthStore from '@/stores/AuthStore'
 import '@/assets/index.css'
 
 import CustomerRelation from '@/views/customer_relation/index'
-import NewEmail from './views/NewEmail'
+import NewEmail from '@/views/NewEmail'
+import EmailDetailWindow from '@/views/EmailDetailWindow'
 
 import { executeDailyCleanupTask, setupDailyMidnightCleanupScheduler } from '@/utils/indexedDB'
 
@@ -89,6 +90,7 @@ const router = createBrowserRouter([
               { path: 'customer_relation/index', element: <CustomerRelation /> },
             ],
           },
+          { path: 'email/view/:mailid', element: <EmailDetailWindow />},
           { path: 'email/:action/:quoteid/:oid/:templateKey', element: <NewEmail />},
           { path: 'email/:action/:quoteid/:oid', element: <NewEmail />},
           { path: 'email/:action/:quoteid', element: <NewEmail />},
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 0e6efac..2c52de9 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef, useMemo } from 'react'
 import { App, Button, Divider, Avatar, List, Flex, Typography, Tooltip, Empty } from 'antd'
-import { LoadingOutlined, ApiOutlined, FilePdfOutlined, FileOutlined, FileWordOutlined, FileExcelOutlined, FileJpgOutlined, FileImageOutlined, FileTextOutlined, FileGifOutlined, GlobalOutlined, FileZipOutlined, DeleteOutlined } from '@ant-design/icons'
+import { LoadingOutlined, ApiOutlined, FilePdfOutlined, FileOutlined, FileWordOutlined, FileExcelOutlined, FileJpgOutlined, FileImageOutlined, FileTextOutlined, FileGifOutlined, GlobalOutlined, FileZipOutlined, DeleteOutlined, ExpandOutlined } from '@ant-design/icons'
 import { EditIcon, MailCheckIcon, ReplyAllIcon, ReplyIcon, ResendIcon, ShareForwardIcon, SendPlaneFillIcon, InboxIcon } from '@/components/Icons'
 import { isEmpty, TagColorStyle } from '@/utils/commons'
 import EmailEditorPopup from '../Input/EmailEditorPopup'
@@ -87,6 +87,10 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
     return () => {}
   }, [mailData.info?.MAI_COLI_SN])
 
+  const handleView = async () => {
+    openPopup(`/email/view/${mailID || 0}`, `view-${mailID || 0}`)
+  };
+
   const handleResend = async () => {
     if (isEmpty(mai_sn)) {
       return false
@@ -192,6 +196,18 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
         break
     }
 
+    const showFullBtn = variant !== 'full'
+    if (showFullBtn) {
+      btns.push(
+        <>
+        <Divider key='divider1' type='vertical' className='mx-0' />
+        <Button key={'view'} onClick={() => handleView()} size='small' type='text' icon={<ExpandOutlined className='text-indigo-500' />}>
+          最大化
+        </Button>
+        </>
+      )
+    }
+
     return <div className={`flex justify-end items-center gap-1  ${className || ''}`}>{btns}</div>
   }
 
@@ -199,6 +215,10 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
     switch (variant) {
       case 'outline':
         return 'border-y-0 border-x border-solid border-neutral-200'
+      case 'full':
+        return 'h-[calc(100vh-16px)]'
+      default:
+        return ''
     }
   }
 
diff --git a/src/views/EmailDetailWindow.jsx b/src/views/EmailDetailWindow.jsx
new file mode 100644
index 0000000..df8c427
--- /dev/null
+++ b/src/views/EmailDetailWindow.jsx
@@ -0,0 +1,28 @@
+import { useParams } from 'react-router-dom';
+import { App, ConfigProvider } from 'antd'
+import useStyleStore from '@/stores/StyleStore'
+import EmailDetailInline from './Conversations/Online/Components/EmailDetailInline';
+
+
+/**
+ * 独立窗口查看邮件
+ *
+ * - 从销售平台进入: 自动复制 storage, 可读取loginUser
+ *
+ * ! 无状态管理
+ */
+const EmailDetailWindow = () => {
+  const pageParam = useParams();
+  // console.log(pageParam)
+
+  // const [mobile] = useStyleStore((state) => [state.mobile])
+
+  return (
+    <>
+      <ConfigProvider theme={{ token: { colorPrimary: '#6366f1' } }}>
+        <EmailDetailInline mailID={pageParam.mailid} variant={'full'} />
+      </ConfigProvider>
+    </>
+  )
+}
+export default EmailDetailWindow
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 6747652..bc8ee50 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -154,7 +154,7 @@ function Follow() {
         </Layout.Sider>
         <Layout.Content style={{ maxHeight: 'calc(100vh - 166px)', height: 'calc(100vh - 166px)', minWidth: '360px' }}>
           <Splitter>
-            <Splitter.Panel defaultSize='40%' min={580} max='70%'>
+            <Splitter.Panel defaultSize='40%' min={380} max='70%'>
               <Mailbox breadcrumb={computedBreadcrumb} mailboxDir={mailboxActiveNode} onMailItemClick={(item) => onClickEmailItem(item)} currentActiveMailItem={activeEmailId} />
             </Splitter.Panel>
             <Splitter.Panel>

From e9e409ed0de3e76870162ad8eb7ffe943358da8e Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 16 Jun 2025 16:21:28 +0800
Subject: [PATCH 109/143] =?UTF-8?q?perf:=20=E8=AE=A2=E5=8D=95=E8=B7=9F?=
 =?UTF-8?q?=E8=B8=AA:=20=E9=BB=98=E8=AE=A4=E6=8A=98=E5=8F=A0`=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/Follow.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index bc8ee50..4cd4029 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -1,7 +1,7 @@
 import useAuthStore from '@/stores/AuthStore'
 import { pick } from '@/utils/commons'
 import { UnorderedListOutlined, LeftOutlined } from '@ant-design/icons'
-import { Flex, Segmented, Tree, Typography, Layout, Splitter, Button } from 'antd'
+import { Flex, Segmented, Tree, Typography, Layout, Splitter, Button, Tooltip } from 'antd'
 import { useEffect, useMemo, useState } from 'react'
 import EmailDetailInline from '../Conversations/Online/Components/EmailDetailInline'
 import OrderProfile from '@/components/OrderProfile'
@@ -44,7 +44,7 @@ const deptMap = new Map([
 
 function Follow() {
 
-  const [collapsed, setCollapsed] = useState(false)
+  const [collapsed, setCollapsed] = useState(true)
 
   const [loginUser, isPermitted] = useAuthStore((state) => [state.loginUser, state.isPermitted])
   const { accountList } = loginUser
@@ -163,7 +163,9 @@ function Follow() {
           </Splitter>
         </Layout.Content>
 
+      <Tooltip title={(collapsed ? '展开' : '收起')+'订单信息'} placement='left' >
         <Button icon={collapsed ? <LeftOutlined /> : <UnorderedListOutlined />} onClick={() => setCollapsed(!collapsed)} className={`absolute z-10 rounded-none  ${collapsed ? 'right-1 top-36 rounded-l-xl' : 'right-8 top-20 rounded-l'}`} size={collapsed ? 'small' : 'middle'} />
+      </Tooltip>
         <Layout.Sider
           width='280'
           theme='light'

From 95a1b16085b2073a326e81ec867e3351acfb555d Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Mon, 16 Jun 2025 17:04:19 +0800
Subject: [PATCH 110/143] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E6=8C=89=E9=92=AE=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E3=80=81=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/orders/components/MailBox.jsx       | 49 +++++++------------
 .../orders/components/NewEmailButton.jsx      |  1 +
 2 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 7c44db2..f20fe8c 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -1,11 +1,11 @@
 import { useEffect, useState } from 'react'
-import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, ExpandOutlined } from '@ant-design/icons'
+import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined } from '@ant-design/icons'
 import { Flex, Button, Tooltip, List, Form, Row, Col, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton } from 'antd'
 import dayjs from 'dayjs'
 import { useEmailList } from '@/hooks/useEmail'
 import { isEmpty } from '@/utils/commons'
 import { MailboxDirIcon } from './MailboxDirIcon'
-import { AttachmentIcon, MailCheckIcon, MailOpenIcon, MailUnreadIcon } from '@/components/Icons'
+import { AttachmentIcon, MailCheckIcon, MailOpenIcon } from '@/components/Icons'
 import NewEmailButton from './NewEmailButton'
 
 const { RangePicker } = DatePicker
@@ -131,8 +131,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
   return (
     <>
       <div className='bg-white h-auto px-1 flex gap-1 items-center'>
-        <NewEmailButton />
-        <Flex wrap gap='middle' justify={'center'} className='min-w-40'>
+        <Flex wrap gap='middle' justify={'center'} className='min-w-30 px-1'>
           <Tooltip title='全选'>
             <Checkbox
               indeterminate={selectedItems.length > 0 && selectedItems.length < pagination.pagedList.length}
@@ -146,44 +145,34 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
                 }
               }}></Checkbox>
           </Tooltip>
-          <Tooltip title='标记已读'>
+          <Tooltip title='刷新'>
+            <Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} onClick={refresh} />
+          </Tooltip>
+        </Flex>
+
+        <NewEmailButton />
             <Button
-              shape='circle'
-              type='text'
               size='small'
               icon={<MailOpenIcon />}
               onClick={() => {
               markAsRead(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
               }}
-            />
-          </Tooltip>
-          <Tooltip title='已处理'>
+            >已读</Button>
+            <Button
+              size='small'
+              icon={<MailOutlined />}
+              onClick={() => {
+              console.info('未读未实现')
+              }}
+            >未读</Button>
             <Button
-              shape='circle'
-              type='text'
               size='small'
               icon={<MailCheckIcon />}
               onClick={() => {
               markAsProcessed(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
               }}
-            />
-          </Tooltip>
-          <Tooltip title='刷新'>
-            <Button shape='circle' type='text' size='small' icon={<ReloadOutlined />} onClick={refresh} />
-          </Tooltip>
-        </Flex>
-        <Input.Search
-          className=''
-          allowClear
-          onChange={(e) => {}}
-          onPressEnter={(e) => {
-            return false
-          }}
-          placeholder={`邮件主题`}
-        />
-        <Tooltip title='高级搜索'>
-          <Switch checkedChildren={<ExpandOutlined />} unCheckedChildren={<ExpandOutlined />} defaultChecked={false} />
-        </Tooltip>
+            >已处理</Button>
+        <Button size='small' icon={<SearchOutlined />}>查找</Button>
       </div>
       <div className='bg-white h-auto p-1 flex gap-1 items-center hidden'>
         <Form
diff --git a/src/views/orders/components/NewEmailButton.jsx b/src/views/orders/components/NewEmailButton.jsx
index 7a280b5..f4099f5 100644
--- a/src/views/orders/components/NewEmailButton.jsx
+++ b/src/views/orders/components/NewEmailButton.jsx
@@ -25,6 +25,7 @@ const NewEmailButton = ({ ...props }) => {
   return (
     <>
       <Dropdown.Button
+        size='small'
         className={`w-auto ${props.className}`}
         placement='bottom'
         arrow

From f7f95004137405be4411c1111b84a422d85dc28d Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 17 Jun 2025 14:54:25 +0800
Subject: [PATCH 111/143] =?UTF-8?q?feat:=20=E8=AE=BE=E4=B8=BA`=E5=B7=B2?=
 =?UTF-8?q?=E5=A4=84=E7=90=86`=E5=90=8E,=20=E6=9B=B4=E6=96=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js | 22 +++++++++-
 src/utils/indexedDB.js      | 87 +++++++++++++++++++++++++++++--------
 2 files changed, 91 insertions(+), 18 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index cd55d6f..2635b85 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -336,7 +336,7 @@ const updateEmailKeyFun = {
     const readCache = await readIndexDB(params.mai_sn_list, 'listrow', 'mailbox')
     const updateField = Object.keys(params.set).reduce((a, c) => ({ ...a, [updateEmailKeyMap[c]]: params.set[c] }), {})
     writeIndexDB(
-      params.mai_sn_list.map((ele) => ({ data: { ...(readCache.get(ele).data || {}), ...updateField }, key: ele })),
+      params.mai_sn_list.map((ele) => ({ data: { ...(readCache.get(ele)?.data || {}), ...updateField }, key: ele })),
       'listrow',
       'mailbox',
     )
@@ -350,6 +350,26 @@ const updateEmailKeyFun = {
     // console.log(`[EmailDetail] Emitted internal`, EMAIL_CHANNEL_NAME, notificationPayload);
     internalEventEmitter.emit(EMAIL_CHANNEL_NAME, notificationPayload);
   },
+  processed: async (params) => {
+    const readRow0 = await readIndexDB(params.mai_sn_list[0], 'listrow', 'mailbox')
+    console.log('first000', readRow0);
+    const listKey = readRow0?.data?.listKey || '';
+    if (listKey) {
+      console.log('first', listKey);
+      const readCache = await readIndexDB(listKey, 'maillist', 'mailbox')
+      console.log('222', readCache);
+      const updatedMailList = readCache.data.filter(mai_sn => !params.mai_sn_list.includes(mai_sn));
+      writeIndexDB([{ key: listKey, data: updatedMailList }], 'maillist', 'mailbox')
+      // 通知邮件列表数据更新
+      const notificationPayload = { type: 'listrow', listKey, affectKeys: params.mai_sn_list }
+      // - 多个tab
+      const channel = getEmailChangesChannel()
+      channel.postMessage(notificationPayload)
+      // - 当前tab
+      // console.log(`[EmailDetail] Emitted internal`, EMAIL_CHANNEL_NAME, notificationPayload);
+      internalEventEmitter.emit(EMAIL_CHANNEL_NAME, notificationPayload);
+    }
+  }
 }
 /**
  * 更新邮件属性
diff --git a/src/utils/indexedDB.js b/src/utils/indexedDB.js
index 38e2a5c..0d3c9ad 100644
--- a/src/utils/indexedDB.js
+++ b/src/utils/indexedDB.js
@@ -274,24 +274,77 @@ export const readIndexDB = (keys=null, table, database) => {
     }
   })
 };
-export const deleteIndexDBbyKey = (key, table, database) => {
-  var open = indexedDB.open(database, INDEXED_DB_VERSION)
-  open.onupgradeneeded = function () {
-    // var db = open.result
-    // // 数据库是否存在
-    // if (!db.objectStoreNames.contains(table)) {
-    //   var store = db.createObjectStore(table, { keyPath: 'id', autoIncrement: true })
-    // }
-  }
-  open.onsuccess = function () {
-    var db = open.result
-    var tx = db.transaction(table, 'readwrite')
-    var store = tx.objectStore(table)
-    store.delete(key)
-    tx.oncomplete = function () {
-      db.close()
+export const deleteIndexDBbyKey = (keys=null, table, database) => {
+  return new Promise((resolve, reject) => {
+    var open = indexedDB.open(database, INDEXED_DB_VERSION)
+    open.onupgradeneeded = function () {
+      // var db = open.result
+      // // 数据库是否存在
+      // if (!db.objectStoreNames.contains(table)) {
+      //   var store = db.createObjectStore(table, { keyPath: 'id', autoIncrement: true })
+      // }
     }
-  }
+    open.onsuccess = function (e) {
+      let db = e.target.result
+      // 数据库是否存在
+      if (!db.objectStoreNames.contains(table)) {
+        resolve('Database does not exist.')
+        return
+      }
+      var tx = db.transaction(table, 'readwrite')
+      var store = tx.objectStore(table)
+      if (Array.isArray(keys) && keys.length > 0) {
+        const promises = keys.map((key) => {
+          return new Promise((innerResolve) => {
+            const delRequest = store.delete(key)
+            delRequest.onsuccess = (event) => {
+              const result = event.target.result
+              if (result) {
+                innerResolve()
+              } else {
+                innerResolve(void 0) // Resolve with undefined for non-existent keys
+              }
+            }
+            delRequest.onerror = (event) => {
+              innerResolve(undefined)
+            }
+          })
+        })
+        Promise.allSettled(promises)
+          .then((results) => {
+            resolve(results)
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      } else if (!isEmpty(keys)) { // Handle single key
+        const delRequest = store.delete(keys);
+        delRequest.onsuccess = (event) => {
+          const result = event.target.result;
+          if (result) {
+            resolve(result);
+          } else {
+            resolve();
+          }
+        };
+        delRequest.onerror = (event) => {
+          reject(event.target.error);
+        };
+      } else {
+        // 删除所有
+        let clearRequest = store.clear()
+        clearRequest.onsuccess = function (e) {
+          resolve(e.target.result)
+        }
+        clearRequest.onerror = function (e) {
+          reject(e.target.error)
+        }
+      }
+      tx.oncomplete = function () {
+        db.close()
+      }
+    }
+  })
 };
 
 function cleanOldData(database, storeNames=[], dateKey = 'timestamp') {

From 5471345cf10c00b1bc2c0097acd457be0f14d458 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 17 Jun 2025 14:55:31 +0800
Subject: [PATCH 112/143] fix: email detail btns key

---
 src/views/Conversations/Online/Components/EmailDetailInline.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 2c52de9..4dc4588 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -200,7 +200,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
     if (showFullBtn) {
       btns.push(
         <>
-        <Divider key='divider1' type='vertical' className='mx-0' />
+        <Divider key='divider2' type='vertical' className='mx-0' />
         <Button key={'view'} onClick={() => handleView()} size='small' type='text' icon={<ExpandOutlined className='text-indigo-500' />}>
           最大化
         </Button>

From 318c2256b36721563586b3e914e0962c6f71864e Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 17 Jun 2025 16:52:06 +0800
Subject: [PATCH 113/143] =?UTF-8?q?perf:=20=E2=9B=94=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=9D:=20=E9=82=AE=E7=AE=B1=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Conversations/Online/ConversationsNewItem.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Conversations/Online/ConversationsNewItem.jsx b/src/views/Conversations/Online/ConversationsNewItem.jsx
index cb3b229..8ca816d 100644
--- a/src/views/Conversations/Online/ConversationsNewItem.jsx
+++ b/src/views/Conversations/Online/ConversationsNewItem.jsx
@@ -59,7 +59,7 @@ export const ConversationItemForm = ({ initialValues, onFormInstanceReady }) =>
       <Form.Item label='WhatsApp' name={'wa_id'} dependencies={['phone_number']}>
         <Input disabled={!initialValues.is_new && isNotEmpty(initialValues.wa_id)} />
       </Form.Item>
-      <Form.Item
+      <Form.Item hidden
         name={'email'}
         label='邮箱'
         validateStatus={contactValidateStatus}

From 2d4edd6c642e430ce7571c6b92737a2c5c966905 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 17 Jun 2025 16:54:34 +0800
Subject: [PATCH 114/143] =?UTF-8?q?=E2=8F=B3=20=E6=9F=A5=E6=89=BE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E2=86=92=E9=82=AE=E7=AE=B1=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                   |  13 +-
 .../Online/Components/EmailBind.jsx           |   2 +-
 src/views/orders/components/MailBox.jsx       |   3 +-
 .../components/MailOrderSearchModal.jsx       | 120 ++++++++++++++++++
 4 files changed, 128 insertions(+), 10 deletions(-)
 create mode 100644 src/views/orders/components/MailOrderSearchModal.jsx

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 2635b85..8e7350e 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -165,15 +165,17 @@ const todoTypes = {
 }
 /**
  * 顾问的邮箱目录
- * @param {object} { opi_sn }
+ * @param {object} { opi_sn, year, by_start_date, by_success, important, if_want_book, if_thinking }
  */
-export const getEmailDirAction = async (params = { opi_sn: '' }) => {
+export const getEmailDirAction = async (params = { opi_sn: '' }, retOrder=false) => {
   const defaultParams = { opi_sn: 0, year: dayjs().year(), by_start_date: -1, by_success: -1, important: -1, if_want_book: -1, if_thinking: -1 }
   const { errcode, result } = await fetchJSON(`${API_HOST_V3}/email_dir`, { ...defaultParams, ...params })
   const mailboxSort = result //.sort(sortBy('MDR_Order'));
   let tree = buildTree(mailboxSort, { key: 'VKey', parent: 'VParent', name: 'VName', iconIndex: 'ImageIndex', rootKeys: [1], ignoreKeys: [-227001, -227002] })
   tree = tree.filter((ele) => ele.key !== 1)
-  return errcode === 0 ? { [`${params.opi_sn}`]: tree } : { [`${params.opi_sn}`]: [] }
+  const retTree = errcode === 0 ? tree : [];
+  const orderList = groupBy(result, row => `${row.IsTrue}`)?.['0'] || [];
+  return retOrder !== false ? orderList : { [`${params.opi_sn}`]: retTree }
 };
 export const getTodoOrdersAction = async (params) => {
   const opi_arr = params.opisn.split(',')
@@ -347,17 +349,13 @@ const updateEmailKeyFun = {
     const channel = getEmailChangesChannel()
     channel.postMessage(notificationPayload)
     // - 当前tab
-    // console.log(`[EmailDetail] Emitted internal`, EMAIL_CHANNEL_NAME, notificationPayload);
     internalEventEmitter.emit(EMAIL_CHANNEL_NAME, notificationPayload);
   },
   processed: async (params) => {
     const readRow0 = await readIndexDB(params.mai_sn_list[0], 'listrow', 'mailbox')
-    console.log('first000', readRow0);
     const listKey = readRow0?.data?.listKey || '';
     if (listKey) {
-      console.log('first', listKey);
       const readCache = await readIndexDB(listKey, 'maillist', 'mailbox')
-      console.log('222', readCache);
       const updatedMailList = readCache.data.filter(mai_sn => !params.mai_sn_list.includes(mai_sn));
       writeIndexDB([{ key: listKey, data: updatedMailList }], 'maillist', 'mailbox')
       // 通知邮件列表数据更新
@@ -366,7 +364,6 @@ const updateEmailKeyFun = {
       const channel = getEmailChangesChannel()
       channel.postMessage(notificationPayload)
       // - 当前tab
-      // console.log(`[EmailDetail] Emitted internal`, EMAIL_CHANNEL_NAME, notificationPayload);
       internalEventEmitter.emit(EMAIL_CHANNEL_NAME, notificationPayload);
     }
   }
diff --git a/src/views/Conversations/Online/Components/EmailBind.jsx b/src/views/Conversations/Online/Components/EmailBind.jsx
index 1a0923f..a2c782a 100644
--- a/src/views/Conversations/Online/Components/EmailBind.jsx
+++ b/src/views/Conversations/Online/Components/EmailBind.jsx
@@ -155,7 +155,7 @@ export const EmailBindFormModal = ({ mai_sn, conversationid, userId, coliID, onB
         onCancel={() => {
           setOpen(false)
         }}
-        destroyOnClose>
+        destroyOnHidden>
         {/* <AdvanceSearchForm onSubmit={onSearchOrder} loading={searchLoading} /> */}
         <Form
           // layout={'inline'}
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index f20fe8c..bb9a943 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -7,6 +7,7 @@ import { isEmpty } from '@/utils/commons'
 import { MailboxDirIcon } from './MailboxDirIcon'
 import { AttachmentIcon, MailCheckIcon, MailOpenIcon } from '@/components/Icons'
 import NewEmailButton from './NewEmailButton'
+import MailOrderSearchModal from './MailOrderSearchModal'
 
 const { RangePicker } = DatePicker
 
@@ -172,7 +173,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
               markAsProcessed(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
               }}
             >已处理</Button>
-        <Button size='small' icon={<SearchOutlined />}>查找</Button>
+        <MailOrderSearchModal />
       </div>
       <div className='bg-white h-auto p-1 flex gap-1 items-center hidden'>
         <Form
diff --git a/src/views/orders/components/MailOrderSearchModal.jsx b/src/views/orders/components/MailOrderSearchModal.jsx
new file mode 100644
index 0000000..9a682ad
--- /dev/null
+++ b/src/views/orders/components/MailOrderSearchModal.jsx
@@ -0,0 +1,120 @@
+import { createContext, useEffect, useState } from 'react'
+import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined } from '@ant-design/icons'
+import { Button, Modal, Form, Input, Checkbox, Select, Radio, DatePicker, Divider } from 'antd'
+import dayjs from 'dayjs'
+import { getEmailDirAction } from '@/actions/EmailActions'
+import { objectMapper } from '@/utils/commons'
+import useConversationStore from '@/stores/ConversationStore'
+
+const yearsArray = Array.from({ length: new Date().getFullYear() - 2004 + 1 }, (_, i) => ({ key: 2004 + i, value: 2004 + i, label: 2004 + i }))
+
+const MailOrderSearchModal = ({ ...props }) => {
+  const [currentMailboxOPI] = useConversationStore((state) => [state.currentMailboxOPI])
+  const [setMailboxNestedDirsActive, setMailboxActiveNode] = useConversationStore((state) => [state.setMailboxNestedDirsActive, state.setMailboxActiveNode])
+
+  const [open, setOpen] = useState(false)
+  const [form] = Form.useForm()
+  const [loading, setLoading] = useState(false)
+  const [formValues, setFormValues] = useState()
+  const onSubmitSearchMailOrder = async (values) => {
+    console.log('Received values of form: ', values)
+    setFormValues(values)
+    // setOpen(false)
+    setLoading(true)
+    const valuesToSub = objectMapper(values, {
+      year: { key: 'year', transform: (val) => (val ? dayjs(val).year() : '') },
+      important: { key: 'important', transform: (val) => (val ? '1' : '0') },
+      by_success: { key: 'by_success', transform: (val) => (val ? '1' : '0') },
+      if_want_book: { key: 'if_want_book', transform: (val) => (val ? '1' : '0') },
+      if_thinking: { key: 'if_thinking', transform: (val) => (val ? '1' : '0') },
+      by_start_date: { key: 'by_start_date', transform: (val) => (val ? '1' : '0') },
+    })
+    const result = await getEmailDirAction({ ...valuesToSub, opi_sn: currentMailboxOPI }, true)
+    console.log('res', result)
+    setLoading(false)
+    // setMailboxActiveNode({
+    //   key: 1130915,
+    //   parent: -1,
+    //   iconIndex: 13,
+    //   title: 'QYCAH250101022',
+    //   parentTitle: '1月',
+    //   parentIconIndex: 1,
+    //   VKey: 1130915,
+    //   VName: 'QYCAH250101022',
+    //   VParent: -1,
+    //   ImageIndex: 13,
+    //   COLI_SN: 1130915,
+    //   OrderSourceType: 227001,
+    //   IsTrue: 0,
+    //   ApplyDate: '2025-01-01T00:06:00',
+    //   StartDate: '2024-12-16',
+    //   IsSuccess: 0,
+    //   OPI_SN: 586,
+    // })
+    setOpen(false)
+  }
+  return (
+    <>
+      <Button key={'bound'} onClick={() => setOpen(true)} size='small' icon={<SearchOutlined className='' />}>
+        查找
+      </Button>
+      <Modal
+        width={window.innerWidth < 700 ? '95%' : 960}
+        title='查找订单' //mask={false}
+        open={open}
+        cancelText='关闭'
+        okText='查找'
+        confirmLoading={loading}
+        okButtonProps={{ autoFocus: true, htmlType: 'submit' }}
+        onCancel={() => setOpen(false)}
+        // footer={null}
+        destroyOnHidden
+        modalRender={(dom) => (
+          <Form
+            layout='inline'
+            size='small'
+            form={form}
+            name='searchmailorder_form_in_modal'
+            initialValues={{ year: dayjs() }}
+            clearOnDestroy
+            onFinish={(values) => onSubmitSearchMailOrder(values)}
+            className='[&_.ant-form-item]:m-2'>
+            {dom}
+          </Form>
+        )}>
+        <Form.Item name='year' label='年份'>
+          <DatePicker picker='year' maxDate={dayjs()} />
+        </Form.Item>
+        <Form.Item name='important' label='重要程度'>
+          <Radio.Group
+            options={[
+              { key: '240001', value: '240001', label: '普通' },
+              { key: '240002', value: '240002', label: '较重要' },
+              { key: '240003', value: '240003', label: '很重要' },
+            ]}
+            optionType='button'
+          />
+        </Form.Item>
+        <div className='flex'>
+          <Form.Item name='by_success' className='' valuePropName='checked'>
+            <Checkbox>成行订单</Checkbox>
+          </Form.Item>
+          <Form.Item name='if_want_book' className='' valuePropName='checked'>
+            <Checkbox>要预定</Checkbox>
+          </Form.Item>
+          <Form.Item name='if_thinking' className='' valuePropName='checked'>
+            <Checkbox>犹豫中</Checkbox>
+          </Form.Item>
+        </div>
+        <Form.Item name='by_start_date' className='' valuePropName='checked'>
+          <Checkbox>按出发日期</Checkbox>
+        </Form.Item>
+        {/* <Divider className='my-2' /> */}
+        <Form.Item name='order' label='订单号' className=''>
+          <Input />
+        </Form.Item>
+      </Modal>
+    </>
+  )
+}
+export default MailOrderSearchModal

From 52e6307769174a206dfc3c1e78c375d3881c6bb6 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 18 Jun 2025 10:25:22 +0800
Subject: [PATCH 115/143] =?UTF-8?q?perf:=20=E9=82=AE=E4=BB=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85:=20=E8=87=AA=E5=8A=A8=E6=A0=87=E8=AE=B0;=20=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                   |  4 +--
 src/hooks/useEmail.js                         | 14 +++++-----
 .../Online/Components/EmailDetailInline.jsx   | 27 ++++++++++++++++---
 src/views/orders/Follow.jsx                   |  2 +-
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 8e7350e..f46959e 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -100,8 +100,8 @@ export const getEmailDetailAction = async (params) => {
 
   const { html, bodyContent, bodyText } = mailType === 'text/html' ? parseHTMLString(cleanContent, true) : { html: '', bodyContent: '', bodyText: '' };
 
-  const attachments = (isEmpty(result?.AttachList) ? [] : result.AttachList).filter(ele => isEmpty(ele.ATI_ContentID) || !ele.ATI_Name.includes('ContentFile'));
-  const insideAttachments = (isEmpty(result?.AttachList) ? [] : result.AttachList).filter(ele => !isEmpty(ele.ATI_ContentID) && ele.ATI_Name.includes('ContentFile'));
+  const attachments = (isEmpty(result?.AttachList) ? [] : result.AttachList).filter(ele => isEmpty(ele.ATI_ContentID) || ele.ATI_ContentID == '0');
+  const insideAttachments = (isEmpty(result?.AttachList) ? [] : result.AttachList).filter(ele => !isEmpty(ele.ATI_ContentID) && ele.ATI_ContentID != '0');
 
   const ret = {
     info: { ...encodeEmailInfo(result.MailInfo?.[0] || {}), mailType },
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 7f9ad78..114815a 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -42,7 +42,7 @@ export const useEmailSignature = (opi_sn) => {
  * - If `number`: 直接传递, 直接获取订单详情
  * - If `false`: 不需要获取订单信息
  */
-export const useEmailDetail = (mai_sn=0, data={}, oid=0) => {
+export const useEmailDetail = (mai_sn=0, data={}, oid=0, markRead=false) => {
   const {notification} = App.useApp()
   const [loading, setLoading] = useState(false)
   const [mailData, setMailData] = useState({ loading, info: { MAI_COLI_SN: 0 }, content: '', attachments: [], AttachList: [] })
@@ -76,11 +76,13 @@ export const useEmailDetail = (mai_sn=0, data={}, oid=0) => {
       setColiSN(oid === false ? 0 : data.info.MAI_COLI_SN)
       setLoading(false)
       // `已读`
-      updateEmailAction({
-        opi_sn: data.info.MAI_OPI_SN,
-        mai_sn_list: [Number(mai_sn) || maiSN],
-        set: { read: 1 },
-      })
+      if (markRead !== false && data.info?.MOI_ReadState !== 1) {
+        updateEmailAction({
+          opi_sn: data.info.MAI_OPI_SN,
+          mai_sn_list: [Number(mai_sn) || maiSN],
+          set: { read: 1 },
+        })
+      }
     } catch (err) {
       setLoading(false)
       notification.error({
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 4dc4588..279573d 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -17,9 +17,11 @@ const extTypeMapped = {
   pdf: { icon: FilePdfOutlined, color: '#ad0b00' },
   doc: { icon: FileWordOutlined, color: '#103f91' },
   docx: { icon: FileWordOutlined, color: '#103f91' },
+  rtf: { icon: FileWordOutlined, color: '#103f91' },
   xls: { icon: FileExcelOutlined, color: '#0c7d0c' },
   xlsx: { icon: FileExcelOutlined, color: '#0c7d0c' },
   jpg: { icon: FileImageOutlined, color: '#1985ff' },
+  jpeg: { icon: FileImageOutlined, color: '#1985ff' },
   png: { icon: FileImageOutlined, color: '#1985ff' },
   gif: { icon: FileGifOutlined, color: '#1985ff' },
   html: { icon: GlobalOutlined, color: '#1985ff' },
@@ -30,7 +32,7 @@ const extTypeMapped = {
 /**
  * @property {*} emailMsg - 邮件数据. { conversationid, actionId, order_opi, coli_sn, msgOrigin: { from, to, id, email: { subject, mai_sn, } } }
  */
-const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, size, ...props }) => {
+const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, size, autoMark = false, ...props }) => {
   // console.log('emailDetail', emailMsg);
   const componentRef = useRef(null);
   const [compactBtn, setCompactBtn] = useState(size==='small');
@@ -80,7 +82,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
     }
   }
 
-  const { loading, mailData, orderDetail, postEmailResend } = useEmailDetail(mailID, null, false)
+  const { loading, mailData, orderDetail, postEmailResend } = useEmailDetail(mailID, null, false, autoMark)
   const [showBindBtn, setShowBindBtn] = useState(false)
   useEffect(() => {
     setShowBindBtn(mailID ? isEmpty(mailData.info?.MAI_COLI_SN) : false)
@@ -301,7 +303,26 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
                     />
                   </>
                 )}
-                {mailData.insideAttachments.length > 0 && <span className='text-gray-500 italic'>&nbsp;文内附件 ({mailData.insideAttachments.length}) 已在正文显示</span>}
+                {mailData.insideAttachments.length > 0 && <details>
+                  <summary>
+                    点击展开<span className='text-gray-500 italic'>&nbsp;文内附件 ({mailData.insideAttachments.length}) 已在正文显示 </span>
+                  </summary>
+                  <List
+                    dataSource={mailData.insideAttachments || []}
+                    size='small'
+                    className='[&_.ant-list-item]:p-1 [&_.ant-list-item]:justify-start'
+                    renderItem={(atta) => (
+                      <List.Item>
+                        <FileTypeIcon fileName={atta.ATI_Name} />
+                        <Typography.Text ellipsis={{ tooltip: { title: atta.ATI_Name, placement: 'left' } }} className='text-inherit'>
+                          <span key={atta.ATI_SN} onClick={() => openPopup(`${EMAIL_ATTA_HOST}${atta.ATI_ServerFile}`, atta.ATI_SN)} size='small' className='text-blue-500 cursor-pointer'>
+                            {atta.ATI_Name}
+                          </span>
+                        </Typography.Text>
+                      </List.Item>
+                    )}
+                  />
+                </details>}
               </div>
             )}
           </Flex>
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 4cd4029..a5863ff 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -158,7 +158,7 @@ function Follow() {
               <Mailbox breadcrumb={computedBreadcrumb} mailboxDir={mailboxActiveNode} onMailItemClick={(item) => onClickEmailItem(item)} currentActiveMailItem={activeEmailId} />
             </Splitter.Panel>
             <Splitter.Panel>
-              <EmailDetailInline mailID={activeEmailId || 0} emailMsg={selectedEmail} variant={'outline'} size={'small'} onUpdated={(prop) => {}} />
+              <EmailDetailInline mailID={activeEmailId || 0} emailMsg={selectedEmail} variant={'outline'} size={'small'} onUpdated={(prop) => {}} autoMark={true} />
             </Splitter.Panel>
           </Splitter>
         </Layout.Content>

From 7cd6e1b2aa16d4dd48de7a39d1a6ac856393ea97 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 18 Jun 2025 13:55:58 +0800
Subject: [PATCH 116/143] =?UTF-8?q?perf:=20=E5=9C=A8=E7=BA=BF=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E5=85=B1=E7=94=A8=E8=AE=A2=E5=8D=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ChatWindow.jsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/ChatWindow.jsx b/src/views/ChatWindow.jsx
index 2f6d47d..1f38461 100644
--- a/src/views/ChatWindow.jsx
+++ b/src/views/ChatWindow.jsx
@@ -4,12 +4,11 @@ import { RightCircleOutlined, RightOutlined, ReloadOutlined, MenuFoldOutlined, M
 // import { useParams, useNavigate } from 'react-router-dom';
 import MessagesHeader from './Conversations/Online/MessagesHeader';
 import MessagesWrapper from './Conversations/Online/MessagesWrapper';
-import InputComposer from './Conversations/Online/Input/InputComposer';
 import ConversationsList from './Conversations/Online/ConversationsList';
-import CustomerProfile from './Conversations/Online/order/CustomerProfile';
-// import { useAuthContext } from '@/stores/AuthContext';
-// import useConversationStore from '@/stores/ConversationStore';
+import OrderProfile from '@/components/OrderProfile'
 import ReplyWrapper from './Conversations/Online/ReplyWrapper';
+import useConversationStore from '@/stores/ConversationStore';
+import { useShallow } from 'zustand/react/shallow';
 
 import './Conversations/Conversations.css';
 import EmailEditorPopup from './Conversations/Online/Input/EmailEditorPopup';
@@ -24,6 +23,9 @@ const ChatWindow = () => {
   const [collapsedLeft, setCollapsedLeft] = useState(false);
   const [collapsedRight, setCollapsedRight] = useState(true);
 
+
+    const currentOrder = useConversationStore(useShallow(state => state.currentConversation?.coli_sn || ""));
+
   return (
     <>
       <Layout hasSider className='h-screen chatwindow-wrapper' style={{ maxHeight: 'calc(100% - 166px)', height: 'calc(100% - 166px)' }}>
@@ -73,7 +75,7 @@ const ChatWindow = () => {
           collapsedWidth={0}
           trigger={null}
           collapsed={collapsedRight}>
-          <CustomerProfile disabled />
+          <OrderProfile coliSN={currentOrder} />
         </Sider>
       </Layout>
       <EmailEditorPopup key='email-editor-online' />

From bf0f85b17ae773f9dc0c353bc31b4780f47ee01d Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 18 Jun 2025 14:14:16 +0800
Subject: [PATCH 117/143] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx                       | 11 ++++++++---
 src/main.jsx                                          |  4 ++--
 .../Conversations/Online/order/CustomerProfile.jsx    |  1 +
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index 49eb5de..d23cfa2 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -4,6 +4,8 @@ import { useEffect, useState } from 'react'
 import { App, Flex, Select, Tooltip, Divider, Typography, Skeleton, Checkbox } from 'antd'
 import { useOrderStore, fetchSetRemindStateAction, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore'
 import { copy, isEmpty } from '@/utils/commons'
+import { useShallow } from 'zustand/react/shallow'
+import useConversationStore from '@/stores/ConversationStore'
 const OrderProfile = ({ coliSN, ...props }) => {
   const { notification, message } = App.useApp()
 
@@ -21,11 +23,14 @@ const OrderProfile = ({ coliSN, ...props }) => {
     s.appendOrderComment,
   ])
 
+  const currentOrder = useConversationStore(useShallow(state => state.currentConversation?.coli_sn || ""))
+  const orderId = coliSN || currentOrder
+
   const [orderRemindState, setOrderRemindState] = useState(orderDetail.remindstate)
   useEffect(() => {
-    if (coliSN) {
+    if (orderId) {
       setLoading(true)
-      fetchOrderDetail(coliSN)
+      fetchOrderDetail(orderId)
         .finally(() => setLoading(false))
         .catch((reason) => {
           notification.error({
@@ -37,7 +42,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
         })
     }
     return () => {}
-  }, [coliSN])
+  }, [orderId])
 
   const handleSetRemindState = async (checkedValue) => {
     const state = checkedValue.filter((v) => v !== orderRemindState)
diff --git a/src/main.jsx b/src/main.jsx
index 5cd3f3e..f457424 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -17,7 +17,7 @@ import MobileConversation from '@/views/mobile/Conversation'
 import MobileChat from '@/views/mobile/Chat'
 import CallCenter from '@/views/CallCenter'
 import MobileSecondHeader from '@/views/mobile/SecondHeaderWrapper'
-import CustomerProfile from '@/views/Conversations/Online/order/CustomerProfile'
+import OrderProfile from '@/components/OrderProfile'
 import SnippetList from '@/views/accounts/SnippetList'
 import GeneratePayment from '@/views/accounts/GeneratePayment'
 
@@ -64,7 +64,7 @@ const router = createBrowserRouter([
           {
             element: <MobileSecondHeader />,
             children: [
-              { path: 'm/order', element: <CustomerProfile /> },
+              { path: 'm/order', element: <OrderProfile /> },
               { path: 'callcenter/call', element: <CallCenter /> },
               { path: 'callcenter/call/:phonenumber', element: <CallCenter /> },
             ],
diff --git a/src/views/Conversations/Online/order/CustomerProfile.jsx b/src/views/Conversations/Online/order/CustomerProfile.jsx
index 32fd9f3..2287fa1 100644
--- a/src/views/Conversations/Online/order/CustomerProfile.jsx
+++ b/src/views/Conversations/Online/order/CustomerProfile.jsx
@@ -18,6 +18,7 @@ import { postEditConversationItemColiAction } from "@/actions/ConversationAction
 import useStyleStore from '@/stores/StyleStore';
 import SupplierEmailDrawer from "../Components/EmailListDrawer";
 
+// @Deprecated 作废，试用 OrderProfile 代替
 const CustomerProfile = ({ disabled }) => {
   const navigate = useNavigate();
 	const { notification, message } = App.useApp();

From be07ab175b4093bea496f5579581a303f4b8df5b Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 18 Jun 2025 14:38:29 +0800
Subject: [PATCH 118/143] =?UTF-8?q?feat:=20=E6=9F=A5=E6=89=BE=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1/=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                   | 12 +++-
 src/stores/EmailSlice.js                      | 17 ++++-
 .../Online/Components/EmailDetailInline.jsx   |  4 +-
 src/views/orders/Follow.jsx                   |  4 +-
 .../components/MailOrderSearchModal.jsx       | 72 +++++++++++--------
 .../orders/components/MailboxDirIcon.jsx      |  3 +-
 6 files changed, 71 insertions(+), 41 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index f46959e..c485a4f 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -231,7 +231,7 @@ export const getTodoOrdersAction = async (params) => {
           parent: key + '-today',
           parentTitle: '今日任务',
           parentIconIndex: 'star',
-          _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: -1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
+          _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: key + '-today', IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: key + '-today' },
         })),
       },
       {
@@ -247,7 +247,7 @@ export const getTodoOrdersAction = async (params) => {
           parent: key + '-todo',
           parentTitle: '待办任务',
           parentIconIndex: 'calendar',
-          _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: -1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
+          _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: key + '-todo', IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: key + '-todo' },
         })),
       },
       ...(!isEmpty(sticky[1] || [])
@@ -265,7 +265,7 @@ export const getTodoOrdersAction = async (params) => {
                 parent: key + '-reminder',
                 parentTitle: '催信',
                 parentIconIndex: 'reminder',
-                _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: -1, IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: -1 },
+                _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: key + '-reminder', IsTrue: 0, ApplyDate: '', OrderSourceType: 227001, parent: key + '-reminder' },
               })),
             },
           ]
@@ -428,3 +428,9 @@ export const deleteEmailAttachmentAction = async (ati_sn_list) => {
   const { errcode, result } = await postJSON(`${API_HOST_V3}/mail_attachment_delete`, { ati_sn_list })
   return errcode === 0 ? result : {}
 };
+
+
+export const queryHTOrderListAction = async (params) => {
+  const { errcode, result } = await fetchJSON(`${API_HOST}/query_order`, params)
+  return errcode !== 0 ? [] : result
+}
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index a322525..44a46d6 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -1,5 +1,5 @@
 import { getEmailDirAction, getRootMailboxDirAction } from '@/actions/EmailActions'
-import { buildTree, isEmpty  } from '@/utils/commons'
+import { buildTree, isEmpty, sortArrayByOrder  } from '@/utils/commons'
 import { readIndexDB, writeIndexDB, createIndexedDBStore, clean7DaysMailboxLog } from '@/utils/indexedDB';
 
 /**
@@ -85,6 +85,21 @@ const emailSlice = (set, get) => ({
   setMailboxNestedDirsActive: (dir) => {
     return set(() => ({ mailboxNestedDirsActive: dir }))
   },
+  updateMailboxNestedDirs: (dirs) => {
+    const { mailboxNestedDirsActive } = get();
+    const keep = mailboxNestedDirsActive.filter((ele) => isEmpty(ele.parent))
+    return set(() => ({ mailboxNestedDirsActive: [...keep, ...dirs] }))
+  },
+  addMailboxNestedDirs: dirs => {
+    const { mailboxNestedDirsActive } = get()
+    const _Map = new Map(mailboxNestedDirsActive.map((obj) => [obj.key, obj]))
+    dirs.forEach((row) => {
+      _Map.set(row.key, row)
+    })
+    const _newValue = sortArrayByOrder(Array.from(_Map.values()), 'key', ['search-orders'])
+
+    return set(() => ({ mailboxNestedDirsActive: _newValue }))
+  },
 
   mailboxActiveNode: {},
   setMailboxActiveNode: (node) => {
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 279573d..c4ff306 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -200,13 +200,11 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
 
     const showFullBtn = variant !== 'full'
     if (showFullBtn) {
+      btns.push(<Divider key='divider2' type='vertical' className='mx-0' />);
       btns.push(
-        <>
-        <Divider key='divider2' type='vertical' className='mx-0' />
         <Button key={'view'} onClick={() => handleView()} size='small' type='text' icon={<ExpandOutlined className='text-indigo-500' />}>
           最大化
         </Button>
-        </>
       )
     }
 
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index a5863ff..32e19da 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -122,10 +122,10 @@ function Follow() {
   useEffect(() => {
     const first = currentMailboxDEI || accountDEI[0].value
     const opi = accountListDEIMapped[first].OPI_SN
-    setExpandTree([`${opi}-today`, `${opi}-todo`])
+    setExpandTree([`${opi}-today`, `${opi}-todo`, `search-orders`, ...[mailboxActiveNode?.VParent || []]])
 
     return () => {}
-  }, [currentMailboxDEI, mailboxNestedDirsActive])
+  }, [currentMailboxDEI, mailboxNestedDirsActive, mailboxActiveNode])
 
   return (
     <>
diff --git a/src/views/orders/components/MailOrderSearchModal.jsx b/src/views/orders/components/MailOrderSearchModal.jsx
index 9a682ad..851d1bf 100644
--- a/src/views/orders/components/MailOrderSearchModal.jsx
+++ b/src/views/orders/components/MailOrderSearchModal.jsx
@@ -1,16 +1,16 @@
 import { createContext, useEffect, useState } from 'react'
 import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined } from '@ant-design/icons'
-import { Button, Modal, Form, Input, Checkbox, Select, Radio, DatePicker, Divider } from 'antd'
+import { Button, Modal, Form, Input, Checkbox, Select, Radio, DatePicker, Divider, Typography } from 'antd'
 import dayjs from 'dayjs'
-import { getEmailDirAction } from '@/actions/EmailActions'
-import { objectMapper } from '@/utils/commons'
+import { getEmailDirAction, queryHTOrderListAction } from '@/actions/EmailActions'
+import { isEmpty, objectMapper, pick } from '@/utils/commons'
 import useConversationStore from '@/stores/ConversationStore'
 
 const yearsArray = Array.from({ length: new Date().getFullYear() - 2004 + 1 }, (_, i) => ({ key: 2004 + i, value: 2004 + i, label: 2004 + i }))
 
 const MailOrderSearchModal = ({ ...props }) => {
   const [currentMailboxOPI] = useConversationStore((state) => [state.currentMailboxOPI])
-  const [setMailboxNestedDirsActive, setMailboxActiveNode] = useConversationStore((state) => [state.setMailboxNestedDirsActive, state.setMailboxActiveNode])
+  const [addMailboxNestedDirs, updateMailboxNestedDirs, setMailboxActiveNode] = useConversationStore((state) => [state.addMailboxNestedDirs, state.updateMailboxNestedDirs, state.setMailboxActiveNode])
 
   const [open, setOpen] = useState(false)
   const [form] = Form.useForm()
@@ -23,34 +23,33 @@ const MailOrderSearchModal = ({ ...props }) => {
     setLoading(true)
     const valuesToSub = objectMapper(values, {
       year: { key: 'year', transform: (val) => (val ? dayjs(val).year() : '') },
-      important: { key: 'important', transform: (val) => (val ? '1' : '0') },
+      important: { key: 'important', transform: (val) => (val || '-1') },
       by_success: { key: 'by_success', transform: (val) => (val ? '1' : '0') },
       if_want_book: { key: 'if_want_book', transform: (val) => (val ? '1' : '0') },
       if_thinking: { key: 'if_thinking', transform: (val) => (val ? '1' : '0') },
       by_start_date: { key: 'by_start_date', transform: (val) => (val ? '1' : '0') },
+      coli_id: { key: 'coli_id', transform: (val) => (val ? val : '') },
+      is_biz: { key: 'sourcetype', transform: (val) => (val ? '227002' : '227001') },
     })
-    const result = await getEmailDirAction({ ...valuesToSub, opi_sn: currentMailboxOPI }, true)
-    console.log('res', result)
+    let result;
+    if (isEmpty(valuesToSub.coli_id)) {
+      const { coli_id, sourcetype, ...mailboxParams} = valuesToSub;
+      result = await getEmailDirAction({ ...mailboxParams, opi_sn: currentMailboxOPI }, false)
+      updateMailboxNestedDirs(result[`${currentMailboxOPI}`])
+    } else {
+      const htOrderParams = pick(valuesToSub, ['coli_id', 'sourcetype',])
+      result = await queryHTOrderListAction(htOrderParams)
+      const addToTree = {
+        key: 'search-orders',
+        title: '搜索结果',
+        iconIndex: 'search',
+        _raw: { COLI_SN: 0, IsTrue: 0 },
+        children: result.map((o) => ({ key: `search-${o.COLI_SN}`, title: `${o.COLI_ID}`, iconIndex: 13, parent: 'search-orders', parentTitle: '搜索结果', parentIconIndex: 'search', _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: 'search-orders', IsTrue: 0, ApplyDate: '', OrderSourceType: htOrderParams.sourcetype, parent: 'search-orders' }, })),
+      }
+      addMailboxNestedDirs([addToTree]);
+      setMailboxActiveNode(addToTree);
+    }
     setLoading(false)
-    // setMailboxActiveNode({
-    //   key: 1130915,
-    //   parent: -1,
-    //   iconIndex: 13,
-    //   title: 'QYCAH250101022',
-    //   parentTitle: '1月',
-    //   parentIconIndex: 1,
-    //   VKey: 1130915,
-    //   VName: 'QYCAH250101022',
-    //   VParent: -1,
-    //   ImageIndex: 13,
-    //   COLI_SN: 1130915,
-    //   OrderSourceType: 227001,
-    //   IsTrue: 0,
-    //   ApplyDate: '2025-01-01T00:06:00',
-    //   StartDate: '2024-12-16',
-    //   IsSuccess: 0,
-    //   OPI_SN: 586,
-    // })
     setOpen(false)
   }
   return (
@@ -60,7 +59,7 @@ const MailOrderSearchModal = ({ ...props }) => {
       </Button>
       <Modal
         width={window.innerWidth < 700 ? '95%' : 960}
-        title='查找订单' //mask={false}
+        title='查找邮件' //mask={false}
         open={open}
         cancelText='关闭'
         okText='查找'
@@ -75,7 +74,7 @@ const MailOrderSearchModal = ({ ...props }) => {
             size='small'
             form={form}
             name='searchmailorder_form_in_modal'
-            initialValues={{ year: dayjs() }}
+            initialValues={{ year: dayjs(), important: '-1' }}
             clearOnDestroy
             onFinish={(values) => onSubmitSearchMailOrder(values)}
             className='[&_.ant-form-item]:m-2'>
@@ -83,11 +82,12 @@ const MailOrderSearchModal = ({ ...props }) => {
           </Form>
         )}>
         <Form.Item name='year' label='年份'>
-          <DatePicker picker='year' maxDate={dayjs()} />
+          <DatePicker picker='year' />
         </Form.Item>
         <Form.Item name='important' label='重要程度'>
           <Radio.Group
             options={[
+              { key: '-1', value: '-1', label: 'All' },
               { key: '240001', value: '240001', label: '普通' },
               { key: '240002', value: '240002', label: '较重要' },
               { key: '240003', value: '240003', label: '很重要' },
@@ -109,10 +109,20 @@ const MailOrderSearchModal = ({ ...props }) => {
         <Form.Item name='by_start_date' className='' valuePropName='checked'>
           <Checkbox>按出发日期</Checkbox>
         </Form.Item>
-        {/* <Divider className='my-2' /> */}
-        <Form.Item name='order' label='订单号' className=''>
+        <div className='text-end'>
+          <Button type='primary' htmlType='submit' loading={loading}>
+            查找
+          </Button>
+        </div>
+
+        <Divider className='my-2' />
+        <Typography.Title level={5}>查找订单</Typography.Title>
+        <Form.Item name='coli_id' label='订单号' className=''>
           <Input />
         </Form.Item>
+        <Form.Item name='is_biz' className='' valuePropName='checked'>
+          <Checkbox>商务订单</Checkbox>
+        </Form.Item>
       </Modal>
     </>
   )
diff --git a/src/views/orders/components/MailboxDirIcon.jsx b/src/views/orders/components/MailboxDirIcon.jsx
index 05b2428..227169f 100644
--- a/src/views/orders/components/MailboxDirIcon.jsx
+++ b/src/views/orders/components/MailboxDirIcon.jsx
@@ -1,7 +1,8 @@
-import { StarTwoTone, CalendarTwoTone, FolderOutlined, DeleteOutlined, ClockCircleOutlined, FormOutlined, DatabaseOutlined, BellTwoTone } from '@ant-design/icons'
+import { StarTwoTone, CalendarTwoTone, FolderOutlined, DeleteOutlined, ClockCircleOutlined, FormOutlined, DatabaseOutlined, BellTwoTone, SearchOutlined } from '@ant-design/icons'
 import { InboxIcon, MailUnreadIcon, SendPlaneFillIcon } from '@/components/Icons'
 
 const EmailDirTypeIcons = {
+  'search': { component: SearchOutlined, color: '', className: 'text-blue-600' },
   'star': { component: StarTwoTone, color: '', className: '' },
   'calendar': { component: CalendarTwoTone, color: '', className: '' },
   'reminder': { component: BellTwoTone, color: '', className: '' },

From b1db77bbe9ae748166e56f180b5c0fe3adb2ab29 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 18 Jun 2025 14:46:53 +0800
Subject: [PATCH 119/143] =?UTF-8?q?conf:=20=E5=A2=9E=E5=8A=A0=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98:=20=E9=99=84=E4=BB=B6,=20=E4=BC=98=E5=8C=96=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/vite.config.js b/vite.config.js
index 8a05e76..448192f 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -99,6 +99,20 @@ const manifestForPWAPlugIn = {
           },
         },
       },
+      {
+        urlPattern: /^https:\/\/.*\.mycht\.cn\/attachment\/.*/i,
+        handler: 'CacheFirst',
+        options: {
+          cacheName: 'mail-attachment',
+          expiration: {
+            maxEntries: 10,
+            maxAgeSeconds: 60 * 60 * 24 * 7, // <== 7 days
+          },
+          cacheableResponse: {
+            statuses: [0, 200],
+          },
+        },
+      },
     ],
   },
   manifest: {

From 696832eba119b7e6ca221494b78d50cdb5e08aac Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 18 Jun 2025 14:50:10 +0800
Subject: [PATCH 120/143] #

---
 src/views/orders/components/MailOrderSearchModal.jsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/orders/components/MailOrderSearchModal.jsx b/src/views/orders/components/MailOrderSearchModal.jsx
index 851d1bf..bfff438 100644
--- a/src/views/orders/components/MailOrderSearchModal.jsx
+++ b/src/views/orders/components/MailOrderSearchModal.jsx
@@ -15,11 +15,9 @@ const MailOrderSearchModal = ({ ...props }) => {
   const [open, setOpen] = useState(false)
   const [form] = Form.useForm()
   const [loading, setLoading] = useState(false)
-  const [formValues, setFormValues] = useState()
+
   const onSubmitSearchMailOrder = async (values) => {
-    console.log('Received values of form: ', values)
-    setFormValues(values)
-    // setOpen(false)
+    // console.log('Received values of form: ', values)
     setLoading(true)
     const valuesToSub = objectMapper(values, {
       year: { key: 'year', transform: (val) => (val ? dayjs(val).year() : '') },

From f081aa46e9776db2a0941b763b8c6a4dfe08715d Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 18 Jun 2025 15:09:00 +0800
Subject: [PATCH 121/143] =?UTF-8?q?perf:=20=E9=82=AE=E4=BB=B6=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E8=AE=A2=E5=8D=95:=20=E6=94=AF=E6=8C=81=E5=95=86?=
 =?UTF-8?q?=E5=8A=A1=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Online/Components/EmailBind.jsx           | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/views/Conversations/Online/Components/EmailBind.jsx b/src/views/Conversations/Online/Components/EmailBind.jsx
index a2c782a..f6c999d 100644
--- a/src/views/Conversations/Online/Components/EmailBind.jsx
+++ b/src/views/Conversations/Online/Components/EmailBind.jsx
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import { App, Modal, Button, Table, Form, Row, Col, Input } from 'antd'
+import { App, Modal, Button, Table, Form, Row, Col, Input, Checkbox } from 'antd'
 import { ApiOutlined } from '@ant-design/icons'
 import { isEmpty, cloneDeep } from '@/utils/commons'
 import { fetchJSON } from '@/utils/request'
@@ -33,7 +33,7 @@ export const EmailBindFormModal = ({ mai_sn, conversationid, userId, coliID, onB
     const copyObject = cloneDeep(values)
     delete copyObject.type
     const allEmpty = Object.values(copyObject).every((val) => {
-      return val === null || val === '' || val === undefined
+      return val === null || String(val).trim() === '' || val === undefined
     })
     if (allEmpty) {
       notification.warning({
@@ -45,12 +45,13 @@ export const EmailBindFormModal = ({ mai_sn, conversationid, userId, coliID, onB
       return false
     }
     // values.opisn = loginUserId
-    values.sourcetype = values.sourcetype || '227001'
+    values.sourcetype = values.is_biz ? '227002' : '227001'
+    delete values.is_biz
     setLoading(false)
     setSearchLoading(true)
     setSearchResult([])
     const result = await fetchHTOrderList(values)
-    setSearchResult(result)
+    setSearchResult(result.map(ele => ({...ele, sourcetype: values.sourcetype})))
     setSearchLoading(false)
   }
 
@@ -133,7 +134,7 @@ export const EmailBindFormModal = ({ mai_sn, conversationid, userId, coliID, onB
       key: 'action',
       width: 150,
       render: (_, record) => (
-        <Button type={'text'} className='text-primary' onClick={() => handleBindOrder({ coli_sn: record.COLI_SN, coli_id: record.COLI_ID })}>
+        <Button type={'text'} className='text-primary' onClick={() => handleBindOrder({ coli_sn: record.COLI_SN, coli_id: record.COLI_ID, sourcetype: record.sourcetype })}>
           关联此订单
         </Button>
       ),
@@ -158,7 +159,7 @@ export const EmailBindFormModal = ({ mai_sn, conversationid, userId, coliID, onB
         destroyOnHidden>
         {/* <AdvanceSearchForm onSubmit={onSearchOrder} loading={searchLoading} /> */}
         <Form
-          // layout={'inline'}
+          layout={'inline'}
           form={form}
           initialValues={{
             orderLabel: '',
@@ -167,21 +168,17 @@ export const EmailBindFormModal = ({ mai_sn, conversationid, userId, coliID, onB
             // ...initialValues,
           }}
           onFinish={onSearchOrder}>
-          <Row justify='start' gutter={16}>
-            <Col span={4}>
-              <Form.Item label='订单号' name='coli_id' initialValue={coliID}>
+              <Form.Item label='订单号' name='coli_id' initialValue={coliID} rules={[{ required: true, message: '请输入订单号' }]}>
                 <Input placeholder='订单号' allowClear />
               </Form.Item>
-              <Form.Item hidden label='订单类型' name='sourcetype' initialValue={'227001'}>
-                <Input placeholder='订单类型' allowClear   />
+              <Form.Item name='is_biz' className='' valuePropName='checked'>
+                <Checkbox>商务订单</Checkbox>
               </Form.Item>
-            </Col>
             <div style={{ flex: '0 1 64px' }} className='flex justify-between'>
               <Button type='primary' htmlType='submit' loading={searchLoading}>
                 搜索
               </Button>
             </div>
-          </Row>
         </Form>
         <Table key={'advanceOrderTable'} loading={loading} dataSource={searchResult} columns={searchResultColumns} pagination={searchResult.length <= 10 ? false : paginationProps} rowKey={'COLI_SN'} />
       </Modal>

From 890027563c6db43fde00924cc36cf8103cf48726 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 18 Jun 2025 15:09:43 +0800
Subject: [PATCH 122/143] =?UTF-8?q?feat:=20=E5=AE=8C=E6=88=90=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx | 77 ++++++++++++++++++++++++++++-----
 1 file changed, 67 insertions(+), 10 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index d23cfa2..46835ec 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -1,16 +1,31 @@
-import { WhatsAppOutlined, FileAddOutlined, MailOutlined, PhoneOutlined, UserOutlined, FieldNumberOutlined, CompassOutlined, CalendarOutlined, EditOutlined, CheckOutlined } from '@ant-design/icons'
+import {
+  WhatsAppOutlined,
+  FileAddOutlined,
+  MailOutlined,
+  PhoneOutlined,
+  UserOutlined,
+  FieldNumberOutlined,
+  CompassOutlined,
+  CalendarOutlined,
+  EditOutlined,
+  CheckOutlined,
+  ReloadOutlined,
+} from '@ant-design/icons'
 
-import { useEffect, useState } from 'react'
-import { App, Flex, Select, Tooltip, Divider, Typography, Skeleton, Checkbox } from 'antd'
+import { useEffect, useState, useRef } from 'react'
+import { App, Flex, Select, Tooltip, Divider, Typography, Skeleton, Checkbox, Drawer, Button, Form, Input } from 'antd'
 import { useOrderStore, fetchSetRemindStateAction, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore'
 import { copy, isEmpty } from '@/utils/commons'
 import { useShallow } from 'zustand/react/shallow'
 import useConversationStore from '@/stores/ConversationStore'
+import useAuthStore from '@/stores/AuthStore'
 const OrderProfile = ({ coliSN, ...props }) => {
   const { notification, message } = App.useApp()
-
+  const [formComment] = Form.useForm()
   const [loading, setLoading] = useState(false)
 
+  const [openOrderCommnet, setOpenOrderCommnet] = useState(false)
+
   const orderLabelOptions = copy(OrderLabelDefaultOptions)
   orderLabelOptions.unshift({ value: 0, label: '未设置', disabled: true })
 
@@ -23,7 +38,8 @@ const OrderProfile = ({ coliSN, ...props }) => {
     s.appendOrderComment,
   ])
 
-  const currentOrder = useConversationStore(useShallow(state => state.currentConversation?.coli_sn || ""))
+  const loginUser = useAuthStore((state) => state.loginUser)
+  const currentOrder = useConversationStore(useShallow((state) => state.currentConversation?.coli_sn || ''))
   const orderId = coliSN || currentOrder
 
   const [orderRemindState, setOrderRemindState] = useState(orderDetail.remindstate)
@@ -186,7 +202,12 @@ const OrderProfile = ({ coliSN, ...props }) => {
         <Divider orientation='left'>
           <Typography.Text strong>表单信息</Typography.Text>
           <Tooltip title='添加'>
-            <FileAddOutlined className='pl-1' />
+            <FileAddOutlined
+              className='pl-1'
+              onClick={() => {
+                setOpenOrderCommnet(true)
+              }}
+            />
           </Tooltip>
         </Divider>
         <p className='p-2 overflow-auto m-0 break-words whitespace-pre-wrap' dangerouslySetInnerHTML={{ __html: orderDetail.order_detail }}></p>
@@ -197,20 +218,56 @@ const OrderProfile = ({ coliSN, ...props }) => {
         <Typography.Text>{orderDetail.customer_request}</Typography.Text>
         <Divider orientation='left'>
           <Typography.Text strong>外联备注</Typography.Text>
-          <Tooltip title='修改'>
+          {/* <Tooltip title='修改'>
             <EditOutlined className='pl-1' />
-          </Tooltip>
+          </Tooltip> */}
         </Divider>
         <Typography.Text>{orderDetail.wl_memo}</Typography.Text>
 
         <Divider orientation='left'>
           <Typography.Text strong>附加信息</Typography.Text>
-          <Tooltip title='修改'>
+          {/* <Tooltip title='修改'>
             <EditOutlined className='pl-1' />
-          </Tooltip>
+          </Tooltip> */}
         </Divider>
         <Typography.Text>泰国马来水灯节</Typography.Text>
       </Skeleton>
+      <Drawer title='添加表单信息' closable={{ 'aria-label': 'Close Button' }} onClose={() => setOpenOrderCommnet(false)} open={openOrderCommnet}>
+        <Form
+          layout={'vertical'}
+          form={formComment}
+          initialValues={{ comment: '' }}
+          scrollToFirstError
+          onFinish={(values) => {
+            console.log('Received values of form: ', values)
+            appendOrderComment(loginUser.userId, orderId, values.comment)
+              .then(() => {
+                notification.success({
+                  message: '温性提示',
+                  description: '添加表单信息成功',
+                })
+                setOpenOrderCommnet(false)
+                formComment.setFieldsValue({ comment: '' })
+              })
+              .catch((reason) => {
+                notification.error({
+                  message: '添加出错',
+                  description: reason.message,
+                  placement: 'top',
+                  duration: 60,
+                })
+              })
+          }}>
+          <Form.Item name='comment' label='表单信息' rules={[{ required: true, message: '请输入表单信息' }]}>
+            <Input.TextArea rows={4} />
+          </Form.Item>
+          <Form.Item>
+            <Button type='primary' htmlType='submit'>
+              提交
+            </Button>
+          </Form.Item>
+        </Form>
+      </Drawer>
     </>
   )
 }

From 70a7f25b07e6870a874a3163a0c92b9d4cbc6351 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 18 Jun 2025 15:31:13 +0800
Subject: [PATCH 123/143] =?UTF-8?q?feat:=20=E6=9F=A5=E6=89=BE=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1/=E8=AE=A2=E5=8D=95:=20=E8=AE=A2=E5=8D=95=E4=BB=85?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E8=B4=A6=E5=8F=B7=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                                 | 5 +++++
 .../Conversations/Online/Components/EmailDetailInline.jsx   | 2 +-
 src/views/orders/components/MailOrderSearchModal.jsx        | 6 ++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index c485a4f..19eb2de 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -434,3 +434,8 @@ export const queryHTOrderListAction = async (params) => {
   const { errcode, result } = await fetchJSON(`${API_HOST}/query_order`, params)
   return errcode !== 0 ? [] : result
 }
+
+export const queryOPIOrderAction = async (params) => {
+  const { errcode, result } = await fetchJSON(`${API_HOST}/getdvancedwlorder`, params)
+  return errcode !== 0 ? [] : result
+};
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index c4ff306..1b033c2 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -87,7 +87,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
   useEffect(() => {
     setShowBindBtn(mailID ? isEmpty(mailData.info?.MAI_COLI_SN) : false)
     return () => {}
-  }, [mailData.info?.MAI_COLI_SN])
+  }, [mailID, mailData.info?.MAI_COLI_SN])
 
   const handleView = async () => {
     openPopup(`/email/view/${mailID || 0}`, `view-${mailID || 0}`)
diff --git a/src/views/orders/components/MailOrderSearchModal.jsx b/src/views/orders/components/MailOrderSearchModal.jsx
index bfff438..e92826d 100644
--- a/src/views/orders/components/MailOrderSearchModal.jsx
+++ b/src/views/orders/components/MailOrderSearchModal.jsx
@@ -2,12 +2,10 @@ import { createContext, useEffect, useState } from 'react'
 import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined } from '@ant-design/icons'
 import { Button, Modal, Form, Input, Checkbox, Select, Radio, DatePicker, Divider, Typography } from 'antd'
 import dayjs from 'dayjs'
-import { getEmailDirAction, queryHTOrderListAction } from '@/actions/EmailActions'
+import { getEmailDirAction, queryHTOrderListAction, } from '@/actions/EmailActions'
 import { isEmpty, objectMapper, pick } from '@/utils/commons'
 import useConversationStore from '@/stores/ConversationStore'
 
-const yearsArray = Array.from({ length: new Date().getFullYear() - 2004 + 1 }, (_, i) => ({ key: 2004 + i, value: 2004 + i, label: 2004 + i }))
-
 const MailOrderSearchModal = ({ ...props }) => {
   const [currentMailboxOPI] = useConversationStore((state) => [state.currentMailboxOPI])
   const [addMailboxNestedDirs, updateMailboxNestedDirs, setMailboxActiveNode] = useConversationStore((state) => [state.addMailboxNestedDirs, state.updateMailboxNestedDirs, state.setMailboxActiveNode])
@@ -36,7 +34,7 @@ const MailOrderSearchModal = ({ ...props }) => {
       updateMailboxNestedDirs(result[`${currentMailboxOPI}`])
     } else {
       const htOrderParams = pick(valuesToSub, ['coli_id', 'sourcetype',])
-      result = await queryHTOrderListAction(htOrderParams)
+      result = await queryHTOrderListAction({...htOrderParams, opi_sn: currentMailboxOPI})
       const addToTree = {
         key: 'search-orders',
         title: '搜索结果',

From 95d6e7dd920452d71cdb07db627e1833bb801765 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 18 Jun 2025 15:35:24 +0800
Subject: [PATCH 124/143] =?UTF-8?q?feat=EF=BC=9A=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx | 28 +++++++++-------------------
 src/config.js                   |  4 ++--
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index 46835ec..5fe142a 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -83,22 +83,12 @@ const OrderProfile = ({ coliSN, ...props }) => {
     return customerDetail.name
   }
 
+  const getPlanStatus = () => {
+    return orderDetail.DidPlan === 0 ? '未做计划' : '已做计划'
+  }
+
   return (
     <>
-      {/* <Tabs
-        tabPosition={'right'}
-        onTabClick={(key) => {
-          console.info(key)
-        }}
-        items={Array.from({ length: 3 }).map((_, i) => {
-          const id = String(i + 1)
-          return {
-            label: `Tab ${id}`,
-            key: id,
-            children: `Content of Tab ${id}`,
-          }
-        })}
-      /> */}
       <Skeleton active loading={loading}>
         <Flex gap='small' vertical={true} justify='space-between' className='p-2'>
           <Typography.Text>
@@ -111,7 +101,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
           </Typography.Text>
           <Typography.Text>
             <CompassOutlined className=' pr-1' />
-            Thailand
+            {orderDetail.MEI_Country}
           </Typography.Text>
           <Typography.Text>
             <PhoneOutlined className=' pr-1' />
@@ -128,13 +118,13 @@ const OrderProfile = ({ coliSN, ...props }) => {
           <Typography.Text>
             <Tooltip title='出发日期'>
               <CalendarOutlined className='pr-1' />
-              2025-09-18
+              {orderDetail.COLI_OrderStartDate}
             </Tooltip>
           </Typography.Text>
           <Typography.Text>
-            <Tooltip title='计划'>
+            <Tooltip title='计划状态'>
               <CheckOutlined className='pr-1' />
-              已做计划
+              {getPlanStatus()}
             </Tooltip>
           </Typography.Text>
         </Flex>
@@ -230,7 +220,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
             <EditOutlined className='pl-1' />
           </Tooltip> */}
         </Divider>
-        <Typography.Text>泰国马来水灯节</Typography.Text>
+        <Typography.Text>{orderDetail.COLI_Introduction}</Typography.Text>
       </Skeleton>
       <Drawer title='添加表单信息' closable={{ 'aria-label': 'Close Button' }} onClose={() => setOpenOrderCommnet(false)} open={openOrderCommnet}>
         <Form
diff --git a/src/config.js b/src/config.js
index 2d475f2..6f6c568 100644
--- a/src/config.js
+++ b/src/config.js
@@ -6,7 +6,7 @@
 // export const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_144'; // prod: Slave
 
 // debug:
-// export const API_HOST = 'http://202.103.68.144:8889/v2';
+export const API_HOST = 'http://202.103.68.144:8889/v2';
 export const API_HOST_V3 = 'http://202.103.68.144:8889/v3';
 // export const WS_URL = 'ws://202.103.68.144:8888';
 // export const EMAIL_HOST = 'http://202.103.68.231:888/service-mail';
@@ -19,7 +19,7 @@ export const EMAIL_ATTA_HOST = 'https://p9axztuwd7x8a7.mycht.cn/attachment'; //
 // prod:
 // export const WAI_HOST = 'https://wai-server-qq4qmtq7wc9he4.mycht.cn/api/v1';
 export const EMAIL_HOST = 'https://p9axztuwd7x8a7.mycht.cn/mail-server/service-mail';
-export const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/v2';
+// export const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/v2';
 export const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_server'; // prod:
 export const VONAGE_URL = 'https://p9axztuwd7x8a7.mycht.cn/vonage-server'; // 语音和视频接口:
 export const HT3 =  process.env.NODE_ENV === 'production' ? 'https://p9axztuwd7x8a7.mycht.cn/ht3' : 'https://p9axztuwd7x8a7.mycht.cn/ht3';

From f8246c10a3e7f34012b9cd29ea4c77ea6cd104e5 Mon Sep 17 00:00:00 2001
From: LiaoYijun <lyj@hainatravel.com>
Date: Wed, 18 Jun 2025 16:08:29 +0800
Subject: [PATCH 125/143] =?UTF-8?q?fix:=20=E8=AF=95=E7=94=A8=20Router-Link?=
 =?UTF-8?q?=20=E8=B7=B3=E8=BD=AC=E5=9C=A8=E7=BA=BF=E8=81=8A=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index 5fe142a..34310d6 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -12,7 +12,8 @@ import {
   ReloadOutlined,
 } from '@ant-design/icons'
 
-import { useEffect, useState, useRef } from 'react'
+import { useEffect, useState } from 'react'
+import { Link, useNavigate } from 'react-router-dom'
 import { App, Flex, Select, Tooltip, Divider, Typography, Skeleton, Checkbox, Drawer, Button, Form, Input } from 'antd'
 import { useOrderStore, fetchSetRemindStateAction, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore'
 import { copy, isEmpty } from '@/utils/commons'
@@ -20,6 +21,7 @@ import { useShallow } from 'zustand/react/shallow'
 import useConversationStore from '@/stores/ConversationStore'
 import useAuthStore from '@/stores/AuthStore'
 const OrderProfile = ({ coliSN, ...props }) => {
+  const navigate = useNavigate()
   const { notification, message } = App.useApp()
   const [formComment] = Form.useForm()
   const [loading, setLoading] = useState(false)
@@ -111,10 +113,12 @@ const OrderProfile = ({ coliSN, ...props }) => {
             <MailOutlined className='pr-1' />
             {customerDetail.email}
           </Typography.Text>
-          <Typography.Link href={`/order/chat/${coliSN}`}>
+          <Typography.Text>
             <WhatsAppOutlined className=' pr-1' />
-            {customerDetail.whatsapp_phone_number}
-          </Typography.Link>
+            <Link to={`/order/chat/${coliSN}`} state={orderDetail}>
+              {customerDetail.whatsapp_phone_number}
+            </Link>
+          </Typography.Text>
           <Typography.Text>
             <Tooltip title='出发日期'>
               <CalendarOutlined className='pr-1' />

From 701a6a00c035a05de268268267d86b4a032471ab Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 18 Jun 2025 16:56:23 +0800
Subject: [PATCH 126/143] =?UTF-8?q?perf:=20=E6=96=B0=E9=82=AE=E4=BB=B6:=20?=
 =?UTF-8?q?=E5=89=8D=E7=BC=80[=E7=A7=B0=E5=91=BC+=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/NewEmail.jsx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index 3ce5f73..055dcc7 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -69,7 +69,7 @@ const generateQuoteContent = (mailData, isRichText = true) => {
   return isRichText ? html : parseHTMLText(html)
 }
 
-const generateMailContent = (mailData) => `<br><p>${mailData.content}</p><br>`
+const generateMailContent = (mailData) => `<p>${mailData.content}</p><br>`
 
 /**
  * 独立窗口编辑器
@@ -105,7 +105,7 @@ const NewEmail = () => {
   // const [emailOrderSN, setEmailOrderSN] = useState('')
   // const [emailMat, setEmailMat] = useState('')
 
-  const [contentPrefix, setContentPrefix] = useState('')
+  // const [contentPrefix, setContentPrefix] = useState('')
   const [localDraft, setLocalDraft] = useState();
 
   // const readMailboxLocalCache = async () => {
@@ -168,7 +168,8 @@ const NewEmail = () => {
     document.title = docTitle
 
     const { order_no } = orderDetail
-    setContentPrefix(order_no ? `<p>Dear Mr./Ms. ${orderDetail.contact?.[0]?.name || ''}</p><p>Reference Number: ${order_no}</p>` : '')
+    // setContentPrefix(order_no ? `<p>Dear Mr./Ms. ${orderDetail.contact?.[0]?.name || ''}</p><p>Reference Number: ${order_no}</p>` : '')
+    const orderPrefix = order_no ? `<p>Dear Mr./Ms. ${orderDetail.contact?.[0]?.name || ''}</p><p>Reference Number: ${order_no}</p>` : ''
 
     const { info } = mailData
     const { ...templateFormValues } = templateContent;
@@ -202,8 +203,8 @@ const NewEmail = () => {
 
     // const _initialContent = isEmpty(mailData.info) ? signatureBody : signatureBody+preQuoteBody
 
-    if (!isEmpty(mailData.info) && !['edit', 'new'].includes(pageParam.action)) {
-      readyToInitialContent = contentPrefix + signatureBody
+    if (!isEmpty(mailData.info) && !['edit'].includes(pageParam.action)) {
+      readyToInitialContent = orderPrefix + signatureBody
     }
     switch (pageParam.action) {
       case 'reply':
@@ -239,7 +240,7 @@ const NewEmail = () => {
           from: quotedMailSenderObj,
           to: info?.MAI_To || '',
           cc: info?.MAI_CS || '',
-          subject: `Fw: ${info.MAI_Subject || ''}`,
+          subject: `${info.MAI_Subject || ''}`,
           id: pageParam.quoteid,
           mai_sn: pageParam.quoteid,
           ..._form2
@@ -255,7 +256,7 @@ const NewEmail = () => {
           subject: `${info.MAI_Subject || templateFormValues.subject || ''}`,
           ..._form2,
         }
-        readyToInitialContent = generateMailContent({ content: templateContent.bodycontent || '' })
+        readyToInitialContent = generateMailContent({ content: templateContent.bodycontent || readyToInitialContent || '' })
         setFileList(mailData.attachments.map(ele => ({ uid: ele.ATI_SN, name: ele.ATI_Name, url: ele.ATI_ServerFile, fullPath: `${EMAIL_ATTA_HOST}${ele.ATI_ServerFile}` })))
         break
 
@@ -267,7 +268,7 @@ const NewEmail = () => {
     setInitialContent(readyToInitialContent);
 
     return () => {}
-  }, [orderDetail.order_no, quoteLoading, loadingTamplate])
+  }, [orderDetail.order_no, quoteLoading, loadingTamplate, signature])
 
 
   // const readFromTemplate = () => {

From 812bf19c26d5ea510cad20b059a9883ed9a63b67 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 19 Jun 2025 10:50:02 +0800
Subject: [PATCH 127/143] =?UTF-8?q?feat:=20=E9=82=AE=E7=AE=B1=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95:=20=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js                   | 41 ++++++++++++++++--
 src/hooks/useEmail.js                         |  2 +-
 src/stores/ConversationStore.js               | 10 ++++-
 src/stores/EmailSlice.js                      | 43 +++++++++++--------
 src/views/orders/Follow.jsx                   | 26 ++++++++---
 .../components/MailOrderSearchModal.jsx       |  6 +--
 6 files changed, 95 insertions(+), 33 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 19eb2de..427e107 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -165,7 +165,8 @@ const todoTypes = {
 }
 /**
  * 顾问的邮箱目录
- * @param {object} { opi_sn, year, by_start_date, by_success, important, if_want_book, if_thinking }
+ * @param {object} params { opi_sn, year, by_start_date, by_success, important, if_want_book, if_thinking }
+ * @param {boolean} retOrder 是否直接返回订单列表 -- 忽略
  */
 export const getEmailDirAction = async (params = { opi_sn: '' }, retOrder=false) => {
   const defaultParams = { opi_sn: 0, year: dayjs().year(), by_start_date: -1, by_success: -1, important: -1, if_want_book: -1, if_thinking: -1 }
@@ -177,6 +178,35 @@ export const getEmailDirAction = async (params = { opi_sn: '' }, retOrder=false)
   const orderList = groupBy(result, row => `${row.IsTrue}`)?.['0'] || [];
   return retOrder !== false ? orderList : { [`${params.opi_sn}`]: retTree }
 };
+export const getMailboxCountAction = async (params = { opi_sn: '' }, update = false) => {
+  const defaultParams = {
+    opi_sn: 0,
+    // date1: dayjs().subtract(1, 'year').startOf('year').format(DATE_FORMAT),
+    date1: dayjs().subtract(180, 'days').format(DATE_FORMAT),
+    date2: dayjs().format(DATEEND_FORMAT)
+  }
+  const { errcode, result } = await fetchJSON(`${API_HOST_V3}/dir_count`, {...defaultParams, ...params})
+  const ret = errcode !== 0 ? { [`${params.opi_sn}`]: {} } : { [`${params.opi_sn}`]: result }
+  // 更新数量
+  if (update !== false) {
+    const readCacheDir = await readIndexDB(Number(params.opi_sn), 'dirs', 'mailbox');
+    const mailboxDir = isEmpty(readCacheDir) ? [] : readCacheDir.tree.filter(node => node._raw.IsTrue === 1);
+    const _MapDir = new Map(mailboxDir.map((obj) => [obj.key, obj]))
+    Object.keys(result).map(dirKey => {
+      _MapDir.set(Number(dirKey), {..._MapDir.get(Number(dirKey)), count: result[dirKey]});
+    })
+    console.log(_MapDir, '_MapDir')
+    const _newToUpdate = Array.from(_MapDir.values());
+    const _MapRoot = new Map((readCacheDir?.tree || []).map((obj) => [obj.key, obj]))
+    _newToUpdate.forEach((row) => {
+      _MapRoot.set(row.key, row)
+    })
+    const _newRoot = Array.from(_MapRoot.values())
+    writeIndexDB([{ key: Number(params.opi_sn), tree: _newRoot }], 'dirs', 'mailbox')
+  }
+
+  return ret;
+};
 export const getTodoOrdersAction = async (params) => {
   const opi_arr = params.opisn.split(',')
   const defaultStickyTree = opi_arr.reduce(
@@ -211,7 +241,7 @@ export const getTodoOrdersAction = async (params) => {
     {},
   )
   const { errcode, result } = await fetchJSON(`${API_HOST}/getwlorder`, params)
-  // 取后一个状态, 因此翻转两次
+  // 订单重复时, 取后一个状态, 因此翻转两次
   const _result_unique = uniqWith(result.reverse(), (a, b) => a.COLI_SN === b.COLI_SN).reverse();
   const orderList = errcode === 0 ? _result_unique : []
   const byOPI = groupBy(orderList, 'OPI_SN')
@@ -286,7 +316,9 @@ export const getRootMailboxDirAction = async ({ opi_sn = 0, userIdStr = '' } = {
     getTodoOrdersAction({ opisn: userIdStr || String(opi_sn), otype: 'today' }),
     ...(userIdStr.split(',').map(_opi => getEmailDirAction({ opi_sn: _opi }))),
   ])
-  const mailboxDirByOPI = mailboxDir.reduce((a, c) => ({...a, ...c}), {});
+  const mailBoxCount = await Promise.all(userIdStr.split(',').map(_opi => getMailboxCountAction({ opi_sn: _opi })));
+  const mailboxDirCountByOPI = mailBoxCount.reduce((a, c) => ({ ...a, ...c, }), {})
+  const mailboxDirByOPI = mailboxDir.reduce((a, c) => ({ ...a, ...(Object.keys(c).reduce((a, opi) => ({...a, [opi]: c[`${opi}`].map((dir) => ({ ...dir, count: mailboxDirCountByOPI[opi][`${dir.key}`] })) }), {} )) }), {})
   const rootTree = Object.keys(stickyTree).map((opi) => ({ key: Number(opi), tree: [...stickyTree[opi], ...(mailboxDirByOPI?.[opi] || [])] }))
   writeIndexDB(rootTree, 'dirs', 'mailbox')
   const _mapped = groupBy(rootTree, 'key')
@@ -304,7 +336,8 @@ export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id
     vkey: 0,
     vparent: 0,
     order_source_type: 0,
-    mai_senddate1: dayjs().subtract(1, 'year').startOf('year').format(DATE_FORMAT),
+    // mai_senddate1: dayjs().subtract(1, 'year').startOf('year').format(DATE_FORMAT),
+    mai_senddate1: dayjs().subtract(180, 'days').format(DATE_FORMAT),
     mai_senddate2: dayjs().format(DATEEND_FORMAT),
     ...omitEmpty({
       ...node,
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 114815a..4eec062 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -54,7 +54,7 @@ export const useEmailDetail = (mai_sn=0, data={}, oid=0, markRead=false) => {
   const refresh = useCallback(() => {
     setRefreshTrigger(prev => prev + 1);
   }, []);
-  console.log(maiSN, 'mailSN', mai_sn)
+  // console.log(maiSN, 'mailSN', mai_sn)
 
   // const [updateMessageItem] = useConversationStore(state => [state.updateMessageItem]);
 
diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js
index b3c747e..83d9974 100644
--- a/src/stores/ConversationStore.js
+++ b/src/stores/ConversationStore.js
@@ -179,7 +179,7 @@ const websocketSlice = (set, get) => ({
     logWebsocket(data, 'I');
     // olog('websocket Messages ----', data);
     // console.log(data);
-    const { updateMessageItem, sentOrReceivedNewMessage, addGlobalNotify, setWai, addToConversationList } = get();
+    const { updateMessageItem, sentOrReceivedNewMessage, addGlobalNotify, setWai, addToConversationList, updateMailboxCount } = get()
     const { errcode, errmsg, result } = data;
 
     if (!result) {
@@ -195,6 +195,14 @@ const websocketSlice = (set, get) => ({
     const msgRender = receivedMsgTypeMapped[resultType].contentToRender(msgObj);
     const msgUpdate = receivedMsgTypeMapped[resultType].contentToUpdate(msgObj);
     // console.log('msgRender msgUpdate', msgRender, msgUpdate);
+    if (['email.updated', 'email.inbound.received',].includes(resultType)) {
+      updateMailboxCount({ opi_sn: msgObj.opi_sn })
+      if (!isEmpty(msgRender)) {
+        const msgNotify = receivedMsgTypeMapped[resultType].contentToNotify(msgObj);
+        addGlobalNotify(msgNotify);
+      }
+      return false;
+    }
     if ([
       'whatsapp.message.updated', 'message', 'error',
       'email.updated', 'wai.message.updated',
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index 44a46d6..649683b 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -1,5 +1,5 @@
-import { getEmailDirAction, getRootMailboxDirAction } from '@/actions/EmailActions'
-import { buildTree, isEmpty, sortArrayByOrder  } from '@/utils/commons'
+import { getEmailDirAction, getMailboxCountAction, getRootMailboxDirAction } from '@/actions/EmailActions'
+import { buildTree, isEmpty, olog, sortArrayByOrder  } from '@/utils/commons'
 import { readIndexDB, writeIndexDB, createIndexedDBStore, clean7DaysMailboxLog } from '@/utils/indexedDB';
 
 /**
@@ -85,18 +85,14 @@ const emailSlice = (set, get) => ({
   setMailboxNestedDirsActive: (dir) => {
     return set(() => ({ mailboxNestedDirsActive: dir }))
   },
-  updateMailboxNestedDirs: (dirs) => {
-    const { mailboxNestedDirsActive } = get();
-    const keep = mailboxNestedDirsActive.filter((ele) => isEmpty(ele.parent))
-    return set(() => ({ mailboxNestedDirsActive: [...keep, ...dirs] }))
-  },
-  addMailboxNestedDirs: dirs => {
+  updateCurrentMailboxNestedDirs: (dirs) => {
     const { mailboxNestedDirsActive } = get()
     const _Map = new Map(mailboxNestedDirsActive.map((obj) => [obj.key, obj]))
     dirs.forEach((row) => {
       _Map.set(row.key, row)
     })
-    const _newValue = sortArrayByOrder(Array.from(_Map.values()), 'key', ['search-orders'])
+    // const _newValue = sortArrayByOrder(Array.from(_Map.values()), 'key', ['search-orders'])
+    const _newValue = Array.from(_Map.values())
 
     return set(() => ({ mailboxNestedDirsActive: _newValue }))
   },
@@ -119,33 +115,46 @@ const emailSlice = (set, get) => ({
     return set(() => ({ mailboxActiveCOLI: coli }))
   },
 
-  getOPIEmailDir: async (opi_sn = 0, userIdStr='') => {
+  getOPIEmailDir: async (opi_sn = 0, userIdStr = '', refreshNow = false) => {
     // console.log('🌐requesting opi dir', opi_sn, typeof opi_sn)
-    const { setMailboxNestedDirsActive } = get()
+    const { setMailboxNestedDirsActive, updateMailboxCount } = get()
     const readCache = await readIndexDB(Number(opi_sn), 'dirs', 'mailbox')
     // console.log(readCache);
-    let isNeedRefresh = false
+    let isNeedRefresh = refreshNow
     if (!isEmpty(readCache)) {
       setMailboxNestedDirsActive(readCache?.tree || [])
-      isNeedRefresh = Date.now() - readCache.timestamp > 1 * 60 * 60 * 1000
+      isNeedRefresh = refreshNow || Date.now() - readCache.timestamp > 1 * 60 * 60 * 1000
       // isNeedRefresh = true; // test: 0
     }
     if (isEmpty(readCache) || isNeedRefresh) {
       // > {4} 更新
-      const rootTree = await getRootMailboxDirAction({ opi_sn, userIdStr  })
+      const rootTree = await getRootMailboxDirAction({ opi_sn, userIdStr: String(userIdStr || opi_sn) })
       // console.log('empty', opi_sn, userIdStr, isEmpty(readCache), isNeedRefresh, rootTree);
       setMailboxNestedDirsActive(rootTree)
+    } else {
+      // 只更新数量
+      updateMailboxCount({ opi_sn })
     }
     return false
   },
 
-  async initMailbox({ opi_sn, dei_sn, userId, userIdStr }) {
+  // 更新数量
+  updateMailboxCount: async ({ opi_sn }) => {
+    const { setMailboxNestedDirsActive } = get()
+    await getMailboxCountAction({ opi_sn }, true)
+    const readCache = await readIndexDB(Number(opi_sn), 'dirs', 'mailbox')
+    if (!isEmpty(readCache)) {
+      setMailboxNestedDirsActive(readCache?.tree || [])
+    }
+  },
+
+  async initMailbox({ opi_sn, dei_sn, userIdStr }) {
+    olog('initMailbox ---- ')
     const { setCurrentMailboxOPI, setCurrentMailboxDEI, getOPIEmailDir } = get()
     createIndexedDBStore(['dirs', 'maillist', 'listrow', 'mailinfo', 'draft'], 'mailbox')
     setCurrentMailboxOPI(opi_sn)
     setCurrentMailboxDEI(dei_sn)
-    getOPIEmailDir(opi_sn, userIdStr)
+    getOPIEmailDir(opi_sn, userIdStr, true)
   },
-
 })
 export default emailSlice
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 32e19da..ed60ba5 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -1,7 +1,7 @@
 import useAuthStore from '@/stores/AuthStore'
 import { pick } from '@/utils/commons'
 import { UnorderedListOutlined, LeftOutlined } from '@ant-design/icons'
-import { Flex, Segmented, Tree, Typography, Layout, Splitter, Button, Tooltip } from 'antd'
+import { Flex, Segmented, Tree, Typography, Layout, Splitter, Button, Tooltip, Badge } from 'antd'
 import { useEffect, useMemo, useState } from 'react'
 import EmailDetailInline from '../Conversations/Online/Components/EmailDetailInline'
 import OrderProfile from '@/components/OrderProfile'
@@ -134,11 +134,13 @@ function Follow() {
           <Flex justify='start' align='start' vertical className='h-full'>
             <Segmented className='w-full' block shape='round' options={accountDEI} value={currentMailboxDEI} onChange={handleSwitchAccount} />
             <div className='overflow-y-auto flex-auto w-full [&_.ant-tree-switcher]:me-0 [&_.ant-tree-node-content-wrapper]:px-0 [&_.ant-tree-node-content-wrapper]:text-ellipsis [&_.ant-tree-node-content-wrapper]:overflow-hidden [&_.ant-tree-node-content-wrapper]:whitespace-nowrap'>
-              <Tree className='[&_.ant-typography-ellipsis]:max-w-44 [&_.ant-typography-ellipsis]:min-w-36'
+              <Tree
+                className='[&_.ant-typography-ellipsis]:max-w-44 [&_.ant-typography-ellipsis]:min-w-36'
                 key='sticky-today'
                 blockNode
                 showIcon
-                showLine autoExpandParent={true}
+                showLine
+                autoExpandParent={true}
                 expandAction={'doubleClick'}
                 onSelect={handleTreeSelectGetMails}
                 selectedKeys={[mailboxActiveNode.key]}
@@ -147,7 +149,12 @@ function Follow() {
                 defaultExpandedKeys={expandTree}
                 treeData={mailboxNestedDirsActive}
                 icon={(node) => <MailboxDirIcon type={node?.iconIndex} />}
-                titleRender={(node) => <Typography.Text ellipsis={{ tooltip: node.title }} className={`${node?._raw?.IsSuccess===1 ? 'text-primary' : ''}`}>{node.title}</Typography.Text>}
+                titleRender={(node) => (
+                  <Typography.Text ellipsis={{ tooltip: node.title }} className={`${node?._raw?.IsSuccess === 1 ? 'text-primary' : ''}`}>
+                    {node.title}
+                    <Badge size={'small'} count={node.count} offset={[3, 0]} style={{backgroundColor: "transparent", color: '#1ba784'}} overflowCount={999} />
+                  </Typography.Text>
+                )}
               />
             </div>
           </Flex>
@@ -163,9 +170,14 @@ function Follow() {
           </Splitter>
         </Layout.Content>
 
-      <Tooltip title={(collapsed ? '展开' : '收起')+'订单信息'} placement='left' >
-        <Button icon={collapsed ? <LeftOutlined /> : <UnorderedListOutlined />} onClick={() => setCollapsed(!collapsed)} className={`absolute z-10 rounded-none  ${collapsed ? 'right-1 top-36 rounded-l-xl' : 'right-8 top-20 rounded-l'}`} size={collapsed ? 'small' : 'middle'} />
-      </Tooltip>
+        <Tooltip title={(collapsed ? '展开' : '收起') + '订单信息'} placement='left'>
+          <Button
+            icon={collapsed ? <LeftOutlined /> : <UnorderedListOutlined />}
+            onClick={() => setCollapsed(!collapsed)}
+            className={`absolute z-10 rounded-none  ${collapsed ? 'right-1 top-36 rounded-l-xl' : 'right-8 top-20 rounded-l'}`}
+            size={collapsed ? 'small' : 'middle'}
+          />
+        </Tooltip>
         <Layout.Sider
           width='280'
           theme='light'
diff --git a/src/views/orders/components/MailOrderSearchModal.jsx b/src/views/orders/components/MailOrderSearchModal.jsx
index e92826d..c040f4b 100644
--- a/src/views/orders/components/MailOrderSearchModal.jsx
+++ b/src/views/orders/components/MailOrderSearchModal.jsx
@@ -8,7 +8,7 @@ import useConversationStore from '@/stores/ConversationStore'
 
 const MailOrderSearchModal = ({ ...props }) => {
   const [currentMailboxOPI] = useConversationStore((state) => [state.currentMailboxOPI])
-  const [addMailboxNestedDirs, updateMailboxNestedDirs, setMailboxActiveNode] = useConversationStore((state) => [state.addMailboxNestedDirs, state.updateMailboxNestedDirs, state.setMailboxActiveNode])
+  const [updateCurrentMailboxNestedDirs, setMailboxActiveNode] = useConversationStore((state) => [state.updateCurrentMailboxNestedDirs, state.setMailboxActiveNode])
 
   const [open, setOpen] = useState(false)
   const [form] = Form.useForm()
@@ -31,7 +31,7 @@ const MailOrderSearchModal = ({ ...props }) => {
     if (isEmpty(valuesToSub.coli_id)) {
       const { coli_id, sourcetype, ...mailboxParams} = valuesToSub;
       result = await getEmailDirAction({ ...mailboxParams, opi_sn: currentMailboxOPI }, false)
-      updateMailboxNestedDirs(result[`${currentMailboxOPI}`])
+      updateCurrentMailboxNestedDirs(result[`${currentMailboxOPI}`])
     } else {
       const htOrderParams = pick(valuesToSub, ['coli_id', 'sourcetype',])
       result = await queryHTOrderListAction({...htOrderParams, opi_sn: currentMailboxOPI})
@@ -42,7 +42,7 @@ const MailOrderSearchModal = ({ ...props }) => {
         _raw: { COLI_SN: 0, IsTrue: 0 },
         children: result.map((o) => ({ key: `search-${o.COLI_SN}`, title: `${o.COLI_ID}`, iconIndex: 13, parent: 'search-orders', parentTitle: '搜索结果', parentIconIndex: 'search', _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: 'search-orders', IsTrue: 0, ApplyDate: '', OrderSourceType: htOrderParams.sourcetype, parent: 'search-orders' }, })),
       }
-      addMailboxNestedDirs([addToTree]);
+      updateCurrentMailboxNestedDirs([addToTree]);
       setMailboxActiveNode(addToTree);
     }
     setLoading(false)

From 88958977c42803436bb105368b0fc8866c080af6 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 19 Jun 2025 11:44:39 +0800
Subject: [PATCH 128/143] =?UTF-8?q?perf:=20=E9=82=AE=E4=BB=B6=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E4=BF=9D=E6=8C=81=E5=B1=95=E5=BC=80=E7=9A=84=E6=A0=91?=
 =?UTF-8?q?;=20style:=20MailBox=20title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js             | 1 -
 src/views/orders/Follow.jsx             | 4 ++--
 src/views/orders/components/MailBox.jsx | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index 427e107..b0d3a01 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -195,7 +195,6 @@ export const getMailboxCountAction = async (params = { opi_sn: '' }, update = fa
     Object.keys(result).map(dirKey => {
       _MapDir.set(Number(dirKey), {..._MapDir.get(Number(dirKey)), count: result[dirKey]});
     })
-    console.log(_MapDir, '_MapDir')
     const _newToUpdate = Array.from(_MapDir.values());
     const _MapRoot = new Map((readCacheDir?.tree || []).map((obj) => [obj.key, obj]))
     _newToUpdate.forEach((row) => {
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index ed60ba5..ed31b04 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -122,7 +122,7 @@ function Follow() {
   useEffect(() => {
     const first = currentMailboxDEI || accountDEI[0].value
     const opi = accountListDEIMapped[first].OPI_SN
-    setExpandTree([`${opi}-today`, `${opi}-todo`, `search-orders`, ...[mailboxActiveNode?.VParent || []]])
+    setExpandTree(prev => [...prev, ...[`${opi}-today`, `${opi}-todo`, `search-orders`, ...[mailboxActiveNode?.VParent || []]]])
 
     return () => {}
   }, [currentMailboxDEI, mailboxNestedDirsActive, mailboxActiveNode])
@@ -152,7 +152,7 @@ function Follow() {
                 titleRender={(node) => (
                   <Typography.Text ellipsis={{ tooltip: node.title }} className={`${node?._raw?.IsSuccess === 1 ? 'text-primary' : ''}`}>
                     {node.title}
-                    <Badge size={'small'} count={node.count} offset={[3, 0]} style={{backgroundColor: "transparent", color: '#1ba784'}} overflowCount={999} />
+                    <Badge size={'small'} count={node.count} offset={[3, 0]} style={{backgroundColor: "#1ba784", color1: '#1ba784'}} overflowCount={999} />
                   </Typography.Text>
                 )}
               />
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index bb9a943..a820ec0 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -206,7 +206,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
           <List
             loading={loading}
             header={
-              <Flex align='center' justify='space-between'>
+              <Flex align='center' justify='space-between' wrap >
                 <Breadcrumb
                   items={props.breadcrumb.map((bc) => {
                     return {
@@ -219,7 +219,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
                     }
                   })}
                 />
-                <Flex align='center' justify='space-between'>
+                <Flex align='center' justify='space-between' className='ml-auto' >
                   <span>已选: {selectedItems.length} 项；</span>
                   <span>
                     {(pagination.current - 1) * PAGE_SIZE + 1}-{Math.min(pagination.current * PAGE_SIZE, pagination.total)} of {pagination.total}

From acf2c02063a70d5b439362a53cd736ea889d7cd1 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 19 Jun 2025 11:54:51 +0800
Subject: [PATCH 129/143] style:

---
 src/views/Conversations/Online/Components/EmailDetailInline.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 1b033c2..4c33355 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -303,7 +303,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
                 )}
                 {mailData.insideAttachments.length > 0 && <details>
                   <summary>
-                    点击展开<span className='text-gray-500 italic'>&nbsp;文内附件 ({mailData.insideAttachments.length}) 已在正文显示 </span>
+                    <span className='text-gray-500 italic'>&nbsp;文内附件 ({mailData.insideAttachments.length}) 已在正文显示&nbsp;</span><span className='cursor-pointer underline'>点击展开</span>
                   </summary>
                   <List
                     dataSource={mailData.insideAttachments || []}

From d9686b3ef5965d4f75074368b398de4559249453 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 19 Jun 2025 13:45:27 +0800
Subject: [PATCH 130/143] #

---
 src/views/orders/Follow.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index ed31b04..6c005ca 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -73,6 +73,7 @@ function Follow() {
 
   const handleSwitchAccount = (value) => {
     setActiveEmailId(0);
+    // setExpandTree([]);
 
     setCurrentMailboxDEI(value)
     const opi = accountListDEIMapped[value].OPI_SN
@@ -122,7 +123,7 @@ function Follow() {
   useEffect(() => {
     const first = currentMailboxDEI || accountDEI[0].value
     const opi = accountListDEIMapped[first].OPI_SN
-    setExpandTree(prev => [...prev, ...[`${opi}-today`, `${opi}-todo`, `search-orders`, ...[mailboxActiveNode?.VParent || []]]])
+    setExpandTree(prev => [...[`${opi}-today`, `${opi}-todo`, `search-orders`, mailboxActiveNode?.VParent ]])
 
     return () => {}
   }, [currentMailboxDEI, mailboxNestedDirsActive, mailboxActiveNode])

From aabc409f6dfd8ce0b885bb4cc6a3f185bb54f962 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 19 Jun 2025 15:00:21 +0800
Subject: [PATCH 131/143] =?UTF-8?q?feat:=20=E9=82=AE=E4=BB=B6:=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4;=20perf:=20=E6=9B=B4=E6=96=B0=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js             | 68 +++++++++++++------------
 src/hooks/useEmail.js                   | 13 ++++-
 src/stores/EmailSlice.js                | 38 +++++++++++---
 src/views/NewEmail.jsx                  |  2 +-
 src/views/orders/components/MailBox.jsx | 15 ++++--
 5 files changed, 92 insertions(+), 44 deletions(-)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index b0d3a01..df31896 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -14,6 +14,25 @@ export const parseHTMLString = (html, needText = false) => {
   return needText ? { html, bodyContent, bodyText } : bodyContent
 }
 
+export const EMAIL_CHANNEL_NAME = 'mailbox_changes';
+let emailChangesChannel = null;
+export function getEmailChangesChannel() {
+  if (!emailChangesChannel) {
+    emailChangesChannel = new BroadcastChannel(EMAIL_CHANNEL_NAME)
+  }
+  return emailChangesChannel
+}
+
+// 通知邮件列表数据更新
+const notifyMailboxUpdate = (payload) => {
+  const notificationPayload = payload
+  // - 多个tab
+  const channel = getEmailChangesChannel()
+  channel.postMessage(notificationPayload)
+  // - 当前tab
+  internalEventEmitter.emit(EMAIL_CHANNEL_NAME, notificationPayload)
+}
+
 /**
  * 获取顾问签名
  * @param {object} { opi_sn }
@@ -178,7 +197,7 @@ export const getEmailDirAction = async (params = { opi_sn: '' }, retOrder=false)
   const orderList = groupBy(result, row => `${row.IsTrue}`)?.['0'] || [];
   return retOrder !== false ? orderList : { [`${params.opi_sn}`]: retTree }
 };
-export const getMailboxCountAction = async (params = { opi_sn: '' }, update = false) => {
+export const getMailboxCountAction = async (params = { opi_sn: '' }, update = true) => {
   const defaultParams = {
     opi_sn: 0,
     // date1: dayjs().subtract(1, 'year').startOf('year').format(DATE_FORMAT),
@@ -190,7 +209,7 @@ export const getMailboxCountAction = async (params = { opi_sn: '' }, update = fa
   // 更新数量
   if (update !== false) {
     const readCacheDir = await readIndexDB(Number(params.opi_sn), 'dirs', 'mailbox');
-    const mailboxDir = isEmpty(readCacheDir) ? [] : readCacheDir.tree.filter(node => node._raw.IsTrue === 1);
+    const mailboxDir = isEmpty(readCacheDir) ? [] : readCacheDir.tree.filter(node => node?._raw?.IsTrue === 1);
     const _MapDir = new Map(mailboxDir.map((obj) => [obj.key, obj]))
     Object.keys(result).map(dirKey => {
       _MapDir.set(Number(dirKey), {..._MapDir.get(Number(dirKey)), count: result[dirKey]});
@@ -202,6 +221,7 @@ export const getMailboxCountAction = async (params = { opi_sn: '' }, update = fa
     })
     const _newRoot = Array.from(_MapRoot.values())
     writeIndexDB([{ key: Number(params.opi_sn), tree: _newRoot }], 'dirs', 'mailbox')
+    notifyMailboxUpdate({ type: 'dirs', key: Number(params.opi_sn) })
   }
 
   return ret;
@@ -315,7 +335,7 @@ export const getRootMailboxDirAction = async ({ opi_sn = 0, userIdStr = '' } = {
     getTodoOrdersAction({ opisn: userIdStr || String(opi_sn), otype: 'today' }),
     ...(userIdStr.split(',').map(_opi => getEmailDirAction({ opi_sn: _opi }))),
   ])
-  const mailBoxCount = await Promise.all(userIdStr.split(',').map(_opi => getMailboxCountAction({ opi_sn: _opi })));
+  const mailBoxCount = await Promise.all(userIdStr.split(',').map(_opi => getMailboxCountAction({ opi_sn: _opi }, false)));
   const mailboxDirCountByOPI = mailBoxCount.reduce((a, c) => ({ ...a, ...c, }), {})
   const mailboxDirByOPI = mailboxDir.reduce((a, c) => ({ ...a, ...(Object.keys(c).reduce((a, opi) => ({...a, [opi]: c[`${opi}`].map((dir) => ({ ...dir, count: mailboxDirCountByOPI[opi][`${dir.key}`] })) }), {} )) }), {})
   const rootTree = Object.keys(stickyTree).map((opi) => ({ key: Number(opi), tree: [...stickyTree[opi], ...(mailboxDirByOPI?.[opi] || [])] }))
@@ -355,15 +375,16 @@ export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id
   return ret;
 }
 
-export const EMAIL_CHANNEL_NAME = 'mailbox_changes';
-let emailChangesChannel = null;
-export function getEmailChangesChannel() {
-  if (!emailChangesChannel) {
-    emailChangesChannel = new BroadcastChannel(EMAIL_CHANNEL_NAME)
+const removeFromCurrentList = async (params) => {
+  const readRow0 = await readIndexDB(params.mai_sn_list[0], 'listrow', 'mailbox')
+  const listKey = readRow0?.data?.listKey || ''
+  if (listKey) {
+    const readCache = await readIndexDB(listKey, 'maillist', 'mailbox')
+    const updatedMailList = readCache.data.filter((mai_sn) => !params.mai_sn_list.includes(mai_sn))
+    writeIndexDB([{ key: listKey, data: updatedMailList }], 'maillist', 'mailbox')
+    notifyMailboxUpdate({ type: 'listrow', listKey, affectKeys: params.mai_sn_list })
   }
-  return emailChangesChannel
 }
-
 const updateEmailKeyMap = { read: 'MOI_ReadState' };
 const updateEmailKeyFun = {
   read: async (params) => {
@@ -374,31 +395,13 @@ const updateEmailKeyFun = {
       'listrow',
       'mailbox',
     )
-    const listKey = readCache.get(params.mai_sn_list[0])?.data?.listKey || '';
     // 通知邮件列表数据更新
+    const listKey = readCache.get(params.mai_sn_list[0])?.data?.listKey || '';
     const notificationPayload = { type: 'listrow', listKey, affectKeys: params.mai_sn_list }
-    // - 多个tab
-    const channel = getEmailChangesChannel()
-    channel.postMessage(notificationPayload)
-    // - 当前tab
-    internalEventEmitter.emit(EMAIL_CHANNEL_NAME, notificationPayload);
+    notifyMailboxUpdate(notificationPayload)
   },
-  processed: async (params) => {
-    const readRow0 = await readIndexDB(params.mai_sn_list[0], 'listrow', 'mailbox')
-    const listKey = readRow0?.data?.listKey || '';
-    if (listKey) {
-      const readCache = await readIndexDB(listKey, 'maillist', 'mailbox')
-      const updatedMailList = readCache.data.filter(mai_sn => !params.mai_sn_list.includes(mai_sn));
-      writeIndexDB([{ key: listKey, data: updatedMailList }], 'maillist', 'mailbox')
-      // 通知邮件列表数据更新
-      const notificationPayload = { type: 'listrow', listKey, affectKeys: params.mai_sn_list }
-      // - 多个tab
-      const channel = getEmailChangesChannel()
-      channel.postMessage(notificationPayload)
-      // - 当前tab
-      internalEventEmitter.emit(EMAIL_CHANNEL_NAME, notificationPayload);
-    }
-  }
+  processed: removeFromCurrentList,
+  delete: removeFromCurrentList
 }
 /**
  * 更新邮件属性
@@ -414,6 +417,7 @@ export const updateEmailAction = async (params = { opi_sn: 0, mai_sn_list: [], s
       updateFun(params)
     }
   }
+  getMailboxCountAction({ opi_sn: params.opi_sn });
   return errcode === 0 ? result : {}
 }
 
diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 4eec062..5833a3c 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -201,6 +201,17 @@ export const useEmailList = (mailboxDirNode) => {
     [VKey],
   )
 
+  const markAsDeleted = useCallback(
+    async (sn_list) => {
+      await updateEmailAction({
+        opi_sn: opi_sn,
+        mai_sn_list: sn_list,
+        set: { delete: 1 },
+      })
+    },
+    [VKey],
+  )
+
   const loadMailListFromCache = useCallback(async (payload) => {
     const cacheKey = isEmpty(COLI_SN) ? `dir-${VKey}` : `order-${VKey}`
     const readCacheIDList = await readIndexDB(cacheKey, 'maillist', 'mailbox')
@@ -276,7 +287,7 @@ export const useEmailList = (mailboxDirNode) => {
     }
   }, [getMailList])
 
-  return { loading, isFreshData, error, mailList, refresh, markAsRead, markAsProcessed }
+  return { loading, isFreshData, error, mailList, refresh, markAsRead, markAsProcessed, markAsDeleted }
 }
 
 const orderMailTypes = new Map([
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index 649683b..a3b3ca1 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -1,6 +1,7 @@
-import { getEmailDirAction, getMailboxCountAction, getRootMailboxDirAction } from '@/actions/EmailActions'
+import { getEmailDirAction, getMailboxCountAction, getRootMailboxDirAction, getEmailChangesChannel, EMAIL_CHANNEL_NAME } from '@/actions/EmailActions'
 import { buildTree, isEmpty, olog, sortArrayByOrder  } from '@/utils/commons'
 import { readIndexDB, writeIndexDB, createIndexedDBStore, clean7DaysMailboxLog } from '@/utils/indexedDB';
+import { internalEventEmitter } from '@/utils/EventEmitterService';
 
 /**
  * Email
@@ -141,20 +142,43 @@ const emailSlice = (set, get) => ({
   // 更新数量
   updateMailboxCount: async ({ opi_sn }) => {
     const { setMailboxNestedDirsActive } = get()
-    await getMailboxCountAction({ opi_sn }, true)
-    const readCache = await readIndexDB(Number(opi_sn), 'dirs', 'mailbox')
-    if (!isEmpty(readCache)) {
-      setMailboxNestedDirsActive(readCache?.tree || [])
-    }
+    await getMailboxCountAction({ opi_sn })
+    // const readCache = await readIndexDB(Number(opi_sn), 'dirs', 'mailbox')
+    // if (!isEmpty(readCache)) {
+    //   setMailboxNestedDirsActive(readCache?.tree || [])
+    // }
   },
 
   async initMailbox({ opi_sn, dei_sn, userIdStr }) {
     olog('initMailbox ---- ')
-    const { setCurrentMailboxOPI, setCurrentMailboxDEI, getOPIEmailDir } = get()
+    const { currentMailboxOPI, setCurrentMailboxOPI, setCurrentMailboxDEI, getOPIEmailDir, setMailboxNestedDirsActive, } = get()
     createIndexedDBStore(['dirs', 'maillist', 'listrow', 'mailinfo', 'draft'], 'mailbox')
     setCurrentMailboxOPI(opi_sn)
     setCurrentMailboxDEI(dei_sn)
     getOPIEmailDir(opi_sn, userIdStr, true)
+
+    // --- Setup Internal Event Listener ---
+    internalEventEmitter.on(EMAIL_CHANNEL_NAME, async (event) => {
+      console.log(`🔔Received internal event. `, event.detail)
+      if (event.detail && event.detail.type === 'dirs') {
+        const readCache = await readIndexDB(event.detail.key, 'dirs', 'mailbox')
+        if (!isEmpty(readCache)) {
+          setMailboxNestedDirsActive(readCache?.tree || [])
+        }
+      }
+    })
+    // --- Setup BroadcastChannel Listener ---
+    const channel = getEmailChangesChannel()
+    channel.addEventListener('message', async (event) => {
+      console.log(`📣Received channel event. `, event.data)
+      if (event.data.type === 'dirs' && currentMailboxOPI === event.data.key) {
+        const readCache = await readIndexDB(event.data.key, 'dirs', 'mailbox')
+        if (!isEmpty(readCache)) {
+          setMailboxNestedDirsActive(readCache?.tree || [])
+        }
+      }
+    })
+
   },
 })
 export default emailSlice
diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index 055dcc7..af3bae2 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -245,7 +245,7 @@ const NewEmail = () => {
           mai_sn: pageParam.quoteid,
           ..._form2
         }
-        readyToInitialContent = generateMailContent(mailData)
+        readyToInitialContent = '<br>'+ generateMailContent(mailData)
         setFileList(mailData.attachments.map(ele => ({ uid: ele.ATI_SN, name: ele.ATI_Name, url: ele.ATI_ServerFile, fullPath: `${EMAIL_ATTA_HOST}${ele.ATI_ServerFile}` })))
         break
       case 'new':
diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index a820ec0..1fe6234 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react'
-import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined } from '@ant-design/icons'
-import { Flex, Button, Tooltip, List, Form, Row, Col, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton } from 'antd'
+import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined, DeleteOutlined } from '@ant-design/icons'
+import { Flex, Button, Tooltip, List, Form, Row, Col, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton, Popconfirm } from 'antd'
 import dayjs from 'dayjs'
 import { useEmailList } from '@/hooks/useEmail'
 import { isEmpty } from '@/utils/commons'
@@ -42,7 +42,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
   ]
   const [form] = Form.useForm()
   const [selectedItems, setSelectedItems] = useState([])
-  const { mailList, loading, error, refresh, markAsRead, markAsProcessed } = useEmailList(mailboxDir)
+  const { mailList, loading, error, refresh, markAsRead, markAsProcessed, markAsDeleted } = useEmailList(mailboxDir)
 
   const [pagination, setPagination] = useState({
     current: 1,
@@ -97,6 +97,8 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
   const mailItemRender = (item) => {
     const isOrderNode = mailboxDir.COLI_SN > 0
     const orderNumber = isEmpty(item.MAI_COLI_ID) || isOrderNode ? '' : item.MAI_COLI_ID + ' - '
+    const folderName = isOrderNode  ? `[${item.FDir}]` : ''
+    const orderMailType = <span className='text-blue-400 text-xs'>{item.MAT_Name}</span>
     const countryName = isEmpty(item.CountryCN) ? '' : '[' + item.CountryCN + '] '
     const mailStateClass = item.MOI_ReadState === 0 ? 'font-bold' : ''
     const hasAtta = item.MAI_Attachment !== 0 ? <AttachmentIcon className='text-blue-500' /> : null
@@ -173,6 +175,13 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
               markAsProcessed(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
               }}
             >已处理</Button>
+            <Button
+              size='small' // danger
+              icon={<DeleteOutlined />}
+              onClick={() => {
+              markAsDeleted(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
+              }}
+            >删除</Button>
         <MailOrderSearchModal />
       </div>
       <div className='bg-white h-auto p-1 flex gap-1 items-center hidden'>

From 1977b8b404fee9aee90597bedcf244b0402b04db Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 19 Jun 2025 15:21:56 +0800
Subject: [PATCH 132/143] =?UTF-8?q?perf:=20=E9=82=AE=E4=BB=B6:=20=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E8=8D=89=E7=A8=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/NewEmail.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index af3bae2..f048c8b 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -98,6 +98,10 @@ const NewEmail = () => {
   const { loading: loadingTamplate, templateContent }  = useEmailTemplate(templateKey, {coli_sn: pageParam.oid, opi_sn: orderDetail.opi_sn || mailData.info?.MAI_OPI_SN || 0, lgc: 1});
   const { signature } = useEmailSignature(orderDetail.opi_sn || mailData.info?.MAI_OPI_SN || 0)
 
+  const [initialContent, setInitialContent] = useState('')
+  const [showQuoteContent, setShowQuoteContent] = useState(false)
+  const [quoteContent, setQuoteContent] = useState('')
+
   // const [newFromEmail, setNewFromEmail] = useState('')
   // const [newToEmail, setNewToEmail] = useState('')
   // const [emailOPI, setEmailOPI] = useState('')
@@ -342,10 +346,6 @@ const NewEmail = () => {
     }
   }
 
-  const [initialContent, setInitialContent] = useState('')
-  const [showQuoteContent, setShowQuoteContent] = useState(false)
-  const [quoteContent, setQuoteContent] = useState('')
-
   const [openPlainTextConfirm, setOpenPlainTextConfirm] = useState(false)
   const handlePlainTextOpenChange = ({ target }) => {
     const { value: newChecked } = target
@@ -488,7 +488,7 @@ const NewEmail = () => {
     body.attaList = fileList;
     // console.log('body', body, '\n', fileList);
     const values = await form.validateFields()
-    const preQuoteBody = pageParam.quoteid ? (quoteContent ? quoteContent : generateQuoteContent(mailData, isRichText)) : ''
+    const preQuoteBody = !['edit', 'new'].includes(pageParam.action) && pageParam.quoteid ? (quoteContent ? quoteContent : generateQuoteContent(mailData, isRichText)) : ''
     body.mailcontent = isRichText ? EmailBuilder({ subject: values.subject, content: htmlContent + preQuoteBody }) : textContent + preQuoteBody
     body.cc = values.cc || ''
     body.bcc = values.bcc || ''

From 29cc138b338d9204a24a272620dc0934b64e6bec Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 19 Jun 2025 15:29:33 +0800
Subject: [PATCH 133/143] #

---
 src/hooks/useEmail.js    | 6 +++---
 src/stores/EmailSlice.js | 4 ++--
 src/utils/indexedDB.js   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 5833a3c..ccbc0bd 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -224,7 +224,7 @@ export const useEmailList = (mailboxDirNode) => {
   }, [VKey])
 
   const getMailList = useCallback(async () => {
-    console.log('getMailList', mailboxDirNode)
+    // console.log('getMailList', mailboxDirNode)
     if (!opi_sn || !VKey || (!IsTrue && !COLI_SN)) {
       setMailList([])
       setLoading(false)
@@ -261,7 +261,7 @@ export const useEmailList = (mailboxDirNode) => {
     getMailList()
     // --- Setup Internal Event Listener ---
     const handleInternalUpdate = (event) => {
-      console.log(`[useEmailList] Received internal event. `, event.detail)
+      // console.log(`[useEmailList] Received internal event. `, event.detail)
       if (event.detail && event.detail.type === 'listrow') {
         loadMailListFromCache()
       }
@@ -271,7 +271,7 @@ export const useEmailList = (mailboxDirNode) => {
     // --- Setup BroadcastChannel Listener ---
     const channel = getEmailChangesChannel()
     const handleMessage = (event) => {
-      console.log(`[useEmailList] Received channel event. `, event.data)
+      // console.log(`[useEmailList] Received channel event. `, event.data)
       const cacheKey = isEmpty(COLI_SN) ? `dir-${VKey}` : `order-${VKey}`
       if (event.data.type === 'listrow' && cacheKey === event.data.listKey) {
         // cacheKey 不相同时, 不需要更新; 邮箱目录不相同
diff --git a/src/stores/EmailSlice.js b/src/stores/EmailSlice.js
index a3b3ca1..30276b6 100644
--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@@ -159,7 +159,7 @@ const emailSlice = (set, get) => ({
 
     // --- Setup Internal Event Listener ---
     internalEventEmitter.on(EMAIL_CHANNEL_NAME, async (event) => {
-      console.log(`🔔Received internal event. `, event.detail)
+      // console.log(`🔔Received internal event. `, event.detail)
       if (event.detail && event.detail.type === 'dirs') {
         const readCache = await readIndexDB(event.detail.key, 'dirs', 'mailbox')
         if (!isEmpty(readCache)) {
@@ -170,7 +170,7 @@ const emailSlice = (set, get) => ({
     // --- Setup BroadcastChannel Listener ---
     const channel = getEmailChangesChannel()
     channel.addEventListener('message', async (event) => {
-      console.log(`📣Received channel event. `, event.data)
+      // console.log(`📣Received channel event. `, event.data)
       if (event.data.type === 'dirs' && currentMailboxOPI === event.data.key) {
         const readCache = await readIndexDB(event.data.key, 'dirs', 'mailbox')
         if (!isEmpty(readCache)) {
diff --git a/src/utils/indexedDB.js b/src/utils/indexedDB.js
index 0d3c9ad..9c60007 100644
--- a/src/utils/indexedDB.js
+++ b/src/utils/indexedDB.js
@@ -238,7 +238,7 @@ export const readIndexDB = (keys=null, table, database) => {
         getRequest.onsuccess = (event) => {
           const result = event.target.result;
           if (result) {
-            console.log(`💾Found record with key ${keys}:`, result);
+            // console.log(`💾Found record with key ${keys}:`, result);
             resolve(result);
           } else {
             console.log(`No record found with key ${keys}.`);

From 674b3cc59156b18888245d0d35f5ebcd856d2b85 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 19 Jun 2025 16:15:54 +0800
Subject: [PATCH 134/143] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=9F=A5=E6=89=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/actions/EmailActions.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/actions/EmailActions.js b/src/actions/EmailActions.js
index df31896..1a61f75 100644
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@@ -475,3 +475,8 @@ export const queryOPIOrderAction = async (params) => {
   const { errcode, result } = await fetchJSON(`${API_HOST}/getdvancedwlorder`, params)
   return errcode !== 0 ? [] : result
 };
+
+export const queryInMailboxAction = async (params) => {
+  const { errcode, result } = await fetchJSON(`${API_HOST_V3}/mail_search`, params)
+  return errcode !== 0 ? [] : result
+}

From f78130544a896514ad9f65918e79f81f4a1f922b Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 19 Jun 2025 16:37:00 +0800
Subject: [PATCH 135/143] =?UTF-8?q?perf:=20=E9=82=AE=E4=BB=B6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85:=20=E6=9C=80=E5=A4=A7=E5=8C=96=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useEmail.js                              | 14 ++++++++++++--
 .../Online/Components/EmailDetailInline.jsx        |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index ccbc0bd..aef1cb7 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -151,8 +151,18 @@ export const EmailBuilder = ({subject, content}) => {
   return `<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html lang="en"><head><title></title><meta http-equiv="Content-Type" content="text/html charset=UTF-8" /><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="width=device-width" name="viewport"><meta charset="UTF-8"><meta content="IE=edge" http-equiv="X-UA-Compatible"><meta content="telephone=no,address=no,email=no,date=no,url=no" name="format-detection"><meta content="light" name="color-scheme"><meta content="light" name="supported-color-schemes"><style id="font">body#highlights-email{ font-family: Verdana, sans-serif;} table{ border-collapse: collapse; border-spacing: 0;} </style></head><body id="highlights-email" style="margin: 0 auto; padding: 0; width: 900px; background-color: #fcfcfc;">${content}</body></html>`;
 }
 
-export const openPopup = (url, target,) => {
-  window.open(url, target, POPUP_FEATURES);
+const objectToFeatureString = (obj) =>
+  obj && typeof obj === 'object'
+    ? Object.entries(obj)
+        .map(([key, value]) => `${key}=${typeof value === 'boolean' ? (value ? 'yes' : 'no') : String(value)}`)
+        .join(',')
+    : '';
+export const openPopup = (url, target, extraFeatures = {}) => {
+  let features2 = objectToFeatureString(extraFeatures)
+  let screenWidth = window.screen.availWidth;
+  let screenHeight = window.screen.availHeight;
+  features2 += extraFeatures?.fullscreen === true ? `,width=${screenWidth},height=${screenHeight}` : ''
+  window.open(url, target, POPUP_FEATURES+`,${features2}`);
 };
 
 export const useEmailList = (mailboxDirNode) => {
diff --git a/src/views/Conversations/Online/Components/EmailDetailInline.jsx b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
index 4c33355..33c2290 100644
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@@ -90,7 +90,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
   }, [mailID, mailData.info?.MAI_COLI_SN])
 
   const handleView = async () => {
-    openPopup(`/email/view/${mailID || 0}`, `view-${mailID || 0}`)
+    openPopup(`/email/view/${mailID || 0}`, `view-${mailID || 0}`, { fullscreen: true })
   };
 
   const handleResend = async () => {

From 7e84b9cb5a20219ad9ce7ae840187d440b60a92a Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 19 Jun 2025 16:41:20 +0800
Subject: [PATCH 136/143] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useEmail.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index aef1cb7..41c4c00 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -414,3 +414,15 @@ export const useEmailTemplate = (templateKey, params) => {
 
   return { loading, error, templateContent };
 }
+
+export const mailboxSystemDirs = () => {
+  return [
+    { key: 1, value: 1, label: '收件箱' },
+    { key: 2, value: 2, label: '未读邮件' },
+    { key: 3, value: 3, label: '已发邮件' },
+    { key: 4, value: 4, label: '待发邮件' },
+    { key: 5, value: 5, label: '草稿' },
+    { key: 6, value: 6, label: '垃圾邮件' },
+    { key: 7, value: 7, label: '已处理邮件' },
+  ]
+}

From 2d7f269a27c0703c401396f214b53bd69afba62d Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 20 Jun 2025 16:34:15 +0800
Subject: [PATCH 137/143] =?UTF-8?q?perf:=20=E9=82=AE=E4=BB=B6=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2:=20=E5=88=87=E6=8D=A2=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/NewEmail.jsx | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/views/NewEmail.jsx b/src/views/NewEmail.jsx
index f048c8b..6c920aa 100644
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@@ -1,8 +1,7 @@
 import { useEffect, useState, useRef, useCallback, useMemo } from 'react'
 import { useParams, useNavigate, useLocation } from 'react-router-dom';
-import { App, ConfigProvider, Button, Form, Input, Flex, Checkbox, Popconfirm, Select, Space, Upload, Divider, Modal, Tabs, Radio, Typography } from 'antd'
-import { UploadOutlined, LoadingOutlined, SaveOutlined, SendOutlined, CheckCircleOutlined } from '@ant-design/icons'
-import '@dckj/react-better-modal/dist/index.css'
+import { App, ConfigProvider, Button, Form, Input, Flex, Checkbox, Popconfirm, Select, Space, Upload, Divider, Modal, Tabs, Radio, Typography, } from 'antd'
+import { UploadOutlined, LoadingOutlined, SaveOutlined, SendOutlined, CheckCircleOutlined, ExclamationCircleFilled } from '@ant-design/icons'
 import useStyleStore from '@/stores/StyleStore'
 // import useConversationStore from '@/stores/ConversationStore'
 import useAuthStore from '@/stores/AuthStore'
@@ -23,6 +22,7 @@ import PaymentlinkBtn from '@/views/Conversations/Online/Input/PaymentlinkBtn'
 import { TextIcon } from '@/components/Icons';
 import { EMAIL_ATTA_HOST, POPUP_FEATURES } from '@/config';
 
+const {confirm} = Modal;
 // 禁止上传的附件类型
 // .application, .exe, .app
 const disallowedAttachmentTypes = [
@@ -69,7 +69,7 @@ const generateQuoteContent = (mailData, isRichText = true) => {
   return isRichText ? html : parseHTMLText(html)
 }
 
-const generateMailContent = (mailData) => `<p>${mailData.content}</p><br>`
+const generateMailContent = (mailData) => `${mailData.content}<br>`
 
 /**
  * 独立窗口编辑器
@@ -93,10 +93,14 @@ const NewEmail = () => {
   const emailListMatMapped = useMemo(() => emailListOption?.reduce((r, v) => ({ ...r, [v.mat_sn]: v }), {}), [emailListOption])
   // console.log('emailListMapped', emailListOption, emailListAddrMapped);
 
+  const [emailAccount, setEmailAccount] = useState({});
+  const [emailAccountOPI, setEmailAccountOPI] = useState(0);
+
   const mai_sn = pageParam.quoteid // activeEdit.quoteid
   const { loading: quoteLoading, mailData, orderDetail, postEmailSaveOrSend } = useEmailDetail(mai_sn, null, pageParam.oid)
   const { loading: loadingTamplate, templateContent }  = useEmailTemplate(templateKey, {coli_sn: pageParam.oid, opi_sn: orderDetail.opi_sn || mailData.info?.MAI_OPI_SN || 0, lgc: 1});
-  const { signature } = useEmailSignature(orderDetail.opi_sn || mailData.info?.MAI_OPI_SN || 0)
+  const initOPI = useMemo(() => emailAccountOPI || orderDetail.opi_sn || mailData.info?.MAI_OPI_SN || 0, [emailAccountOPI, mailData, orderDetail])
+  const { signature } = useEmailSignature(initOPI)
 
   const [initialContent, setInitialContent] = useState('')
   const [showQuoteContent, setShowQuoteContent] = useState(false)
@@ -166,7 +170,7 @@ const NewEmail = () => {
   useEffect(() => {
     // console.log('useEffect 1---- \nform.setFieldsValue ');
     if (isEmpty(mailData.content) && isEmpty(orderDetail.order_no)) {
-      return () => {}
+      // return () => {}
     }
     const docTitle = mailData.info?.MAI_Subject || 'New Email-';
     document.title = docTitle
@@ -187,13 +191,13 @@ const NewEmail = () => {
     const quotedMailSender = _findMatOldE?.email || ''
 
     const sender = quotedMailSender || orderSender
-    const quotedMailSenderObj = sender; // { key: sender, label: sender, value: sender }
+    const quotedMailSenderObj = emailAccount?.email || sender; // { key: sender, label: sender, value: sender }
     const defaultMAT = emailListAddrMapped?.[sender]?.mat_sn || ''
 
     const _form2 = {
       coli_sn: Number(pageParam.oid) || info?.MAI_COLI_SN || '',
-      mat_sn: info?.MAI_MAT_SN || defaultMAT,
-      opi_sn: info?.MAI_OPI_SN || orderDetail.opi_sn || '',
+      mat_sn: emailAccount?.mat_sn || info?.MAI_MAT_SN || defaultMAT,
+      opi_sn: emailAccount?.opi_sn || info?.MAI_OPI_SN || orderDetail.opi_sn || '',
     }
 
     let readyToInitialContent = '';
@@ -207,6 +211,7 @@ const NewEmail = () => {
 
     // const _initialContent = isEmpty(mailData.info) ? signatureBody : signatureBody+preQuoteBody
 
+    // 排除草稿: `编辑`有id 的邮件
     if (!isEmpty(mailData.info) && !['edit'].includes(pageParam.action)) {
       readyToInitialContent = orderPrefix + signatureBody
     }
@@ -260,7 +265,7 @@ const NewEmail = () => {
           subject: `${info.MAI_Subject || templateFormValues.subject || ''}`,
           ..._form2,
         }
-        readyToInitialContent = generateMailContent({ content: templateContent.bodycontent || readyToInitialContent || '' })
+        readyToInitialContent = generateMailContent({ content: templateContent.bodycontent || readyToInitialContent || `<br>${signatureBody}` || '' })
         setFileList(mailData.attachments.map(ele => ({ uid: ele.ATI_SN, name: ele.ATI_Name, url: ele.ATI_ServerFile, fullPath: `${EMAIL_ATTA_HOST}${ele.ATI_ServerFile}` })))
         break
 
@@ -272,7 +277,7 @@ const NewEmail = () => {
     setInitialContent(readyToInitialContent);
 
     return () => {}
-  }, [orderDetail.order_no, quoteLoading, loadingTamplate, signature])
+  }, [orderDetail.order_no, quoteLoading, loadingTamplate, emailAccount, signature])
 
 
   // const readFromTemplate = () => {
@@ -316,6 +321,9 @@ const NewEmail = () => {
     // setNewFromEmail(value)
     const _findMat = emailListAddrMapped?.[value]
     form.setFieldsValue({ mat_sn: _findMat?.mat_sn, opi_sn: _findMat?.opi_sn })
+    // console.log(_findMat, 'handleSwitchEmail')
+    setEmailAccount(_findMat)
+    setEmailAccountOPI(_findMat?.opi_sn)
   }
 
   const [isRichText, setIsRichText] = useState(mobile === false)
@@ -508,7 +516,7 @@ const NewEmail = () => {
     body.contenttype = isRichText ? 'text/html' : 'text/plain'
     try {
 
-      // console.log('postSendEmail', body, '\n', msgObj);
+      // console.log('postSendEmail', body, '\n');
       // return;
       const mailSavedId = await postEmailSaveOrSend(body, isDraft)
       form.setFieldsValue({

From 7ec91716a719b48807e709a66de7b209b98881a9 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 20 Jun 2025 16:38:48 +0800
Subject: [PATCH 138/143] =?UTF-8?q?style:=20=E6=A0=BC=E5=BC=8F=E5=88=B7?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/images/icons/brush-3-line.svg                          | 1 +
 .../plugins/FormatPaint/FormatPainterToolbarButton.tsx        | 4 +++-
 src/components/LexicalEditor/plugins/ToolbarPlugin.jsx        | 2 +-
 src/components/LexicalEditor/styles.css                       | 3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 public/images/icons/brush-3-line.svg

diff --git a/public/images/icons/brush-3-line.svg b/public/images/icons/brush-3-line.svg
new file mode 100644
index 0000000..6ba5eb8
--- /dev/null
+++ b/public/images/icons/brush-3-line.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M8 19.9967V14.9967H10V19.9967H19V12.9967H5V19.9967H8ZM4 10.9967H20V7.9967H14V3.9967H10V7.9967H4V10.9967ZM3 20.9967V12.9967H2V6.9967C2 6.44442 2.44772 5.9967 3 5.9967H8V2.9967C8 2.44442 8.44772 1.9967 9 1.9967H15C15.5523 1.9967 16 2.44442 16 2.9967V5.9967H21C21.5523 5.9967 22 6.44442 22 6.9967V12.9967H21V20.9967C21 21.549 20.5523 21.9967 20 21.9967H4C3.44772 21.9967 3 21.549 3 20.9967Z"></path></svg>
\ No newline at end of file
diff --git a/src/components/LexicalEditor/plugins/FormatPaint/FormatPainterToolbarButton.tsx b/src/components/LexicalEditor/plugins/FormatPaint/FormatPainterToolbarButton.tsx
index fe3bc07..ac83799 100644
--- a/src/components/LexicalEditor/plugins/FormatPaint/FormatPainterToolbarButton.tsx
+++ b/src/components/LexicalEditor/plugins/FormatPaint/FormatPainterToolbarButton.tsx
@@ -67,11 +67,13 @@ export function FormatPainterToolbarButton() {
       onClick={handleClick}
       onDoubleClick={handleDoubleClick}
       className={`toolbar-item spaced ${isActive ? 'active' : ''}`}
-      title={isActive ? (isSticky ? 'Format Painter (Sticky)' : 'Format Painter (Active)') : 'Format Painter'}
+    //   title={isActive ? (isSticky ? 'Format Painter (Sticky)' : 'Format Painter (Active)') : 'Format Painter'}
+      title={'格式刷'}
       aria-label={isActive ? (isSticky ? 'Deactivate Format Painter (Sticky)' : 'Deactivate Format Painter (Active)') : 'Activate Format Painter'}
       disabled={!isActive && !canCopy}
     >
       <PaintBrushIcon />
+      {/* <span style={{wordBreak: 'keep-all'}}>格式刷</span> */}
     </button>
   );
 }
diff --git a/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx b/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
index b74d45f..c9a1cc4 100644
--- a/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
+++ b/src/components/LexicalEditor/plugins/ToolbarPlugin.jsx
@@ -857,7 +857,7 @@ export default function ToolbarPlugin() {
       <button type='button'
         onClick={() => clearFormatting(activeEditor)}
         className='toolbar-item'
-        title="Clear text formatting"
+        title="清除格式"
         aria-label='Clear'>
         <i className='format clear' />
       </button>
diff --git a/src/components/LexicalEditor/styles.css b/src/components/LexicalEditor/styles.css
index cb13fe9..2fae643 100644
--- a/src/components/LexicalEditor/styles.css
+++ b/src/components/LexicalEditor/styles.css
@@ -404,6 +404,7 @@ pre::-webkit-scrollbar-thumb {
   padding: 8px;
   cursor: pointer;
   vertical-align: middle;
+  word-break: keep-all;
 }
 
 .toolbar button.toolbar-item:disabled {
@@ -842,7 +843,7 @@ i.outdent {
 }
 
 i.painter {
-  background-image: url(/images/icons/paint-brush-line.svg);
+  background-image: url(/images/icons/brush-3-line.svg);
 }
 
 i.bold {

From 4fb50411793d16a2661d56dcf188f82242bf29ba Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 23 Jun 2025 10:17:32 +0800
Subject: [PATCH 139/143] =?UTF-8?q?feat:=20=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95:=20+=E6=B8=A0=E9=81=93=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Conversations/History/SearchForm.jsx            | 6 +++---
 .../Conversations/Online/Components/ChatListFilter.jsx    | 8 ++++----
 src/views/DesktopApp.jsx                                  | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/Conversations/History/SearchForm.jsx b/src/views/Conversations/History/SearchForm.jsx
index 6bef0c6..fed37f1 100644
--- a/src/views/Conversations/History/SearchForm.jsx
+++ b/src/views/Conversations/History/SearchForm.jsx
@@ -40,10 +40,10 @@ const SearchForm = memo(function ({ initialValues, onSubmit, onReset }) {
             <Input placeholder='关键词' allowClear />
           </Form.Item>
           <Form.Item label='消息渠道' name='mchannel' className='w-52'>
-            <Select mode='multiple' maxTagCount={0} allowClear options={[
-                { key: 'waba', label: 'WA商业号', value: 'waba' },
+            <Select maxTagCount={0} allowClear options={[
+                { key: 'WABA', label: 'WA商业号', value: 'WABA' },
                 { key: 'email', label: '邮件', value: 'email' },
-                { key: 'whatsapp', label: 'WhatsApp', value: 'whatsapp' },
+                { key: 'wai', label: 'WhatsApp', value: 'wai' },
                 ]} className='w-8' />
           </Form.Item>
           {/* <Form.Item label='消息类型' name='mtype' className='w-44'>
diff --git a/src/views/Conversations/Online/Components/ChatListFilter.jsx b/src/views/Conversations/Online/Components/ChatListFilter.jsx
index 3d42efb..e63fb34 100644
--- a/src/views/Conversations/Online/Components/ChatListFilter.jsx
+++ b/src/views/Conversations/Online/Components/ChatListFilter.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Button, Tag, Radio, Popover, Form } from 'antd';
+import { Button, Tag, Radio, Popover, Form, Space } from 'antd';
 import { isEmpty, objectMapper, TagColorStyle } from '@/utils/commons';
 import useConversationStore from '@/stores/ConversationStore';
 import { OrderLabelDefaultOptions } from '@/stores/OrderStore';
@@ -127,7 +127,7 @@ const ChatListFilter = ({ onFilterChange, activeList, ...props }) => {
             setFilterOtype(e.target.value)
           }}
         /> */}
-        {tags.slice(0, 2).map((tag, ti) => (
+        {tags.slice(0, 3).map((tag, ti) => (
           <Tag.CheckableTag
             className='mb-1'
             key={tag.key}
@@ -190,14 +190,14 @@ const ChatListFilter = ({ onFilterChange, activeList, ...props }) => {
                 </Form.Item>
 
                 <Form.Item noStyle className='flex justify-center mb-0'>
-                  <Button.Group>
+                  <Space.Compact>
                     <Button onClick={onReset} type='primary' ghost>
                       重置
                     </Button>
                     {/* <Button htmlType='submit' type='primary'>
                       确定
                     </Button> */}
-                  </Button.Group>
+                  </Space.Compact>
                 </Form.Item>
               </Form>
             </>
diff --git a/src/views/DesktopApp.jsx b/src/views/DesktopApp.jsx
index 64e264f..fca6e41 100644
--- a/src/views/DesktopApp.jsx
+++ b/src/views/DesktopApp.jsx
@@ -158,7 +158,7 @@ function DesktopApp() {
                 // },
                 {
                   key: '/chat/history',
-                  label: <Link to='/chat/history'>聊天记录</Link>,
+                  label: <Link to='/chat/history'>历史记录</Link>,
                 },
                 {
                   key: '/customer_relation/index',

From 6211d275d152af0dce94fee5171295091aa5e772 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 23 Jun 2025 10:50:50 +0800
Subject: [PATCH 140/143] =?UTF-8?q?perf:=20=E8=AE=A2=E5=8D=95=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF:=20=E5=82=AC=E4=BF=A1=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrderProfile.jsx | 3 +++
 src/stores/OrderStore.js        | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/OrderProfile.jsx b/src/components/OrderProfile.jsx
index 34310d6..06ac025 100644
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@@ -45,6 +45,9 @@ const OrderProfile = ({ coliSN, ...props }) => {
   const orderId = coliSN || currentOrder
 
   const [orderRemindState, setOrderRemindState] = useState(orderDetail.remindstate)
+  useEffect(() => {
+    setOrderRemindState(orderDetail.remindstate);
+  }, [orderDetail.remindstate]);
   useEffect(() => {
     if (orderId) {
       setLoading(true)
diff --git a/src/stores/OrderStore.js b/src/stores/OrderStore.js
index 09f66dd..7cb5608 100644
--- a/src/stores/OrderStore.js
+++ b/src/stores/OrderStore.js
@@ -246,9 +246,9 @@ export const RemindStateDefaultOptions = [
  * @useage 订单信息: 标记状态
  */
 export const remindStatusOptions = [
-  { value: '1', label: '已发一催' },
-  { value: '2', label: '已发二催' },
-  { value: '3', label: '已发三催' },
+  { value: 1, label: '已发一催' },
+  { value: 2, label: '已发二催' },
+  { value: 3, label: '已发三催' },
   { value: 'important', label: '重点团' },
   { value: 'sendsurvey', label: '已发 travel advisor survey' },
 ];

From 8eccf74c61cff5ba0cf6b904d465e9e372ee332b Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 23 Jun 2025 11:48:11 +0800
Subject: [PATCH 141/143] style:

---
 src/views/orders/components/MailBox.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/orders/components/MailBox.jsx b/src/views/orders/components/MailBox.jsx
index 1fe6234..2c75388 100644
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@@ -121,7 +121,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
           <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
             <div>
               {orderNumber}
-              <span className={mailStateClass}>{item.MAI_Subject}</span>
+              <span className={mailStateClass}>{item.MAI_Subject || '[无主题]'}</span>
               {hasAtta}
             </div>
             <span className='text-neutral-500 text-wrap break-words break-all '>{countryName + item.SenderReceiver + ' ' + item.SRDate}</span>
@@ -153,6 +153,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
           </Tooltip>
         </Flex>
 
+        <Flex wrap gap={8}>
         <NewEmailButton />
             <Button
               size='small'
@@ -183,6 +184,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
               }}
             >删除</Button>
         <MailOrderSearchModal />
+        </Flex>
       </div>
       <div className='bg-white h-auto p-1 flex gap-1 items-center hidden'>
         <Form

From 15acbf4f2f15a18a09e5e0d7e6baa0dbc2c490b0 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 23 Jun 2025 13:55:32 +0800
Subject: [PATCH 142/143] update: antd Modal props

---
 src/views/Conversations/History/MergeConversationTo.jsx | 2 +-
 src/views/Conversations/Online/ConversationBind.jsx     | 2 +-
 src/views/Conversations/Online/ConversationsNewItem.jsx | 2 +-
 src/views/accounts/SnippetList.jsx                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/Conversations/History/MergeConversationTo.jsx b/src/views/Conversations/History/MergeConversationTo.jsx
index f9df108..071da68 100644
--- a/src/views/Conversations/History/MergeConversationTo.jsx
+++ b/src/views/Conversations/History/MergeConversationTo.jsx
@@ -103,7 +103,7 @@ const MergeConversationTo = ({ currentWAID, opi_sn, ...props }) => {
           setOpen(false);
           formInstance?.resetFields();
         }}
-        destroyOnClose
+        destroyOnHidden
         onOk={async () => {
           try {
             const values = await formInstance?.validateFields();
diff --git a/src/views/Conversations/Online/ConversationBind.jsx b/src/views/Conversations/Online/ConversationBind.jsx
index 5e83f6d..b1a4c49 100644
--- a/src/views/Conversations/Online/ConversationBind.jsx
+++ b/src/views/Conversations/Online/ConversationBind.jsx
@@ -126,7 +126,7 @@ export const ConversationBindFormModal = ({ currentConversationID, userId, onBou
         onCancel={() => {
           setOpen(false);
         }}
-        destroyOnClose>
+        destroyOnHidden>
         <AdvanceSearchForm onSubmit={onSearchOrder} loading={searchLoading} />
         <Table
           key={'advanceOrderTable'}
diff --git a/src/views/Conversations/Online/ConversationsNewItem.jsx b/src/views/Conversations/Online/ConversationsNewItem.jsx
index 8ca816d..3bf6aeb 100644
--- a/src/views/Conversations/Online/ConversationsNewItem.jsx
+++ b/src/views/Conversations/Online/ConversationsNewItem.jsx
@@ -124,7 +124,7 @@ export const ConversationItemFormModal = ({ open, onCreate, onCancel, initialVal
         onCancel();
         formInstance?.resetFields();
       }}
-      destroyOnClose
+      destroyOnHidden
       onOk={async () => {
         try {
           const values = await formInstance?.validateFields();
diff --git a/src/views/accounts/SnippetList.jsx b/src/views/accounts/SnippetList.jsx
index c467d7b..9cd3e1d7 100644
--- a/src/views/accounts/SnippetList.jsx
+++ b/src/views/accounts/SnippetList.jsx
@@ -113,7 +113,7 @@ function SnippetList() {
           snippetForm.resetFields()
           setSnippetModalOpen(false)}
         }
-        destroyOnClose
+        destroyOnHidden
         forceRender
         modalRender={(dom) => (
           <Form

From b29b927b5cddc20fc1f62857f1745615263f100c Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 23 Jun 2025 14:39:24 +0800
Subject: [PATCH 143/143] #

---
 src/hooks/useEmail.js                         |   5 +-
 .../components/MailOrderSearchModal.jsx       | 130 ++++++++++--------
 2 files changed, 77 insertions(+), 58 deletions(-)

diff --git a/src/hooks/useEmail.js b/src/hooks/useEmail.js
index 41c4c00..892ef4c 100644
--- a/src/hooks/useEmail.js
+++ b/src/hooks/useEmail.js
@@ -415,8 +415,7 @@ export const useEmailTemplate = (templateKey, params) => {
   return { loading, error, templateContent };
 }
 
-export const mailboxSystemDirs = () => {
-  return [
+export const mailboxSystemDirs = [
     { key: 1, value: 1, label: '收件箱' },
     { key: 2, value: 2, label: '未读邮件' },
     { key: 3, value: 3, label: '已发邮件' },
@@ -425,4 +424,4 @@ export const mailboxSystemDirs = () => {
     { key: 6, value: 6, label: '垃圾邮件' },
     { key: 7, value: 7, label: '已处理邮件' },
   ]
-}
+
diff --git a/src/views/orders/components/MailOrderSearchModal.jsx b/src/views/orders/components/MailOrderSearchModal.jsx
index c040f4b..76cef9e 100644
--- a/src/views/orders/components/MailOrderSearchModal.jsx
+++ b/src/views/orders/components/MailOrderSearchModal.jsx
@@ -1,10 +1,11 @@
 import { createContext, useEffect, useState } from 'react'
 import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined } from '@ant-design/icons'
-import { Button, Modal, Form, Input, Checkbox, Select, Radio, DatePicker, Divider, Typography } from 'antd'
+import { Button, Modal, Form, Input, Checkbox, Select, Radio, DatePicker, Divider, Typography, Flex } from 'antd'
 import dayjs from 'dayjs'
-import { getEmailDirAction, queryHTOrderListAction, } from '@/actions/EmailActions'
+import { getEmailDirAction, queryHTOrderListAction, queryInMailboxAction } from '@/actions/EmailActions'
 import { isEmpty, objectMapper, pick } from '@/utils/commons'
 import useConversationStore from '@/stores/ConversationStore'
+import { mailboxSystemDirs } from '@/hooks/useEmail'
 
 const MailOrderSearchModal = ({ ...props }) => {
   const [currentMailboxOPI] = useConversationStore((state) => [state.currentMailboxOPI])
@@ -19,7 +20,7 @@ const MailOrderSearchModal = ({ ...props }) => {
     setLoading(true)
     const valuesToSub = objectMapper(values, {
       year: { key: 'year', transform: (val) => (val ? dayjs(val).year() : '') },
-      important: { key: 'important', transform: (val) => (val || '-1') },
+      important: { key: 'important', transform: (val) => val || '-1' },
       by_success: { key: 'by_success', transform: (val) => (val ? '1' : '0') },
       if_want_book: { key: 'if_want_book', transform: (val) => (val ? '1' : '0') },
       if_thinking: { key: 'if_thinking', transform: (val) => (val ? '1' : '0') },
@@ -27,23 +28,31 @@ const MailOrderSearchModal = ({ ...props }) => {
       coli_id: { key: 'coli_id', transform: (val) => (val ? val : '') },
       is_biz: { key: 'sourcetype', transform: (val) => (val ? '227002' : '227001') },
     })
-    let result;
+    let result
     if (isEmpty(valuesToSub.coli_id)) {
-      const { coli_id, sourcetype, ...mailboxParams} = valuesToSub;
+      const { coli_id, sourcetype, ...mailboxParams } = valuesToSub
       result = await getEmailDirAction({ ...mailboxParams, opi_sn: currentMailboxOPI }, false)
       updateCurrentMailboxNestedDirs(result[`${currentMailboxOPI}`])
     } else {
-      const htOrderParams = pick(valuesToSub, ['coli_id', 'sourcetype',])
-      result = await queryHTOrderListAction({...htOrderParams, opi_sn: currentMailboxOPI})
+      const htOrderParams = pick(valuesToSub, ['coli_id', 'sourcetype'])
+      result = await queryHTOrderListAction({ ...htOrderParams, opi_sn: currentMailboxOPI })
       const addToTree = {
         key: 'search-orders',
         title: '搜索结果',
         iconIndex: 'search',
         _raw: { COLI_SN: 0, IsTrue: 0 },
-        children: result.map((o) => ({ key: `search-${o.COLI_SN}`, title: `${o.COLI_ID}`, iconIndex: 13, parent: 'search-orders', parentTitle: '搜索结果', parentIconIndex: 'search', _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: 'search-orders', IsTrue: 0, ApplyDate: '', OrderSourceType: htOrderParams.sourcetype, parent: 'search-orders' }, })),
+        children: result.map((o) => ({
+          key: `search-${o.COLI_SN}`,
+          title: `${o.COLI_ID}`,
+          iconIndex: 13,
+          parent: 'search-orders',
+          parentTitle: '搜索结果',
+          parentIconIndex: 'search',
+          _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: 'search-orders', IsTrue: 0, ApplyDate: '', OrderSourceType: htOrderParams.sourcetype, parent: 'search-orders' },
+        })),
       }
-      updateCurrentMailboxNestedDirs([addToTree]);
-      setMailboxActiveNode(addToTree);
+      updateCurrentMailboxNestedDirs([addToTree])
+      setMailboxActiveNode(addToTree)
     }
     setLoading(false)
     setOpen(false)
@@ -55,19 +64,19 @@ const MailOrderSearchModal = ({ ...props }) => {
       </Button>
       <Modal
         width={window.innerWidth < 700 ? '95%' : 960}
-        title='查找邮件' //mask={false}
+        // title='查找' //mask={false}
         open={open}
         cancelText='关闭'
         okText='查找'
         confirmLoading={loading}
-        okButtonProps={{ autoFocus: true, htmlType: 'submit' }}
+        okButtonProps={{ autoFocus: true, htmlType: 'submit', type: 'default' }}
         onCancel={() => setOpen(false)}
-        // footer={null}
+        footer={null}
         destroyOnHidden
         modalRender={(dom) => (
           <Form
             layout='inline'
-            size='small'
+            // size='small'
             form={form}
             name='searchmailorder_form_in_modal'
             initialValues={{ year: dayjs(), important: '-1' }}
@@ -77,48 +86,59 @@ const MailOrderSearchModal = ({ ...props }) => {
             {dom}
           </Form>
         )}>
-        <Form.Item name='year' label='年份'>
-          <DatePicker picker='year' />
-        </Form.Item>
-        <Form.Item name='important' label='重要程度'>
-          <Radio.Group
-            options={[
-              { key: '-1', value: '-1', label: 'All' },
-              { key: '240001', value: '240001', label: '普通' },
-              { key: '240002', value: '240002', label: '较重要' },
-              { key: '240003', value: '240003', label: '很重要' },
-            ]}
-            optionType='button'
-          />
-        </Form.Item>
-        <div className='flex'>
-          <Form.Item name='by_success' className='' valuePropName='checked'>
-            <Checkbox>成行订单</Checkbox>
-          </Form.Item>
-          <Form.Item name='if_want_book' className='' valuePropName='checked'>
-            <Checkbox>要预定</Checkbox>
-          </Form.Item>
-          <Form.Item name='if_thinking' className='' valuePropName='checked'>
-            <Checkbox>犹豫中</Checkbox>
-          </Form.Item>
-        </div>
-        <Form.Item name='by_start_date' className='' valuePropName='checked'>
-          <Checkbox>按出发日期</Checkbox>
-        </Form.Item>
-        <div className='text-end'>
-          <Button type='primary' htmlType='submit' loading={loading}>
-            查找
-          </Button>
-        </div>
+        <Flex wrap gap={8}>
+          <div>
+            <Typography.Text strong>按订单的时间范围</Typography.Text>
+            <Form.Item name='year' label='年份'>
+              <DatePicker picker='year' />
+            </Form.Item>
+            <Form.Item name='important' label='重要程度'>
+              <Radio.Group
+                options={[
+                  { key: '-1', value: '-1', label: 'All' },
+                  { key: '240001', value: '240001', label: '普通' },
+                  { key: '240002', value: '240002', label: '较重要' },
+                  { key: '240003', value: '240003', label: '很重要' },
+                ]}
+                optionType='button'
+              />
+            </Form.Item>
+            <div className='flex'>
+              <Form.Item name='by_success' className='' valuePropName='checked'>
+                <Checkbox>成行订单</Checkbox>
+              </Form.Item>
+              <Form.Item name='if_want_book' className='' valuePropName='checked'>
+                <Checkbox>要预定</Checkbox>
+              </Form.Item>
+              <Form.Item name='if_thinking' className='' valuePropName='checked'>
+                <Checkbox>犹豫中</Checkbox>
+              </Form.Item>
+            </div>
+            <Form.Item name='by_start_date' className='' valuePropName='checked'>
+              <Checkbox>按出发日期</Checkbox>
+            </Form.Item>
+            <div className='text-end'>
+              <Button type='primary' htmlType='submit' loading={loading}>
+                查找
+              </Button>
+            </div>
 
-        <Divider className='my-2' />
-        <Typography.Title level={5}>查找订单</Typography.Title>
-        <Form.Item name='coli_id' label='订单号' className=''>
-          <Input />
-        </Form.Item>
-        <Form.Item name='is_biz' className='' valuePropName='checked'>
-          <Checkbox>商务订单</Checkbox>
-        </Form.Item>
+            <Divider className='my-2' />
+            <Typography.Text strong>订单号精确查找</Typography.Text>
+            <Form.Item name='coli_id' label='订单号' className=''>
+              <Input />
+            </Form.Item>
+            <Form.Item name='is_biz' className='' valuePropName='checked'>
+              <Checkbox>商务订单</Checkbox>
+            </Form.Item>
+            <div className='text-end'>
+              <Button type='primary' htmlType='submit' loading={loading}>
+                查找
+              </Button>
+            </div>
+
+          </div>
+        </Flex>
       </Modal>
     </>
   )