From 88f321cc0c1c62bc287bd20f7c5a10bc79a49656 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 14 Jul 2023 13:45:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BApr=E8=A6=81=E4=BC=A0=E6=BA=90?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93identity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Information/Pages/source.jsx | 10 +++++-----
 src/forge/Merge/CreateMerge.js         |  1 +
 src/forge/Merge/merge_form.js          |  1 +
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/forge/Information/Pages/source.jsx b/src/forge/Information/Pages/source.jsx
index fb2dbe119..40159495a 100644
--- a/src/forge/Information/Pages/source.jsx
+++ b/src/forge/Information/Pages/source.jsx
@@ -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>
                     )
                   })
                 }
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,