From d3ce0ed9c3c737e7617d59e2fea76d1aed6923d3 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Wed, 22 Apr 2020 18:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                    | 1 -
 src/forge/Main/CoderRootDirectory.js | 8 ++++----
 src/forge/Main/Detail.js             | 3 +--
 src/forge/Newfile/Index.js           | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/public/index.html b/public/index.html
index fdcb75664..1fc54298e 100755
--- a/public/index.html
+++ b/public/index.html
@@ -43,7 +43,6 @@
 
       <!--需要去build js配置-->
       <link rel="stylesheet" type="text/css" href="/css/iconfont.css">
-      <!-- <link rel="stylesheet" type="text/css" href="/css/edu-all.css"> -->
 
       <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.css">
     <style>
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index fad7bea42..150432b84 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -316,7 +316,7 @@ class CoderRootDirectory extends Component{
       }
     }
 
-    const urlRoot = `/${filePath}`;
+    const urlRoot = filePath === undefined ? '':`/${filePath}`;
     const { projectDetail } = this.props;
     let array = filePath && filePath.split("/");
     return(
@@ -352,12 +352,12 @@ class CoderRootDirectory extends Component{
               }
             </div>
             <div className="f-wrap-alignCenter">
-              {
-                subFileType !== "file" && (isManager || isDeveloper) &&
+              {/* {
+                subFileType !== "file" && (isManager || isDeveloper) && */}
                 <p className="addFile mr30">
                   <Link to={`/projects/${projectsId}/coders/${branch}/newfile${urlRoot}`} >新建文件</Link>
                 </p>
-              }
+              {/* } */}
               {
                 http_url && <CloneAddress http_url={http_url} downloadUrl={downloadUrl} showNotification={this.props.showNotification}></CloneAddress>
               }
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index b56df2294..c82a81b96 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -155,8 +155,7 @@ class Detail extends Component{
   }
 
   componentDidUpdate=(prevState)=>{
-
-    if((prevState.match.params.projectsId !== this.props.match.params.projectsId) || (prevState.location.pathname.indexOf("newfile") !== -1)){
+    if((prevState.match.params.projectsId !== this.props.match.params.projectsId)){
       this.getDetail();
     }
   }
diff --git a/src/forge/Newfile/Index.js b/src/forge/Newfile/Index.js
index af2af9e4b..91f1121f4 100644
--- a/src/forge/Newfile/Index.js
+++ b/src/forge/Newfile/Index.js
@@ -22,7 +22,7 @@ class Index extends Component{
   }
   // 取消，弹框询问
   CancelAddFile=()=>{
-
+    this.props.history.goBack();
   }
 
   changeEditor=(editorValue)=>{