From bfdc60f3a981fc0faf371b3546c118a914eea22a Mon Sep 17 00:00:00 2001
From: Jimmy Liow <18777396951@163.com>
Date: Fri, 4 Aug 2023 10:45:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=BC=80=E5=B1=95=E7=A4=BA=E6=AF=8F?=
 =?UTF-8?q?=E6=AC=A1=E5=8F=98=E6=9B=B4=E7=A1=AE=E8=AE=A4=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reservation/Detail.jsx | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/views/reservation/Detail.jsx b/src/views/reservation/Detail.jsx
index 2263c8f..1a1f54f 100644
--- a/src/views/reservation/Detail.jsx
+++ b/src/views/reservation/Detail.jsx
@@ -24,7 +24,7 @@ function Detail() {
     },
     {
       title: 'Confirmation Details',
-      dataIndex: 'PCI_ConfirmText',
+      render: detailTextRender
     },
     {
       title: 'Attachments',
@@ -39,6 +39,15 @@ function Detail() {
       render: confirmRender
     },
   ];
+
+  function detailTextRender(text, confirm) {
+    const formattedText = confirm.PCI_ConfirmText;//.replace(/\;/g, "\n——————————————————————\n");
+    return (
+      <div style={{whiteSpace: 'pre-line'}}>
+      {formattedText}
+      </div>
+    );
+  }
     
   function attachmentRender(text, confirm) {
     return (
@@ -82,13 +91,14 @@ function Detail() {
 
   const showConfirmModal = (confirm) => { 
     setIsModalOpen(true);
-    setConfirmText(confirm.PCI_ConfirmText);
+    const formattedText = confirm.PCI_ConfirmText;//.replace(/\;/g, "\n——————————————————————\n");
+    setConfirmText(formattedText);
     reservationStore.editConfirmation(confirm);
   };
 
   const handleOk = () => {
     setConfirmLoading(true);
-    reservationStore.submitConfirmation(confirmText + ';' +newConfirmText)
+    reservationStore.submitConfirmation(confirmText + '\n——————————————————————\n' +newConfirmText)
       .finally(() => {
         setNewConfirmText('');
         setIsModalOpen(false);
@@ -124,8 +134,13 @@ function Detail() {
       >
         <Title level={4}>Confirm</Title>
         <Paragraph>
-          <blockquote>{confirmText}</blockquote>
+          <blockquote>
+            <div style={{whiteSpace: 'pre-line'}}>
+              {confirmText}
+            </div>
+          </blockquote>
         </Paragraph>
+
         <TextArea
           value={newConfirmText}
           onChange={(e) => setNewConfirmText(e.target.value)}
@@ -168,4 +183,4 @@ function Detail() {
   );
 }
 
-export default observer(Detail);
\ No newline at end of file
+export default observer(Detail);