-
setChooseZoneId(undefined)} className={!chooseZoneId ?"active":""}>全部
+
{setChooseZoneId(undefined);window.scrollTo(0,450)}} className={!chooseZoneId ?"active":""}>全部
{
zoneList.map((i,k)=>{
return(
-
{setChooseZoneId(i.id)}} className={chooseZoneId && chooseZoneId === i.id ? "active":"" }>{i.name}
+
{setChooseZoneId(i.id);window.scrollTo(0,450)}} className={chooseZoneId && chooseZoneId === i.id ? "active":"" }>{i.name}
)
})
}
@@ -108,11 +108,11 @@ function Source(props){
资源类别
-
- setChooseTypeId(undefined)} className={!chooseTypeId ?"active":""}>全部
+ - {setChooseTypeId(undefined);window.scrollTo(0,450)}} className={!chooseTypeId ?"active":""}>全部
{
typeList.map((i,k)=>{
return(
- - {setChooseTypeId(i.id)}} className={chooseTypeId && chooseTypeId === i.id ? "active":"" }>{i.name}
+ - {setChooseTypeId(i.id);window.scrollTo(0,450)}} className={chooseTypeId && chooseTypeId === i.id ? "active":"" }>{i.name}
)
})
}
diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index ab852844c..aadebd24c 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -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判断
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 30ef66b08..2525cd5f0 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -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,