fix(TransmitModal): 更新转发确认逻辑并优化联系人显示
修正了转发确认时的参数传递,确保选中的微信好友能够正确传递给onConfirm回调。同时,在联系人显示中添加了备注信息的支持,提升了用户体验。
This commit is contained in:
@@ -21,7 +21,7 @@ import { useWeChatStore } from "@/store/module/weChat/weChat";
|
||||
import { ContractData, weChatGroup } from "@/pages/pc/ckbox/data";
|
||||
|
||||
export interface TransmitModalProps {
|
||||
onConfirm?: (params: ContractData[] | weChatGroup[]) => void; // 可选,因为会自动更新到store
|
||||
onConfirm?: (params: (ContractData | weChatGroup)[]) => void; // 可选,因为会自动更新到store
|
||||
}
|
||||
|
||||
const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
|
||||
@@ -100,7 +100,9 @@ const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
|
||||
|
||||
// 确认转发
|
||||
const handleConfirm = () => {
|
||||
console.log("handleConfirm");
|
||||
console.log("handleConfirm", selectedWechatFriend);
|
||||
onConfirm?.(selectedWechatFriend);
|
||||
updateTransmitModal(false);
|
||||
};
|
||||
|
||||
// 检查联系人是否已选择
|
||||
@@ -108,11 +110,6 @@ const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
|
||||
return selectedWechatFriend.some(contact => contact.id === contactId);
|
||||
};
|
||||
|
||||
// 重试加载
|
||||
const handleRetry = () => {
|
||||
loadContacts();
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal
|
||||
title="转发消息"
|
||||
@@ -187,6 +184,7 @@ const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
|
||||
/>
|
||||
<span className={styles.contactName}>
|
||||
{contact.nickname}
|
||||
{contact.conRemark && `-(${contact.conRemark})`}
|
||||
</span>
|
||||
{contact.type === "group" && (
|
||||
<TeamOutlined className={styles.groupIcon} />
|
||||
@@ -229,6 +227,7 @@ const TransmitModal: React.FC<TransmitModalProps> = ({ onConfirm }) => {
|
||||
/>
|
||||
<span className={styles.contactName}>
|
||||
{contact.nickname}
|
||||
{contact.conRemark && `-(${contact.conRemark})`}
|
||||
</span>
|
||||
{contact.type === "group" && (
|
||||
<TeamOutlined className={styles.groupIcon} />
|
||||
|
||||
Reference in New Issue
Block a user