From 781241e433106c5784195af7cad14a1a37e61f4a Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 29 Mar 2023 14:14:30 +0800
Subject: [PATCH] =?UTF-8?q?=20commit=20rename=EF=BC=8Cneed=20show=20old=20?=
 =?UTF-8?q?name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/Files.jsx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 6661c1d3c..b55a23ec7 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -72,8 +72,8 @@ function Files({ data,history,owner,projectsId , parentsSha }){
         <div onClick={()=>{setIsOpen(!isOpen)}}>
           <i className={`iconfont mr5 ${isOpen? "font-18 icon-sanjiaoxing-down":"font-16 icon-triangle"}`}></i>
           <span className="color-grey-6 update-file-count">
-          共有<span className="color-grey-3"> {data && data.files_count} 个文件 </span>被更改，包括
-          { data && data.total_addition ? <span className="color-green"> {data && data.total_addition} 次插入</span>:"" }
+          共有<span className="color-grey-3"> {data && data.files_count} 个文件 </span>被更改
+          { data && data.total_addition ? <span>，包括 <span className="color-green">{data && data.total_addition} 次插入</span></span>:"" }
           { data && data.total_addition && data.total_deletion ? " 和 ":""}
           { data && data.total_deletion ? <span className="color-red"> {data && data.total_deletion} 次删除</span>:""}
           </span>
@@ -90,8 +90,12 @@ function Files({ data,history,owner,projectsId , parentsSha }){
                   <a id= {`value${key}`} className="anchorPoint"></a>
                   <FlexAJ className="filesInfo">
                     <AlignCenter>
-                      {!item.isBin ? <i className={!item.flag?"iconfont icon-sanjiaoxing-down color-grey-9 mt4":"iconfont icon-triangle font-15 color-grey-9"} onClick={()=>showDown(item.flag,key,item.isBin)}></i>:""}
-                      <span className="cursor-pointer" data-clipboard-text={item.name} onClick={()=>showDown(item.flag,key,item.isBin)}>{item.name}</span>
+                      {!item.isBin ? <i className={!item.flag?"iconfont icon-sanjiaoxing-down color-grey-9":"iconfont icon-triangle font-15 color-grey-9"} onClick={()=>showDown(item.flag,key,item.isBin)}></i>:""}
+                      <span className="cursor-pointer" data-clipboard-text={item.name} onClick={()=>showDown(item.flag,key,item.isBin)}>
+                        {item.name}
+                        { item.isRenamed && <i className="iconfont icon-youjiang font-12 color-grey-8 ml5 mr5"></i> }
+                        { item.isRenamed && item.old_name}
+                      </span>
                       <Tooltip
                         title={copyfileTipTitle}
                         onVisibleChange={()=>setCopyfileTipTitle("复制文件路径")}