fix: 保存发送邮件字段名称错误

feat: update favicon.ico
1.5.4
26 changed files with 773 additions and 531 deletions
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "global-sales",
  "private": true,
-  "version": "1.4.10",
+  "version": "1.5.4",
  "type": "module",
  "scripts": {
    "dev": "vite",
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/src/actions/ConversationActions.js
+++ b/src/actions/ConversationActions.js
@ -28,6 +28,7 @@ export const fetchTemplates = async (params) => {
  const scNames = ['trip_planner_showcase', 'showcase_different', 'order_status_updated'];
  // 客运
  const crNames = [
+    'notification_of_next_trip_planning',
    // 'notification_of_following_up_by_cr_v3',
    'notification_of_one_day_before_ending_the_trip_by_cr_v2',
    'one_day_after_payment_by_yuni',
--- a/src/actions/EmailActions.js
+++ b/src/actions/EmailActions.js
@ -1,5 +1,5 @@
 import { fetchJSON, postForm, postJSON } from '@/utils/request';
-import { API_HOST, API_HOST_V3, DATE_FORMAT, DATEEND_FORMAT, DATETIME_FORMAT, EMAIL_HOST } from '@/config';
+import { API_HOST, API_HOST_V3, DATE_FORMAT, DATEEND_FORMAT, DATETIME_FORMAT, EMAIL_HOST, EMAIL_HOST_v3 } from '@/config';
 import { buildTree, groupBy, isEmpty, objectMapper, omitEmpty, uniqWith } from '@/utils/commons';
 import { readIndexDB, writeIndexDB } from '@/utils/indexedDB';
 import dayjs from 'dayjs';
@ -208,7 +208,7 @@ export const getMailboxCountAction = async (params = { opi_sn: '' }, update = tr
  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 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 => {
@ -220,7 +220,7 @@ export const getMailboxCountAction = async (params = { opi_sn: '' }, update = tr
      _MapRoot.set(row.key, row)
    })
    const _newRoot = Array.from(_MapRoot.values())
-    writeIndexDB([{ key: Number(params.opi_sn), tree: _newRoot }], 'dirs', 'mailbox')
+    writeIndexDB([{ ...readCacheDir, key: Number(params.opi_sn), tree: _newRoot }], 'dirs', 'mailbox')
    notifyMailboxUpdate({ type: 'dirs', key: Number(params.opi_sn) })
  }

@ -338,7 +338,7 @@ export const getRootMailboxDirAction = async ({ opi_sn = 0, userIdStr = '' } = {
  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] || [])] }))
+  const rootTree = Object.keys(stickyTree).map((opi) => ({ key: Number(opi), tree: [...stickyTree[opi], ...(mailboxDirByOPI?.[opi] || [])], treeTimestamp: Date.now() }))
  writeIndexDB(rootTree, 'dirs', 'mailbox')
  const _mapped = groupBy(rootTree, 'key')
  return _mapped[opi_sn]?.[0]?.tree || []
