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

Merge branch 'pre_develop' of https://git.trustie.net/Gitlink/forgeplus-react into feature_pull_routers

This commit is contained in:
yuzhantian 2021-10-11 09:01:02 +08:00
parent 8a8f8693fe a489271a2f
commit 5a88a1a4e6
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/forge/Main/Diff.jsx
View File

@ -42,6 +42,12 @@ const Infos = styled.div`
} }
} }
`; `;
function turnbar(str){
if(str && str.length>0 && str.indexOf("/")>-1){
return str.replaceAll('/','%2F');
}
return str;
}
//提交详情页 //提交详情页
export default (props) => { export default (props) => {
const {match , history } = props; const {match , history } = props;
@ -81,7 +87,7 @@ export default (props) => {
{commit && commit.message && {commit && commit.message &&
<pre className="task-hide">{commit.message}</pre> <pre className="task-hide">{commit.message}</pre>
} }
<Link to={`/${owner}/${projectsId}/tree/${data.branch}`}><i className="iconfont icon-fenzhi2 font-18"></i>{data.branch}</Link> <Link to={`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`}><i className="iconfont icon-fenzhi2 font-18"></i>{data.branch}</Link>
</div> </div>
<Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="btnblue" style={{height:"36px"}}>浏览文件</Button> <Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="btnblue" style={{height:"36px"}}>浏览文件</Button>
</div> </div>

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

@ -100,7 +100,10 @@ function Files({ data,history,owner,projectsId , parentsSha }){
<Progress showInfo = {false} strokeColor = "#2DB44D" size="small" percent={item.addition/(item.addition+item.deletion)*100} /> <Progress showInfo = {false} strokeColor = "#2DB44D" size="small" percent={item.addition/(item.addition+item.deletion)*100} />
<span className="ml10">{item.addition+item.deletion}处</span> <span className="ml10">{item.addition+item.deletion}处</span>
</Tooltip> </Tooltip>
<span className="see-file-btn" onClick={()=>{history.push(`/${owner}/${projectsId}${item.isDeleted ? `/commits/${truncateCommitId(parentsSha)}`:`/tree/${truncateCommitId(item.sha)}/${item.name}`}`)}}>查看文件</span> {
!item.isSubmodule &&
<span className="see-file-btn" onClick={()=>{history.push(`/${owner}/${projectsId}${item.isDeleted ? `/commits/${truncateCommitId(parentsSha)}`:`/tree/${truncateCommitId(item.sha)}/${item.name}`}`)}}>查看文件</span>
}
</div> </div>
</FlexAJ> </FlexAJ>
{ {

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

@ -361,7 +361,7 @@ class MessageCount extends Component {
to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`} to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
className="ver-middle" className="ver-middle"
> >
{data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)} {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {data.pull_request && data.pull_request.head}
</Link> </Link>
</Tag> </Tag>
<span className="mr8 ver-middle"> <span className="mr8 ver-middle">

6
src/forge/Merge/merge.css
View File

@ -208,4 +208,8 @@ form .ant-cascader-picker, form .ant-select {
} }
.linesContent.add{ .linesContent.add{
background: rgba(48, 232, 132, 0.15); background: rgba(48, 232, 132, 0.15);
} }
.mergeRequest .folders{
width: 72rem;
}

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

@ -119,7 +119,7 @@ class MergeFooter extends Component {
return ( return (
!footer_type && !comparesData || (comparesData && ((comparesData.commits && comparesData.commits.length===0)||(comparesData && !comparesData.diff)) )?"": !footer_type && !comparesData || (comparesData && ((comparesData.commits && comparesData.commits.length===0)||(comparesData && !comparesData.diff)) )?"":
<div className="main" style={{paddingTop:"0px"}}> <div className="main mergeRequest" style={{paddingTop:"0px"}}>
<Spin spinning={isSpin}> <Spin spinning={isSpin}>
<Tabs <Tabs
activeKey={activeKey} activeKey={activeKey}