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

Merge branch 'develop' into gitlink_server

This commit is contained in:
jasder 2021-11-09 09:31:05 +08:00
parent 1c48ffb130 ea979b78ee
commit 54741a6d8a
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Main/CoderDepotReadme.jsx
View File

@ -41,7 +41,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
return( return(
<div className="commonBox readBox" id="readme"> <div className="commonBox readBox" id="readme">
<Anchor offsetTop={70} targetOffset={160}> <Anchor offsetTop={70}>
<div className="commonBox-title boxTitle"> <div className="commonBox-title boxTitle">
<AlignCenter> <AlignCenter>
<Dropdown overlay={menu()} trigger={['hover']} overlayClassName="menuslist"> <Dropdown overlay={menu()} trigger={['hover']} overlayClassName="menuslist">

2
src/forge/Main/sub/ReadmeCatelogue.jsx
View File

@ -36,7 +36,7 @@ function ReadmeCatelogue({ menuList , hash }) {
{ {
menu && menu.length>0? menu && menu.length>0?
<div className="anchorBox"> <div className="anchorBox">
<Anchor affix={false} onChange={onChange}> <Anchor affix={false} onChange={onChange} offsetTop={140}>
{ {
menu.map((item,key)=>{ menu.map((item,key)=>{
return( return(

10
src/forge/Merge/MergeItem.js
View File

@ -112,9 +112,9 @@ class MergeItem extends Component {
to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`} to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}} className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
> >
{item.is_original {item.is_fork
? item.fork_project_user ? item.pull_request_base
: project_author_name} : item.author_name}
:{item.pull_request_head} :{item.pull_request_head}
</Link> </Link>
</Tag> </Tag>
@ -136,8 +136,8 @@ class MergeItem extends Component {
to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`} to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}} className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
> >
{/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */} {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`}
{project_author_name}:{item.pull_request_base} {/* {project_author_name}:{item.pull_request_base} */}
</Link> </Link>
</Tag> </Tag>
} }

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

@ -365,10 +365,10 @@ class MessageCount extends Component {
<div className="mt15"> <div className="mt15">
<Tag className="pr-branch-tag"> <Tag className="pr-branch-tag">
<Link <Link
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_fork ? data.pull_request_base.fork_project_user : data.issue.author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: ${data.pull_request && data.pull_request.head}`} className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: ${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} {data.pull_request.is_fork ? data.pull_request_base.fork_project_user : data.issue.author_name}: {data.pull_request && data.pull_request.head}
</Link> </Link>
</Tag> </Tag>
<span className="mr8 ver-middle"> <span className="mr8 ver-middle">
@ -383,7 +383,7 @@ class MessageCount extends Component {
to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`} to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`} className="ver-middle task-hide" style={{maxWidth:"200px"}} title={`${data.issue.project_author_name}:${data.pull_request.base}`}
> >
{data.issue.project_author_name}:{data.pull_request.base} {data.issue.author_name}:{data.pull_request.base}
</Link> </Link>
</Tag> </Tag>
</div> </div>