From 74f668217871bba0596aadca0e2fcf12e382fd6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 22 Sep 2022 16:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4pr=E6=B5=8F=E8=A7=88=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81link=20url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/Commits.jsx     | 7 ++++---
 src/forge/Merge/CreateMerge.js  | 3 +++
 src/forge/Merge/Index.scss      | 2 +-
 src/forge/Merge/MessageCount.js | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/forge/Merge/Commits.jsx b/src/forge/Merge/Commits.jsx
index 43e671817..24f5cdb4c 100644
--- a/src/forge/Merge/Commits.jsx
+++ b/src/forge/Merge/Commits.jsx
@@ -6,7 +6,8 @@ import { getImageUrl } from 'educoder';
 import { Link } from 'react-router-dom';
 import { Pagination } from 'antd';
 
-function Commits({ commits , projectsId , owner , total ,limit , changeCommitFunc }){
+function Commits(props){
+  const { commits , projectsId , owner , total ,limit , changeCommitFunc, pullOwnerLogin } = props;
   return(
     <div className="pb20">
       {
@@ -17,10 +18,10 @@ function Commits({ commits , projectsId , owner , total ,limit , changeCommitFun
               <div className="prInfo">
                 <FlexAJ>
                   <AlignCenter>
-                    <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
+                    <Link to={`/${pullOwnerLogin}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
                     <p className="ml15 font-16 color-grey-3 task-hide" style={{maxWidth:"700px"}}>{item.message}</p>
                   </AlignCenter>
-                  <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
+                  <Link to={`/${pullOwnerLogin}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
                 </FlexAJ>
                 <AlignCenter className="mt15">
                   <User url={getImageUrl(`/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>
diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index e974f5360..4ed3570d4 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -386,6 +386,8 @@ class CreateMerge extends Component {
     } = this.state;
 
     let { project } = this.props;
+    // 源仓库所有者login
+    const pullOwnerLogin = projects_names && projects_names.filter(item=>{return item.id === id})[0].project_user_login;
     return (
       <div>
         <Spin spinning={isSpin || isCompareSpin}>
@@ -481,6 +483,7 @@ class CreateMerge extends Component {
               limit = {limit}
               changeCommitFunc={this.changeCommitFunc}
               comparesData={comparesData}
+              pullOwnerLogin={pullOwnerLogin}
             ></MergeFooter>
           )}
         </Spin>
diff --git a/src/forge/Merge/Index.scss b/src/forge/Merge/Index.scss
index 16cc95632..ea8b6b7eb 100644
--- a/src/forge/Merge/Index.scss
+++ b/src/forge/Merge/Index.scss
@@ -33,7 +33,7 @@
     word-break: break-all;
   }
   .see-file{
-    width: 14rem;
+    width: 15rem;
     .ml10{
       display: inline-block;
       width: 4.5rem;
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index d577bc57a..0d39f74cf 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -592,6 +592,7 @@ class MessageCount extends Component {
               {...this.props}
               {...this.state}
               bindFootRef={this.bindFootRef}
+              pullOwnerLogin={data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.author_login}
             ></MergeLinkFooter>
           </div>
         ) : (