Gitlink
/
forgeplus-react
0
0
Fork 37
Code Issues Pull Requests 5 Releases 1 Wiki Activity

创建pr要传源仓库identity

This commit is contained in:
caishi 2023-07-14 13:45:14 +08:00
parent 1ecfb04386
commit 88f321cc0c
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/forge/Information/Pages/source.jsx
View File

@ -85,18 +85,18 @@ function Source(props){
/>
</div>
</div>
<div className="sources" style={{alignItems:(sourceList && sourceList.length>0) ? "flex-start":"center"}}>
<div className="sources">
<div className="source_left_ul">
{
zoneList && zoneList.length>0&&
<ul className="source_l_u">
<p>资源领域</p>
<div>
<li onClick={()=>setChooseZoneId(undefined)} className={!chooseZoneId ?"active":""}>全部</li>
<li onClick={()=>{setChooseZoneId(undefined);window.scrollTo(0,450)}} className={!chooseZoneId ?"active":""}>全部</li>
{
zoneList.map((i,k)=>{
return(
<li key={k} onClick={()=>{setChooseZoneId(i.id)}} className={chooseZoneId && chooseZoneId === i.id ? "active":"" }>{i.name}</li>
<li key={k} onClick={()=>{setChooseZoneId(i.id);window.scrollTo(0,450)}} className={chooseZoneId && chooseZoneId === i.id ? "active":"" }>{i.name}</li>
)
})
}
@ -108,11 +108,11 @@ function Source(props){
<ul className="source_l_u">
<p className="borderRight">资源类别</p>
<div>
<li onClick={()=>setChooseTypeId(undefined)} className={!chooseTypeId ?"active":""}>全部</li>
<li onClick={()=>{setChooseTypeId(undefined);window.scrollTo(0,450)}} className={!chooseTypeId ?"active":""}>全部</li>
{
typeList.map((i,k)=>{
return(
<li key={k} onClick={()=>{setChooseTypeId(i.id)}} className={chooseTypeId && chooseTypeId === i.id ? "active":"" }>{i.name}</li>
<li key={k} onClick={()=>{setChooseTypeId(i.id);window.scrollTo(0,450)}} className={chooseTypeId && chooseTypeId === i.id ? "active":"" }>{i.name}</li>
)
})
}

1
src/forge/Merge/CreateMerge.js
View File

@ -309,6 +309,7 @@ class CreateMerge extends Component {
merge_user_login: is_fork
? projects_names[0].project_user_login
: undefined,
merge_project_identifier:pullIdentity||projectId
},
});
// 加上是否需要切换url判断

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

@ -180,6 +180,7 @@ class MergeForm extends Component {
is_original: data && data.is_original,
fork_project_id: data && data.fork_project_id,
merge_user_login: data && data.merge_user_login,
merge_project_identifier:data && data.merge_project_identifier,
files_count,
commits_count,
receivers_login:atWhoLoginList,