From 7c8d60bdca1693cca0099e79620128b21dac5d0a Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 11 Mar 2024 16:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=B0=E5=BD=95=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=A1=8C=E7=BC=A9=E8=BF=9B-=E7=BE=A4=E9=87=8C?=
 =?UTF-8?q?=E6=8F=90=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/Files.jsx | 7 ++++---
 src/forge/Merge/merge.css | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 4610a1b77..d0e58b45f 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -131,10 +131,11 @@ function Files({ data,history,owner,projectsId , parentsSha }){
                                     <span>{item.leftIdx && item.leftIdx !=="0" ? item.leftIdx :"" }</span>
                                     <span>{item.rightIdx && item.rightIdx !=="0" ? item.rightIdx :"" }</span>
                                   </span>
-                                  <p style={{display:"flex"}}>
+                                  <div style={{display:"flex"}}>
                                     <span className="linetype">{item.type===2 ? "+" : item.type===3 ? "-" :""}</span>
-                                    { (item.type===3 || item.type===2) ? subStrContent(item.content) : item.content}
-                                  </p>
+                                    <div dangerouslySetInnerHTML={{__html:(item.type===3 || item.type===2) ? subStrContent(item.content) : item.content}}></div>
+                                    {/* <div><span style={{whiteSpace:"pre-wrap"}}>{(item.type===3 || item.type===2) ? subStrContent(item.content) : item.content}</span></div> */}
+                                  </div>
                                 </div>
                               )
                             })
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index a338c2909..d467300a2 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -182,10 +182,11 @@ form .ant-cascader-picker, form .ant-select {
   color: #333;
   flex-wrap: wrap;
 }
-.linesContent > p{
+.linesContent > div{
   flex:1;
   word-break: break-all;
-  /* white-space: pre; */
+  white-space: pre-wrap;
+  font-family: auto;
 }
 .linesContent .lines{
   display: flex;