From 49795b0682cead58fc72ae43d6b74507d70ffe5e Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 12 Nov 2020 14:43:33 +0800
Subject: [PATCH] &&

---
 src/forge/Main/CoderRootDirectory.js | 2 +-
 src/forge/Merge/Files.jsx            | 5 +++--
 src/forge/Merge/merge_form.js        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 1ff47e86..1f3593d4 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -432,7 +432,7 @@ class CoderRootDirectory extends Component {
         width:"30%",
         render: (text,item) => (
           <a onClick={()=>this.goToSubRoot(item.path,item.type,text)} className="ml12 task-hide" style={{ display: "block", maxWidth: "345px" }}>
-            <i className={ item.type === "file" ? "iconfont icon-wenjia font-15 color-green-file mr5":"iconfont icon-wenjianjia1 color-green-file font-15 mr5"}></i>{text}
+            <i className={ item.type === "file" ? "iconfont icon-wenjia font-15 color-green-file mr5" : "iconfont icon-wenjianjia1 color-green-file font-15 mr5"}></i>{text}
           </a>
         ),
       },
diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 0adda45f..3a88ab01 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -30,8 +30,9 @@ function Files({data,history,owner,projectsId}){
         <i className="iconfont icon-sanjiaoxing-down mr5"></i>
         <span>
           共有<span className="color-grey-3"> {data && data.files_count} 个文件被更改</span>，包括
-          {data && data.total_addition && <span className="color-green"> {data && data.total_addition} 次插入</span> }
-          { data && data.total_deletion ? <span className="color-red"> 和{data && data.total_deletion} 次删除</span>:""}
+          { data && data.total_addition ? <span className="color-green"> {data && data.total_addition} 次插入</span>:"" }
+          { data && data.total_addition && data.total_deletion ? " 和 ":""}
+          { data && data.total_deletion ? <span className="color-red"> {data && data.total_deletion} 次删除</span>:""}
         </span>
       </AlignCenter>
       {
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 201574be..d8169c5a 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -223,7 +223,7 @@ class MergeForm extends Component {
   };
 
   render() {
-    const { merge_type, data } = this.props;
+    const { merge_type } = this.props;
     const { getFieldDecorator } = this.props.form;
     const { projectsId, mergeId ,owner } = this.props.match.params;
     const {