From 9dd0ed5102d4267956dd008300830fe8caf0b7de Mon Sep 17 00:00:00 2001 From: Lei OT Date: Tue, 26 Mar 2024 09:35:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A8=A1=E6=9D=BF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/msgUtils.js | 20 +++++++++++++++++++ .../Conversations/Components/MessagesList.jsx | 10 +++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/lib/msgUtils.js b/src/lib/msgUtils.js index b524c61..21de89a 100644 --- a/src/lib/msgUtils.js +++ b/src/lib/msgUtils.js @@ -185,6 +185,26 @@ export const sentMsgTypeMapped = { // const footer = msg.template_origin.components?.footer?.[0]?.text || ''; return { ...msg, + template: { + ...msg.template, + components: [ + ...msg.template.components.filter((com) => !['footer', 'buttons', 'header'].includes(com.type.toLowerCase())), + ...(msg.template.components.filter((com) => 'header' === com.type.toLowerCase()).length > 0 + ? msg.template.components + .filter((com) => 'header' === com.type.toLowerCase()) + .map((ele) => ({ type: 'header', parameters: [{ text: ele.text, type: ele.format.toLowerCase(), [ele.format.toLowerCase()]: { link: ele.example.header_url[0] } }] })) + : []), + ...(msg.template.components.filter((com) => 'buttons' === com.type.toLowerCase()).length > 0 + ? msg.template.components + .filter((com) => 'buttons' === com.type.toLowerCase())[0] + // .buttons.filter((btns) => ! ['phone_number', 'url'].includes( btns.type.toLowerCase())) + .buttons.filter((btns) => ! isEmpty(btns.example)) // 静态按钮不发 + .map((btn, btnI) => ({ type: 'button', sub_type: btn.type.toLowerCase(), index: btnI, + // parameters: [{ text: 'lq1FTtA8', type: 'text' }] + })) + : []), + ], + }, actionId: msg.id, conversationid: msg.id.split('.')[0], type: 'text', diff --git a/src/views/Conversations/Components/MessagesList.jsx b/src/views/Conversations/Components/MessagesList.jsx index fdfeea0..4841b5e 100644 --- a/src/views/Conversations/Components/MessagesList.jsx +++ b/src/views/Conversations/Components/MessagesList.jsx @@ -60,11 +60,11 @@ const MessagesList = ({ messages, handlePreview, reference, longListLoading, get {headerObj ? (
- {'text' === headerObj.format.toLowerCase() &&
{headerObj.text}
} - {'image' === headerObj.format.toLowerCase() && } - {['document', 'video'].includes(headerObj.format.toLowerCase()) && ( - - [ {headerObj.format} ] + {'text' === (headerObj?.parameters?.[0]?.type || '').toLowerCase() &&
{headerObj.text}
} + {'image' === (headerObj?.parameters?.[0]?.type || '').toLowerCase() && } + {['document', 'video'].includes((headerObj?.parameters?.[0]?.type || '').toLowerCase()) && ( +
+ [ {headerObj.parameters[0].type} ] )}