From d191f0b8174e5a76958ba5a17a81e777677af722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 7 Jan 2020 15:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RepositoryAddFileupload_file.js           | 32 ++++++++++++-------
 .../shixunchild/Repository/Repositoryfile.js  | 15 ++++-----
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js
index 72bc9bf8c..fe060835b 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js
@@ -29,17 +29,19 @@ class RepositoryAddFileupload_files extends Component {
   }
 
   handleChange = (info) => {
-
-    if (info.file.status === 'done') {
+    console.log(info)
+    if (info.file.status === 'done'||info.file.status === "uploading") {
 
       let fileList = [...info.fileList];
 
-      if(info.file.response.status===-1){
-        notification.open({
-          message: '提示',
-          description:info.file.response.message,
-        })
-        return
+      if(info.file.response){
+        if(info.file.response.status===-1) {
+          notification.open({
+            message: '提示',
+            description: info.file.response.message,
+          })
+          return
+        }
       }
 
       fileList = fileList.slice(-2);
@@ -74,9 +76,17 @@ class RepositoryAddFileupload_files extends Component {
     if(matchpath.indexOf("secret_repository")>-1){
       Repositoryflag =true;
     }
+
+    let newfilspath=filspath;
+
+    if(newfilspath===""){
+      newfilspath=info.name
+    }else{
+      newfilspath=filspath+"/"+info.name
+    }
     const url = `/shixuns//${shixunId}/delete_git_file.json`;
     axios.delete(url, { data: {
-        path:filspath+info.name,
+        path:newfilspath,
         message:message,
         secret_repository:Repositoryflag
       }})
@@ -247,7 +257,7 @@ class RepositoryAddFileupload_files extends Component {
 
 
               <p className="ant-form-item-label">
-                <div className={"color888 font-16"}>当前目录：{this.state.filspath===""?"./":this.state.filspath}   <span className={"color-blue"} onClick={this.Selectfiledirectory}>选择文件目录</span></div>
+                <div className={"color888 font-16"}>当前目录：{this.state.filspath===""?"/":"/"+this.state.filspath}   <span className={"color-blue"} onClick={this.Selectfiledirectory}>选择文件目录</span></div>
               </p>
 
               {/*<div className="mt10 mb25 repoCMWrapper filecode">*/}
@@ -278,7 +288,7 @@ class RepositoryAddFileupload_files extends Component {
             </div>
           </Form>
         </div>
-        <Bottomsubmit {...this.props} {...this.state} url={`/shixuns/${shixunId}/${Repositoryflag}`}/>
+        <Bottomsubmit {...this.props} {...this.state} url={`/shixuns/${shixunId}/${Repositoryflag}`} bottomvalue={"确定"}/>
       </div>
     )
   }
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/Repositoryfile.js b/public/react/src/modules/tpm/shixunchild/Repository/Repositoryfile.js
index 195cfea8a..bc58d6cc0 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/Repositoryfile.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/Repositoryfile.js
@@ -85,21 +85,20 @@ class Repositoryfile extends Component{
     })
 
     if(paths===""&&type==="tree"){
-      newpath=newpath+"/";
+      newpath=newpath;
       paths="";
       if(main.length===0){
-        ary.push({val:"根目录/",path:""},{val:newpath,path:paths+newpath})
+        ary.push({val:"根目录",path:""},{val:"/"+newpath,path:paths+newpath});
       }else{
-        ary.push({val:newpath,path:paths+newpath})
+        ary.push({val:"/"+newpath,path:paths+newpath});
       }
-
     }else if(paths!=""&&type==="tree"){
-      newpath=newpath+"/";
-      ary.push({val:newpath,path:paths+newpath})
+      newpath=paths+"/"+newpath;
+      ary.push({val:"/"+newpath,path:paths+newpath});
     }
 
       axios.post(url,{
-        path: paths+newpath
+        path: newpath
       }).then((response) => {
         if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
 
@@ -138,7 +137,7 @@ class Repositoryfile extends Component{
       this.props.form.validateFieldsAndScroll((err, values) => {
         if (!err) {
           console.log('Received values of form: ', values);
-          let paths=path+values.name;
+          let paths=path+"/"+values.name;
           axios.post(url,{
             path: paths,
             secret_repository:flag===false?undefined:flag,