-
-
-
- {dataCount}次提交代码({branch})
-
-
- {
- commitDatas && commitDatas.length > 0 && commitDatas.map((item,k)=>{
- return(
-
+
+ )
+ })
+ }
+ {commitDatas && commitDatas.length === 0 &&
-
- {truncateCommitId(`${item.sha}`)}
- {item.message}
-
-
+ {
+ commitDatas && commitDatas.length > 0 && commitDatas.map((item,k)=>{
+ return(
+ 最新:}>
+
-
- {
- item.id ?
-
- {item.image_url?:""}
-
- :
-
- {item.image_url?
:""}
-
-
- }
-
-
+
- )
- })
- }
- {commitDatas && commitDatas.length === 0 &&
+
+ {item.message}
+
+
+
+ {
+ item.id ?
+
+ {item.image_url?:""}
+
+ :
+
+ {item.image_url?
:""}
+
+
+ }
+
+
+
+
+
+ 
+ {truncateCommitId(`${item.sha}`)}
+
+
+
+
+
+
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js
index b5d241968..b740ca7e2 100644
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@@ -108,7 +108,7 @@ class CoderRootIndex extends Component{
() => ( (
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 6e7ae731b..6e0c300c4 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -402,6 +402,16 @@
cursor: pointer;
background: #FAFBFC;
border-radius: 4px;
+ .ant-dropdown-menu-item{
+ border-radius: 8px;
+ text-align: left!important;
+ a{
+ width: 350px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
border: 1px solid #D0D0D0;
font-size: 15px;
font-weight: normal;
diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss
index 72c3437e9..a6666ce17 100644
--- a/src/forge/Main/list.scss
+++ b/src/forge/Main/list.scss
@@ -718,12 +718,76 @@ a.color-grey-ccc:hover{
padding:0px 30px;
min-height: 400px;
}
-.commitList > div{
- border-bottom: 1px solid #EEEEEE;
- padding:16px 0px;
-}
-.commitList > div:last-child{
- border-bottom: none;
+
+.main{
+ margin: 30px auto;
+ .ant-timeline{
+ margin-top: 28px;
+ .commitList-item{
+ position: relative;
+ padding: 20px 20px;
+ background: #FAFCFF;
+ border: 1px solid rgba(42, 97, 255, 0.23);
+ border-radius: 4px;
+ margin-left: 16px;
+ align-items: center;
+ &:after,&:before{
+ content: "";
+ position: absolute;
+ left: -10px;
+ top: 10px;
+ border-top: 6px solid transparent;
+ border-bottom: 6px solid transparent;
+ border-right: 10px solid rgba(42, 97, 255, 0.23);
+ }
+ &:after{
+ left: -8px;
+ border-right: 10px solid #FAFCFF;
+ &:hover{
+ border-right: 10px solid #EEF6FF;
+ }
+ }
+ &:hover{
+ background: #EEF6FF;
+ border: 1px solid rgba(42, 97, 255, 0.58);
+ &:after{
+ border-right: 10px solid #EEF6FF;
+ }
+ &:before{
+ border-right: 10px solid rgba(42, 97, 255, 0.58);
+ }
+ }
+ .treecopy-cont{
+ padding: 4px 15px;
+ }
+ .btn-83{
+ margin-left: 20px;
+ }
+ }
+ .ant-timeline-item{
+ padding: 8px 0 20px;
+ }
+ .ant-timeline-item-tail{
+ height: calc(100% - 20px);
+ border-left: 2px solid #EEEEEE;
+ top: 12px;
+ &:after{
+ content: ' ';
+ height: 0;
+ position: absolute;
+ width: 0;
+ border: 7px solid transparent;
+ border-top-color: #EEEEEE;
+ top: 100%;
+ left: 50%;
+ margin-left: -8px;
+ }
+ }
+ .ant-timeline-item-head-custom{
+ top:20px;
+ padding: 0 1px;
+ }
+ }
}
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index 83268b9e9..5e3ab9440 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -86,7 +86,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
:""
}
- {
+ {/* {
item.menu_name === "resources" &&
@@ -95,7 +95,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
{projectDetail && projectDetail.source_count ? {projectDetail.source_count} :""}
- }
+ } */}
{
item.menu_name === "versions" &&
diff --git a/src/forge/Main/tree/Index.scss b/src/forge/Main/tree/Index.scss
index 964fee19e..30c2fce7b 100644
--- a/src/forge/Main/tree/Index.scss
+++ b/src/forge/Main/tree/Index.scss
@@ -34,48 +34,61 @@
margin-right: 5px;
}
}
- .treecopy{
- flex:1;
- display: flex;
- justify-content: center;
- &>div{
- height: 32px;
- background: #FAFBFC;
- border-radius: 4px;
- border: 1px solid #D0D0D0;
- position: relative;
- z-index: 1;
- display: flex;
- align-items: center;
- &>span{
- padding:0px 15px;
- border-right: 1px solid rgba(153, 153, 153, 0.4);
- height: 100%;
- img{
- margin-right: 4px;
- }
- a{
- color: #466AFF;
- &:hover{
- text-decoration: underline;
- }
- }
- }
- &>i{
- margin:0px 12px;
- color: #333!important;
- }
- input{
- position: absolute;
- z-index: 0;
- opacity: 0;
- top: 32px;
- }
- }
- }
.treeabout{
flex:1;
text-align: right;
}
}
+}
+.treecopy{
+ flex:1;
+ display: flex;
+ justify-content: center;
+ &>div{
+ height: 32px;
+ background: #FAFBFC;
+ border-radius: 4px;
+ border: 1px solid #D0D0D0;
+ position: relative;
+ z-index: 1;
+ display: flex;
+ align-items: center;
+ &>span{
+ padding:0px 15px;
+ border-right: 1px solid rgba(153, 153, 153, 0.4);
+ height: 100%;
+ img{
+ margin-right: 4px;
+ }
+ a{
+ color: #466AFF;
+ &:hover{
+ text-decoration: underline;
+ }
+ }
+ }
+ &>i{
+ margin:0px 12px;
+ color: #333!important;
+ }
+ input{
+ position: absolute;
+ z-index: 0;
+ opacity: 0;
+ top: 32px;
+ }
+ }
+}
+.new-conmmit{
+ width: 30px;
+ height: 18px;
+ line-height: 18px;
+ display: block;
+ background: #FF6832;
+ color: white;
+ font-size: 12px;
+ border-radius: 4px;
+}
+.icon-a-yuanquan2x{
+ color: #466AFF;
}
\ No newline at end of file
diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 82a8638c6..64f09a787 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -1,11 +1,15 @@
import React ,{useEffect,useState } from 'react';
import { truncateCommitId } from '../common/util';
import { AlignCenter , FlexAJ } from '../Component/layout';
-import { Button } from 'antd';
+import { Button, Tooltip,Progress, Popover, Anchor } from 'antd';
import './merge.css';
+import './Index.scss';
+
+const {Link} =Anchor;
function Files({data,history,owner,projectsId}){
const [ files , setFiles ] = useState(data && data.files);
+ const [ copyfileTipTitle, setCopyfileTipTitle] = useState("复制文件路径");
useEffect(()=>{
if(data){
@@ -22,35 +26,82 @@ function Files({data,history,owner,projectsId}){
}
}
+ function copyFileName(fileName){
+ var copyCont = document.createElement('input');
+ copyCont.defaultValue = fileName;
+ document.body.appendChild(copyCont);
+ copyCont.select(); // 选择对象
+ document.execCommand("Copy"); // 执行浏览器复制命令
+ copyCont.className = 'copyCont';
+ copyCont.style.display='none';
+ setCopyfileTipTitle("复制成功");
+ }
+
+ const folderOpen = (
+
+
+ )
+
return(
+
{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) => {
+ return (
+ {item.flag && showDown(item.flag, key, item.isBin);}}>
+
+
+ {/* {!item.isBin ? showDown(item.flag, key, item.isBin)}> : ""} */}
+ {item.name}
+
+
+
+ 0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${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} 次删除:""}
-
+
+
{
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 936b868f8..19f24c613 100644
--- a/src/forge/Merge/Index.scss
+++ b/src/forge/Merge/Index.scss
@@ -18,4 +18,78 @@
.pr_tags_closed{
border:1px solid #FA6400;
color: #FA6400;
+}
+
+.color-grey-3{
+ font-weight: bold;
+}
+.invisable{
+ display: none;
+}
+.fileList{
+ .sc-bxivhb{
+ width: 55rem;
+ }
+ .see-file{
+ width: 15rem;
+ .ml10{
+ display: inline-block;
+ width: 5rem;
+ cursor: default;
+ }
+ 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,.ant-anchor-ink-ball {
+ display: none;
+}
+.ant-popover-inner {
+ margin-left: -21px;
+ background: #FFF;
+}
+.ant-anchor-link,.ant-popover-inner-content{
+ padding: 0 0;
+}
+.ant-anchor-wrapper,.ant-anchor{
+ margin-left: 0;
+ padding-left: 0;
+}
+.ant-anchor-link-active > .ant-anchor-link-title {
+ color: #466AFF;
+}
+.ant-popover-inner-content{
+ color: #333333;
+ width: 75rem;
+ .folderList{
+ max-height: 280px;
+ overflow:auto;
+ .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 6b50eeb10..088874c19 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/Settings/Setting.js b/src/forge/Settings/Setting.js
index 55c1efdda..c3150323f 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -16,7 +16,7 @@ const menu = [
{name:"合并请求",index:"pulls"},
{name:"Wiki",index:"wiki"},
{name:"工作流(beta版)",index:"devops"},
- {name:"资源库",index:"resources"},
+ // {name:"资源库",index:"resources"},
{name:"里程碑",index:"versions"},
{name:"动态",index:"activity"},
]
diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx
index 499a00c20..1b3dc8422 100644
--- a/src/forge/Team/Setting/TeamSettingCommon.jsx
+++ b/src/forge/Team/Setting/TeamSettingCommon.jsx
@@ -122,7 +122,11 @@ export default Form.create()(
validator:checkname
}
],
+<<<<<<< HEAD
+ ,true
+=======
,true
+>>>>>>> 465ae57b071299c682f2c8d57d3380aa647c7d23
)}
{helper(
"组织名称：",
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index 03bbbc42e..9c2c60b4b 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -91,11 +91,14 @@ ul,ol,dl{
}
.commitDesc{
flex:1;
- margin-left:20px;
- font-size:16px;
- color:#333;
- line-height:26px;
+ line-height:20px;
word-break: break-all;
+ width: 48rem;
+ overflow: hidden;
+ white-space: normal;
+ &:hover{
+ text-decoration: underline;
+ }
}
.normalBox{
@@ -297,17 +300,31 @@ form{
border-radius: 5px;
font-weight: 500;
color: #333333!important;
- &:hover,&:active{
+ &:hover{
background: #F3F4F6;
color: #333333!important;
}
+ &:active{
+ background: #D0D0D0;
+ 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);
+ border-color:rgba(70, 106, 255, 0.85);
}
}
\ No newline at end of file
+ 0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${item.deletion>0?item.deletion+"处删除":""}`}>
+
+ {history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件
+