@ -348,7 +348,6 @@ export const getRootMailboxDirAction = async ({ opi_sn = 0, userIdStr = '' } = {
 * 获取邮件列表
 * @usage 邮件目录下的邮件列表
 * @usage 订单的邮件列表
- * @usage 高级搜索
 */
 export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id = '', node = {}, } = {}) => {
  const _params = {
@ -375,6 +374,20 @@ export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id
  return ret;
 }

+export const searchEmailListAction = async ({opi_sn = '', mailboxtype = 'ALL', sender = '', receiver = '', subject = '', content=''}={}) => {
+  const formData = new FormData()
+  formData.append('opi_sn', opi_sn)
+  formData.append('mailboxtype', mailboxtype)
+  formData.append('sender', sender)
+  formData.append('receiver', receiver)
+  formData.append('subject', subject)
+  // formData.append('content', content)
+  const { errcode, result } = await postForm(`${API_HOST_V3}/mail_search`, formData)
+  const ret = errcode === 0 ? result : []
+  notifyMailboxUpdate({ type: 'maillist-search-result', query: [sender, receiver, subject].filter(s => s).join(' '), data: ret.map(ele => ({...ele, key: ele.MAI_SN, showFolder: true })) })
+  return ret;
+}
+
 const removeFromCurrentList = async (params) => {
  const readRow0 = await readIndexDB(params.mai_sn_list[0], 'listrow', 'mailbox')
  const listKey = readRow0?.data?.listKey || ''
@ -442,7 +455,7 @@ export const getReminderEmailTemplateAction = async (params = { coli_sn: 0, lgc:
 * @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_V3}/email_draft_save` : `${EMAIL_HOST_v3}/sendmail`;
  const { attaList=[], atta, content, ...bodyData } = body;
  bodyData.ordertype = 227001;
  const formData = new FormData();
@ -476,7 +489,3 @@ export const queryOPIOrderAction = async (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
-}
--- a/src/assets/App.css
+++ b/src/assets/App.css
@ -1,6 +1,6 @@
 .logo {
  float: left;
-  height: 68px;
+  height: 60px;
  margin: 0 6px 0 0;
  background: rgba(255, 255, 255, 0.3);
 }
--- a/src/assets/highlights_travel_300_300_250613.png
+++ b/src/assets/highlights_travel_300_300_250613.png
--- a/src/channel/bubbleMsgUtils.js
+++ b/src/channel/bubbleMsgUtils.js
@ -488,7 +488,7 @@ const sessionMsgMapped = {
    getMsg: (result) => {
      // sessionItem 是数组
      return isEmpty(result?.sessionItem)
-        ? null
+        ? []
        : result.sessionItem.map((ele) => ({
            ...ele,
            customer_name: `${ele.whatsapp_name || ''}`.trim(),
--- a/src/components/OrderProfile.jsx
+++ b/src/components/OrderProfile.jsx
@ -13,7 +13,7 @@ import {
 } from '@ant-design/icons'

 import { useEffect, useState } from 'react'
-import { Link, useNavigate } from 'react-router-dom'
+import { Link } 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'
@ -21,23 +21,28 @@ 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 [formWhatsApp] = Form.useForm()
+  const [formExtra] = Form.useForm()
  const [loading, setLoading] = useState(false)

  const [openOrderCommnet, setOpenOrderCommnet] = useState(false)
+  const [openWhatsApp, setOpenWhatsApp] = useState(false)
+  const [openExtra, setOpenExtra] = useState(false)

  const orderLabelOptions = copy(OrderLabelDefaultOptions)
  orderLabelOptions.unshift({ value: 0, label: '未设置', disabled: true })

  const orderStatusOptions = copy(OrderStatusDefaultOptions)
-  const [orderDetail, customerDetail, fetchOrderDetail, setOrderPropValue, appendOrderComment] = useOrderStore((s) => [
+  const [orderDetail, customerDetail, fetchOrderDetail, setOrderPropValue, appendOrderComment, updateWhatsapp, updateExtraInfo] = useOrderStore((s) => [
    s.orderDetail,
    s.customerDetail,
    s.fetchOrderDetail,
    s.setOrderPropValue,
    s.appendOrderComment,
+    s.updateWhatsapp,
+    s.updateExtraInfo,
  ])

  const loginUser = useAuthStore((state) => state.loginUser)
@ -46,8 +51,8 @@ const OrderProfile = ({ coliSN, ...props }) => {

  const [orderRemindState, setOrderRemindState] = useState(orderDetail.remindstate)
  useEffect(() => {
-    setOrderRemindState(orderDetail.remindstate);
-  }, [orderDetail.remindstate]);
+    setOrderRemindState(orderDetail.remindstate)
+  }, [orderDetail.remindstate])
  useEffect(() => {
    if (orderId) {
      setLoading(true)
@ -117,10 +122,16 @@ const OrderProfile = ({ coliSN, ...props }) => {
            {customerDetail.email}
          </Typography.Text>
          <Typography.Text>
-            <WhatsAppOutlined className=' pr-1' />
-            <Link to={`/order/chat/${coliSN}`} state={orderDetail}>
-              {customerDetail.whatsapp_phone_number}
-            </Link>
+            <WhatsAppOutlined className='pr-1' />
+            {isEmpty(customerDetail.whatsapp_phone_number) ? (
+              <Button type='text' onClick={() => setOpenWhatsApp(true)} size='small'>
+                设置 WhatsApp
+              </Button>
+            ) : (
+              <Link to={`/order/chat/${coliSN}`} state={{...orderDetail, coli_guest_WhatsApp: customerDetail.whatsapp_phone_number, }}>
+                {customerDetail.whatsapp_phone_number}
+              </Link>
+            )}
          </Typography.Text>
          <Typography.Text>
            <Tooltip title='出发日期'>
@ -223,9 +234,15 @@ const OrderProfile = ({ coliSN, ...props }) => {

        <Divider orientation='left'>
          <Typography.Text strong>附加信息</Typography.Text>
-          {/* <Tooltip title='修改'>
-            <EditOutlined className='pl-1' />
-          </Tooltip> */}
+          <Tooltip title='修改'>
+            <EditOutlined
+              className='pl-1'
+              onClick={() => {
+                formExtra.setFieldsValue({ extra: orderDetail.COLI_Introduction })
+                setOpenExtra(true)
+              }}
+            />
+          </Tooltip>
        </Divider>
        <Typography.Text>{orderDetail.COLI_Introduction}</Typography.Text>
      </Skeleton>
@ -236,7 +253,6 @@ const OrderProfile = ({ coliSN, ...props }) => {
          initialValues={{ comment: '' }}
          scrollToFirstError
          onFinish={(values) => {
-            console.log('Received values of form: ', values)
            appendOrderComment(loginUser.userId, orderId, values.comment)
              .then(() => {
                notification.success({
@ -265,6 +281,74 @@ const OrderProfile = ({ coliSN, ...props }) => {
          </Form.Item>
        </Form>
      </Drawer>
+      <Drawer title='设置 WhatsApp' closable={{ 'aria-label': 'Close Button' }} onClose={() => setOpenWhatsApp(false)} open={openWhatsApp}>
+        <Form
+          layout={'vertical'}
+          form={formWhatsApp}
+          initialValues={{ number: '' }}
+          scrollToFirstError
+          onFinish={(values) => {
+            updateWhatsapp(orderId, values.number)
+              .then(() => {
+                notification.success({
+                  message: '温性提示',
+                  description: '设置 WhatsApp 成功',
+                })
+                setOpenWhatsApp(false)
+                formWhatsApp.setFieldsValue({ number: '' })
+              })
+              .catch((reason) => {
+                notification.error({
+                  message: '设置出错',
+                  description: reason.message,
+                  placement: 'top',
+                  duration: 60,
+                })
+              })
+          }}>
+          <Form.Item name='number' label='WhatsApp' rules={[{ required: true, message: '请输入 WhatsApp 号码' }]}>
+            <Input placeholder='国家代码+城市代码+电话号码' />
+          </Form.Item>
+          <Form.Item>
+            <Button type='primary' htmlType='submit'>
+              提交
+            </Button>
+          </Form.Item>
+        </Form>
+      </Drawer>
+      <Drawer title='设置附加信息' closable={{ 'aria-label': 'Close Button' }} onClose={() => setOpenExtra(false)} open={openExtra}>
+        <Form
+          layout={'vertical'}
+          form={formExtra}
+          scrollToFirstError
+          onFinish={(values) => {
+            updateExtraInfo(orderId, values.extra)
+              .then(() => {
+                notification.success({
+                  message: '温性提示',
+                  description: '设置附加信息成功',
+                })
+                setOpenExtra(false)
+              })
+              .catch((reason) => {
+                notification.error({
+                  message: '设置出错',
+                  description: reason.message,
+                  placement: 'top',
+                  duration: 60,
+                })
+              })
+          }}>
+          <Form.Item name='extra' label='附加信息' rules={[{ required: true, message: '请输入附加信息' }]}>
+            <Input />
+          </Form.Item>
+          <Form.Item>
+            <Button type='primary' htmlType='submit'>
+              提交
+            </Button>
+          </Form.Item>
+        </Form>
+      </Drawer>
    </>
  )
 }
--- a/src/config.js
+++ b/src/config.js
@ -6,20 +6,20 @@
 // 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_V3 = 'http://202.103.68.144:8889/v3';
+// 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'; // 香港服务器
-export const WAI_HOST = 'http://47.254.53.81/api/v1'; // 美国服务器
+// export const WAI_HOST = 'http://47.254.53.81/api/v1'; // 美国服务器
 // export const WAI_HOST = 'http://localhost:3031/api/v1'; // 美国服务器
 export const WAI_SERVER_KEY = 'G-STR:WAI_SERVER'

+// prod:--------------------------------------------------------------------------------------------------
 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 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 EMAIL_HOST_v3 = 'https://p9axztuwd7x8a7.mycht.cn/mail-server/service-mail';
+export const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/v2';
+export const API_HOST_V3 = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/v3';
 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';
--- 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, getReminderEmailTemplateAction, saveEmailDraftOrSendAction, updateEmailAction, getEmailChangesChannel, EMAIL_CHANNEL_NAME } from '@/actions/EmailActions'
+import { getEmailDetailAction, postResendEmailAction, getSalesSignatureAction, getEmailOrderAction, queryEmailListAction, searchEmailListAction, getReminderEmailTemplateAction, saveEmailDraftOrSendAction, updateEmailAction, getEmailChangesChannel, EMAIL_CHANNEL_NAME } from '@/actions/EmailActions'
 import { App } from 'antd'
 import useConversationStore from '@/stores/ConversationStore';
 import { msgStatusRenderMapped } from '@/channel/bubbleMsgUtils';
@ -132,16 +132,12 @@ export const useEmailDetail = (mai_sn=0, data={}, oid=0, markRead=false) => {
  }

  const postEmailSaveOrSend = async (body, isDraft) => {
-    try {
-      const { id: savedID } = await saveEmailDraftOrSendAction(body, isDraft)
-      setMaiSN(savedID)
-      if (isDraft) {
-        refresh()
-      }
-      return savedID
-    } catch (error) {
-      console.error(error);
+    const { id: savedID } = await saveEmailDraftOrSendAction(body, isDraft)
+    setMaiSN(savedID)
+    if (isDraft) {
+      refresh()
    }
+    return savedID
  };

  return { loading, mailData, orderDetail, postEmailResend, postEmailSaveOrSend }
@ -171,6 +167,7 @@ export const useEmailList = (mailboxDirNode) => {
  const [error, setError] = useState(null)
  const [isFreshData, setIsFreshData] = useState(false)
  const [refreshTrigger, setRefreshTrigger] = useState(0)
+  const [tempBreadcrumb, setTempBreadcrumb] = useState(null);

  const refresh = useCallback(() => {
    setRefreshTrigger((prev) => prev + 1)
@ -178,7 +175,7 @@ export const useEmailList = (mailboxDirNode) => {

  const { OPI_SN: opi_sn, COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = mailboxDirNode

-  const markAsRead = useCallback(
+  const markAsUnread = useCallback(
    async (sn_list) => {
    // 优化性能的话，需要更新 mailList 数据，
    // 但是更新 mailList 会造成页面全部刷新
@ -194,7 +191,7 @@ export const useEmailList = (mailboxDirNode) => {
      await updateEmailAction({
        opi_sn: opi_sn,
        mai_sn_list: sn_list,
-        set: { read: 1 },
+        set: { read: 0 },
      })
    },
    [VKey],
@ -242,7 +239,7 @@ export const useEmailList = (mailboxDirNode) => {
      setIsFreshData(false)
      return
    }
-
+    setTempBreadcrumb(null)
    setLoading(true)
    setError(null)
    setIsFreshData(false)
@ -271,10 +268,19 @@ export const useEmailList = (mailboxDirNode) => {
    getMailList()
    // --- Setup Internal Event Listener ---
    const handleInternalUpdate = (event) => {
-      // console.log(`[useEmailList] Received internal event. `, event.detail)
-      if (event.detail && event.detail.type === 'listrow') {
+      // console.log(`🔔[useEmailList] Received internal event. `, event.detail)
+      if (isEmpty(event.detail)) {
+        return false;
+      }
+      const { type, } = event.detail
+      if (type === 'listrow') {
        loadMailListFromCache()
      }
+      if (type === 'maillist-search-result') {
+        const { data, query } = event.detail
+        setMailList(data)
+        setTempBreadcrumb([{title: '查找邮件:'+query, iconIndex: 'search'}]);
+      }
    }
    internalEventEmitter.on(EMAIL_CHANNEL_NAME, handleInternalUpdate)

@ -282,11 +288,20 @@ export const useEmailList = (mailboxDirNode) => {
    const channel = getEmailChangesChannel()
    const handleMessage = (event) => {
      // console.log(`[useEmailList] Received channel event. `, event.data)
+      if (isEmpty(event.data)) {
+        return false;
+      }
+      const { type, } = event.data
      const cacheKey = isEmpty(COLI_SN) ? `dir-${VKey}` : `order-${VKey}`
-      if (event.data.type === 'listrow' && cacheKey === event.data.listKey) {
+      if (type === 'listrow' && cacheKey === event.data.listKey) {
        // cacheKey 不相同时, 不需要更新; 邮箱目录不相同
        loadMailListFromCache(event.data)
      }
+      if (type === 'maillist-search-result') {
+        // 搜索的结果不需要更新所有页面
+        // const { data } = event.detail
+        // setMailList(data)
+      }
    }
    channel.addEventListener('message', handleMessage)

@ -297,7 +312,7 @@ export const useEmailList = (mailboxDirNode) => {
    }
  }, [getMailList])

-  return { loading, isFreshData, error, mailList, refresh, markAsRead, markAsProcessed, markAsDeleted }
+  return { loading, isFreshData, error, mailList, tempBreadcrumb, refresh, markAsUnread, markAsProcessed, markAsDeleted }
 }

 const orderMailTypes = new Map([
@ -416,12 +431,12 @@ export const useEmailTemplate = (templateKey, params) => {
 }

 export const mailboxSystemDirs = [
-    { 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: '已处理邮件' },
-  ]
+  { 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: '已处理邮件' },
+]

--- a/src/stores/ConversationStore.js
+++ b/src/stores/ConversationStore.js
@ -1,6 +1,6 @@
 import { create } from 'zustand';
 import { RealTimeAPI } from '@/channel/realTimeAPI';
-import { olog, isEmpty, groupBy, sortArrayByOrder, pick, sortKeys, omit, sortObjectsByKeysMap } from '@/utils/commons';
+import { olog, isEmpty, groupBy, sortArrayByOrder, pick, sortKeys, omit, sortObjectsByKeysMap, merge } 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';
@ -197,10 +197,10 @@ const websocketSlice = (set, get) => ({
    // 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);
-      }
+      // if (!isEmpty(msgRender)) {
+      //   const msgNotify = receivedMsgTypeMapped[resultType].contentToNotify(msgObj);
+      //   addGlobalNotify(msgNotify);
+      // }
      return false;
    }
    if ([
@ -238,9 +238,11 @@ const websocketSlice = (set, get) => ({
      // }, 60_000);
    }
    // 会话表 更新
-    if (['session.new', 'session.updated'].includes(resultType)) {
+    if (['session.new', 'session.updated'].includes(resultType)
+      && result.webhooksource !== 'email'
+    ) {
      const sessionList = receivedMsgTypeMapped[resultType].getMsg(result);
-      addToConversationList(sessionList, 'top');
+      addToConversationList(sessionList || [], 'top')
    }
    // console.log('handleMessage*******************');
  },
@ -276,13 +278,17 @@ const conversationSlice = (set, get) => ({
    // 让当前会话显示在页面上
    let _tmpCurrentMsgs = [];
    if (currentConversation.sn) {
-      _tmpCurrentMsgs = activeConversations[currentConversation.sn];
+    //   _tmpCurrentMsgs = activeConversations[currentConversation.sn];
    }
    const conversationsMapped = conversationsList.reduce((r, v) => ({ ...r, [`${v.sn}`]: [] }), {});
-    if (currentConversation.sn) {
-      const hasCurrent = Object.keys(conversationsMapped).findIndex(sn => Number(sn) === Number(currentConversation.sn)) !== -1;
-      conversationsMapped[currentConversation.sn] = _tmpCurrentMsgs;
-      const _len = hasCurrent ? 0 : conversationsList.unshift(currentConversation);
+    const indexCurrent = currentConversation.sn ? conversationsList.findIndex(ele => Number(ele.sn) === Number(currentConversation.sn)) : -1;
+    if (indexCurrent !== -1) {
+      const [currentElement] = conversationsList.splice(indexCurrent, 1);
+      conversationsList.unshift(currentElement); // Add to top
+      // const hasCurrent = Object.keys(conversationsMapped).findIndex(sn => Number(sn) === Number(currentConversation.sn)) !== -1;
+      // conversationsMapped[currentConversation.sn] = _tmpCurrentMsgs;
+      // conversationsList.unshift(hasCurrent ? )
+      // hasCurrent ? 0 : conversationsList.unshift(currentConversation);
    }

    const { topList, pageList } = sortConversationList(conversationsList);
@ -318,9 +324,11 @@ const conversationSlice = (set, get) => ({
    const needUpdateCurrent = -1 !== newList.findIndex(row => Number(row.sn) === Number(currentConversation.sn));
    const updateCurrent = needUpdateCurrent ? { currentConversation: newList.find(row => Number(row.sn) === Number(currentConversation.sn)) } : {};
    // 让当前会话显示在页面上
-    if (currentConversation.sn) {
-      const hasCurrent = -1 !== Object.keys(mergedListMsgs).findIndex(sn => Number(sn) === Number(currentConversation.sn));
-      hasCurrent ? 0 : mergedList.unshift(currentConversation);
+    const indexCurrent = currentConversation.sn ? mergedList.findIndex(ele => Number(ele.sn) === Number(currentConversation.sn)) : -1;
+    if (indexCurrent !== -1 ) {
+      const [currentElement] = mergedList.splice(indexCurrent, 1);
+      mergedList.unshift(currentElement); // Add to top
+      // hasCurrent ? 0 : mergedList.unshift(currentConversation);
    }
    const refreshTotalNotify = mergedList.reduce((r, c) => r+(c.unread_msg_count === UNREAD_MARK ? 0 : c.unread_msg_count), 0);

--- a/src/stores/EmailSlice.js
+++ b/src/stores/EmailSlice.js
@ -124,7 +124,7 @@ const emailSlice = (set, get) => ({
    let isNeedRefresh = refreshNow
    if (!isEmpty(readCache)) {
      setMailboxNestedDirsActive(readCache?.tree || [])
-      isNeedRefresh = refreshNow || Date.now() - readCache.timestamp > 1 * 60 * 60 * 1000
+      isNeedRefresh = refreshNow || Date.now() - readCache.treeTimestamp > 1 * 60 * 60 * 1000
      // isNeedRefresh = true; // test: 0
    }
    if (isEmpty(readCache) || isNeedRefresh) {
@ -139,9 +139,14 @@ const emailSlice = (set, get) => ({
    return false
  },

-  // 更新数量
+  /**
+   * 更新数量
+   * @usage 1. 邮件列表页切换用户时
+   * @usage 2. 收到新邮件推送时
+   *
+   */
  updateMailboxCount: async ({ opi_sn }) => {
-    const { setMailboxNestedDirsActive } = get()
+    // const { setMailboxNestedDirsActive } = get()
    await getMailboxCountAction({ opi_sn })
    // const readCache = await readIndexDB(Number(opi_sn), 'dirs', 'mailbox')
    // if (!isEmpty(readCache)) {
@ -150,7 +155,7 @@ const emailSlice = (set, get) => ({
  },

  async initMailbox({ opi_sn, dei_sn, userIdStr }) {
-    olog('initMailbox ---- ')
+    olog('Initialize Mailbox ---- ')
    const { currentMailboxOPI, setCurrentMailboxOPI, setCurrentMailboxDEI, getOPIEmailDir, setMailboxNestedDirsActive, } = get()
    createIndexedDBStore(['dirs', 'maillist', 'listrow', 'mailinfo', 'draft'], 'mailbox')
    setCurrentMailboxOPI(opi_sn)
--- a/src/stores/OrderStore.js
+++ b/src/stores/OrderStore.js
@ -1,7 +1,7 @@
 import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
-import { fetchJSON, postForm } from '@/utils/request'
-import { API_HOST, EMAIL_HOST } from '@/config'
+import { fetchJSON, postForm, postJSON } from '@/utils/request'
+import { API_HOST, API_HOST_V3, EMAIL_HOST } from '@/config'
 import { isNotEmpty, prepareUrl, uniqWith } from '@/utils/commons'

 const initialState = {
@ -11,213 +11,247 @@ const initialState = {
  lastQuotation: {},
  quotationList: [],
  otherEmailList: [],
-};
-
-export const useOrderStore = create(devtools((set, get) => ({
-
-  ...initialState,
-  drawerOpen: false,
-
-  resetOrderStore: () => set(initialState),
-
-  openDrawer: () => {
-    set(() => ({
-      drawerOpen: true
-    }))
-  },
-
-  closeDrawer: () => {
-    set(() => ({
-      drawerOpen: false
-    }))
-  },
-
-  fetchOrderList: async (formValues, loginUser) => {
-    let fetchOrderUrl = `${API_HOST}/getwlorder?opisn=${loginUser.userIdStr}&otype=${formValues.type}`
-    const params = {};
-
-    if (formValues.type === 'advance') {
-      fetchOrderUrl = `${API_HOST}/getdvancedwlorder?opisn=${loginUser.userIdStr}`;
-      const { type, ...formParams } = formValues;
-      Object.assign(params, formParams)
-    }
-
-    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: _result_unique,
-          }))
-        } else {
-          throw new Error(json?.errmsg + ': ' + json.errcode)
+}
+
+export const useOrderStore = create(
+  devtools(
+    (set, get) => ({
+      ...initialState,
+      drawerOpen: false,
+
+      resetOrderStore: () => set(initialState),
+
+      openDrawer: () => {
+        set(() => ({
+          drawerOpen: true,
+        }))
+      },
+
+      closeDrawer: () => {
+        set(() => ({
+          drawerOpen: false,
+        }))
+      },
+
+      fetchOrderList: async (formValues, loginUser) => {
+        let fetchOrderUrl = `${API_HOST}/getwlorder?opisn=${loginUser.userIdStr}&otype=${formValues.type}`
+        const params = {}
+
+        if (formValues.type === 'advance') {
+          fetchOrderUrl = `${API_HOST}/getdvancedwlorder?opisn=${loginUser.userIdStr}`
+          const { type, ...formParams } = formValues
+          Object.assign(params, formParams)
        }
-      })

-  },
-
-  fetchOrderDetail: (colisn) => {
-    return fetchJSON(`${API_HOST}/getorderinfo`, { colisn })
-      .then(json => {
-        if (json.errcode === 0 && json.result.length > 0) {
-          const orderResult = json.result[0]
-          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,
-          }))
-          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,
+        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: _result_unique,
+            }))
+          } else {
+            throw new Error(json?.errmsg + ': ' + json.errcode)
          }
-        } else {
-          throw new Error(json?.errmsg + ': ' + json.errcode)
-        }
-      })
-
-  },
-
-  appendOrderComment: async (opi_sn, coli_sn, comment) => {
-    const { fetchOrderDetail } = get()
-    const formData = new FormData()
-    formData.append('opi_sn', opi_sn)
-    formData.append('coli_sn', coli_sn)
-    formData.append('remark', comment)
-
-    return postForm(`${API_HOST}/remark_order`, formData)
-      .then(json => {
-        if (json.errcode === 0) {
-          return fetchOrderDetail(coli_sn)
-        } else {
-          throw new Error(json?.errmsg + ': ' + json.errcode)
-        }
-      })
-  },
-
-  generatePayment: async (formValues) => {
-    const formData = new FormData()
-    formData.append('descriptions', formValues.description)
-    formData.append('currency', formValues.currency)
-    formData.append('lgc', formValues.langauge)
-    formData.append('amount', formValues.amount)
-    formData.append('coli_id', formValues.orderNumber)
-    formData.append('ordertype', formValues.orderType)
-    formData.append('opisn', formValues.userId)
-    formData.append('paytype', 'SYT')
-    formData.append('wxzh', 'cht')
-    formData.append('fq', 0)
-    formData.append('onlyusa', 0)
-    formData.append('useyhm', 0)
-
-    return postForm(`${API_HOST}/generate_payment_links`, formData)
-      .then(json => {
-        if (json.errcode === 0) {
-          return json.result
-        } else {
-          throw new Error(json?.errmsg + ': ' + json.errcode)
-        }
-      })
-  },
-
-  fetchHistoryOrder: (userId, email, whatsappid='') => {
-    return fetchJSON(`${API_HOST}/query_guest_order`, { opisn: userId, whatsappid, email: email })
-      .then(json => {
-        if (json.errcode === 0) {
-          return json.result
-        } else {
-          throw new Error(json?.errmsg + ': ' + json.errcode)
-        }
-      })
-
-  },
-
-  importEmailMessage: ({ orderId, orderNumber }) => {
-    return fetchJSON(`${API_HOST}/generate_email_msg`, { coli_sn: orderId, coli_id: orderNumber })
-      .then(json => {
-        if (json.errcode === 0) {
-          return json
-        } else {
-          throw new Error(json?.errmsg + ': ' + json.errcode)
-        }
-      })
-  },
-
-  batchImportEmailMessage: () => {
-    const { orderList } = get()
-
-    const orderPromiseList = orderList.map(order => {
-      return new Promise((resolve, reject) => {
-        fetchJSON(`${API_HOST}/generate_email_msg`, { coli_sn: order.COLI_SN, coli_id: order.COLI_ID })
-          .then(json => {
-            if (json.errcode === 0) {
-              resolve(json)
-            } else {
-              reject(json?.errmsg + ': ' + json.errcode)
+        })
+      },
+
+      fetchOrderDetail: (colisn) => {
+        return fetchJSON(`${API_HOST}/getorderinfo`, { colisn }).then((json) => {
+          if (json.errcode === 0 && json.result.length > 0) {
+            const orderResult = json.result[0]
+            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,
+            }))
+            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,
            }
+          } else {
+            throw new Error(json?.errmsg + ': ' + json.errcode)
+          }
+        })
+      },
+
+      appendOrderComment: async (opi_sn, coli_sn, comment) => {
+        const { fetchOrderDetail } = get()
+        const formData = new FormData()
+        formData.append('opi_sn', opi_sn)
+        formData.append('coli_sn', coli_sn)
+        formData.append('remark', comment)
+
+        return postForm(`${API_HOST}/remark_order`, formData).then((json) => {
+          if (json.errcode === 0) {
+            return fetchOrderDetail(coli_sn)
+          } else {
+            throw new Error(json?.errmsg + ': ' + json.errcode)
+          }
+        })
+      },
+
+      generatePayment: async (formValues) => {
+        const formData = new FormData()
+        formData.append('descriptions', formValues.description)
+        formData.append('currency', formValues.currency)
+        formData.append('lgc', formValues.langauge)
+        formData.append('amount', formValues.amount)
+        formData.append('coli_id', formValues.orderNumber)
+        formData.append('ordertype', formValues.orderType)
+        formData.append('opisn', formValues.userId)
+        formData.append('paytype', 'SYT')
+        formData.append('wxzh', 'cht')
+        formData.append('fq', 0)
+        formData.append('onlyusa', 0)
+        formData.append('useyhm', 0)
+
+        return postForm(`${API_HOST}/generate_payment_links`, formData).then((json) => {
+          if (json.errcode === 0) {
+            return json.result
+          } else {
+            throw new Error(json?.errmsg + ': ' + json.errcode)
+          }
+        })
+      },
+
+      fetchHistoryOrder: (userId, email, whatsappid = '') => {
+        return fetchJSON(`${API_HOST}/query_guest_order`, { opisn: userId, whatsappid, email: email }).then((json) => {
+          if (json.errcode === 0) {
+            return json.result
+          } else {
+            throw new Error(json?.errmsg + ': ' + json.errcode)
+          }
+        })
+      },
+
+      importEmailMessage: ({ orderId, orderNumber }) => {
+        return fetchJSON(`${API_HOST}/generate_email_msg`, { coli_sn: orderId, coli_id: orderNumber }).then((json) => {
+          if (json.errcode === 0) {
+            return json
+          } else {
+            throw new Error(json?.errmsg + ': ' + json.errcode)
+          }
+        })
+      },
+
+      batchImportEmailMessage: () => {
+        const { orderList } = get()
+
+        const orderPromiseList = orderList.map((order) => {
+          return new Promise((resolve, reject) => {
+            fetchJSON(`${API_HOST}/generate_email_msg`, { coli_sn: order.COLI_SN, coli_id: order.COLI_ID }).then((json) => {
+              if (json.errcode === 0) {
+                resolve(json)
+              } else {
+                reject(json?.errmsg + ': ' + json.errcode)
+              }
+            })
          })
-      })
-    })
-
-    Promise.all(orderPromiseList).then((values) => {
-      console.log(values);
-    })
-  },
-
-  fetchOtherEmail: (coli_sn) => {
-    return fetchJSON(`${EMAIL_HOST}/email_supplier`, { coli_sn })
-      .then(json => {
-        if (json.errcode === 0) {
-          set(() => ({
-            otherEmailList: json.result.MailInfo ?? [],
+        })
+
+        Promise.all(orderPromiseList).then((values) => {
+          console.log(values)
+        })
+      },
+
+      fetchOtherEmail: (coli_sn) => {
+        return fetchJSON(`${EMAIL_HOST}/email_supplier`, { coli_sn }).then((json) => {
+          if (json.errcode === 0) {
+            set(() => ({
+              otherEmailList: json.result.MailInfo ?? [],
+            }))
+          } else {
+            throw new Error(json?.errmsg + ': ' + json.errcode)
+          }
+        })
+      },
+
+      updateWhatsapp: (coli_sn, number) => {
+        return postJSON(`${API_HOST_V3}/order_update`, {
+          coli_sn: coli_sn,
+          set: {
+            concat_whatsapp: number,
+          },
+        }).then((json) => {
+          if (json.errcode > 0) {
+            throw new Error(json?.errmsg + ': ' + json.errcode)
+          } else {
+            set((state) => ({
+              customerDetail: {
+                ...state.customerDetail,
+                whatsapp_phone_number: number,
+              },
+            }))
+          }
+        })
+      },
+
+      updateExtraInfo: (coli_sn, extra) => {
+        const { orderDetail } = get()
+
+        return postJSON(`${API_HOST_V3}/order_update`, {
+          coli_sn: coli_sn,
+          set: {
+            extra_info: extra,
+          },
+        }).then((json) => {
+          if (json.errcode > 0) {
+            throw new Error(json?.errmsg + ': ' + json.errcode)
+          } else {
+            set((state) => ({
+              orderDetail: {
+                ...state.orderDetail,
+                COLI_Introduction: extra,
+              },
+            }))
+          }
+        })
+      },
+
+      setOrderPropValue: async (colisn, propName, value) => {
+        if (propName === 'orderlabel') {
+          set((state) => ({
+            orderDetail: {
+              ...state.orderDetail,
+              tags: value,
+            },
          }))
-        } else {
-          throw new Error(json?.errmsg + ': ' + json.errcode)
-        }
-      })
-  },
-
-  setOrderPropValue: async (colisn, propName, value) => {
-
-    if (propName === 'orderlabel') {
-      set((state) => ({
-        orderDetail: {
-          ...state.orderDetail,
-          tags: value
-        }
-      }))
-    }
-
-    if (propName === 'orderstatus') {
-      set((state) => ({
-        orderDetail: {
-          ...state.orderDetail,
-          states: value
        }
-      }))
-    }

-    return fetchJSON(`${API_HOST}/setorderstatus`, { colisn, stype: propName, svalue: value })
-      .then(json => {
-        if (json.errcode > 0) {
-          throw new Error(json?.errmsg + ': ' + json.errcode)
+        if (propName === 'orderstatus') {
+          set((state) => ({
+            orderDetail: {
+              ...state.orderDetail,
+              states: value,
+            },
+          }))
        }
-      })
-  },

-}), { name: 'orderStore' }))
+        return fetchJSON(`${API_HOST}/setorderstatus`, { colisn, stype: propName, svalue: value }).then((json) => {
+          if (json.errcode > 0) {
+            throw new Error(json?.errmsg + ': ' + json.errcode)
+          }
+        })
+      },
+    }),
+    { name: 'orderStore' },
+  ),
+)

 export const OrderLabelDefaultOptions = [
  { value: 240003, label: '重点', emoji: '❣️' },
  { value: 240002, label: '次重点', emoji: '❗' },
-  { value: 240001, label: '一般', emoji: '' }
+  { value: 240001, label: '一般', emoji: '' },
 ]
 export const OrderLabelDefaultOptionsMapped = OrderLabelDefaultOptions.reduce((acc, cur) => {
  return { ...acc, [String(cur.value)]: cur }
-}, {}) ;
+}, {})

 export const OrderStatusDefaultOptions = [
  { value: 1, label: '新订单', emoji: '' },
@ -226,8 +260,8 @@ export const OrderStatusDefaultOptions = [
  { value: 4, label: '等待付订金', emoji: '🛒' },
  { value: 5, label: '成行', emoji: '💰' },
  { value: 6, label: '丢失', emoji: '🎈' },
-  { value: 7, label: '取消', emoji: '🚫' },
-  { value: 8, label: '未报价', emoji: '' }
+  // { value: 7, label: '取消', emoji: '🚫' }, // 取消要顾问确认后才能执行操作，暂时到 HT 操作
+  { value: 8, label: '未报价', emoji: '' },
 ]
 export const OrderStatusDefaultOptionsMapped = OrderStatusDefaultOptions.reduce((acc, cur) => {
  return { ...acc, [String(cur.value)]: cur }
@ -239,7 +273,7 @@ export const OrderStatusDefaultOptionsMapped = OrderStatusDefaultOptions.reduce(
 export const RemindStateDefaultOptions = [
  { value: '1', label: '一催' },
  { value: '2', label: '二催' },
-  { value: '3', label: '三催' }
+  { value: '3', label: '三催' },
 ]

 /**
@ -251,15 +285,15 @@ export const remindStatusOptions = [
  { value: 3, label: '已发三催' },
  { 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 }
 */
 export const fetchSetRemindStateAction = async (params) => {
-  const { errcode, result } = await fetchJSON(`${API_HOST}/SetRemindState`, params);
-  return errcode === 0 ? result : {};
-};
+  const { errcode, result } = await fetchJSON(`${API_HOST}/SetRemindState`, params)
+  return errcode === 0 ? result : {}
+}
--- a/src/utils/indexedDB.js
+++ b/src/utils/indexedDB.js
@ -2,7 +2,13 @@ import { isEmpty } from './commons';
 /**
 *
 */
-const INDEXED_DB_VERSION = 4;
+
+/**
+ * 数据库版本
+ * ! 每次涉及indexedDB的更新都要往上+1
+ * @type {number}
+ */
+const INDEXED_DB_VERSION = 5;
 export const logWebsocket = (message, direction) => {
  var open = indexedDB.open('LogWebsocketData', INDEXED_DB_VERSION)
  open.onupgradeneeded = function () {
@ -104,7 +110,7 @@ export const clearWebsocketLog = () => {
 export const createIndexedDBStore = (tables, database) => {
  var open = indexedDB.open(database, INDEXED_DB_VERSION)
  open.onupgradeneeded = function () {
-    console.log('readIndexDB onupgradeneeded', database, )
+    // console.log('createIndexedDBStore onupgradeneeded', database, )
    var db = open.result
    // 数据库是否存在
    for (const table of tables) {
@ -124,7 +130,7 @@ export const createIndexedDBStore = (tables, database) => {
 export const writeIndexDB = (rows, table, database) => {
  var open = indexedDB.open(database, INDEXED_DB_VERSION)
  open.onupgradeneeded = function () {
-    console.log('readIndexDB onupgradeneeded', table, )
+    // console.log('readIndexDB onupgradeneeded', table, )
    var db = open.result
    // 数据库是否存在
    if (!db.objectStoreNames.contains(table)) {
@ -139,6 +145,11 @@ export const writeIndexDB = (rows, table, database) => {
  }
  open.onsuccess = function () {
    var db = open.result
+    // 数据库是否存在
+    if (!db.objectStoreNames.contains(table)) {
+      console.warn(`writeIndexDB > Database does not exist.`, table);
+      return
+    }
    var tx = db.transaction(table, 'readwrite')
    var store = tx.objectStore(table)
    rows.forEach(row => {
@ -170,7 +181,7 @@ 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, )
+      // console.log('readIndexDB onupgradeneeded', table, )
      var db = openRequest.result
      // 数据库是否存在
      if (!db.objectStoreNames.contains(table)) {
@ -191,7 +202,8 @@ export const readIndexDB = (keys=null, table, database) => {
      let db = e.target.result
      // 数据库是否存在
      if (!db.objectStoreNames.contains(table)) {
-        resolve('Database does not exist.')
+        console.warn(`readIndexDB > Database does not exist.`, table);
+        resolve();
        return
      }
      let transaction = db.transaction(table, 'readonly')
@ -208,7 +220,7 @@ export const readIndexDB = (keys=null, table, database) => {
                // 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}.`);
+                // console.log(`No record found with key ${key}.`);
                innerResolve(void 0); // Resolve with undefined for non-existent keys
              }
            };
