From fb1fe1e2a7d61763b0a22af7f382cc249f67e5b1 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 7 Feb 2020 15:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/forge/Main/CoderRootDirectory.js      |  9 +--
 .../src/forge/Main/CoderRootFileDetail.js     | 58 ++++++++++++++++---
 2 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/public/react/src/forge/Main/CoderRootDirectory.js b/public/react/src/forge/Main/CoderRootDirectory.js
index 1f37811a7..e812d66d9 100644
--- a/public/react/src/forge/Main/CoderRootDirectory.js
+++ b/public/react/src/forge/Main/CoderRootDirectory.js
@@ -18,7 +18,6 @@ import axios from 'axios';
  * filePath:点击目录时当前目录的路径
  * subfileType:保存当前点击目录的文件类型（显示目录列表时才显示新建文件，如果点击的是文件就不显示新建文件按钮）
  * readMeContent:根目录下面的readme文件内容
- * current_path:当前文件路径
  */
 class CoderRootDirectory extends Component{
   constructor(props){
@@ -30,7 +29,6 @@ class CoderRootDirectory extends Component{
       http_url:undefined,
       subFileType:"",
       readMeContent:undefined,
-      current_path:undefined,
 
       branchList:undefined,
       fileDetail:undefined,
@@ -72,8 +70,7 @@ class CoderRootDirectory extends Component{
     this.renderUrl(arr.name,arr.path,arr.type);
     this.getFileDetail(arr);
     this.setState({
-      subFileType:arr.type,
-      current_path:arr.path
+      subFileType:arr.type
     })
   }
 
@@ -189,7 +186,7 @@ class CoderRootDirectory extends Component{
     })
   }
   render(){
-    const { rootList , branch ,filePath , fileDetail , subFileType , readMeContent , current_path } = this.state;
+    const { rootList , branch ,filePath , fileDetail , subFileType , readMeContent } = this.state;
 
     const { branchLastCommit , http_url , isManager , isDeveloper } = this.props;
     const { projectsId } = this.props.match.params;
@@ -287,7 +284,7 @@ class CoderRootDirectory extends Component{
 
         {
           fileDetail &&
-            <CoderRootFileDetail detail = {fileDetail} current_path={current_path} {...this.props} {...this.state}></CoderRootFileDetail>
+            <CoderRootFileDetail detail = {fileDetail} {...this.props} {...this.state}></CoderRootFileDetail>
         }
 
         {/* readme.txt */}
diff --git a/public/react/src/forge/Main/CoderRootFileDetail.js b/public/react/src/forge/Main/CoderRootFileDetail.js
index 666d3d15a..782abd550 100644
--- a/public/react/src/forge/Main/CoderRootFileDetail.js
+++ b/public/react/src/forge/Main/CoderRootFileDetail.js
@@ -17,10 +17,19 @@ class CoderRootFileDetail extends Component{
   constructor(props){
     super(props);
     this.state={
-      readOnly:true
+      readOnly:true,
+      value:undefined
     }
   }
 
+  componentDidMount=()=>{
+    const { detail } = this.props;
+
+    this.setState({
+      value:detail.content
+    })
+  }
+
   EditFile=()=>{
     this.setState({
       readOnly:false
@@ -32,19 +41,52 @@ class CoderRootFileDetail extends Component{
     })
   }
 
+  // 编辑文件
+  changeContent=(e)=>{
+    this.setState({
+      value:e
+    })
+  }
+
   deleteFile=()=>{
-    const { current_path , current_user , branch}= this.props;
+    const { current_user , branch , detail }= this.props;
     const { projectsId } = this.props.match.params;
 
-    const url =  `/api/${current_user.login}/${projectsId}/contents/files/delete.json`;
+    const url =  `/${current_user.login}/${projectsId}/contents/files/delete.json`;
     axios.delete(url,{
       params:{
-        filepath:current_path,
+        filepath:detail.path,
         branch
       }
     }).then(result=>{
       if(result){
+        this.props.showNotification("删除成功!");
+        this.props.history.push(`/projects/${projectsId}`);
+      }
+    }).catch(error=>{
+      console.log(error);
+    })
+  }
+
 
+
+  // 确认修改文件
+  UpdateFile=()=>{
+    const { current_user , branch , detail}= this.props;
+    const { projectsId } = this.props.match.params;
+    const { value } = this.state;
+    const url =`/${current_user.login}/${projectsId}/contents/files/update.json`;
+    axios.put(url,{
+      filepath:detail.path,
+      branch,
+      content:value,
+      sha:detail.sha,
+    }).then(result=>{
+      if(result){
+        this.props.showNotification("修改成功!");
+        this.setState({
+          readOnly:true
+        })
       }
     }).catch(error=>{
       console.log(error);
@@ -53,8 +95,7 @@ class CoderRootFileDetail extends Component{
 
   render(){
     const { detail } = this.props;
-
-    const { readOnly } = this.state;
+    const { readOnly ,value } = this.state;
     return(
       <div className="branchTable">
         <p className="branchTitle f-wrap-alignCenter f-wrap-between">
@@ -66,7 +107,7 @@ class CoderRootFileDetail extends Component{
               :
               <React.Fragment>
                 <button type="button" class="ant-btn ant-btn-sm mr10" onClick={this.CancelEdit}><span>取 消</span></button>
-                <button type="button" class="ant-btn ant-btn-primary ant-btn-sm"><span>确 定</span></button>
+                <button type="button" class="ant-btn ant-btn-primary ant-btn-sm" onClick={this.UpdateFile}><span>确 定</span></button>
               </React.Fragment>
             }
             
@@ -78,7 +119,8 @@ class CoderRootFileDetail extends Component{
         <Editor
           height="300px"
           theme={"vs-dark"}
-          value={detail && detail.content}
+          value={value}
+          onChange={this.changeContent}
           readOnly={readOnly}
         />
       </div>