From 13d3bc13763aff602941dbb29eff9125a0f6cff9 Mon Sep 17 00:00:00 2001 From: Lei OT Date: Fri, 10 Jan 2025 10:43:06 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=89=8D=E7=AB=AF):=20WhatsApp=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF,=20=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E5=8F=91=E9=80=81=E6=9C=AA=E7=BA=AF=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Conversations/Online/Input/ComposerTools.jsx | 2 +- src/views/Conversations/Online/Input/Template.jsx | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/Conversations/Online/Input/ComposerTools.jsx b/src/views/Conversations/Online/Input/ComposerTools.jsx index 0216085..a2002ba 100644 --- a/src/views/Conversations/Online/Input/ComposerTools.jsx +++ b/src/views/Conversations/Online/Input/ComposerTools.jsx @@ -17,7 +17,7 @@ const ComposerTools = ({ channel, invokeSendUploadMessage, invokeSendMessage, in return ( <> - {['waba'].includes(channel) && } + {['waba', 'wai'].includes(channel) && } diff --git a/src/views/Conversations/Online/Input/Template.jsx b/src/views/Conversations/Online/Input/Template.jsx index 124960a..8120d09 100644 --- a/src/views/Conversations/Online/Input/Template.jsx +++ b/src/views/Conversations/Online/Input/Template.jsx @@ -160,7 +160,7 @@ const CategoryList = ({ dataSource, handleSendTemplate, valueMapped, onInput, ac ) } -const InputTemplate = ({ disabled = false, invokeSendMessage }) => { +const InputTemplate = ({ disabled = false, invokeSendMessage, channel }) => { const [mobile] = useStyleStore((state) => [state.mobile]); const searchInputRef = useRef(null); @@ -240,6 +240,10 @@ const InputTemplate = ({ disabled = false, invokeSendMessage }) => { }, template_origin: fromTemplate, }; + const plainTextMsgObj = { + type: 'text', + text: msgObj.template.components.map((citem) => citem.text).join(''), + }; if (valid !== true) { notification.warning({ message: '提示', @@ -250,7 +254,7 @@ const InputTemplate = ({ disabled = false, invokeSendMessage }) => { }); return false; } - invokeSendMessage(msgObj); + invokeSendMessage(channel === 'waba' ? msgObj : plainTextMsgObj); setOpenTemplates(false); setActiveInput({}); }; @@ -314,7 +318,7 @@ const InputTemplate = ({ disabled = false, invokeSendMessage }) => { ...(Object.keys(templateLangMapped).map(lang => ({ key: lang, label: lang.toUpperCase(), children: }))) - ]} defaultActiveKey='utility' tabBarExtraContent={{right: , }} size='small' /> + ]} defaultActiveKey='utility' tabBarExtraContent={{right: , }} size='small' /> ) : ( // Search result