@ -241,7 +253,7 @@ export const readIndexDB = (keys=null, table, database) => {
            // console.log(`💾Found record with key ${keys}:`, result);
            resolve(result);
          } else {
-            console.log(`No record found with key ${keys}.`);
+            // console.log(`No record found with key ${keys}.`);
            resolve();
          }
        };
@ -258,10 +270,10 @@ export const readIndexDB = (keys=null, table, database) => {
            allData.forEach(item => {
              resultMap.set(item.key, item);
            });
-            console.log(`💾Found all records:`, resultMap);
+            // console.log(`💾Found all records:`, resultMap);
            resolve(resultMap);
          } else {
-            console.log(`No records found.`);
+            // console.log(`No records found.`);
            resolve(resultMap); // Resolve with an empty Map if no records
          }
        };
@ -288,7 +300,8 @@ export const deleteIndexDBbyKey = (keys=null, table, database) => {
      let db = e.target.result
      // 数据库是否存在
      if (!db.objectStoreNames.contains(table)) {
-        resolve('Database does not exist.')
+        console.warn('deleteIndexDBbyKey > Database does not exist.', table)
+        resolve();
        return
      }
      var tx = db.transaction(table, 'readwrite')
@ -347,7 +360,7 @@ export const deleteIndexDBbyKey = (keys=null, table, database) => {
  })
 };

