From 37f5bce087a9a9e000d623fa553b5b15d4038f39 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Tue, 9 Nov 2021 16:38:53 +0800
Subject: [PATCH] =?UTF-8?q?pr/Anchor=E7=AD=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderDepotReadme.jsx   | 2 +-
 src/forge/Main/CoderRootFileDetail.js | 2 +-
 src/forge/Merge/MergeItem.js          | 7 +++----
 src/forge/Merge/MessageCount.js       | 8 ++++----
 src/home/Index.scss                   | 5 ++++-
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx
index 438b2d64..bb9bdd5b 100644
--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@@ -41,7 +41,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
 
   return(
     <div className="commonBox readBox" id="readme">
-      <Anchor offsetTop={70}>
+      <Anchor offsetTop={58}>
         <div className="commonBox-title boxTitle">
           <AlignCenter>
             <Dropdown overlay={menu()} trigger={['hover']} overlayClassName="menuslist">
diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js
index bdcfc98a..b73a2168 100644
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@@ -215,7 +215,7 @@ class CoderRootFileDetail extends Component {
     const Option = Select.Option;
     return (
       <React.Fragment>
-        <Anchor className="griditemAnchor" offsetTop={70}>
+        <Anchor className="griditemAnchor" offsetTop={58}>
           <div className="griditemCate">
             {
               md && readOnly &&
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 3e88eeb9..dd72c761 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -112,8 +112,8 @@ 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)}`}
                             className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
                           >
-                            {item.is_fork
-                              ? item.pull_request_base
+                            {item.is_original
+                              ? item.fork_project_user_name
                               : item.author_name}
                             :{item.pull_request_head}
                           </Link>
@@ -136,8 +136,7 @@ class MergeItem extends Component {
                             to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
                             className="maxW200px task-hide ver-middle" style={{maxWidth:"200px"}}
                           >
-                            {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>
                         </Tag>
                       }
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index d7f665dd..28140ddf 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -365,10 +365,10 @@ class MessageCount extends Component {
                       <div className="mt15">
                         <Tag className="pr-branch-tag">
                           <Link
-                            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}`}
+                            to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author}/${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_name : data.issue.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}
+                            {data.pull_request.is_original ? data.pull_request.fork_project_user_name : data.issue.author_name}: {data.pull_request && data.pull_request.head}
                           </Link>
                         </Tag>
                         <span className="mr8 ver-middle">
@@ -383,7 +383,7 @@ class MessageCount extends Component {
                             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}`}
                           >
-                            {data.issue.author_name}:{data.pull_request.base}
+                            {data.issue.project_author_name}:{data.pull_request.base}
                           </Link>
                         </Tag>
                       </div>
diff --git a/src/home/Index.scss b/src/home/Index.scss
index 538f6026..25d5f83f 100644
--- a/src/home/Index.scss
+++ b/src/home/Index.scss
@@ -946,7 +946,7 @@ body{
             background: #FFFFFF;
             box-shadow: 0px 1px 8px 1px rgba(0, 0, 0, 0.06);
             border-radius: 4px;
-            border: 2px solid #FFFFFF;
+            border: 1px solid #FFFFFF;
             margin-right: 20px;
             padding:20px;
             height: 120px;
@@ -954,6 +954,9 @@ body{
             display: flex;
             align-items: center;
             justify-content: center;
+            &:hover{
+              border: 1px solid #8FCEFF;
+            }
             img{
               max-width: 100%;
               max-height: 100%;