Haina
/
Global-sales
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into dev/RoosterEditor

Browse Source 
# Conflicts:
#	src/views/NewEmail.jsx
dev/RoosterEditor
Lei OT 4 days ago
parent 16378d2d1a 9ed85c81b2
commit 5ec77f21f2
17 changed files with 530 additions and 425 deletions
Show Stats Download Patch File Download Diff File

2
package.json
Unescape Escape View File

@ -1,7 +1,7 @@
{ {
"name": "global-sales", "name": "global-sales",
"private": true, "private": true,
"version": "1.4.10", "version": "1.5.0-1",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

29
src/actions/EmailActions.js
Unescape Escape View File

@ -1,5 +1,5 @@
import { fetchJSON, postForm, postJSON } from '@/utils/request'; 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 { buildTree, groupBy, isEmpty, objectMapper, omitEmpty, uniqWith } from '@/utils/commons';
import { readIndexDB, writeIndexDB } from '@/utils/indexedDB'; import { readIndexDB, writeIndexDB } from '@/utils/indexedDB';
import dayjs from 'dayjs'; 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 } const ret = errcode !== 0 ? { [`${params.opi_sn}`]: {} } : { [`${params.opi_sn}`]: result }
// 更新数量 // 更新数量
if (update !== false) { 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 mailboxDir = isEmpty(readCacheDir) ? [] : readCacheDir.tree.filter(node => node?._raw?.IsTrue === 1);
const _MapDir = new Map(mailboxDir.map((obj) => [obj.key, obj])) const _MapDir = new Map(mailboxDir.map((obj) => [obj.key, obj]))
Object.keys(result).map(dirKey => { Object.keys(result).map(dirKey => {
@ -220,7 +220,7 @@ export const getMailboxCountAction = async (params = { opi_sn: '' }, update = tr
_MapRoot.set(row.key, row) _MapRoot.set(row.key, row)
}) })
const _newRoot = Array.from(_MapRoot.values()) 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) }) 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 mailBoxCount = await Promise.all(userIdStr.split(',').map(_opi => getMailboxCountAction({ opi_sn: _opi }, false)));
const mailboxDirCountByOPI = mailBoxCount.reduce((a, c) => ({ ...a, ...c, }), {}) 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 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') writeIndexDB(rootTree, 'dirs', 'mailbox')
const _mapped = groupBy(rootTree, 'key') const _mapped = groupBy(rootTree, 'key')
return _mapped[opi_sn]?.[0]?.tree || [] return _mapped[opi_sn]?.[0]?.tree || []
@ -348,7 +348,6 @@ export const getRootMailboxDirAction = async ({ opi_sn = 0, userIdStr = '' } = {
* 获取邮件列表 * 获取邮件列表
* @usage 邮件目录下的邮件列表 * @usage 邮件目录下的邮件列表
* @usage 订单的邮件列表 * @usage 订单的邮件列表
* @usage 高级搜索
*/ */
export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id = '', node = {}, } = {}) => { export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id = '', node = {}, } = {}) => {
const _params = { const _params = {
@ -375,6 +374,20 @@ export const queryEmailListAction = async ({ opi_sn = '', pagesize = 10, last_id
return ret; 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})) })
return ret;
}
const removeFromCurrentList = async (params) => { const removeFromCurrentList = async (params) => {
const readRow0 = await readIndexDB(params.mai_sn_list[0], 'listrow', 'mailbox') const readRow0 = await readIndexDB(params.mai_sn_list[0], 'listrow', 'mailbox')
const listKey = readRow0?.data?.listKey || '' 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. * @param {boolean} [isDraft=false] - Whether the email is a draft.
*/ */
export const saveEmailDraftOrSendAction = async (body, isDraft = false) => { 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; const { attaList=[], atta, content, ...bodyData } = body;
bodyData.ordertype = 227001; bodyData.ordertype = 227001;
const formData = new FormData(); const formData = new FormData();
@ -476,7 +489,3 @@ export const queryOPIOrderAction = async (params) => {
return errcode !== 0 ? [] : result return errcode !== 0 ? [] : result
}; };
export const queryInMailboxAction = async (params) => {
const { errcode, result } = await fetchJSON(`${API_HOST_V3}/mail_search`, params)
return errcode !== 0 ? [] : result
}

78
src/components/OrderProfile.jsx
Unescape Escape View File

@ -13,7 +13,7 @@ import {
} from '@ant-design/icons' } from '@ant-design/icons'
import { useEffect, useState } from 'react' 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 { App, Flex, Select, Tooltip, Divider, Typography, Skeleton, Checkbox, Drawer, Button, Form, Input } from 'antd'
import { useOrderStore, fetchSetRemindStateAction, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore' import { useOrderStore, fetchSetRemindStateAction, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore'
import { copy, isEmpty } from '@/utils/commons' import { copy, isEmpty } from '@/utils/commons'
@ -21,24 +21,28 @@ import { useShallow } from 'zustand/react/shallow'
import useConversationStore from '@/stores/ConversationStore' import useConversationStore from '@/stores/ConversationStore'
import useAuthStore from '@/stores/AuthStore' import useAuthStore from '@/stores/AuthStore'
const OrderProfile = ({ coliSN, ...props }) => { const OrderProfile = ({ coliSN, ...props }) => {
const navigate = useNavigate()
const { notification, message } = App.useApp() const { notification, message } = App.useApp()
const [formComment, formWhatsApp] = Form.useForm() const [formComment] = Form.useForm()
const [formWhatsApp] = Form.useForm()
const [formExtra] = Form.useForm()
const [loading, setLoading] = useState(false) const [loading, setLoading] = useState(false)
const [openOrderCommnet, setOpenOrderCommnet] = useState(false) const [openOrderCommnet, setOpenOrderCommnet] = useState(false)
const [openWhatsApp, setOpenWhatsApp] = useState(false) const [openWhatsApp, setOpenWhatsApp] = useState(false)
const [openExtra, setOpenExtra] = useState(false)
const orderLabelOptions = copy(OrderLabelDefaultOptions) const orderLabelOptions = copy(OrderLabelDefaultOptions)
orderLabelOptions.unshift({ value: 0, label: '未设置', disabled: true }) orderLabelOptions.unshift({ value: 0, label: '未设置', disabled: true })
const orderStatusOptions = copy(OrderStatusDefaultOptions) 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.orderDetail,
s.customerDetail, s.customerDetail,
s.fetchOrderDetail, s.fetchOrderDetail,
s.setOrderPropValue, s.setOrderPropValue,
s.appendOrderComment, s.appendOrderComment,
s.updateWhatsapp,
s.updateExtraInfo,
]) ])
const loginUser = useAuthStore((state) => state.loginUser) const loginUser = useAuthStore((state) => state.loginUser)
@ -47,8 +51,8 @@ const OrderProfile = ({ coliSN, ...props }) => {
const [orderRemindState, setOrderRemindState] = useState(orderDetail.remindstate) const [orderRemindState, setOrderRemindState] = useState(orderDetail.remindstate)
useEffect(() => { useEffect(() => {
setOrderRemindState(orderDetail.remindstate); setOrderRemindState(orderDetail.remindstate)
}, [orderDetail.remindstate]); }, [orderDetail.remindstate])
useEffect(() => { useEffect(() => {
if (orderId) { if (orderId) {
setLoading(true) setLoading(true)
@ -119,12 +123,15 @@ const OrderProfile = ({ coliSN, ...props }) => {
</Typography.Text> </Typography.Text>
<Typography.Text> <Typography.Text>
<WhatsAppOutlined className='pr-1' /> <WhatsAppOutlined className='pr-1' />
{isEmpty(customerDetail.whatsapp_phone_number) ? {isEmpty(customerDetail.whatsapp_phone_number) ? (
<Button type="text" onClick={() => setOpenWhatsApp(true)} size='small'>设置 WhatsApp</Button> : <Button type='text' onClick={() => setOpenWhatsApp(true)} size='small'>
设置 WhatsApp
</Button>
) : (
<Link to={`/order/chat/${coliSN}`} state={orderDetail}> <Link to={`/order/chat/${coliSN}`} state={orderDetail}>
{customerDetail.whatsapp_phone_number} {customerDetail.whatsapp_phone_number}
</Link> </Link>
} )}
</Typography.Text> </Typography.Text>
<Typography.Text> <Typography.Text>
<Tooltip title='出发日期'> <Tooltip title='出发日期'>
@ -227,9 +234,15 @@ const OrderProfile = ({ coliSN, ...props }) => {
<Divider orientation='left'> <Divider orientation='left'>
<Typography.Text strong>附加信息</Typography.Text> <Typography.Text strong>附加信息</Typography.Text>
{/* <Tooltip title='修改'> <Tooltip title='修改'>
<EditOutlined className='pl-1' /> <EditOutlined
</Tooltip> */} className='pl-1'
onClick={() => {
formExtra.setFieldsValue({ extra: orderDetail.COLI_Introduction })
setOpenExtra(true)
}}
/>
</Tooltip>
</Divider> </Divider>
<Typography.Text>{orderDetail.COLI_Introduction}</Typography.Text> <Typography.Text>{orderDetail.COLI_Introduction}</Typography.Text>
</Skeleton> </Skeleton>
@ -240,7 +253,6 @@ const OrderProfile = ({ coliSN, ...props }) => {
initialValues={{ comment: '' }} initialValues={{ comment: '' }}
scrollToFirstError scrollToFirstError
onFinish={(values) => { onFinish={(values) => {
console.log('Received values of form: ', values)
appendOrderComment(loginUser.userId, orderId, values.comment) appendOrderComment(loginUser.userId, orderId, values.comment)
.then(() => { .then(() => {
notification.success({ notification.success({
@ -276,15 +288,14 @@ const OrderProfile = ({ coliSN, ...props }) => {
initialValues={{ number: '' }} initialValues={{ number: '' }}
scrollToFirstError scrollToFirstError
onFinish={(values) => { onFinish={(values) => {
console.log('Received values of form: ', values) updateWhatsapp(orderId, values.number)
// appendOrderComment(loginUser.userId, orderId, values.number)
.then(() => { .then(() => {
notification.success({ notification.success({
message: '温性提示', message: '温性提示',
description: '设置 WhatsApp 成功', description: '设置 WhatsApp 成功',
}) })
setOpenWhatsApp(false) setOpenWhatsApp(false)
formComment.setFieldsValue({ number: '' }) formWhatsApp.setFieldsValue({ number: '' })
}) })
.catch((reason) => { .catch((reason) => {
notification.error({ notification.error({
@ -295,7 +306,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
}) })
}) })
}}> }}>
<Form.Item name='comment' label='WhatsApp' rules={[{ required: true, message: '请输入 WhatsApp 号码' }]}> <Form.Item name='number' label='WhatsApp' rules={[{ required: true, message: '请输入 WhatsApp 号码' }]}>
<Input placeholder='国家代码+城市代码+电话号码' /> <Input placeholder='国家代码+城市代码+电话号码' />
</Form.Item> </Form.Item>
<Form.Item> <Form.Item>
@ -305,6 +316,39 @@ const OrderProfile = ({ coliSN, ...props }) => {
</Form.Item> </Form.Item>
</Form> </Form>
</Drawer> </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>
</> </>
) )
} }

2
src/config.js
Unescape Escape View File

@ -9,7 +9,7 @@
export const API_HOST = 'http://202.103.68.144:8889/v2'; export const API_HOST = 'http://202.103.68.144:8889/v2';
export const API_HOST_V3 = 'http://202.103.68.144:8889/v3'; export const API_HOST_V3 = 'http://202.103.68.144:8889/v3';
// export const WS_URL = 'ws://202.103.68.144:8888'; // export const WS_URL = 'ws://202.103.68.144:8888';
// export const EMAIL_HOST = 'http://202.103.68.231:888/service-mail'; export const EMAIL_HOST_v3 = 'http://202.103.68.144:888/service-mail';
// export const WAI_HOST = 'http://47.83.248.120/api/v1'; // 香港服务器 // 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_HOST = 'http://localhost:3031/api/v1'; // 美国服务器

39
src/hooks/useEmail.js
Unescape Escape View File

@ -1,7 +1,7 @@
import { useState, useEffect, useCallback } from 'react' import { useState, useEffect, useCallback } from 'react'
import { isEmpty, objectMapper, olog, } from '@/utils/commons' import { isEmpty, objectMapper, olog, } from '@/utils/commons'
import { readIndexDB } from '@/utils/indexedDB' 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 { App } from 'antd'
import useConversationStore from '@/stores/ConversationStore'; import useConversationStore from '@/stores/ConversationStore';
import { msgStatusRenderMapped } from '@/channel/bubbleMsgUtils'; 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) => { const postEmailSaveOrSend = async (body, isDraft) => {
try {
const { id: savedID } = await saveEmailDraftOrSendAction(body, isDraft) const { id: savedID } = await saveEmailDraftOrSendAction(body, isDraft)
setMaiSN(savedID) setMaiSN(savedID)
if (isDraft) { if (isDraft) {
refresh() refresh()
} }
return savedID return savedID
} catch (error) {
console.error(error);
}
}; };
return { loading, mailData, orderDetail, postEmailResend, postEmailSaveOrSend } return { loading, mailData, orderDetail, postEmailResend, postEmailSaveOrSend }
@ -171,6 +167,7 @@ export const useEmailList = (mailboxDirNode) => {
const [error, setError] = useState(null) const [error, setError] = useState(null)
const [isFreshData, setIsFreshData] = useState(false) const [isFreshData, setIsFreshData] = useState(false)
const [refreshTrigger, setRefreshTrigger] = useState(0) const [refreshTrigger, setRefreshTrigger] = useState(0)
const [tempBreadcrumb, setTempBreadcrumb] = useState(null);
const refresh = useCallback(() => { const refresh = useCallback(() => {
setRefreshTrigger((prev) => prev + 1) 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 { OPI_SN: opi_sn, COLI_SN, VKey, VParent, ApplyDate, OrderSourceType, IsTrue } = mailboxDirNode
const markAsRead = useCallback( const markAsUnread = useCallback(
async (sn_list) => { async (sn_list) => {
// 优化性能的话，需要更新 mailList 数据， // 优化性能的话，需要更新 mailList 数据，
// 但是更新 mailList 会造成页面全部刷新 // 但是更新 mailList 会造成页面全部刷新
@ -194,7 +191,7 @@ export const useEmailList = (mailboxDirNode) => {
await updateEmailAction({ await updateEmailAction({
opi_sn: opi_sn, opi_sn: opi_sn,
mai_sn_list: sn_list, mai_sn_list: sn_list,
set: { read: 1 }, set: { read: 0 },
}) })
}, },
[VKey], [VKey],
@ -242,7 +239,7 @@ export const useEmailList = (mailboxDirNode) => {
setIsFreshData(false) setIsFreshData(false)
return return
} }
setTempBreadcrumb(null)
setLoading(true) setLoading(true)
setError(null) setError(null)
setIsFreshData(false) setIsFreshData(false)
@ -271,10 +268,19 @@ export const useEmailList = (mailboxDirNode) => {
getMailList() getMailList()
// --- Setup Internal Event Listener --- // --- Setup Internal Event Listener ---
const handleInternalUpdate = (event) => { const handleInternalUpdate = (event) => {
// console.log(`[useEmailList] Received internal event. `, event.detail) // console.log(`🔔[useEmailList] Received internal event. `, event.detail)
if (event.detail && event.detail.type === 'listrow') { if (isEmpty(event.detail)) {
return false;
}
const { type, } = event.detail
if (type === 'listrow') {
loadMailListFromCache() loadMailListFromCache()
} }
if (type === 'maillist-search-result') {
const { data, query } = event.detail
setMailList(data)
setTempBreadcrumb([{title: '查找邮件:'+query, iconIndex: 'search'}]);
}
} }
internalEventEmitter.on(EMAIL_CHANNEL_NAME, handleInternalUpdate) internalEventEmitter.on(EMAIL_CHANNEL_NAME, handleInternalUpdate)
@ -282,11 +288,20 @@ export const useEmailList = (mailboxDirNode) => {
const channel = getEmailChangesChannel() const channel = getEmailChangesChannel()
const handleMessage = (event) => { const handleMessage = (event) => {
// console.log(`[useEmailList] Received channel event. `, event.data) // 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}` 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 不相同时, 不需要更新; 邮箱目录不相同 // cacheKey 不相同时, 不需要更新; 邮箱目录不相同
loadMailListFromCache(event.data) loadMailListFromCache(event.data)
} }
if (type === 'maillist-search-result') {
// 搜索的结果不需要更新所有页面
// const { data } = event.detail
// setMailList(data)
}
} }
channel.addEventListener('message', handleMessage) channel.addEventListener('message', handleMessage)
@ -297,7 +312,7 @@ export const useEmailList = (mailboxDirNode) => {
} }
}, [getMailList]) }, [getMailList])
return { loading, isFreshData, error, mailList, refresh, markAsRead, markAsProcessed, markAsDeleted } return { loading, isFreshData, error, mailList, tempBreadcrumb, refresh, markAsUnread, markAsProcessed, markAsDeleted }
} }
const orderMailTypes = new Map([ const orderMailTypes = new Map([

12
src/stores/ConversationStore.js
Unescape Escape View File

@ -197,10 +197,10 @@ const websocketSlice = (set, get) => ({
// console.log('msgRender msgUpdate', msgRender, msgUpdate); // console.log('msgRender msgUpdate', msgRender, msgUpdate);
if (['email.updated', 'email.inbound.received',].includes(resultType)) { if (['email.updated', 'email.inbound.received',].includes(resultType)) {
updateMailboxCount({ opi_sn: msgObj.opi_sn }) updateMailboxCount({ opi_sn: msgObj.opi_sn })
if (!isEmpty(msgRender)) { // if (!isEmpty(msgRender)) {
const msgNotify = receivedMsgTypeMapped[resultType].contentToNotify(msgObj); // const msgNotify = receivedMsgTypeMapped[resultType].contentToNotify(msgObj);
addGlobalNotify(msgNotify); // addGlobalNotify(msgNotify);
} // }
return false; return false;
} }
if ([ if ([
@ -238,7 +238,9 @@ const websocketSlice = (set, get) => ({
// }, 60_000); // }, 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); const sessionList = receivedMsgTypeMapped[resultType].getMsg(result);
addToConversationList(sessionList, 'top'); addToConversationList(sessionList, 'top');
} }

6
src/stores/EmailSlice.js
Unescape Escape View File

@ -124,7 +124,7 @@ const emailSlice = (set, get) => ({
let isNeedRefresh = refreshNow let isNeedRefresh = refreshNow
if (!isEmpty(readCache)) { if (!isEmpty(readCache)) {
setMailboxNestedDirsActive(readCache?.tree || []) 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 // isNeedRefresh = true; // test: 0
} }
if (isEmpty(readCache) || isNeedRefresh) { if (isEmpty(readCache) || isNeedRefresh) {
@ -141,7 +141,7 @@ const emailSlice = (set, get) => ({
// 更新数量 // 更新数量
updateMailboxCount: async ({ opi_sn }) => { updateMailboxCount: async ({ opi_sn }) => {
const { setMailboxNestedDirsActive } = get() // const { setMailboxNestedDirsActive } = get()
await getMailboxCountAction({ opi_sn }) await getMailboxCountAction({ opi_sn })
// const readCache = await readIndexDB(Number(opi_sn), 'dirs', 'mailbox') // const readCache = await readIndexDB(Number(opi_sn), 'dirs', 'mailbox')
// if (!isEmpty(readCache)) { // if (!isEmpty(readCache)) {
@ -150,7 +150,7 @@ const emailSlice = (set, get) => ({
}, },
async initMailbox({ opi_sn, dei_sn, userIdStr }) { async initMailbox({ opi_sn, dei_sn, userIdStr }) {
olog('initMailbox ---- ') olog('Initialize Mailbox ---- ')
const { currentMailboxOPI, setCurrentMailboxOPI, setCurrentMailboxDEI, getOPIEmailDir, setMailboxNestedDirsActive, } = get() const { currentMailboxOPI, setCurrentMailboxOPI, setCurrentMailboxDEI, getOPIEmailDir, setMailboxNestedDirsActive, } = get()
createIndexedDBStore(['dirs', 'maillist', 'listrow', 'mailinfo', 'draft'], 'mailbox') createIndexedDBStore(['dirs', 'maillist', 'listrow', 'mailinfo', 'draft'], 'mailbox')
setCurrentMailboxOPI(opi_sn) setCurrentMailboxOPI(opi_sn)

134
src/stores/OrderStore.js
Unescape Escape View File

@ -1,7 +1,7 @@
import { create } from 'zustand' import { create } from 'zustand'
import { devtools } from 'zustand/middleware' import { devtools } from 'zustand/middleware'
import { fetchJSON, postForm } from '@/utils/request' import { fetchJSON, postForm, postJSON } from '@/utils/request'
import { API_HOST, EMAIL_HOST } from '@/config' import { API_HOST, API_HOST_V3, EMAIL_HOST } from '@/config'
import { isNotEmpty, prepareUrl, uniqWith } from '@/utils/commons' import { isNotEmpty, prepareUrl, uniqWith } from '@/utils/commons'
const initialState = { const initialState = {
@ -11,10 +11,11 @@ const initialState = {
lastQuotation: {}, lastQuotation: {},
quotationList: [], quotationList: [],
otherEmailList: [], otherEmailList: [],
}; }
export const useOrderStore = create(devtools((set, get) => ({
export const useOrderStore = create(
devtools(
(set, get) => ({
...initialState, ...initialState,
drawerOpen: false, drawerOpen: false,
@ -22,30 +23,31 @@ export const useOrderStore = create(devtools((set, get) => ({
openDrawer: () => { openDrawer: () => {
set(() => ({ set(() => ({
drawerOpen: true drawerOpen: true,
})) }))
}, },
closeDrawer: () => { closeDrawer: () => {
set(() => ({ set(() => ({
drawerOpen: false drawerOpen: false,
})) }))
}, },
fetchOrderList: async (formValues, loginUser) => { fetchOrderList: async (formValues, loginUser) => {
let fetchOrderUrl = `${API_HOST}/getwlorder?opisn=${loginUser.userIdStr}&otype=${formValues.type}` let fetchOrderUrl = `${API_HOST}/getwlorder?opisn=${loginUser.userIdStr}&otype=${formValues.type}`
const params = {}; const params = {}
if (formValues.type === 'advance') { if (formValues.type === 'advance') {
fetchOrderUrl = `${API_HOST}/getdvancedwlorder?opisn=${loginUser.userIdStr}`; fetchOrderUrl = `${API_HOST}/getdvancedwlorder?opisn=${loginUser.userIdStr}`
const { type, ...formParams } = formValues; const { type, ...formParams } = formValues
Object.assign(params, formParams) Object.assign(params, formParams)
} }
return fetchJSON(fetchOrderUrl, params) return fetchJSON(fetchOrderUrl, params).then((json) => {
.then(json => {
if (json.errcode === 0) { if (json.errcode === 0) {
const _result = json.result.map((order) => { return { ...order, key: order.COLI_ID } }) 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) const _result_unique = uniqWith(_result, (a, b) => a.COLI_SN === b.COLI_SN)
set(() => ({ set(() => ({
orderList: _result_unique, orderList: _result_unique,
@ -54,12 +56,10 @@ export const useOrderStore = create(devtools((set, get) => ({
throw new Error(json?.errmsg + ': ' + json.errcode) throw new Error(json?.errmsg + ': ' + json.errcode)
} }
}) })
}, },
fetchOrderDetail: (colisn) => { fetchOrderDetail: (colisn) => {
return fetchJSON(`${API_HOST}/getorderinfo`, { colisn }) return fetchJSON(`${API_HOST}/getorderinfo`, { colisn }).then((json) => {
.then(json => {
if (json.errcode === 0 && json.result.length > 0) { if (json.errcode === 0 && json.result.length > 0) {
const orderResult = json.result[0] const orderResult = json.result[0]
set(() => ({ set(() => ({
@ -78,7 +78,6 @@ export const useOrderStore = create(devtools((set, get) => ({
throw new Error(json?.errmsg + ': ' + json.errcode) throw new Error(json?.errmsg + ': ' + json.errcode)
} }
}) })
}, },
appendOrderComment: async (opi_sn, coli_sn, comment) => { appendOrderComment: async (opi_sn, coli_sn, comment) => {
@ -88,8 +87,7 @@ export const useOrderStore = create(devtools((set, get) => ({
formData.append('coli_sn', coli_sn) formData.append('coli_sn', coli_sn)
formData.append('remark', comment) formData.append('remark', comment)
return postForm(`${API_HOST}/remark_order`, formData) return postForm(`${API_HOST}/remark_order`, formData).then((json) => {
.then(json => {
if (json.errcode === 0) { if (json.errcode === 0) {
return fetchOrderDetail(coli_sn) return fetchOrderDetail(coli_sn)
} else { } else {
@ -113,8 +111,7 @@ export const useOrderStore = create(devtools((set, get) => ({
formData.append('onlyusa', 0) formData.append('onlyusa', 0)
formData.append('useyhm', 0) formData.append('useyhm', 0)
return postForm(`${API_HOST}/generate_payment_links`, formData) return postForm(`${API_HOST}/generate_payment_links`, formData).then((json) => {
.then(json => {
if (json.errcode === 0) { if (json.errcode === 0) {
return json.result return json.result
} else { } else {
@ -124,20 +121,17 @@ export const useOrderStore = create(devtools((set, get) => ({
}, },
fetchHistoryOrder: (userId, email, whatsappid = '') => { fetchHistoryOrder: (userId, email, whatsappid = '') => {
return fetchJSON(`${API_HOST}/query_guest_order`, { opisn: userId, whatsappid, email: email }) return fetchJSON(`${API_HOST}/query_guest_order`, { opisn: userId, whatsappid, email: email }).then((json) => {
.then(json => {
if (json.errcode === 0) { if (json.errcode === 0) {
return json.result return json.result
} else { } else {
throw new Error(json?.errmsg + ': ' + json.errcode) throw new Error(json?.errmsg + ': ' + json.errcode)
} }
}) })
}, },
importEmailMessage: ({ orderId, orderNumber }) => { importEmailMessage: ({ orderId, orderNumber }) => {
return fetchJSON(`${API_HOST}/generate_email_msg`, { coli_sn: orderId, coli_id: orderNumber }) return fetchJSON(`${API_HOST}/generate_email_msg`, { coli_sn: orderId, coli_id: orderNumber }).then((json) => {
.then(json => {
if (json.errcode === 0) { if (json.errcode === 0) {
return json return json
} else { } else {
@ -149,10 +143,9 @@ export const useOrderStore = create(devtools((set, get) => ({
batchImportEmailMessage: () => { batchImportEmailMessage: () => {
const { orderList } = get() const { orderList } = get()
const orderPromiseList = orderList.map(order => { const orderPromiseList = orderList.map((order) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
fetchJSON(`${API_HOST}/generate_email_msg`, { coli_sn: order.COLI_SN, coli_id: order.COLI_ID }) fetchJSON(`${API_HOST}/generate_email_msg`, { coli_sn: order.COLI_SN, coli_id: order.COLI_ID }).then((json) => {
.then(json => {
if (json.errcode === 0) { if (json.errcode === 0) {
resolve(json) resolve(json)
} else { } else {
@ -163,13 +156,12 @@ export const useOrderStore = create(devtools((set, get) => ({
}) })
Promise.all(orderPromiseList).then((values) => { Promise.all(orderPromiseList).then((values) => {
console.log(values); console.log(values)
}) })
}, },
fetchOtherEmail: (coli_sn) => { fetchOtherEmail: (coli_sn) => {
return fetchJSON(`${EMAIL_HOST}/email_supplier`, { coli_sn }) return fetchJSON(`${EMAIL_HOST}/email_supplier`, { coli_sn }).then((json) => {
.then(json => {
if (json.errcode === 0) { if (json.errcode === 0) {
set(() => ({ set(() => ({
otherEmailList: json.result.MailInfo ?? [], otherEmailList: json.result.MailInfo ?? [],
@ -180,14 +172,55 @@ export const useOrderStore = create(devtools((set, get) => ({
}) })
}, },
setOrderPropValue: async (colisn, propName, value) => { 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,
},
}))
}
})
},
if (propName === 'orderlabel') { 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) => ({ set((state) => ({
orderDetail: { orderDetail: {
...state.orderDetail, ...state.orderDetail,
tags: value COLI_Introduction: extra,
},
}))
} }
})
},
setOrderPropValue: async (colisn, propName, value) => {
if (propName === 'orderlabel') {
set((state) => ({
orderDetail: {
...state.orderDetail,
tags: value,
},
})) }))
} }
@ -195,29 +228,30 @@ export const useOrderStore = create(devtools((set, get) => ({
set((state) => ({ set((state) => ({
orderDetail: { orderDetail: {
...state.orderDetail, ...state.orderDetail,
states: value states: value,
} },
})) }))
} }
return fetchJSON(`${API_HOST}/setorderstatus`, { colisn, stype: propName, svalue: value }) return fetchJSON(`${API_HOST}/setorderstatus`, { colisn, stype: propName, svalue: value }).then((json) => {
.then(json => {
if (json.errcode > 0) { if (json.errcode > 0) {
throw new Error(json?.errmsg + ': ' + json.errcode) throw new Error(json?.errmsg + ': ' + json.errcode)
} }
}) })
}, },
}),
}), { name: 'orderStore' })) { name: 'orderStore' },
),
)
export const OrderLabelDefaultOptions = [ export const OrderLabelDefaultOptions = [
{ value: 240003, label: '重点', emoji: '❣️' }, { value: 240003, label: '重点', emoji: '❣️' },
{ value: 240002, label: '次重点', emoji: '❗' }, { value: 240002, label: '次重点', emoji: '❗' },
{ value: 240001, label: '一般', emoji: '' } { value: 240001, label: '一般', emoji: '' },
] ]
export const OrderLabelDefaultOptionsMapped = OrderLabelDefaultOptions.reduce((acc, cur) => { export const OrderLabelDefaultOptionsMapped = OrderLabelDefaultOptions.reduce((acc, cur) => {
return { ...acc, [String(cur.value)]: cur } return { ...acc, [String(cur.value)]: cur }
}, {}) ; }, {})
export const OrderStatusDefaultOptions = [ export const OrderStatusDefaultOptions = [
{ value: 1, label: '新订单', emoji: '' }, { value: 1, label: '新订单', emoji: '' },
@ -227,7 +261,7 @@ export const OrderStatusDefaultOptions = [
{ value: 5, label: '成行', emoji: '💰' }, { value: 5, label: '成行', emoji: '💰' },
{ value: 6, label: '丢失', emoji: '🎈' }, { value: 6, label: '丢失', emoji: '🎈' },
{ value: 7, label: '取消', emoji: '🚫' }, { value: 7, label: '取消', emoji: '🚫' },
{ value: 8, label: '未报价', emoji: '' } { value: 8, label: '未报价', emoji: '' },
] ]
export const OrderStatusDefaultOptionsMapped = OrderStatusDefaultOptions.reduce((acc, cur) => { export const OrderStatusDefaultOptionsMapped = OrderStatusDefaultOptions.reduce((acc, cur) => {
return { ...acc, [String(cur.value)]: cur } return { ...acc, [String(cur.value)]: cur }
@ -239,7 +273,7 @@ export const OrderStatusDefaultOptionsMapped = OrderStatusDefaultOptions.reduce(
export const RemindStateDefaultOptions = [ export const RemindStateDefaultOptions = [
{ value: '1', label: '一催' }, { value: '1', label: '一催' },
{ value: '2', label: '二催' }, { value: '2', label: '二催' },
{ value: '3', label: '三催' } { value: '3', label: '三催' },
] ]
/** /**
@ -251,15 +285,15 @@ export const remindStatusOptions = [
{ value: 3, label: '已发三催' }, { value: 3, label: '已发三催' },
{ value: 'important', label: '重点团' }, { value: 'important', label: '重点团' },
{ value: 'sendsurvey', label: '已发 travel advisor survey' }, { value: 'sendsurvey', label: '已发 travel advisor survey' },
]; ]
export const remindStatusOptionsMapped = remindStatusOptions.reduce((acc, cur) => { export const remindStatusOptionsMapped = remindStatusOptions.reduce((acc, cur) => {
return { ...acc, [String(cur.value)]: cur } return { ...acc, [String(cur.value)]: cur }
}, {}); }, {})
/** /**
* @param {Object} params { coli_sn, remindstate } * @param {Object} params { coli_sn, remindstate }
*/ */
export const fetchSetRemindStateAction = async (params) => { export const fetchSetRemindStateAction = async (params) => {
const { errcode, result } = await fetchJSON(`${API_HOST}/SetRemindState`, params); const { errcode, result } = await fetchJSON(`${API_HOST}/SetRemindState`, params)
return errcode === 0 ? result : {}; return errcode === 0 ? result : {}
}; }

14
src/utils/indexedDB.js
Unescape Escape View File

@ -104,7 +104,7 @@ export const clearWebsocketLog = () => {
export const createIndexedDBStore = (tables, database) => { export const createIndexedDBStore = (tables, database) => {
var open = indexedDB.open(database, INDEXED_DB_VERSION) var open = indexedDB.open(database, INDEXED_DB_VERSION)
open.onupgradeneeded = function () { open.onupgradeneeded = function () {
console.log('readIndexDB onupgradeneeded', database, ) // console.log('readIndexDB onupgradeneeded', database, )
var db = open.result var db = open.result
// 数据库是否存在 // 数据库是否存在
for (const table of tables) { for (const table of tables) {
@ -124,7 +124,7 @@ export const createIndexedDBStore = (tables, database) => {
export const writeIndexDB = (rows, table, database) => { export const writeIndexDB = (rows, table, database) => {
var open = indexedDB.open(database, INDEXED_DB_VERSION) var open = indexedDB.open(database, INDEXED_DB_VERSION)
open.onupgradeneeded = function () { open.onupgradeneeded = function () {
console.log('readIndexDB onupgradeneeded', table, ) // console.log('readIndexDB onupgradeneeded', table, )
var db = open.result var db = open.result
// 数据库是否存在 // 数据库是否存在
if (!db.objectStoreNames.contains(table)) { if (!db.objectStoreNames.contains(table)) {
@ -170,7 +170,7 @@ export const readIndexDB = (keys=null, table, database) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let openRequest = indexedDB.open(database) let openRequest = indexedDB.open(database)
openRequest.onupgradeneeded = function () { openRequest.onupgradeneeded = function () {
console.log('readIndexDB onupgradeneeded', table, ) // console.log('readIndexDB onupgradeneeded', table, )
var db = openRequest.result var db = openRequest.result
// 数据库是否存在 // 数据库是否存在
if (!db.objectStoreNames.contains(table)) { if (!db.objectStoreNames.contains(table)) {
@ -208,7 +208,7 @@ export const readIndexDB = (keys=null, table, database) => {
// console.log(`💾Found record with key ${key}:`, result); // console.log(`💾Found record with key ${key}:`, result);
innerResolve([key, result]); // Resolve with [key, data] tuple innerResolve([key, result]); // Resolve with [key, data] tuple
} else { } 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 innerResolve(void 0); // Resolve with undefined for non-existent keys
} }
}; };
@ -241,7 +241,7 @@ export const readIndexDB = (keys=null, table, database) => {
// console.log(`💾Found record with key ${keys}:`, result); // console.log(`💾Found record with key ${keys}:`, result);
resolve(result); resolve(result);
} else { } else {
console.log(`No record found with key ${keys}.`); // console.log(`No record found with key ${keys}.`);
resolve(); resolve();
} }
}; };
@ -258,10 +258,10 @@ export const readIndexDB = (keys=null, table, database) => {
allData.forEach(item => { allData.forEach(item => {
resultMap.set(item.key, item); resultMap.set(item.key, item);
}); });
console.log(`💾Found all records:`, resultMap); // console.log(`💾Found all records:`, resultMap);
resolve(resultMap); resolve(resultMap);
} else { } else {
console.log(`No records found.`); // console.log(`No records found.`);
resolve(resultMap); // Resolve with an empty Map if no records resolve(resultMap); // Resolve with an empty Map if no records
} }
}; };

2
src/views/Conversations/Online/Components/EmailContent.jsx
Unescape Escape View File

@ -113,7 +113,7 @@ const EmailContent = ({ id, content: MailContent, className='', ...props }) => {
return ( return (
<div ref={containerRef} className={`space-y-4 w-full ${className}`}> <div ref={containerRef} className={`space-y-4 w-full ${className}`}>
<div className='w-full relative'> <div className='w-full relative pt-2'>
<iframe <iframe
key={id} key={id}
ref={iframeRef} ref={iframeRef}

1
src/views/Conversations/Online/order/QuotesHistory.jsx
Unescape Escape View File

@ -3,6 +3,7 @@ import { Button, Flex, List, Popover } from 'antd'
import { useState } from 'react' import { useState } from 'react'
import EmailQuotation from '../Components/EmailQuotation' import EmailQuotation from '../Components/EmailQuotation'
// @Deprecated 作废，已经不用
const QuotesHistory = ((props) => { const QuotesHistory = ((props) => {
const [open, setOpen] = useState(false) const [open, setOpen] = useState(false)

96
src/views/NewEmail.jsx
Unescape Escape View File

@ -21,7 +21,6 @@ import useSnippetStore from '@/stores/SnippetStore'
import PaymentlinkBtn from '@/views/Conversations/Online/Input/PaymentlinkBtn' import PaymentlinkBtn from '@/views/Conversations/Online/Input/PaymentlinkBtn'
import { TextIcon } from '@/components/Icons'; import { TextIcon } from '@/components/Icons';
import { EMAIL_ATTA_HOST, POPUP_FEATURES } from '@/config'; import { EMAIL_ATTA_HOST, POPUP_FEATURES } from '@/config';
import RoosterEditor from '@/components/RoosterEditor';
const {confirm} = Modal; const {confirm} = Modal;
// 禁止上传的附件类型 // 禁止上传的附件类型
@ -47,18 +46,19 @@ const parseHTMLText = (html) => {
const parser = new DOMParser() const parser = new DOMParser()
const dom = parser.parseFromString(html, 'text/html') const dom = parser.parseFromString(html, 'text/html')
// Replace <br> and <p> with line breaks // Replace <br> and <p> with line breaks
Array.from(dom.body.querySelectorAll('br, p')).forEach((el) => { // Array.from(dom.body.querySelectorAll('br, p')).forEach((el) => {
el.textContent = '\n' + el.textContent // el.textContent = '<br>' + el.textContent
}) // })
// Replace <hr> with a line of dashes // Replace <hr> with a line of dashes
Array.from(dom.body.querySelectorAll('hr')).forEach((el) => { // Array.from(dom.body.querySelectorAll('hr')).forEach((el) => {
el.textContent = '\n------------------------------------------------------------------\n' // el.innerHTML = '<p><hr>------------------------------------------------------------------</p>'
}) // })
return dom.body.textContent || '' const line = '<p>------------------------------------------------------------------</p>'
return line+(dom.body.innerHTML || '')
} }
const generateQuoteContent = (mailData, isRichText = true) => { 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, '&lt;')
.replace(/>/g, '&gt;')} </span></p><p class="font-sans"><b><strong >Sent: </strong></b><span >${ .replace(/>/g, '&gt;')} </span></p><p class="font-sans"><b><strong >Sent: </strong></b><span >${
mailData.info?.MAI_SendDate || '' mailData.info?.MAI_SendDate || ''
@ -66,11 +66,11 @@ const generateQuoteContent = (mailData, isRichText = true) => {
.replace(/</g, '&lt;') .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>${ .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>') mailData.info?.MAI_ContentType === 'text/html' ? mailData.content : mailData.content.replace(/\r\n/g, '<br>')
}</p>` }</p></blockquote>`
return isRichText ? html : parseHTMLText(html) 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>`
/** /**
* 独立窗口编辑器 * 独立窗口编辑器
@ -200,6 +200,8 @@ const NewEmail = () => {
mat_sn: emailAccount?.mat_sn || info?.MAI_MAT_SN || defaultMAT, mat_sn: emailAccount?.mat_sn || info?.MAI_MAT_SN || defaultMAT,
opi_sn: emailAccount?.opi_sn || info?.MAI_OPI_SN || orderDetail.opi_sn || '', opi_sn: emailAccount?.opi_sn || info?.MAI_OPI_SN || orderDetail.opi_sn || '',
} }
const originalContentType = info?.mailType === 'text/html';
setIsRichText(originalContentType)
let readyToInitialContent = ''; let readyToInitialContent = '';
let _formValues = {}; let _formValues = {};
@ -214,7 +216,7 @@ const NewEmail = () => {
// 排除草稿: `编辑`有id 的邮件 // 排除草稿: `编辑`有id 的邮件
if (!isEmpty(mailData.info) && !['edit'].includes(pageParam.action)) { if (!isEmpty(mailData.info) && !['edit'].includes(pageParam.action)) {
readyToInitialContent = orderPrefix + signatureBody readyToInitialContent = orderPrefix + '<br>' + signatureBody
} }
switch (pageParam.action) { switch (pageParam.action) {
case 'reply': case 'reply':
@ -226,6 +228,7 @@ const NewEmail = () => {
subject: `Re: ${info.MAI_Subject || ''}`, subject: `Re: ${info.MAI_Subject || ''}`,
..._form2 ..._form2
} }
readyToInitialContent += generateQuoteContent(mailData, originalContentType)
break break
case 'replyall': case 'replyall':
_formValues = { _formValues = {
@ -236,6 +239,7 @@ const NewEmail = () => {
subject: `Re: ${info.MAI_Subject || ''}`, subject: `Re: ${info.MAI_Subject || ''}`,
..._form2 ..._form2
} }
readyToInitialContent += generateQuoteContent(mailData, originalContentType)
break break
case 'forward': case 'forward':
_formValues = { _formValues = {
@ -244,6 +248,7 @@ const NewEmail = () => {
// coli_sn: pageParam.oid, // coli_sn: pageParam.oid,
..._form2 ..._form2
} }
readyToInitialContent += generateQuoteContent(mailData, originalContentType)
break break
case 'edit': case 'edit':
_formValues = { _formValues = {
@ -255,7 +260,7 @@ const NewEmail = () => {
mai_sn: pageParam.quoteid, mai_sn: pageParam.quoteid,
..._form2 ..._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}` }))) 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 break
case 'new': case 'new':
@ -266,8 +271,9 @@ const NewEmail = () => {
subject: `${info.MAI_Subject || templateFormValues.subject || ''}`, subject: `${info.MAI_Subject || templateFormValues.subject || ''}`,
..._form2, ..._form2,
} }
readyToInitialContent = generateMailContent({ content: templateContent.bodycontent || readyToInitialContent || `<br>${signatureBody}` || '' }) 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}` }))) // 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 break
default: default:
@ -342,12 +348,14 @@ const NewEmail = () => {
} }
const handleEditorChange = ({ editorStateJSON, htmlContent, textContent }) => { 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); // console.log('html', html);
setHtmlContent(htmlContent) setHtmlContent(htmlContent)
setTextContent(textContent) setTextContent(_text)
form.setFieldValue('content', htmlContent) form.setFieldValue('content', htmlContent)
const { bodyText: abstract } = parseHTMLString(htmlContent, true); const abstract = _text;
// const { bodyText: abstract } = parseHTMLString(htmlContent, true);
// form.setFieldValue('abstract', getAbstract(textContent)) // form.setFieldValue('abstract', getAbstract(textContent))
const formValues = omitEmpty(form.getFieldsValue()); const formValues = omitEmpty(form.getFieldsValue());
if (!isEmpty(formValues)) { if (!isEmpty(formValues)) {
@ -497,8 +505,8 @@ const NewEmail = () => {
body.attaList = fileList; body.attaList = fileList;
// console.log('body', body, '\n', fileList); // console.log('body', body, '\n', fileList);
const values = await form.validateFields() const values = await form.validateFields()
const preQuoteBody = !['edit', 'new'].includes(pageParam.action) && pageParam.quoteid ? (quoteContent ? quoteContent : generateQuoteContent(mailData, isRichText)) : '' // const preQuoteBody = !['edit', 'new'].includes(pageParam.action) && pageParam.quoteid ? (quoteContent ? quoteContent : generateQuoteContent(mailData, isRichText)) : ''
body.mailcontent = isRichText ? EmailBuilder({ subject: values.subject, content: htmlContent + preQuoteBody }) : textContent + preQuoteBody body.mailcontent = isRichText ? EmailBuilder({ subject: values.subject, content: htmlContent }) : textContent
body.cc = values.cc || '' body.cc = values.cc || ''
body.bcc = values.bcc || '' body.bcc = values.bcc || ''
body.bcc = values.mailtype || '' body.bcc = values.mailtype || ''
@ -518,6 +526,8 @@ const NewEmail = () => {
try { try {
// console.log('postSendEmail', body, '\n'); // console.log('postSendEmail', body, '\n');
// console.log('🎈postSendEmail mailContent', body.mailcontent, '\n');
// throw new Error('test')
// return; // return;
const mailSavedId = await postEmailSaveOrSend(body, isDraft) const mailSavedId = await postEmailSaveOrSend(body, isDraft)
form.setFieldsValue({ form.setFieldsValue({
@ -604,26 +614,17 @@ const NewEmail = () => {
// labelCol={{ span: 3 }} // 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'> <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> </Button>
<Form.Item name={'from'} rules={[{ required: true, message: '请选择发件地址' }]} > <Form.Item name={'from'} rules={[{ required: true, message: '请选择发件地址' }]} >
<Select <Select labelInValue={false} options={emailListOption} labelRender={item => `发件人: ${item?.label || '选择'}`} variant={'borderless'} placeholder='发件人: 选择' className='[&_.ant-select-selection-item]:font-bold [&_.ant-select-selection-placeholder]:font-bold [&_.ant-select-selection-placeholder]:text-black' classNames={{popup: {root:'min-w-60'}}} />
labelInValue={false}
options={emailListOption}
labelRender={(item) => `发件人: ${item?.label || '选择'}`}
variant={'borderless'}
placeholder='发件人: 选择'
className='[&_.ant-select-selection-item]:font-bold [&_.ant-select-selection-placeholder]:font-bold [&_.ant-select-selection-placeholder]:text-black'
classNames={{ popup: { root: 'min-w-60' } }}
/>
</Form.Item> </Form.Item>
{/* <div className="ant-form-item-explain-error text-red-500" >请选择发件地址</div> */} {/* <div className="ant-form-item-explain-error text-red-500" >请选择发件地址</div> */}
<div className='ml-auto'></div> <div className='ml-auto'></div>
<span>{orderDetail.order_no}</span> <span>{orderDetail.order_no}</span>
<span>{templateContent.mailtypeName}</span> <span>{templateContent.mailtypeName}</span>
<Popconfirm <Popconfirm trigger1={['hover', 'click']}
trigger1={['hover', 'click']}
description='切换内容为纯文本格式将丢失信件和签名的格式, 确定使用纯文本?' description='切换内容为纯文本格式将丢失信件和签名的格式, 确定使用纯文本?'
onConfirm={confirmPlainText} onConfirm={confirmPlainText}
open={openPlainTextConfirm} open={openPlainTextConfirm}
@ -632,21 +633,9 @@ const NewEmail = () => {
纯文本 纯文本
</Checkbox> */} </Checkbox> */}
{/* <Button type='link' size='small' icon={<TextIcon />} className=' ' >纯文本</Button> */} {/* <Button type='link' size='small' icon={<TextIcon />} className=' ' >纯文本</Button> */}
<Radio.Group <Radio.Group options={[{label: '纯文本', value: false}, {label: '富文本', value: true}]} optionType="button" buttonStyle="solid" onChange={handlePlainTextOpenChange} value={isRichText} size='small' />
options={[
{ label: '纯文本', value: false },
{ label: '富文本', value: true },
]}
optionType='button'
buttonStyle='solid'
onChange={handlePlainTextOpenChange}
value={isRichText}
size='small'
/>
</Popconfirm> </Popconfirm>
<Button onClick={() => onHandleSaveOrSend(true)} type='dashed' icon={<SaveOutlined />} size='small' className=''> <Button onClick={() => onHandleSaveOrSend(true)} type='dashed' icon={<SaveOutlined />} size='small' className='' >存草稿</Button>
存草稿
</Button>
</div> </div>
<Form.Item className='w-full'> <Form.Item className='w-full'>
<Space.Compact className='w-full'> <Space.Compact className='w-full'>
@ -724,16 +713,15 @@ const NewEmail = () => {
<Input /> <Input />
</Form.Item> </Form.Item>
</Form> </Form>
<RoosterEditor initialContent={'<p>Hello from <b>RoosterJs</b> in your <i>Ant Design</i> React app!</p>' }onChange={handleEditorChange} />
<LexicalEditor {...{ isRichText }} onChange={handleEditorChange} defaultValue={initialContent} /> <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'> <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>
{/* <Button className='flex gap-2 ' type='link' danger onClick={() => {setMergeQuote(false);setShowQuoteContent(false)}}>
删除引用内容
</Button> */}
</div> </div>
)} )}
{showQuoteContent && ( {showQuoteContent && (
@ -742,7 +730,7 @@ const NewEmail = () => {
className='border-0 outline-none cursor-text' className='border-0 outline-none cursor-text'
onBlur={(e) => setQuoteContent(`<blockquote>${e.target.innerHTML}</blockquote>`)} onBlur={(e) => setQuoteContent(`<blockquote>${e.target.innerHTML}</blockquote>`)}
dangerouslySetInnerHTML={{ __html: generateQuoteContent(mailData) }}></blockquote> dangerouslySetInnerHTML={{ __html: generateQuoteContent(mailData) }}></blockquote>
)} )} */}
</ConfigProvider> </ConfigProvider>
</> </>
) )

2
src/views/orders/Follow.jsx
Unescape Escape View File

@ -175,7 +175,7 @@ function Follow() {
<Button <Button
icon={collapsed ? <LeftOutlined /> : <UnorderedListOutlined />} icon={collapsed ? <LeftOutlined /> : <UnorderedListOutlined />}
onClick={() => setCollapsed(!collapsed)} 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'} size={collapsed ? 'small' : 'middle'}
/> />
</Tooltip> </Tooltip>

71
src/views/orders/components/MailBox.jsx
Unescape Escape View File

@ -1,48 +1,21 @@
import { useEffect, useState } from 'react' 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 } from '@ant-design/icons'
import { Flex, Button, Tooltip, List, Form, Row, Col, Input, Checkbox, DatePicker, Switch, Breadcrumb, Skeleton, Popconfirm } from 'antd' 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 { useEmailList } from '@/hooks/useEmail'
import { isEmpty } from '@/utils/commons' import { isEmpty } from '@/utils/commons'
import { MailboxDirIcon } from './MailboxDirIcon' import { MailboxDirIcon } from './MailboxDirIcon'
import { AttachmentIcon, MailCheckIcon, MailOpenIcon } from '@/components/Icons' import { AttachmentIcon, MailCheckIcon, MailOpenIcon } from '@/components/Icons'
import NewEmailButton from './NewEmailButton' import NewEmailButton from './NewEmailButton'
import MailOrderSearchModal from './MailOrderSearchModal' import MailOrderSearchModal from './MailOrderSearchModal'
import MailListSearchModal from './MailListSearchModal'
const { RangePicker } = DatePicker
const PAGE_SIZE = 50 // 每页显示条数 const PAGE_SIZE = 50 // 每页显示条数
const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => { const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
const DATE_RANGE_PRESETS = [
{
label: '本周',
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 [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({ const [pagination, setPagination] = useState({
current: 1, current: 1,
@ -156,19 +129,11 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
<Flex wrap gap={8} > <Flex wrap gap={8} >
<NewEmailButton /> <NewEmailButton />
<Button
size='small'
icon={<MailOpenIcon />}
onClick={() => {
markAsRead(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
}}>
已读
</Button>
<Button <Button
size='small' size='small'
icon={<MailOutlined />} icon={<MailOutlined />}
onClick={() => { onClick={() => {
console.info('未读未实现') markAsUnread(selectedItems.map((item) => item.MAI_SN)).then(() => setSelectedItems([]))
}}> }}>
未读 未读
</Button> </Button>
@ -189,36 +154,12 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
删除 删除
</Button> </Button>
<MailOrderSearchModal /> <MailOrderSearchModal />
<MailListSearchModal />
</Flex> </Flex>
</div> </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'> <Flex align='center' justify='space-between' wrap className='px-1 border-0 border-b border-solid border-neutral-200'>
<Breadcrumb <Breadcrumb
items={props.breadcrumb.map((bc) => { items={(tempBreadcrumb || props.breadcrumb).map((bc) => {
return { return {
title: ( title: (
<> <>

75
src/views/orders/components/MailListSearchModal.jsx
Unescape Escape View File

@ -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

15
src/views/orders/components/MailOrderSearchModal.jsx
Unescape Escape View File

@ -1,11 +1,10 @@
import { createContext, useEffect, useState } from 'react' import { useState } from 'react'
import { ReloadOutlined, ReadOutlined, RightOutlined, LeftOutlined, SearchOutlined, MailOutlined } from '@ant-design/icons' import { SearchOutlined } from '@ant-design/icons'
import { Button, Modal, Form, Input, Checkbox, Select, Radio, DatePicker, Divider, Typography, Flex } from 'antd' import { Button, Modal, Form, Input, Checkbox, Radio, DatePicker, Divider, Typography, Flex } from 'antd'
import dayjs from 'dayjs' 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 { isEmpty, objectMapper, pick } from '@/utils/commons'
import useConversationStore from '@/stores/ConversationStore' import useConversationStore from '@/stores/ConversationStore'
import { mailboxSystemDirs } from '@/hooks/useEmail'
const MailOrderSearchModal = ({ ...props }) => { const MailOrderSearchModal = ({ ...props }) => {
const [currentMailboxOPI] = useConversationStore((state) => [state.currentMailboxOPI]) const [currentMailboxOPI] = useConversationStore((state) => [state.currentMailboxOPI])
@ -38,7 +37,7 @@ const MailOrderSearchModal = ({ ...props }) => {
result = await queryHTOrderListAction({ ...htOrderParams, opi_sn: currentMailboxOPI }) result = await queryHTOrderListAction({ ...htOrderParams, opi_sn: currentMailboxOPI })
const addToTree = { const addToTree = {
key: 'search-orders', key: 'search-orders',
title: '搜索结果', title: '查找订单',
iconIndex: 'search', iconIndex: 'search',
_raw: { COLI_SN: 0, IsTrue: 0 }, _raw: { COLI_SN: 0, IsTrue: 0 },
children: result.map((o) => ({ children: result.map((o) => ({
@ -46,7 +45,7 @@ const MailOrderSearchModal = ({ ...props }) => {
title: `${o.COLI_ID}`, title: `${o.COLI_ID}`,
iconIndex: 13, iconIndex: 13,
parent: 'search-orders', parent: 'search-orders',
parentTitle: '搜索结果', parentTitle: '查找订单',
parentIconIndex: 'search', parentIconIndex: 'search',
_raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: 'search-orders', IsTrue: 0, ApplyDate: '', OrderSourceType: htOrderParams.sourcetype, parent: 'search-orders' }, _raw: { ...o, VKey: o.COLI_SN, VName: o.COLI_ID, VParent: 'search-orders', IsTrue: 0, ApplyDate: '', OrderSourceType: htOrderParams.sourcetype, parent: 'search-orders' },
})), })),
@ -60,7 +59,7 @@ const MailOrderSearchModal = ({ ...props }) => {
return ( return (
<> <>
<Button key={'bound'} onClick={() => setOpen(true)} size='small' icon={<SearchOutlined className='' />}> <Button key={'bound'} onClick={() => setOpen(true)} size='small' icon={<SearchOutlined className='' />}>
查找 查找订单
</Button> </Button>
<Modal <Modal
width={window.innerWidth < 700 ? '95%' : 960} width={window.innerWidth < 700 ? '95%' : 960}

9
vite.config.js
Unescape Escape View File

@ -183,12 +183,9 @@ export default defineConfig({
output: { output: {
entryFileNames: '[name]/build.[hash].js', entryFileNames: '[name]/build.[hash].js',
manualChunks(id) { manualChunks(id) {
if (id.toLowerCase().includes('lexical')) { if (id.includes('node_modules/')) {
return 'lexical'; // 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) => { // chunkFileNames: (chunkInfo) => {

Write Preview
Loading…
Cancel
Save