-function cleanOldData(database, storeNames=[], dateKey = 'timestamp') {
+function cleanOldData(database, storeNames=[], dateKey = 'timestamp', keySet = { keyPath: 'key' }) {
  return function (daysToKeep = 7) {
    return new Promise((resolve, reject) => {
      let deletedCount = 0
@ -355,11 +368,13 @@ function cleanOldData(database, storeNames=[], dateKey = 'timestamp') {

      let openRequest = indexedDB.open(database, INDEXED_DB_VERSION)
      openRequest.onupgradeneeded = function () {
+        // console.log('----cleanOldData onupgradeneeded----')
        var db = openRequest.result
        storeNames.forEach(storeName => {
          // 数据库是否存在
          if (!db.objectStoreNames.contains(storeName)) {
-            var store = db.createObjectStore(storeName, { keyPath: 'id', autoIncrement: true })
+            var store = db.createObjectStore(storeName, keySet)
+            // var store = db.createObjectStore(storeName, { keyPath: 'id', autoIncrement: true })
            store.createIndex('timestamp', 'timestamp', { unique: false })
          } else {
            const logStore = openRequest.transaction.objectStore(storeName)
@ -442,6 +457,8 @@ function cleanOldData(database, storeNames=[], dateKey = 'timestamp') {
              reject(event.target.error)
            }
          }
+        } else {
+          console.warn('cleanOldData: No data to delete.', database);
        }
      }
      openRequest.onerror = function (e) {
@ -451,8 +468,8 @@ function cleanOldData(database, storeNames=[], dateKey = 'timestamp') {
  }
 }

-export const clean7DaysWebsocketLog = cleanOldData('LogWebsocketData', ['LogStore']);
-export const clean7DaysMailboxLog = cleanOldData('mailbox');
+export const clean7DaysWebsocketLog = cleanOldData('LogWebsocketData', ['LogStore'], 'timestamp', { keyPath: 'id', autoIncrement: true });
+export const clean7DaysMailboxLog = cleanOldData('mailbox', ['dirs', 'maillist', 'listrow', 'mailinfo', 'draft']);


 /**
@ -567,4 +584,3 @@ export function setupDailyMidnightCleanupScheduler() {
    setupDailyMidnightCleanupScheduler()
  }, msToMidnight)
 }
-
--- a/src/views/Conversations/Online/Components/ChatListFilter.jsx
+++ b/src/views/Conversations/Online/Components/ChatListFilter.jsx
@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import { Button, Tag, Radio, Popover, Form, Space } from 'antd';
+import { Button, Tag, Radio, Popover, Form, Space, Tooltip } from 'antd';
 import { isEmpty, objectMapper, TagColorStyle } from '@/utils/commons';
 import useConversationStore from '@/stores/ConversationStore';
 import { OrderLabelDefaultOptions } from '@/stores/OrderStore';
-import { FilterIcon } from '@/components/Icons';
+import { FilterOutlined, FilterTwoTone } from '@ant-design/icons';

 const otypes = [
  { label: 'All', value: '', labelValue: '' },
@ -202,17 +202,15 @@ const ChatListFilter = ({ onFilterChange, activeList, ...props }) => {
              </Form>
            </>
          }>
-          <Button
-            icon={
-              <FilterIcon
-                className={
-                  isEmpty(selectedTags) ? 'text-neutral-500' : 'text-blue-500'
-                }
-              />
-            }
-            type='text'
-            size='middle'
-          />
+          <Tooltip title='更多筛选' >
+            <Button
+              icon={
+                isEmpty(selectedTags) ? <FilterOutlined className='text-neutral-500' /> : <FilterTwoTone />
+              }
+              type='text'
+              size='middle'
+            />
+          </Tooltip>
        </Popover>
      </div>
    </>
--- a/src/views/Conversations/Online/Components/EmailContent.jsx
+++ b/src/views/Conversations/Online/Components/EmailContent.jsx
@ -1,3 +1,4 @@
+import { POPUP_FEATURES } from '@/config'
 import React, { useState, useEffect, useRef } from 'react'

 const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
@ -31,11 +32,12 @@ const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
              width: 900px;
              max-width: 100%;
            }
-              img {
-                max-width: 90%;
-                height: auto;
-                object-fit: contain;
-              }
+            img {
+              max-width: 90%;
+              height: auto;
+              object-fit: contain;
+            }
+            img:not(a img){ cursor: pointer;}
            </style>
        </head>
        <body>
@ -58,6 +60,15 @@ const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
            links.forEach((link) => {
              link.setAttribute('target', '_blank')
            })
+            const imgs = doc.querySelectorAll('img:not(a img)')
+            imgs.forEach((img) => {
+              // open img in new tab
+              img.addEventListener('click', (e) => {
+                // e.preventDefault()
+                img.style.cursor = 'pointer'
+                window.open(img.src, img.src, POPUP_FEATURES)
+              })
+            })
          } catch (e) {
            // console.error('Could not access iframe content due to Same-Origin Policy or other error:', e)
          }
@ -113,7 +124,7 @@ const EmailContent = ({ id, content: MailContent, className='', ...props }) => {

  return (
    <div ref={containerRef} className={`space-y-4 w-full ${className}`}>
-      <div className='w-full relative'>
+      <div className='w-full relative pt-2'>
        <iframe
          key={id}
          ref={iframeRef}
--- a/src/views/Conversations/Online/Components/EmailDetailInline.jsx
+++ b/src/views/Conversations/Online/Components/EmailDetailInline.jsx
@ -29,6 +29,13 @@ const extTypeMapped = {
  default: { icon: FileOutlined }, // rtf bmp
 }

+const FileTypeIcon = ({fileName}) => {
+  const ext = fileName.split('.').pop() || 'default';
+  const Com = extTypeMapped[ext]?.icon || FileOutlined;
+  const color = extTypeMapped[ext]?.color || 'inherit';
+  return <Com style={{ color: color }} size={36} />;
+};
+
 /**
 * @property {*} emailMsg - 邮件数据. { conversationid, actionId, order_opi, coli_sn, msgOrigin: { from, to, id, email: { subject, mai_sn, } } }
 */
@ -125,12 +132,6 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
      })
    }
  }
-  const FileTypeIcon = ({fileName}) => {
-    const ext = fileName.split('.').pop() || 'default';
-    const Com = extTypeMapped[ext]?.icon || FileOutlined;
-    const color = extTypeMapped[ext]?.color || 'inherit';
-    return <Com style={{ color: color }} size={36} />;
-  };

  /**
   * 根据状态, 显示操作
@ -139,7 +140,7 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
   * * 失败: 重发
   * todo: disabled 不显示
   */
-  const ActionBtns = ({ className, ...props }) => {
+  const renderActionBtns = ({ className, ...props }) => {
    const { status } = mailData.info

    let btns = []
@ -211,27 +212,48 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
    return <div className={`flex justify-end items-center gap-1  ${className || ''}`}>{btns}</div>
  }

+  const renderAttaList = ({ list }) => {
+    return (
+      <List
+        dataSource={list}
+        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>
+        )}
+      />
+    )
+  };
+
  const variantCls = (variant) => {
    switch (variant) {
      case 'outline':
-        return 'border-y-0 border-x border-solid border-neutral-200'
+        return 'h-full border-y-0 border-x border-solid border-neutral-200'
      case 'full':
-        return 'h-[calc(100vh-16px)]'
+        return 'h-[calc(100dvh-16px)]'
      default:
-        return ''
+        return 'h-full'
    }
  }

  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 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={(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'} />
+            {/* <ActionBtns key='actions' className={'ml-auto'} /> */}
+            {renderActionBtns({ className: 'ml-auto'})}
          </div>
          <Divider className='my-2' />
          <div className={['flex flex-wrap justify-end', window.innerWidth < 800 ? 'flex-col' : 'flex-row '].join(' ')}>
@ -284,42 +306,14 @@ const EmailDetailInline = ({ mailID, emailMsg = {}, disabled = false, variant, s
                {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>
-                      )}
-                    />
+                    {renderAttaList({ list: mailData.attachments || []})}
                  </>
                )}
                {mailData.insideAttachments.length > 0 && <details>
                  <summary>
                    <span className='text-gray-500 italic'>&nbsp;文内附件 ({mailData.insideAttachments.length}) 已在正文显示&nbsp;</span><span className='cursor-pointer underline'>点击展开</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>
-                    )}
-                  />
+                  {renderAttaList({ list: mailData.insideAttachments || []})}
                </details>}
              </div>
            )}
