From 9242df0037ee7dd11a649a3cb5ade18152cf9654 Mon Sep 17 00:00:00 2001 From: manhtai Date: Fri, 13 May 2022 11:28:48 +0700 Subject: [PATCH] Filename input (#20) --- package.json | 1 + src/components/merge/MailMerge.tsx | 58 +++++++++++++++++-- src/components/pdf/PdfEditor.tsx | 1 + src/main.dev.ts | 92 +++++++++++++++--------------- src/package.json | 2 +- src/render.ts | 87 +++++++++++++++++++--------- yarn.lock | 5 ++ 7 files changed, 166 insertions(+), 80 deletions(-) diff --git a/package.json b/package.json index aa26e49..8f06d0b 100644 --- a/package.json +++ b/package.json @@ -277,6 +277,7 @@ "react-sizeme": "^3.0.1", "regenerator-runtime": "^0.13.5", "source-map-support": "^0.5.19", + "unidecode-plus": "^1.0.4", "xlsx": "^0.17.0" }, "devEngines": { diff --git a/src/components/merge/MailMerge.tsx b/src/components/merge/MailMerge.tsx index 9a36930..6d8a302 100644 --- a/src/components/merge/MailMerge.tsx +++ b/src/components/merge/MailMerge.tsx @@ -30,6 +30,7 @@ const MailMerge = ({ configPath }: MailMergeProps) => { const [outputPdf, setOutputPdf] = useState(''); const [smtpValid, setSmtpValid] = useState(false); const [tab, setTab] = useState('local'); + const [filename, setFilename] = useState(''); const tagSettings = { pattern: /@/, @@ -65,6 +66,10 @@ const MailMerge = ({ configPath }: MailMergeProps) => { setBody(e.detail.value); }; + const handleChangeFilename = (e: any) => { + setFilename(e.detail.value); + }; + const handleChooseFile = () => { const name = 'PDF file'; const extensions = ['pdf']; @@ -76,20 +81,21 @@ const MailMerge = ({ configPath }: MailMergeProps) => { const handleSendEmail = async () => { setSending(true); + const conf = { ...pdfConfig, filename }; await ipcRenderer.invoke( 'send-email', fromEmail, emailIndex, subject, body, - pdfConfig + conf ); setSending(false); }; const handleSavePdf = async () => { setSaving(true); - const conf = { ...pdfConfig, combinePdf, outputPdf }; + const conf = { ...pdfConfig, combinePdf, outputPdf, filename }; await ipcRenderer.invoke('save-pdf', conf); setSaving(false); }; @@ -117,7 +123,7 @@ const MailMerge = ({ configPath }: MailMergeProps) => {