@@ -204,6 +204,7 @@ const EmailDetail = ({ open, setOpen, emailMsg, ...props }) => {
setOpen={setOpenEmailEditor}
fromEmail={fromEmail}
fromUser={mailData.info?.MAI_OPI_SN || order_opi}
+ fromOrder={mailData.info?.MAI_COLI_SN || coli_sn}
conversationid={conversationid}
// emailMsg={ReferEmailMsg}
quoteid={mailID}
diff --git a/src/views/Conversations/Online/ConversationsList.jsx b/src/views/Conversations/Online/ConversationsList.jsx
index d9a12ff..99aabf1 100644
--- a/src/views/Conversations/Online/ConversationsList.jsx
+++ b/src/views/Conversations/Online/ConversationsList.jsx
@@ -1,12 +1,13 @@
import React, { useEffect, useState, useRef, useCallback } from 'react';
import { useParams, useNavigate, useLocation } from 'react-router-dom';
-import { Input, Button, Empty, Tooltip, List } from 'antd';
+import { App, Input, Button, Empty, Tooltip, List } from 'antd';
import { PlusOutlined, LoadingOutlined, HistoryOutlined, FireOutlined,AudioTwoTone } from '@ant-design/icons';
import { fetchConversationsList, fetchOrderConversationsList, CONVERSATION_PAGE_SIZE } from '@/actions/ConversationActions';
import ConversationsNewItem from './ConversationsNewItem';
import { debounce, flush, isEmpty, isNotEmpty, pick } from '@/utils/commons';
import useConversationStore from '@/stores/ConversationStore';
import useAuthStore from '@/stores/AuthStore';
+import { useOrderStore, OrderLabelDefaultOptions, OrderStatusDefaultOptions } from "@/stores/OrderStore";
import { useVisibilityState } from '@/hooks/useVisibilityState';
import ChatListItem from './Components/ChatListItem';
import ChatListFilter from './Components/ChatListFilter';
@@ -14,10 +15,12 @@ import useStyleStore from '@/stores/StyleStore';
import dayjs from 'dayjs';
import { DATETIME_FORMAT } from '@/config';
+
/**
* []
*/
const Conversations = () => {
+ const { message } = App.useApp();
const [mobile] = useStyleStore((state) => [state.mobile]);
const routerReplace = mobile === false ? true : false; // : true;
const routePrefix = mobile === false ? `/order/chat` : `/m/chat`;
@@ -26,8 +29,12 @@ const Conversations = () => {
const { order_sn } = useParams();
const navigate = useNavigate();
const userId = useAuthStore((state) => state.loginUser.userId);
+
const initialState = useConversationStore((state) => state.initialState);
- const [currentConversation, setCurrentConversation] = useConversationStore((state) => [state.currentConversation, state.setCurrentConversation]);
+
+ const [customerDetail] = useOrderStore((s) => [s.customerDetail])
+
+ const [currentConversation, setCurrentConversation, updateCurrentConversation] = useConversationStore((state) => [state.currentConversation, state.setCurrentConversation, state.updateCurrentConversation]);
const [topList, pageList, conversationsList] = useConversationStore((state) => [state.topList, state.pageList, state.conversationsList]);
const [conversationsListLoading, setConversationsListLoading] = useConversationStore((state) => [state.conversationsListLoading, state.setConversationsListLoading]);
const addToConversationList = useConversationStore((state) => state.addToConversationList);
@@ -35,16 +42,22 @@ const Conversations = () => {
const isVisible = useVisibilityState();
- const [tabSelectedConversation, setTabSelectedConversation] = useState({});
- const [tabCnt, setTabCnt] = useState(-1);
-
const [{ search: searchContent, loadNextPage, ...filterState }, setSearchContent, setFilter] = useConversationStore((state) => [state.filter, state.setFilterSearch, state.setFilter])
+ const [activeList, setActiveList] = useState(true);
const [currentLoading, setCurrentLoading] = useState(false);
+ const [shouldFetchCList, setShouldFetchCList] = useState(true);
+
/**
*
*/
+ let refreshing = false;
async function refreshConversationList(current='', append=false) {
+ // console.log('invoke -- refreshConversationList', current, conversationsListLoading, refreshing);
+ if (refreshing !== false) {
+ return false;
+ }
+ refreshing = true;
// setConversationsListLoading(mobile !== undefined ? true : false);
setConversationsListLoading(true);
setCurrentLoading(current==='');
@@ -67,6 +80,7 @@ const Conversations = () => {
}
const _list = await fetchConversationsList({ ...searchParams, opisn: userId });
+ // const _list = DebounceFetchList({ ...searchParams, opisn: userId });
// 搜索时, 清空列表
if (current) {
@@ -86,18 +100,30 @@ const Conversations = () => {
// } : {}),
});
+ refreshing = false;
setConversationsListLoading(false);
setCurrentLoading(false);
}
useEffect(() => {
- if (mobile !== undefined) {
+ if (mobile !== false) {
setCurrentConversation({});
}
return () => {};
}, []);
- const [activeList, setActiveList] = useState(true);
+ useEffect(() => {
+ if (order_sn && shouldFetchCList) {
+ setCurrentConversation({ coli_sn: Number(order_sn) })
+ // updateCurrentConversation({ coli_sn: Number(order_sn) });
+ } else {
+ // setCurrentConversation({ coli_sn: order_sn })
+ }
+
+ return () => {}
+ }, [order_sn])
+
+
useEffect(() => {
if (isVisible && initialState) {
@@ -117,6 +143,9 @@ const Conversations = () => {
const [dataSource, setDataSource] = useState(conversationsList);
const [listUpdateFlag, setListUpdateFlag] = useState();
+
+ const [switchToC, setSwitchToC] = useState({});
+
useEffect(() => {
setDataSource([...topList, ...pageList]);
// setDataSource(activeList ? conversationsList: closedConversationsList);
@@ -129,45 +158,51 @@ const Conversations = () => {
}
return () => {}
- }, [conversationsList, initialState])
+ }, [order_sn, initialState, customerDetail.email])
- const [switchToC, setSwitchToC] = useState({});
- const [shouldFetchCList, setShouldFetchCList] = useState(true);
- // useEffect(() => {
- // console.log('shouldFetchCList', order_sn , shouldFetchCList , initialState);
+ const getOrderConversationList = async (colisn) => {
- // if (order_sn && shouldFetchCList && initialState) {
- // getOrderConversationList(order_sn);
- // }
+ const { whatsapp_phone_number } = switchToC;
+ const whatsappID = coli_guest_WhatsApp || whatsapp_phone_number || '';
+ // if (isEmpty(conversationsList)) {
+ // return false;
+ // }
- // return () => {};
- // }, [order_sn, shouldFetchCList, initialState]);
+ let findCurrentOrderChats;
+ let findCurrentIndex;
+ let findCurrent;
- const getOrderConversationList = async (colisn, WHATSAPP_ID = null) => {
- const { whatsapp_phone_number } = switchToC;
- const whatsappID = WHATSAPP_ID || coli_guest_WhatsApp || whatsapp_phone_number || '';
// let findCurrentOrderChats = conversationsList.filter((item) => `${item.coli_sn}` === `${colisn}`);
// 使用opisn + whatsappID 判断, 解决订单修改whatsappID号码之后获取新会话, 登录账号此处省略
- if (isEmpty(conversationsList)) {
- return false;
- }
-
- let findCurrentOrderChats = conversationsList.filter((item) => `${item.whatsapp_phone_number}` === `${whatsappID}` && `${item.coli_sn}` === `${colisn}`)
- let findCurrentIndex = isEmpty(findCurrentOrderChats) ? -1 : 0; // findCurrentOrderChats.length-1;
- let findCurrent = findCurrentOrderChats[findCurrentIndex];
- if (findCurrentIndex !== -1) {
- addToConversationList(findCurrentOrderChats);
- } else if (!isEmpty(whatsappID)) {
- const data = await fetchOrderConversationsList({ opisn: userId, colisn: colisn, whatsappid: whatsappID });
- if (!isEmpty(data)) {
- addToConversationList(data);
- findCurrentIndex = 0; // data.length-1; // data.lastIndexOf((item) => item.coli_sn === Number(colisn));
- findCurrent = data[findCurrentIndex];
- } else {
- // findCurrentIndex = conversationsList.findIndex((item) => item.coli_sn === Number(colisn)); // data.findIndex((item) => item.sn === currentConversation.sn);
+ if (!isEmpty(whatsappID) || !isEmpty(customerDetail.email)) {
+
+ findCurrentOrderChats = conversationsList.filter(
+ (item) => `${item.coli_sn}` === `${colisn}` && (`${item.whatsapp_phone_number}` === `${whatsappID}` || `${item.channels?.email}` === `${customerDetail.email}`)
+ )
+ findCurrentIndex = isEmpty(findCurrentOrderChats) ? -1 : 0; // findCurrentOrderChats.length-1;
+ findCurrent = findCurrentOrderChats[findCurrentIndex];
+
+ if (findCurrentIndex !== -1) {
+ addToConversationList(findCurrentOrderChats);
+ } else // if (!isEmpty(whatsappID))
+ {
+ try {
+ const data = await fetchOrderConversationsList({ opisn: userId, colisn: colisn, whatsappid: whatsappID, email: customerDetail.email });
+ if (!isEmpty(data)) {
+ addToConversationList(data);
+ findCurrentIndex = 0; // data.length-1; // data.lastIndexOf((item) => item.coli_sn === Number(colisn));
+ findCurrent = data[findCurrentIndex];
+ } else {
+ // findCurrentIndex = conversationsList.findIndex((item) => item.coli_sn === Number(colisn)); // data.findIndex((item) => item.sn === currentConversation.sn);
+ }
+ } catch (error) {
+ // message.warning('获取订单会话失败')
+ }
}
- } else if (isEmpty(whatsappID)) {
+ }
+ // else
+ if (isEmpty(whatsappID)) {
// 刷新页面
findCurrentIndex = conversationsList.findIndex((item) => `${item.coli_sn}` === `${colisn}`);
findCurrent = conversationsList[findCurrentIndex];
@@ -306,7 +341,6 @@ const Conversations = () => {
refreshConversationList,
setListUpdateFlag,
onSwitchConversation,
- tabSelectedConversation,
setNewChatModalVisible,
setEditingChat,
}}
diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
index 56861e2..b03ceb4 100644
--- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
+++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx
@@ -53,7 +53,7 @@ const generateQuoteContent = (mailData) => `
Subject:
-
${mailData.info.subject || ''}
+
${mailData.info?.MAI_Subject || ''}
${mailData.content}
@@ -65,52 +65,89 @@ const generateMailContent = (mailData) => `
${mailData.content}
`
-const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, toEmail, conversationid, quoteid, initial = {}, mailData: _mailData, action = 'reply', ...props }) => {
+/**
+ * @property {string} fromEmail - 发件人邮箱
+ * @property {string} fromUser - 发件人用户
+ * @property {string} fromOrder - 发件人订单
+ * @property {string} toEmail - 收件人邮箱
+ * @property {string} conversationid - 会话ID
+ * @property {string} quoteid - 引用邮件ID
+ */
+const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEmail, conversationid, quoteid, initial = {}, mailData: _mailData, action = 'reply', ...props }) => {
+ const { notification, message } = App.useApp();
+ const [form] = Form.useForm();
+
const [mobile] = useStyleStore((state) => [state.mobile]);
const [userId, username, emailList] = useAuthStore((state) => [state.loginUser.userId, state.loginUser.username, state.loginUser.emailList]);
const emailListOption = emailList?.map(ele => ({ ...ele, label: ele.email, key: ele.email, value: ele.email })) || [];
- const emailListMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.opi_sn]: v }), {});
+ // const emailListMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.opi_sn]: v }), {});
const emailListAddrMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.email]: v }), {});
const emailListMatMapped = emailListOption?.reduce((r, v) => ({ ...r, [v.mat_sn]: v }), {});
// console.log('emailListMapped', emailListOption, emailListAddrMapped);
const mai_sn = quoteid;
- const { loading, mailData } = useEmailDetail(mai_sn, _mailData)
+ const { loading: getLoading, mailData } = useEmailDetail(mai_sn, _mailData)
- const [newFromEmail, setNewFromEmail] = useState(fromEmail);
- const [newToEmail, setNewToEmail] = useState(toEmail);
- const [emailOPI, setEmailOPI] = useState(fromUser);
+ const [stickToProps, setStickToProps] = useState({});
+
+ const [newFromEmail, setNewFromEmail] = useState('');
+ const [newToEmail, setNewToEmail] = useState('');
+ const [emailOPI, setEmailOPI] = useState('');
+ const [emailOrder, setEmailOrder] = useState('');
const [emailMat, setEmailMat] = useState('');
- useEffect(() => {
- const emailUser = mailData.info?.MAI_OPI_SN || fromUser // quote.order_opi
- const emailUserMat = mailData.info?.MAI_MAT_SN
- // const _default =
- // emailListOption?.find((ele) => ele.opi_sn === emailUser && ele.default === true) ||
- // emailListOption?.find((ele) => ele.opi_sn === emailUser && ele.backup === true) ||
- // emailListOption?.find((ele) => ele.opi_sn === emailUser) ||
- // emailListOption?.find((ele) => ele.default === true) ||
- // emailListOption?.find((ele) => ele.backup === true)
+ // 存储: 会话ID,
+ // 这个窗口没有模态, 即使不是focus, 还是需要保持会话ID
+ // 否则, 会话列表切换之后, 会话ID更新, 导致消息关联错误
+ const [stickToCid, setStickToCid] = useState(conversationid);
+ useEffect(() => {
+ // console.log('emailEditorPopup effect', open, '\nto', toEmail)
+ setStickToProps({ fromEmail, fromUser, fromOrder, toEmail, conversationid, quoteid, action });
- setNewFromEmail(fromEmail);
- setEmailOPI(emailUser);
- setNewToEmail(toEmail);
+ setStickToCid(conversationid)
+ setEmailOrder(fromOrder)
+ setEmailOPI(fromUser)
+ setNewFromEmail(fromEmail)
+ setNewToEmail(toEmail)
const _findMat = emailListAddrMapped?.[fromEmail]?.mat_sn
- setEmailMat(emailUserMat || _findMat)
+ setEmailMat(_findMat)
- // 转发/回复时, 从发出的邮件操作, 获取原来的发件人邮箱
- const _findMatOld = emailListMatMapped?.[emailUserMat]
- if (isEmpty(_findMat) && _findMatOld) {
+ if (open !== true) {
+ form.resetFields()
+ }
+
+ return () => {
+ setStickToProps({})
+ setStickToCid('')
+ setEmailOrder('')
+ setEmailOPI('')
+ setNewFromEmail('')
+ setNewToEmail('')
+ }
+ }, [open])
+
+ // 转发/回复时, 使用详情的账户信息
+ useEffect(() => {
+ const reEmailO = mailData.info?.MAI_COLI_SN
+ const reEmailUser = mailData.info?.MAI_OPI_SN
+ const reEmailUserMat = mailData.info?.MAI_MAT_SN
+
+ setEmailOrder(prev => reEmailO || prev);
+ setEmailOPI(prev => reEmailUser || prev);
+ setEmailMat(prev => reEmailUserMat || prev)
+
+ const _findMatOld = emailListMatMapped?.[reEmailUserMat]
+ if (_findMatOld) {
setNewFromEmail(_findMatOld.email)
setEmailOPI(_findMatOld.opi_sn)
setEmailMat(_findMatOld.mat_sn)
}
return () => {}
- }, [open, fromEmail, fromUser, toEmail, mailData])
+ }, [mailData])
const handleSwitchEmail = (labelValue) => {
const { value } = labelValue
@@ -120,24 +157,6 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, toEmail, convers
setEmailOPI(_findMat?.opi_sn)
};
-
- const { notification, message } = App.useApp();
- const [form] = Form.useForm();
-
- // 存储会话ID,
- // 这个窗口没有模态, 即使不是focus, 还是需要保持会话ID
- // 否则, 会话列表切换之后, 会话ID更新, 导致消息关联错误
- const [stickToCid, setStickToCid] = useState(conversationid);
- useEffect(() => {
- setStickToCid(conversationid)
- if (open !== true) {
- form.resetFields();
- }
-
- return () => {}
- }, [open])
-
-
const [isRichText, setIsRichText] = useState(mobile === false);
// const [isRichText, setIsRichText] = useState(false); // 默认纯文本
const [htmlContent, setHtmlContent] = useState('');
@@ -164,9 +183,6 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, toEmail, convers
const [initialForm, setInitialForm] = useState({});
const [initialContent, setInitialContent] = useState('');
- /**
- * 加载邮件数据
- */
useEffect(() => {
// console.log('quoteid', quoteid, isEmpty(quoteid), isEmpty(mailData.info));
@@ -184,12 +200,12 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, toEmail, convers
}
const _formValues = {
- to: info?.MAI_From || fromEmail,
+ to: info?.MAI_From || newFromEmail,
cc: info?.MAI_CS || '',
// bcc: quote.bcc || '',
subject: `Re: ${info.MAI_Subject || ''}`,
};
- const forwardValues = { subject: `Fw: ${info.subject || ''}` };
+ const forwardValues = { subject: `Fw: ${info.MAI_Subject || ''}` };
if (action === 'reply') {
form.setFieldsValue(_formValues);
setInitialForm(_formValues);
@@ -209,13 +225,13 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, toEmail, convers
setInitialContent(thisBody)
} else if (action === 'new') {
- const newEmail = { to: toEmail, }
+ const newEmail = { to: newToEmail, }
form.setFieldsValue(newEmail);
setInitialForm(newEmail);
}
return () => {};
- }, [open, action, mailData.info]);
+ }, [stickToProps, mailData.info, newToEmail, newFromEmail]);
const [openPlainTextConfirm, setOpenPlainTextConfirm] = useState(false);
const handlePlainTextOpenChange = ({ target }) => {
@@ -306,15 +322,16 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, toEmail, convers
const [sendLoading, setSendLoading] = useState(false);
const onHandleSend = async () => {
- console.log('onSend callback', '\nisRichText', isRichText);
+ // console.log('onSend callback', '\nisRichText', isRichText);
// console.log(form.getFieldsValue());
const body = structuredClone(form.getFieldsValue());
body.mailcontent = isRichText ? htmlContent : textContent;
- body.from = newFromEmail || fromEmail;
+ body.from = newFromEmail;
body.attaList = fileList;
body.opi_sn = emailOPI;
body.mat_sn = emailMat;
- console.log('body', body);
+ body.coli_sn = emailOrder || '';
+ // console.log('body', body, '\n', emailOrder);
const values = await form.validateFields();
body.cc = values.cc || '';
body.bcc = values.bcc || '';
@@ -338,14 +355,14 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, toEmail, convers
try {
const bubbleMsg = cloneDeep(msgObj);
bubbleMsg.id = `${stickToCid}.${msgObj.id}`;
- bubbleMsg.email.mai_sn = '';
+ // bubbleMsg.email.mai_sn = '';
bubbleMsg.content = undefined;
- invokeEmailMessage(bubbleMsg);
+ // invokeEmailMessage(bubbleMsg);
const result = await postSendEmail(body);
- // const mailSavedId = result.id || '';
- // bubbleMsg.email.mai_sn = mailSavedId;
- // invokeEmailMessage(bubbleMsg);
+ const mailSavedId = result.id || '';
+ bubbleMsg.email.mai_sn = mailSavedId;
+ invokeEmailMessage(bubbleMsg);
// setSendLoading(false);
@@ -358,8 +375,9 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, toEmail, convers
duration: 3,
});
+ } finally {
+ setSendLoading(false);
}
- setSendLoading(false);
};
@@ -382,8 +400,8 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, toEmail, convers
}}
title={
<>
- {loading ?
: null}
- {initialForm.subject || `${!isEmpty(quoteid) ? '回复: ' : '写邮件: '} ${fromEmail || ''}`}
+ {getLoading ?
: null}
+ {initialForm.subject || `${!isEmpty(quoteid) ? '回复: ' : '写邮件: '} ${newFromEmail || ''}`}
}
footer={
diff --git a/src/views/Conversations/Online/Input/EmailNewBtn.jsx b/src/views/Conversations/Online/Input/EmailNewBtn.jsx
index a06d815..74d2651 100644
--- a/src/views/Conversations/Online/Input/EmailNewBtn.jsx
+++ b/src/views/Conversations/Online/Input/EmailNewBtn.jsx
@@ -46,6 +46,7 @@ const EmailNewBtn = ({ ...props }) => {
setFromEmail(email_addr)
setToEmail(currentConversation?.channels?.email || customerDetail?.email || '')
}
+
return (
@@ -80,7 +81,16 @@ const EmailNewBtn = ({ ...props }) => {
} type='primary' onClick={() => openEditor(pickEmail.key)}>
新邮件
-
+
)
diff --git a/src/views/Conversations/Online/MessagesWrapper.jsx b/src/views/Conversations/Online/MessagesWrapper.jsx
index 3774d56..2710004 100644
--- a/src/views/Conversations/Online/MessagesWrapper.jsx
+++ b/src/views/Conversations/Online/MessagesWrapper.jsx
@@ -211,6 +211,7 @@ const MessagesWrapper = ({ updateRead = true, forceGetMessages }) => {
setOpen={setOpenEmailEditor}
fromEmail={fromEmail}
fromUser={Number(orderDetail?.opi_sn || userId)}
+ fromOrder={currentConversation.coli_sn}
quoteid={ReferEmailMsg.mai_sn || ReferEmailMsg.id}
conversationid={currentConversation.sn}
key={`email-msg-reply-top-popup_${ReferEmailMsg.id}`}
diff --git a/src/views/Conversations/Online/order/CustomerProfile.jsx b/src/views/Conversations/Online/order/CustomerProfile.jsx
index a8ad89c..3c5cdef 100644
--- a/src/views/Conversations/Online/order/CustomerProfile.jsx
+++ b/src/views/Conversations/Online/order/CustomerProfile.jsx
@@ -55,7 +55,7 @@ const CustomerProfile = () => {
fetchOtherEmail(currentOrder)
.then(result => {
- console.info(result)
+ // console.info(result)
})
.finally(() => setLoading(false))
.catch(reason => {