--- a/src/views/Conversations/Online/order/QuotesHistory.jsx
+++ b/src/views/Conversations/Online/order/QuotesHistory.jsx
@ -3,6 +3,7 @@ import { Button, Flex, List, Popover } from 'antd'
 import { useState } from 'react'
 import EmailQuotation from '../Components/EmailQuotation'

+// @Deprecated 作废，已经不用
 const QuotesHistory = ((props) => {

  const [open, setOpen] = useState(false)
--- a/src/views/DesktopApp.jsx
+++ b/src/views/DesktopApp.jsx
@ -22,7 +22,7 @@ import { useEffect, useState, useCallback, useRef } from 'react'
 import { Link, NavLink, Outlet, useHref } from 'react-router-dom'

 import '@/assets/App.css'
-import AppLogo from '@/assets/highlights_travel_300_300.png'
+import AppLogo from '@/assets/highlights_travel_300_300_250613.png'
 import 'react-chat-elements/dist/main.css'
 import ReloadPrompt from './ReloadPrompt'
 import ClearCache from './ClearCache'
@ -123,7 +123,7 @@ function DesktopApp() {
          background: 'white',
        }}>
        <Row gutter={{ md: 24 }} align='middle'>
-          <Col flex='220px'>
+          <Col flex='240px'>
            <NavLink to='/'>
              <img src={AppLogo} className='logo' alt='App logo' />
            </NavLink>
--- a/src/views/NewEmail.jsx
+++ b/src/views/NewEmail.jsx
@ -46,18 +46,19 @@ 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
-  })
+  // Array.from(dom.body.querySelectorAll('br, p')).forEach((el) => {
+  //   el.textContent = '<br>' + 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 || ''
+  // Array.from(dom.body.querySelectorAll('hr')).forEach((el) => {
+  //   el.innerHTML = '<p><hr>------------------------------------------------------------------</p>'
+  // })
+  const line = '<p>------------------------------------------------------------------</p>'
+  return line+(dom.body.innerHTML || '')
 }

 const generateQuoteContent = (mailData, isRichText = true) => {
-  const html = `<br><br><hr><p class="font-sans"><b><strong >From: </strong></b><span >${(mailData.info?.MAI_From || '')
+  const html = `<br><hr><blockquote><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 || ''
@ -65,11 +66,11 @@ const generateQuoteContent = (mailData, isRichText = true) => {
    .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>`
+  }</p></blockquote>`
  return isRichText ? html : parseHTMLText(html)
 }

-const generateMailContent = (mailData) => `${mailData.content}<br>`
+const generateMailContent = (mailData) => mailData.info?.MAI_ContentType === 'text/html' ? `${mailData.content}<br>` : `<p>${mailData.content.replace(/\r\n/g, '<br>')}</p>`

 /**
 * 独立窗口编辑器
@ -199,6 +200,8 @@ const NewEmail = () => {
      mat_sn: emailAccount?.mat_sn || info?.MAI_MAT_SN || defaultMAT,
      opi_sn: emailAccount?.opi_sn || info?.MAI_OPI_SN || orderDetail.opi_sn || '',
    }
+    const originalContentType = info?.mailType === 'text/html';
+    setIsRichText(originalContentType)

    let readyToInitialContent = '';
    let _formValues = {};
@ -213,7 +216,7 @@ const NewEmail = () => {

    // 排除草稿: `编辑`有id 的邮件
    if (!isEmpty(mailData.info) && !['edit'].includes(pageParam.action)) {
-      readyToInitialContent = orderPrefix + signatureBody
+      readyToInitialContent = orderPrefix + '<br>' + signatureBody
    }
    switch (pageParam.action) {
      case 'reply':
@ -225,6 +228,7 @@ const NewEmail = () => {
          subject: `Re: ${info.MAI_Subject || ''}`,
          ..._form2
        }
+        readyToInitialContent += generateQuoteContent(mailData, originalContentType)
        break
      case 'replyall':
        _formValues = {
@ -235,6 +239,7 @@ const NewEmail = () => {
          subject: `Re: ${info.MAI_Subject || ''}`,
          ..._form2
        }
+        readyToInitialContent += generateQuoteContent(mailData, originalContentType)
        break
      case 'forward':
        _formValues = {
@ -243,6 +248,7 @@ const NewEmail = () => {
          // coli_sn: pageParam.oid,
          ..._form2
        }
+        readyToInitialContent += generateQuoteContent(mailData, originalContentType)
        break
      case 'edit':
        _formValues = {
@ -254,7 +260,7 @@ const NewEmail = () => {
          mai_sn: pageParam.quoteid,
          ..._form2
        }
-        readyToInitialContent = '<br>'+ generateMailContent(mailData)
+        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':
@ -265,8 +271,9 @@ const NewEmail = () => {
          subject: `${info.MAI_Subject || templateFormValues.subject || ''}`,
          ..._form2,
        }
-        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}` })))
+        readyToInitialContent = generateMailContent({ content: templateContent.bodycontent || readyToInitialContent || `<p></p><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}` })))
+        setIsRichText(true)
        break

      default:
@ -341,12 +348,14 @@ const NewEmail = () => {
  }

  const handleEditorChange = ({ editorStateJSON, htmlContent, textContent }) => {
-    // console.log('textContent', textContent);
+    const _text = textContent.replace(/\r\n/g, '\n').replace(/\n{2,}/g, '\n')
+    // console.log('textContent---\n', textContent, 'textContent');
    // console.log('html', html);
    setHtmlContent(htmlContent)
-    setTextContent(textContent)
+    setTextContent(_text)
    form.setFieldValue('content', htmlContent)
-    const { bodyText: abstract } = parseHTMLString(htmlContent, true);
+    const abstract = _text;
+    // const { bodyText: abstract } = parseHTMLString(htmlContent, true);
    // form.setFieldValue('abstract', getAbstract(textContent))
    const formValues = omitEmpty(form.getFieldsValue());
    if (!isEmpty(formValues)) {
@ -496,11 +505,12 @@ const NewEmail = () => {
    body.attaList = fileList;
    // console.log('body', body, '\n', fileList);
    const values = await form.validateFields()
-    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
+    // const preQuoteBody = !['edit', 'new'].includes(pageParam.action) && pageParam.quoteid ? (quoteContent ? quoteContent : generateQuoteContent(mailData, isRichText)) : ''
+    body.mailcontent = isRichText ? EmailBuilder({ subject: values.subject, content: htmlContent }) : textContent
    body.cc = values.cc || ''
    body.bcc = values.bcc || ''
-    body.bcc = values.mailtype || ''
+    body.mailtype = values.mailtype || ''
+    body.order_mail_type = values.mailtype || ''
    setSendLoading(!isDraft)
    notification.open({
      key: editorKey,
@ -517,6 +527,8 @@ const NewEmail = () => {
    try {

      // console.log('postSendEmail', body, '\n');
+      // console.log('🎈postSendEmail mailContent', body.mailcontent, '\n');
+      // throw new Error('test')
      // return;
      const mailSavedId = await postEmailSaveOrSend(body, isDraft)
      form.setFieldsValue({
@ -603,7 +615,7 @@ const NewEmail = () => {
          // labelCol={{ span: 3 }}
        >
            <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 type='primary' size='middle' onClick={() => onHandleSaveOrSend()} loading={sendLoading} icon={<SendOutlined />}>
                发送
              </Button>
              <Form.Item name={'from'} rules={[{ required: true, message: '请选择发件地址' }]} >
@ -703,14 +715,14 @@ const NewEmail = () => {
          </Form.Item>
        </Form>
        <LexicalEditor {...{ isRichText }} onChange={handleEditorChange} defaultValue={initialContent} />
-        {!isEmpty(Number(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)}>
-              显示引用内容 ↓ {/*(不可更改)*/}
+            <Button className='flex gap-2 ' type='link' onClick={() => {
+              setShowQuoteContent(!showQuoteContent);
+              setInitialContent(pre => pre + generateQuoteContent(mailData))
+            }}>
+              显示引用内容 ↓
            </Button>
