From f0472845f9b5609c8a963d4822fecb6bbaa166b6 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 14 Aug 2024 09:58:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82-=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=BB=93=E5=BA=93=E5=92=8C=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppConfig.js             |  2 +-
 src/forge/Merge/MergeItem.js | 25 ++++++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index e102edbe..45f12c80 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -101,7 +101,7 @@ export function initAxiosInterceptors(props) {
         // 邀请页面不进行404跳转
         if( window.location.pathname.includes('/invite') && (responseURL.includes('/simple.json')||responseURL.includes('/detail.json')||responseURL.includes('/menu_list.json'))){
         }else{
-          // locationurl('/nopage');
+          locationurl('/nopage');
         }
       }
     }
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 8ca39bce..583e7165 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -110,15 +110,22 @@ class MergeItem extends Component {
                       {
                         item.pull_request_head &&
                         <Tag className="pr-branch-tag">
-                          <Link
-                            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:"300px"}}
-                          >
-                            {item.is_original
-                              ? item.fork_project_user_name
-                              : item.author_name}
-                            : {item.pull_request_head}
-                          </Link>
+                          {
+                            item.is_original ?
+                            (
+                              (item.fork_project_user && item.fork_project_identifier) ?
+                              <Link
+                                to={`/${ item.fork_project_user }/${ item.fork_project_identifier }/tree/${turnbar(item.pull_request_head)}`}
+                                className="maxW200px task-hide ver-middle" style={{maxWidth:"300px"}}
+                              >
+                                {item.fork_project_user_name || "仓库已删除"} : {item.pull_request_head || "分支已删除"}
+                              </Link> 
+                              :
+                              <span>{item.fork_project_user_name || "仓库已删除"} : {item.pull_request_head || "分支已删除"}</span>
+                            )
+                            :
+                            <Link to={`/${ owner }/${ projectsId }/tree/${turnbar(item.pull_request_head)}`} style={{maxWidth:"300px"}}>{item.author_name} :{item.pull_request_head || "分支已删除"}</Link>
+                          }
                         </Tag>
                       }
                       {