From a91fb41ef0f6f3f94ab32e905359b3026c0ea993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Thu, 30 Sep 2021 21:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2-=E5=88=86=E6=94=AF=E4=BF=A1=E7=94=B1=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=8E=A5=E5=8F=A3=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderRootCommit.js | 4 ++--
 src/forge/Main/CoderRootIndex.js  | 2 +-
 src/forge/Main/Diff.jsx           | 8 ++++----
 src/forge/Main/version/version.js | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index cdd8597af..cdd8d59d9 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -153,7 +153,7 @@ class CoderRootCommit extends Component{
                       <div className="commitList-item f-wrap-between">
                         <div>
                           <AlignTop>
-                            <div className="commitDesc"><Link to={{pathname:`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branch}`,query:{commitPage:page}}} className="font-14 color-grey-3 font-bd">{item.message}</Link></div>
+                            <div className="commitDesc"><Link to={{pathname:`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`,query:{commitPage:page}}} className="font-14 color-grey-3 font-bd">{item.message}</Link></div>
                           </AlignTop>
                           <p className="f-wrap-alignCenter mt15 pb5">
                             <User
@@ -170,7 +170,7 @@ class CoderRootCommit extends Component{
                             <div>
                               <span className="treecopy-cont shadow">
                                 <img src={Tree} alt="sha" width={"16px"}/>
-                                <Link to={{pathname:`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branch}`,query:{page:page}}}>{truncateCommitId(`${item.sha}`)}</Link>
+                                <Link to={{pathname:`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`,query:{page:page}}}>{truncateCommitId(`${item.sha}`)}</Link>
                                 <input type="text" id={`value${k}`} value={`${truncateCommitId(`${item.sha}`)}`}/>
                               </span>
                               <CopyTool beforeText="复制commit id" afterText="复制成功" inputId={`value${k}`}/>
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js
index b740ca7e2..b5d241968 100644
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@@ -108,7 +108,7 @@ class CoderRootIndex extends Component{
               () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
             }
           ></Route>
-          <Route path="/:owner/:projectsId/commits/:sha/:branchName"
+          <Route path="/:owner/:projectsId/commits/:sha"
             render={
               (props) => (<Diff {...this.props} {...props} {...this.state}/>)
             }
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index 36b5d7cc2..fe9c130fe 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -50,7 +50,7 @@ export default (props) => {
   const [parents, setParents] = useState(undefined);
   const [committer, setCommitter] = useState(undefined);
   const [isSpin, setIsSpin] = useState(true);
-  const { sha , projectsId, owner, branchName } = match.params;
+  const { sha , projectsId, owner } = match.params;
   useEffect(() => {
     if (projectsId && owner && sha) {
       const url = `/${owner}/${projectsId}/commits/${sha}.json`;
@@ -63,6 +63,7 @@ export default (props) => {
             setParents(result.data.parents);
             setCommitter(result.data.committer || (result.data.commit && result.data.commit.committer));
             setIsSpin(false);
+            
           }
         })
         .catch(error => {
@@ -70,7 +71,6 @@ export default (props) => {
         });
     }
   }, [projectsId , owner, sha]);
-  
   return (
     <div className="main" style={{padding:"0px",border:"none"}}>
       <Spin spinning={isSpin}>
@@ -81,7 +81,7 @@ export default (props) => {
                 {commit && commit.message &&
                   <pre className="task-hide">{commit.message}</pre>
                 }
-                <Link to={`/${owner}/${projectsId}/tree/${branchName}`}><i className="iconfont icon-fenzhi2 font-18"></i>{branchName}</Link>
+                <Link to={`/${owner}/${projectsId}/tree/${data.branch}`}><i className="iconfont icon-fenzhi2 font-18"></i>{data.branch}</Link>
               </div>
               <Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="btnblue" style={{height:"36px"}}>浏览文件</Button>
             </div>
@@ -103,7 +103,7 @@ export default (props) => {
                     <div className="ml40 f-wrap-alignCenter">
                       <label className="mr8">父节点</label>
                       <img src={Tree} alt="sha" width={"16px"} className="mr4"/>
-                      <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branchName}`} className="underline">{truncateCommitId(item.sha)}</Link>
+                      <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${data.branch}`} className="underline">{truncateCommitId(item.sha)}</Link>
                     </div>
                   )
                 })
diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js
index 6c13a809d..68cfd7746 100644
--- a/src/forge/Main/version/version.js
+++ b/src/forge/Main/version/version.js
@@ -67,7 +67,7 @@ function version(props) {
           </span>
           <span className="color-grey-3 font-12">
             <img src={Tree} width="16px" color="#333333" className="mr3"/>
-            <Link className="hover" to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${item.branch}`}>{truncateCommitId(item.sha)}</Link>
+            <Link className="hover" to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`}>{truncateCommitId(item.sha)}</Link>
           </span>
         </span>
         <div className="versionInfo_right">