-            {/* <Button className='flex gap-2 ' type='link' danger onClick={() => {setMergeQuote(false);setShowQuoteContent(false)}}>
-                删除引用内容
-              </Button> */}
          </div>
        )}
        {showQuoteContent && (
@ -719,7 +731,7 @@ const NewEmail = () => {
            className='border-0 outline-none cursor-text'
            onBlur={(e) => setQuoteContent(`<blockquote>${e.target.innerHTML}</blockquote>`)}
            dangerouslySetInnerHTML={{ __html: generateQuoteContent(mailData) }}></blockquote>
-        )}
+        )} */}
      </ConfigProvider>
    </>
  )
--- a/src/views/accounts/GeneratePayment.jsx
+++ b/src/views/accounts/GeneratePayment.jsx
@ -110,6 +110,7 @@ function GeneratePayment() {
              <Select
                options={[
                  { value: 'US', label: '英语' },
+                  { value: 'en_HTravel', label: '英语(Highlights)' },
                  { value: 'de_de', label: '德语' },
                  { value: 'fr_fr', label: '法语' },
                  { value: 'es_es', label: '西语' },
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@ -2,12 +2,13 @@ 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, Badge } from 'antd'
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useState, useRef } from 'react'
 import EmailDetailInline from '../Conversations/Online/Components/EmailDetailInline'
 import OrderProfile from '@/components/OrderProfile'
 import Mailbox from './components/Mailbox'
 import useConversationStore from '@/stores/ConversationStore';
 import { MailboxDirIcon } from './components/MailboxDirIcon'
+import { useVisibilityState } from '@/hooks/useVisibilityState'

 const deptMap = new Map([
  ['1', 'CH'], // CH直销组
@ -45,6 +46,8 @@ const deptMap = new Map([
 function Follow() {

  const [collapsed, setCollapsed] = useState(true)
+  const mailboxTreeRef = useRef(null);
+  const [treeHeight, setTreeHeight] = useState(500);

  const [loginUser, isPermitted] = useAuthStore((state) => [state.loginUser, state.isPermitted])
  const { accountList } = loginUser
@ -123,10 +126,35 @@ function Follow() {
  useEffect(() => {
    const first = currentMailboxDEI || accountDEI[0].value
    const opi = accountListDEIMapped[first].OPI_SN
-    setExpandTree(prev => [...[`${opi}-today`, `${opi}-todo`, `search-orders`, mailboxActiveNode?.VParent ]])
+    setExpandTree([...[`${opi}-today`, `${opi}-todo`, `search-orders` ]])

    return () => {}
-  }, [currentMailboxDEI, mailboxNestedDirsActive, mailboxActiveNode])
+  }, [currentMailboxDEI ])
+
+  useEffect(() => {
+    if (mailboxActiveNode?.expand === true) {
+      setExpandTree([mailboxActiveNode.key])
+    }
+
+    return () => {}
+  }, [mailboxActiveNode])
+
+  useEffect(() => {
+    const targetRect = mailboxTreeRef.current?.getBoundingClientRect()
+    setTreeHeight(Math.floor(targetRect.height))
+
+    return () => {}
+  }, [])
+
+  const isVisible = useVisibilityState();
+  useEffect(() => {
+    // console.log('effect isVisible', isVisible);
+    if (isVisible && currentMailboxOPI) {
+      getOPIEmailDir(currentMailboxOPI, null, true)
+    }
+
+    return () => {}
+  }, [isVisible]);

  return (
    <>
@ -134,13 +162,14 @@ function Follow() {
        <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'>
+            <div ref={mailboxTreeRef} 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'
                key='sticky-today'
                blockNode
                showIcon
                showLine
+                height={treeHeight}
                autoExpandParent={true}
                expandAction={'doubleClick'}
                onSelect={handleTreeSelectGetMails}
@ -175,7 +204,7 @@ function Follow() {
          <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'}`}
+            className={`absolute z-10 rounded-none  ${collapsed ? 'right-1 top-20 rounded-l-xl' : 'right-8 top-20 rounded-l'}`}
            size={collapsed ? 'small' : 'middle'}
          />
        </Tooltip>
--- a/src/views/orders/components/MailBox.jsx
+++ b/src/views/orders/components/MailBox.jsx
@ -1,48 +1,21 @@
 import { useEffect, useState } from 'react'
-import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined, DeleteOutlined } from '@ant-design/icons'
+import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined, DeleteOutlined, CloseOutlined, CloseCircleTwoTone, CloseCircleOutlined } 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'
 import { MailboxDirIcon } from './MailboxDirIcon'
 import { AttachmentIcon, MailCheckIcon, MailOpenIcon } from '@/components/Icons'
 import NewEmailButton from './NewEmailButton'
 import MailOrderSearchModal from './MailOrderSearchModal'
+import MailListSearchModal from './MailListSearchModal'

-const { RangePicker } = DatePicker

 const PAGE_SIZE = 50 // 每页显示条数

 const MailBox = ({ mailboxDir, onMailItemClick, ...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 [form] = Form.useForm()
+
  const [selectedItems, setSelectedItems] = useState([])
-  const { mailList, loading, error, refresh, markAsRead, markAsProcessed, markAsDeleted } = useEmailList(mailboxDir)
+  const { mailList, loading, error, tempBreadcrumb, refresh, markAsUnread, markAsProcessed, markAsDeleted, } = useEmailList(mailboxDir)

  const [pagination, setPagination] = useState({
    current: 1,
@ -97,13 +70,14 @@ 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 folderName = (item.showFolder) ? `[${item.FDir}] ` : ''
+    const orderMailType = item.MAT_Name ? <span className='text-neutral-600 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
    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.MAI_SN ? '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)}
@ -120,11 +94,15 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
          }}>
          <Flex gap='small' vertical={true} justify='space-between' className='cursor-pointer'>
            <div>
-              {orderNumber}
+              {folderName}{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 gap='small' align='center' justify='flex-end' wrap className='text-neutral-500 text-wrap break-words break-all '>
+              <span className='mr-auto'>{countryName + item.SenderReceiver}</span>
+              {orderMailType}
+              <span className=''>{item.SRDate}</span>
+            </Flex>
          </Flex>
        </div>
      </li>
@ -132,7 +110,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
  }

  return (
-    <>
+    <div className='h-full flex flex-col gap-1 bg-white'>
      <div className='bg-white h-auto px-1 flex gap-1 items-center'>
        <Flex wrap gap='middle' justify={'center'} className='min-w-30 px-1'>
          <Tooltip title='全选'>
@ -153,105 +131,78 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
          </Tooltip>
        </Flex>

-        <Flex wrap gap={8}>
-        <NewEmailButton />
-            <Button
-              size='small'
-              icon={<MailOpenIcon />}
-              onClick={() => {
-              markAsRead(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
-              }}
-            >已读</Button>
-            <Button
-              size='small'
-              icon={<MailOutlined />}
-              onClick={() => {
-              console.info('未读未实现')
-              }}
-            >未读</Button>
-            <Button
-              size='small'
-              icon={<MailCheckIcon />}
-              onClick={() => {
+        <Flex wrap gap={8} >
+          <NewEmailButton />
+          <Button
+            size='small'
+            icon={<MailOutlined />}
+            onClick={() => {
+              markAsUnread(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
+            }}>
+            未读
+          </Button>
+          <Button
+            size='small'
+            icon={<MailCheckIcon />}
+            onClick={() => {
              markAsProcessed(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
-              }}
-            >已处理</Button>
-            <Button
-              size='small' // danger
-              icon={<DeleteOutlined />}
-              onClick={() => {
+            }}>
+            已处理
+          </Button>
+          <Button
+            size='small' // danger
+            icon={<DeleteOutlined />}
+            onClick={() => {
              markAsDeleted(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
-              }}
-            >删除</Button>
-        <MailOrderSearchModal />
+            }}>
+            删除
+          </Button>
+          <MailOrderSearchModal />
+          <MailListSearchModal />
        </Flex>
      </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={10}>
-              <Form.Item label='订单号' name='orderNumber'>
-                <Input placeholder='订单号' allowClear />
-              </Form.Item>
-            </Col>
-            <Col span={12}>
-              <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>
+      <Flex align='center' justify='space-between' wrap className='px-1 border-0 border-b border-solid border-neutral-200'>
+        <Breadcrumb
+          items={(tempBreadcrumb || props.breadcrumb).map((bc) => {
+            return {
+              title: (
+                <>
+                  <MailboxDirIcon type={bc?.iconIndex} />
+                  <span>{bc.title}</span>
+                </>
+              ),
+            }
+          })}
+        />
+        {tempBreadcrumb && (<Button type="text" icon={<CloseCircleOutlined />} onClick={() => refresh()} />)}
+        <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}
+          </span>
+          <Button
+            icon={<LeftOutlined />}
+            type='text'
+            onClick={() => {
+              prePage()
+            }}
+            iconPosition={'end'}></Button>
+          <Button
+            icon={<RightOutlined />}
+            type='text'
+            onClick={() => {
+              nextPage()
+            }}
+            iconPosition={'end'}></Button>
+        </Flex>
+      </Flex>

-      <div className='bg-white overflow-y-auto px-2' style={{ height: 'calc(100vh - 198px)' }}>
+      <div className='bg-white overflow-auto px-2' style={{ height1: 'calc(100vh - 198px)' }}>
        <Skeleton active loading={loading}>
          <List
            loading={loading}
-            header={
-              <Flex align='center' justify='space-between' wrap >
-                <Breadcrumb
-                  items={props.breadcrumb.map((bc) => {
-                    return {
-                      title: (
-                        <>
-                          <MailboxDirIcon type={bc?.iconIndex} />
-                          <span>{bc.title}</span>
-                        </>
-                      ),
-                    }
-                  })}
-                />
-                <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}
-                  </span>
-                  <Button
-                    icon={<LeftOutlined />}
-                    type='text'
-                    onClick={() => {
-                      prePage()
-                    }}
-                    iconPosition={'end'}></Button>
-                  <Button
-                    icon={<RightOutlined />}
-                    type='text'
-                    onClick={() => {
-                      nextPage()
-                    }}
-                    iconPosition={'end'}></Button>
-                </Flex>
-              </Flex>
-            }
+            className='flex flex-col h-full [&_.ant-list-items]:overflow-auto'
+            header={null}
            itemLayout='vertical'
            pagination={false}
            dataSource={pagination.pagedList}
@ -259,7 +210,7 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
          />
        </Skeleton>
      </div>
-    </>
+    </div>
  )
 }

--- a/src/views/orders/components/MailListSearchModal.jsx
+++ b/src/views/orders/components/MailListSearchModal.jsx
@ -0,0 +1,75 @@
+import { useState } from 'react'
+import { SearchOutlined } from '@ant-design/icons'
+import { Button, Modal, Form, Input, Radio } from 'antd'
+import { searchEmailListAction } from '@/actions/EmailActions'
+import useConversationStore from '@/stores/ConversationStore'
+
+const MailListSearchModal = ({ ...props }) => {
+  const [currentMailboxOPI] = useConversationStore((state) => [state.currentMailboxOPI])
+
+  const [openForm, setOpenForm] = useState(false)
+  const [formSearch] = Form.useForm()
+  const [loading, setLoading] = useState(false)
+
+  const onSubmitSearchMailList = async (values) => {
+    setLoading(true)
+    await searchEmailListAction({...values, opi_sn: currentMailboxOPI});
+    setLoading(false)
+    setOpenForm(false)
+  }
+  return (
+    <>
+      <Button key={'bound'} onClick={() => setOpenForm(true)} size='small' icon={<SearchOutlined className='' />}>
+        查找邮件
+      </Button>
+      <Modal
+        width={window.innerWidth < 700 ? '95%' : 960}
+        open={openForm}
+        cancelText='关闭'
+        okText='查找'
+        confirmLoading={loading}
+        okButtonProps={{ autoFocus: true, htmlType: 'submit', type: 'default' }}
+        onCancel={() => setOpenForm(false)}
+        footer={null}
+        destroyOnHidden
+        modalRender={(dom) => (
+          <Form
+            layout='vertical'
+            form={formSearch}
+            name='searchmaillist_form_in_modal'
+            initialValues={{ mailboxtype: '' }}
+            clearOnDestroy
+            onFinish={(values) => onSubmitSearchMailList(values)}
+            className='[&_.ant-form-item]:m-2'>
+            {dom}
+          </Form>
+        )}>
+        <Form.Item name='mailboxtype' label='邮箱文件夹'>
+          <Radio.Group
+            options={[
+              { key: 'All', value: '', label: 'All' },
+              { key: '1', value: '1', label: '收件箱' },
+              { key: '2', value: '2', label: '未读邮件' },
+              { key: '3', value: '3', label: '已发邮件' },
+              { key: '7', value: '7', label: '已处理邮件' },
+            ]}
+            optionType='button'
+          />
+        </Form.Item>
+        <Form.Item name='sender' label='发件人'>
+          <Input />
+        </Form.Item>
+        <Form.Item name='receiver' label='收件人'>
+          <Input />
+        </Form.Item>
+        <Form.Item name='subject' label='主题'>
+          <Input />
+        </Form.Item>
+        <Button type='primary' htmlType='submit' loading={loading}>
+          查找
+        </Button>
+      </Modal>
+    </>
+  )
+}
+export default MailListSearchModal
--- a/src/views/orders/components/MailOrderSearchModal.jsx
+++ b/src/views/orders/components/MailOrderSearchModal.jsx
@ -1,11 +1,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, Flex } from 'antd'
+import { useState } from 'react'
+import { SearchOutlined } from '@ant-design/icons'
+import { Button, Modal, Form, Input, Checkbox, Radio, DatePicker, Divider, Typography, Flex } from 'antd'
 import dayjs from 'dayjs'
-import { getEmailDirAction, queryHTOrderListAction, queryInMailboxAction } from '@/actions/EmailActions'
+import { getEmailDirAction, queryHTOrderListAction,  } 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])
@ -33,12 +32,14 @@ const MailOrderSearchModal = ({ ...props }) => {
      const { coli_id, sourcetype, ...mailboxParams } = valuesToSub
      result = await getEmailDirAction({ ...mailboxParams, opi_sn: currentMailboxOPI }, false)
      updateCurrentMailboxNestedDirs(result[`${currentMailboxOPI}`])
+      setMailboxActiveNode({expand:true, key: -1, title: '1月', iconIndex: 1, _raw: { VKey: -1, COLI_SN: 0, IsTrue: 0 }})
    } else {
      const htOrderParams = pick(valuesToSub, ['coli_id', 'sourcetype'])
      result = await queryHTOrderListAction({ ...htOrderParams, opi_sn: currentMailboxOPI })
      const addToTree = {
+        expand:true,
        key: 'search-orders',
-        title: '搜索结果',
+        title: '查找订单',
        iconIndex: 'search',
        _raw: { COLI_SN: 0, IsTrue: 0 },
        children: result.map((o) => ({
@ -46,7 +47,7 @@ const MailOrderSearchModal = ({ ...props }) => {
          title: `${o.COLI_ID}`,
          iconIndex: 13,
          parent: 'search-orders',
-          parentTitle: '搜索结果',
+          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' },
        })),
@ -60,7 +61,7 @@ const MailOrderSearchModal = ({ ...props }) => {
  return (
    <>
      <Button key={'bound'} onClick={() => setOpen(true)} size='small' icon={<SearchOutlined className='' />}>
-        查找
+        查找订单
      </Button>
      <Modal
        width={window.innerWidth < 700 ? '95%' : 960}
--- a/vite.config.js
+++ b/vite.config.js
@ -183,12 +183,9 @@ export default defineConfig({
      output: {
        entryFileNames: '[name]/build.[hash].js',
        manualChunks(id) {
-          if (id.toLowerCase().includes('lexical')) {
-            return 'lexical';
-          }
-          if (id.includes('node_modules')) {
-            return 'vendor';
-            // return id.toString().split('node_modules/')[1].split('/')[0].toString();
+          if (id.includes('node_modules/')) {
+            // return 'vendor';
+            return id.toString().split('node_modules/')[1].split('/')[0].toString();
          }
        },
    //     chunkFileNames: (chunkInfo) => {
Author	SHA1	Message	Date
Lei OT	6d5e037f3f	fix: 保存发送邮件字段名称错误	3 months ago
LiaoYijun	e5281be550	feat: update favicon.ico	3 months ago
LiaoYijun	a7f2e1d5dc	1.5.4	3 months ago
Lei OT	17577d6fb6	fix: indexedDB 版本更新	3 months ago
LiaoYijun	0ec8566344	1.5.3	3 months ago
Lei OT	7e20ca48cf	perf: 在线聊天: 会话搜索: 判断是否把当前选中的放顶部显示	3 months ago
LiaoYijun	b35b5db436	perf: 隐藏订单操作状态【取消】	3 months ago
LiaoYijun	bc5d86d568	feat: 增加 HighlightsTravel 收款 perf: 更新 Logo	3 months ago
Lei OT	f3b2093d8b	fix: `session.updated` 推送, 排除email	3 months ago
Lei OT	13a8bca806	perf: 订单跟踪: 目录刷新: 页面活跃时	3 months ago
Lei OT	f718049de4	Merge remote-tracking branch 'origin/main'	3 months ago
Lei OT	79b9e21c73	perf: 邮箱目录Tree, 虚拟滚动	3 months ago
Lei OT	d6724fa0a6	fix: indexDB 初始化	3 months ago
LiaoYijun	22f07f9100	1.5.2	3 months ago
Lei OT	0ca4a7a15a	perf: 订单跟踪: 查找订单: 自动展开到`收件箱`下	3 months ago
Lei OT	bfdeba11ee	fix: 从订单跳转到会话页面，没有新建会话	3 months ago
LiaoYijun	504366b529	1.5.1	3 months ago
LiaoYijun	c69acb791d	fix: 使用正式环境地址	3 months ago
LiaoYijun	f24a40fe6b	1.5.0	3 months ago
Lei OT	84e9ada0e7	style:	3 months ago
Lei OT	6a3da2a537	#	3 months ago
Lei OT	535aa38775	perf: 邮件内容: 图片点击预览	3 months ago
Lei OT	22674fe498	.	3 months ago
Lei OT	eabb53e0a9	perf: 邮件列表: 搜索结果	3 months ago
LiaoYijun	9ed85c81b2	perf：优化订单展开、收缩按钮位置	3 months ago
LiaoYijun	6baff26720	doc：prerealse 1.5.0-1	3 months ago
LiaoYijun	0a06f6c16a	perf: 精简查找邮件目录数量	3 months ago
LiaoYijun	038db199e9	feat: 删除已读设置，增加未读。删除无用代码	3 months ago
Lei OT	210d3e7263	fix: Listener 数据对象	3 months ago
Lei OT	945f1b3651	perf: 邮箱目录更新	3 months ago
Lei OT	378c864277	perf: email quote, text/plain	3 months ago
Lei OT	cbf63c5e86	feat: 查找邮件: 更新	3 months ago
Lei OT	01997b7d23	Merge remote-tracking branch 'origin/main'	3 months ago
LiaoYijun	d5a522e88f	feat: 增加【查找邮件】界面	3 months ago
Lei OT	e0950bb773	style:	3 months ago
Lei OT	74a0e0c14e	conf: build chunk	3 months ago
Lei OT	068a02ff64	perf: email quote, text/plain	3 months ago
Lei OT	2abd149655	perf: email 不在在线聊天页面通知	3 months ago
Lei OT	2b344eec43	perf: email quote	3 months ago
LiaoYijun	7365ae08ee	perf: 修改 WA 后更新 State	3 months ago
LiaoYijun	5b5ebe896c	perf：编辑附加信息初始值	3 months ago
LiaoYijun	cd5dbb3be5	feat：增加 WA、附加信息设置	3 months ago
LiaoYijun	d0fbf179fd	feat: 增加设置 WA 界面	3 months ago
Lei OT	6b32601fc7	style: 固定mail list 的header	3 months ago
Lei OT	403cb4f7c7	perf: 模板	3 months ago
Lei OT	c51df7fa03	style: 会话筛选	3 months ago
Lei OT	26b709a7dc	Merge branch 'dev/2025a'	3 months ago
Lei OT	f3ead963cc	fix: 会话列表时间	4 months ago