From 1e1ea499516f1490dc164dd7fd720bc6e0d968eb Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 17 May 2023 11:44:51 +0800
Subject: [PATCH] commit add reduce

---
 src/forge/Merge/Files.jsx  | 13 ++++++++++++-
 src/forge/Merge/Index.scss |  5 +++++
 src/forge/Merge/merge.css  |  1 -
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 8562a0ca4..55799e651 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -66,6 +66,14 @@ function Files({ data,history,owner,projectsId , parentsSha }){
     </div>
   )
 
+  function subStrContent(content){
+    if(content){
+      return content.slice(1);
+    }else{
+      return "";
+    }
+  }
+
   return(
     <div onClick={(e)=>{e.nativeEvent.stopImmediatePropagation()}}>
       <AlignCenter className="color-grey-9" style={{position:'relative'}}>
@@ -127,7 +135,10 @@ 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>{item.content}</p>
+                                  <p 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>
                               )
                             })
diff --git a/src/forge/Merge/Index.scss b/src/forge/Merge/Index.scss
index c50c810cc..476cc0d29 100644
--- a/src/forge/Merge/Index.scss
+++ b/src/forge/Merge/Index.scss
@@ -112,4 +112,9 @@
 .mergeBox{
   margin:0px auto;
   width: 1200px;
+}
+.linetype{
+  width:30px;
+  text-align: center;
+  display: inline-block;
 }
\ No newline at end of file
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index 1a3828872..a338c2909 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -193,7 +193,6 @@ form .ant-cascader-picker, form .ant-select {
   width: 100px;
   padding: 0px 8px;
   box-sizing: border-box;
-  margin-right: 8px;
 }
 .linesContent .lines > span:first-child{
   margin-right: 0px;