From 50627aba6be4efdf0e27a16cface4c59170bd24d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 28 Sep 2021 15:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=B9=E7=89=88-=E6=B5=8B=E8=AF=95-?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=8F=91=E8=A1=8C=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                      |   2 +-
 src/forge/Main/CoderRootCommit.js |  12 ++++--------
 src/forge/Main/img/tree-black.png | Bin 0 -> 631 bytes
 src/forge/Main/version/version.js |   9 ++++++---
 src/forge/Merge/Files.jsx         |  10 +++++-----
 5 files changed, 16 insertions(+), 17 deletions(-)
 create mode 100644 src/forge/Main/img/tree-black.png

diff --git a/package.json b/package.json
index 736bba88c..04142cb4d 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
   "scripts": {
     "start": "node --max_old_space_size=15360 scripts/start.js",
     "build": "cross-env NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
-    "test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
+    "test-build": "cross-env NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
     "pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js",
     "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",
     "ana": "webpack-bundle-analyzer ./stats.json",
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index 183523888..7b8eaa23a 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -29,12 +29,12 @@ function timeFormat(seconds) {
 //代码库--提交页面
 class CoderRootCommit extends Component{
   constructor(props){
-    super(props)
+    super(props);
     this.state={
       commitDatas:undefined,
       dataCount:undefined,
       limit:10,
-      page:1,
+      page: 1,
       isSpining:false,
       branchList:undefined
     }
@@ -43,12 +43,8 @@ class CoderRootCommit extends Component{
   componentDidMount=()=>{
     this.Init();
     this.getBranchs();
-    // goBack
-    // addEventListener
   }
 
-  // componentde
-
   // 获取分支列表
   getBranchs=()=>{
     const { projectsId , owner } = this.props.match.params;
@@ -157,7 +153,7 @@ class CoderRootCommit extends Component{
                       <div className="commitList-item f-wrap-between">
                         <div>
                           <AlignTop>
-                            <div className="commitDesc"><Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branch}?page=${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}`)}/${branch}`,query:{page:page}}} className="font-14 color-grey-3 font-bd">{item.message}</Link></div>
                           </AlignTop>
                           <p className="f-wrap-alignCenter mt15">
                             <User
@@ -174,7 +170,7 @@ class CoderRootCommit extends Component{
                             <div>
                               <span className="treecopy-cont shadow">
                                 <img src={Tree} alt="sha" width={"16px"}/>
-                                <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branch}?page=${page}`}>{truncateCommitId(`${item.sha}`)}</Link>
+                                <Link to={{pathname:`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${branch}`,query:{page:page}}}>{truncateCommitId(`${item.sha}`)}</Link>
                                 <input type="text" id={`value${k}`} value={`${truncateCommitId(`${item.sha}`)}`} disabled/>
                               </span>
                               <CopyTool beforeText="复制commit id" afterText="复制成功" inputId={`value${k}`}/>
diff --git a/src/forge/Main/img/tree-black.png b/src/forge/Main/img/tree-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..02aa71c3adc567259467d2e29b08d068d9d3747f
GIT binary patch
literal 631
zcmeAS@N?(olHy`uVBq!ia0vp^IzTMI!3HFAZRTDFQjEnx?oJHr&dIz4a$Hg)JkxxA
z8MJ_G4hF{dOa>N^5+IfWVg?501&j>LK$;OGwtxvPtFwR^&K3YEoUwnC3Q*ZYPZ!4!
z58kU``~43&h}5}0y0WsFyVEmLB853-m!-#@h={oncdpE}U-&A)L{aaYj?R%I66JNh
zlQuX!I?%u@-OTdpw_dK3b9R4r@*`F89p(4G?_EFrb@f$^g@IaA`(%!<{AiPU(mDKF
z@Z~Mx^ZfV5y;trGiHez+wRM;MOrN|PFIcmeI(@m8^XsC?+1F{Cf66vZ<T`G|v-$DI
zAFal76{4302^!Bn+x29R``R#XA3=qx=X*ErSQfkXZhhC$N3{zB3Qj%Ubop)B&k4=!
z-x?Uj=G-+_J#b)dDzo;CA7|Hm=QzN?&9`Hf*r9hZOXQ?i8fvs=A7E4Z2o&u*-TQ=v
z@sWg^=?5Q{%>1J<hmW+emUAlz2AG|>wWy?0e};?Rtpio5{%y|=FDYDKGjV_9i&d46
z=WM7jnWA@dBe$84v8@Eplq|#P%cJ*oPhYY5XN{fDeQ|cN=GiA=_ut?DDc4JHioe9$
zX~k<2n{MZ&SS7?9eo^&6tJhXlZ1S?pFT>R)TRzx-e6C-6(N39<RsnozufJO9igC|*
z$2|XCu|j~-iX4es(^B`IeO}z%JL7HH?6l32l5LK=)?F^zx#VJoORrmV&TX-@nN8Pf
z>}2@Dh3+vadVMbsei>i;Cr8SCw<~+`?56N^;s1O7Ft+?=+PJQz=maRzJzf1=);T3K
F0RU_U1wQ})

literal 0
HcmV?d00001

diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js
index 44b20919c..5b48affaf 100644
--- a/src/forge/Main/version/version.js
+++ b/src/forge/Main/version/version.js
@@ -100,9 +100,12 @@ function version(props) {
             <a href={item.zipball_url}><i className="iconfont icon-wenjian7 font-14 mr10 color-grey-3"></i>{item.tag_name}.ZIP</a>
           </p>
           {/* 发行版附件下载 */}
-          {item.attachments && item.attachments.map((item)=>{
-            return(<a href={`/${owner}/${projectsId}${item.url}`}><i className="iconfont icon-wenjian7 font-14 mr10 color-grey-3"></i>{item.title}</a>)
-          })}
+          {/* {item.attachments.length !=0 && <p className="versionFile">
+            <span>附件：</span> */}
+            {item.attachments && item.attachments.map((item)=>{
+              return(<Link to={`${item.url}`}><i className="iconfont icon-wenjian7 font-14 mr10 color-grey-3"></i>{item.title}</Link>)
+            })}
+          {/* </p>} */}
         </div>
       </div>
     )
diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index c5bd17688..32215d108 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -1,22 +1,22 @@
-import React ,{useEffect,useState } from 'react';
+import React ,{useEffect,useRef,useState } from 'react';
 import { truncateCommitId } from '../common/util';
 import { AlignCenter , FlexAJ } from '../Component/layout';
 import { Button, Tooltip,Progress, Popover, Anchor } from 'antd';
 import './merge.css';
 import './Index.scss';
 
-const {Link} =Anchor;
-
-function Files({data,history,owner,projectsId}){
+function Files(props){
+  const { data,history,owner,projectsId } = props;
   const [ files , setFiles ] = useState(data && data.files);
   const [ copyfileTipTitle, setCopyfileTipTitle] = useState("复制文件路径");
   const [ isOpen, setIsOpen] = useState(false);
+  const commitPage = history && history.location && history.location.query && history.location.query.page;
 
   useEffect(()=>{
     if(data){
       setFiles(data.files);
     }
-  },[data])
+  },[data]);
 
   function showDown(flag,index,isBin){
     if(!isBin){