durian
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

&&

This commit is contained in:
caishi 2020-11-12 14:43:33 +08:00
parent 0c59855e9c
commit 49795b0682
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Main/CoderRootDirectory.js
View File

@ -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>
),
},

5
src/forge/Merge/Files.jsx
View File

@ -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>
{

2
src/forge/Merge/merge_form.js
View File

@ -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 {