-
*/}
- {dataCount}次提交代码({branch})
-
- { @@ -166,15 +162,15 @@ class CoderRootCommit extends Component{
-
+
- {truncateCommitId(`${item.sha}`)}
+ {truncateCommitId(`${item.sha}`)}
-
+
+
{commit && commit.message &&
-
+
{commit.message}
+ {commit.message}
}
-
+ {branchName}
+
@@ -68,17 +90,25 @@ export default ({ match , history }) => {
url={(committer && getImageUrl(`/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
name={committer && committer.name}
/>
- {committer && committer.time_from_now && {committer.time_from_now} }
+ {commit && commit.time_from_now && 提交于{commit.time_from_now} }
{
parents && parents.length > 0 && parents.map((item,key)=>{
return(
-
+
+
+ {truncateCommitId(item.sha)}
+
)
})
}
-
+
+
+ {truncateCommitId(sha)}
+
+ {files && files.length>1 && files.map((item, key) => {
+ console.log(item.flag);
+ return (
+ item.flag && showDown(item.flag, key, item.isBin)}>
+
+
+ {/* {!item.isBin ? showDown(item.flag, key, item.isBin)}> : ""} */}
+ {item.name}
+
+
+ )
+ })}
+
+ )
+
return(
+ 0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${item.deletion>0?item.deletion+"处删除":""}`}>
+
+ {item.addition >0 && +{item.addition}}
+ {item.deletion >0 && -{item.deletion}}
+
+
-
-
-
- 共有 {data && data.files_count} 个文件被更改，包括
+
+
+
+ 共有 {data && data.files_count} 个文件 被更改，包括
{ data && data.total_addition ? {data && data.total_addition} 次插入:"" }
{ data && data.total_addition && data.total_deletion ? " 和 ":""}
{ data && data.total_deletion ? {data && data.total_deletion} 次删除:""}
@@ -35,22 +73,29 @@ function Files({data,history,owner,projectsId}){
{
files && files.length>0 &&
-
+
{
files.map((item,key)=>{
return(
- showDown(item.flag,key,item.isBin)}>
+
- {!item.isBin ? :""}
-
- {item.name}
+ {!item.isBin ? showDown(item.flag,key,item.isBin)}>:""}
+ showDown(item.flag,key,item.isBin)}>{item.name}
+ setCopyfileTipTitle("复制文件路径")}
+ >
+ copyFileName(item.name)}>
+
-
-
- +{item.addition}
- -{item.deletion}
-
+
{
item.sections && item.sections.length >= 1 && !item.flag &&
diff --git a/src/forge/Merge/Index.scss b/src/forge/Merge/Index.scss
index 936b868f..71831e2a 100644
--- a/src/forge/Merge/Index.scss
+++ b/src/forge/Merge/Index.scss
@@ -18,4 +18,64 @@
.pr_tags_closed{
border:1px solid #FA6400;
color: #FA6400;
+}
+.color-grey-3{
+ font-weight: bold;
+}
+.fileList{
+ .sc-bxivhb{
+ width: 55rem;
+ }
+ .see-file{
+ width: 15rem;
+ .ml10{
+ display: inline-block;
+ width: 5rem;
+ }
+ span{
+ width: 7%;
+ }
+ }
+}
+.filesInfo{
+ background: #FAFCFF;
+ border-color:rgba(42, 97, 255, 0.23);
+
+
+ .ant-progress-line {
+ width: 5rem;
+ }
+ .ant-progress-inner{
+ background-color: #D14A4A;
+ }
+}
+.ant-popover-arrow {
+ display: none;
+}
+.ant-popover-inner {
+ margin-left: -48px;
+ background: #FFF;
+}
+.ant-popover-inner-content{
+ padding: 0 0;
+ color: #333333;
+ width: 75rem;
+ .folderList{
+ .files{
+ border: 0px;
+ }
+ .filesInfo {
+ padding: 10px 18px 10px 15px;
+ height: 55px;
+ background: #FFF;
+ border-bottom: 1px solid #EEEEEE;
+ &:hover{
+ background: #F3F4F6;
+ }
+ .color-green,.color-red{
+ width: 3%;
+ text-align: right;
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index 6b50eeb1..088874c1 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -152,13 +152,23 @@ form .ant-cascader-picker, form .ant-select {
margin-top: 15px;
border-radius: 2px;
}
+.see-file-btn{
+ color: #466AFF;
+ cursor: pointer;
+}
.filesInfo{
padding:10px 15px;
background-color: #fafafa;
}
+.filesInfo .cursor-pointer{
+ cursor: pointer;
+}
.filesContent{
border-top: 1px solid #ddd;
}
+.icon-fuzhiicon:hover{
+ color: #466AFF;
+}
.linesContent{
display: flex;
min-height: 30px;
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index 52c16632..8d9b9b8d 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -93,6 +93,12 @@ ul,ol,dl{
flex:1;
line-height:20px;
word-break: break-all;
+ width: 48rem;
+ overflow: hidden;
+ white-space: normal;
+ &:hover{
+ text-decoration: underline;
+ }
}
.normalBox{
@@ -303,11 +309,20 @@ form{
color: #333333!important;
}
}
+.shadow{
+ &:hover{
+ background: #F3F4F6;
+ }
+ &:active{
+ background: #D0D0D0;
+ }
+}
a.hover:hover{
text-decoration: underline;
}
button.ant-btn-primary.btnblue{
background-color:rgba(70, 106, 255, 1);
+ border-color:rgba(70, 106, 255, 1);
&:hover{
background-color:rgba(70, 106, 255, 0.85);
}
+ 0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${item.deletion>0?item.deletion+"处删除":""}`}>
+
+ {item.addition+item.deletion}处
+ {history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件
+