From e7d8a4f0ccd544db8ce1ad052a5aa5ce12bbc262 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Tue, 24 Mar 2020 16:51:34 +0800
Subject: [PATCH] issue

---
 src/App.js                     |   2 +-
 src/forge/Main/Detail.js       | 377 +++++++++++++++++----------------
 src/modules/tpm/NewHeader.js   |   2 +-
 src/modules/tpm/TPMIndexHOC.js |   2 +-
 4 files changed, 199 insertions(+), 184 deletions(-)

diff --git a/src/App.js b/src/App.js
index c1f17c5be..1d4d382b8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -481,7 +481,7 @@ class App extends Component {
 		this.setState({
 			mygetHelmetapi: undefined
 		});
-		document.title = "EduCoder";
+		document.title = "Forge";
 		var link = document.createElement('link'),
 			oldLink = document.getElementById('dynamic-favicon');
 		link.id = 'dynamic-favicon';
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index cb567b03a..bf53fe729 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -1,4 +1,5 @@
 import React , { Component } from 'react';
+import { Spin } from 'antd';
 import { Link , Route , Switch,withRouter } from 'react-router-dom';
 
 import '../css/index.css'
@@ -129,6 +130,7 @@ class Detail extends Component{
   constructor(props){
     super(props);
     this.state={
+      isSpin:false,
       projectDetail:undefined,
       isManager:false,
       isReporter:false,
@@ -162,10 +164,15 @@ class Detail extends Component{
 
 
   componentDidMount=()=>{
-    // this.getUserInfo();
     this.getDetail();
   }
 
+  componentDidUpdate=(prevState)=>{
+    if(prevState.match.params.projectsId !== this.props.match.params.projectsId){
+      this.getDetail();
+    }
+  }
+
 
   getDetail=()=>{
     const { projectsId } = this.props.match.params;
@@ -242,12 +249,18 @@ class Detail extends Component{
 
   // fork项目
   forkFunc=()=>{
+    this.setState({
+      isSpin:true
+    })
     const { project_id } = this.state;
     const url = `/projects/${project_id}/forks.json`;
     axios.post(url).then(result=>{
       if(result && result.data.status === 0){
         this.props.history.push(`/projects/${result.data.id}/coders`);
         this.props.showNotification(result.data.message);
+        this.setState({
+          isSpin:false
+        })
       }else{
         this.props.showNotification(result.data.message);
       }
@@ -278,7 +291,7 @@ class Detail extends Component{
 
   render(){
 
-    const { projectDetail , watchers_count , praises_count , forked_count } = this.state;
+    const { projectDetail , watchers_count , praises_count , forked_count , isSpin } = this.state;
     const url = this.props.history.location.pathname;
     const urlArr= url.split("/");
     const urlFlag = (urlArr.length === 3);
@@ -290,207 +303,209 @@ class Detail extends Component{
 
     return(
       <div>
-        <div className="detailHeader-wrapper">
-          <div className="normal">
-            <div className="f-wrap-between mb20">
-              <p className="font-18 color-white df flex-1 lineH2 mt15" style={{alignItems:"center"}}>
-                {projectDetail && projectDetail.author && projectDetail.author.name}
-                <span className="ml5 mr5">/</span>
-                <span className="hide-1 flex-1">
-									<Link to={`/projects/${projectsId}/coders`} className="color-white">{ projectDetail && projectDetail.name }</Link>
-									</span>
-              </p>
-            </div>
-            <div className="f-wrap-between">
-              <ul className="headerMenu-wrapper">
-                <li className={(url.indexOf("coders")>-1 || urlFlag) ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/coders`,state}}><img alt="" src={img_1} width="18" />代码</Link></li>
-                <li className={url.indexOf("orders")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/orders`,state}}><img alt="" src={img_2} width="12" />工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}</Link></li>
-                <li className={url.indexOf("merge")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/merge`,state}}><img alt="" src={img_3} width="13" />合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}</Link></li>
-                <li className={url.indexOf("version")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/version`,state}}><img alt="" src={img_4} width="16" />版本发布</Link></li>
-                <li className={url.indexOf("trends")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/trends`,state}}><img alt="" src={img_6} width="16" />动态</Link></li>
-                {
-                  isManager &&
-                    <li className={url.indexOf("setting")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/setting`}><img alt="" src={img_7} width="19" />仓库设置</Link></li>
-                }
-              </ul>
-              <span className="df">
-                <span className="detail_tag_btn">
-                  <a className="detail_tag_btn_name" onClick={()=>this.focusFunc(projectDetail && projectDetail.watched)}>
-                    <img src={projectDetail && projectDetail.watched ? img_focused : img_focus} alt="" width="14px"/>
-                    {projectDetail && projectDetail.watched ? '取消关注':'关注'}
-                  </a>
-                  <span className="detail_tag_btn_count">{watchers_count}</span>
+        <Spin spinning={isSpin}>
+          <div className="detailHeader-wrapper">
+            <div className="normal">
+              <div className="f-wrap-between mb20">
+                <p className="font-18 color-white df flex-1 lineH2 mt15" style={{alignItems:"center"}}>
+                  {projectDetail && projectDetail.author && projectDetail.author.name}
+                  <span className="ml5 mr5">/</span>
+                  <span className="hide-1 flex-1">
+                    <Link to={`/projects/${projectsId}/coders`} className="color-white">{ projectDetail && projectDetail.name }</Link>
+                    </span>
+                </p>
+              </div>
+              <div className="f-wrap-between">
+                <ul className="headerMenu-wrapper">
+                  <li className={(url.indexOf("coders")>-1 || urlFlag) ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/coders`,state}}><img alt="" src={img_1} width="18" />代码</Link></li>
+                  <li className={url.indexOf("orders")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/orders`,state}}><img alt="" src={img_2} width="12" />工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}</Link></li>
+                  <li className={url.indexOf("merge")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/merge`,state}}><img alt="" src={img_3} width="13" />合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}</Link></li>
+                  <li className={url.indexOf("version")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/version`,state}}><img alt="" src={img_4} width="16" />版本发布</Link></li>
+                  <li className={url.indexOf("trends")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/trends`,state}}><img alt="" src={img_6} width="16" />动态</Link></li>
+                  {
+                    isManager &&
+                      <li className={url.indexOf("setting")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/setting`}><img alt="" src={img_7} width="19" />仓库设置</Link></li>
+                  }
+                </ul>
+                <span className="df">
+                  <span className="detail_tag_btn">
+                    <a className="detail_tag_btn_name" onClick={()=>this.focusFunc(projectDetail && projectDetail.watched)}>
+                      <img src={projectDetail && projectDetail.watched ? img_focused : img_focus} alt="" width="14px"/>
+                      {projectDetail && projectDetail.watched ? '取消关注':'关注'}
+                    </a>
+                    <span className="detail_tag_btn_count">{watchers_count}</span>
+                  </span>
+                  <span className="detail_tag_btn">
+                    <a className="detail_tag_btn_name" onClick={()=>this.pariseFunc(projectDetail && projectDetail.praised)}>
+                      <img src={projectDetail && projectDetail.praised ? img_parised : img_parise} width="13px" alt=""/>
+                      {projectDetail && projectDetail.praised ? '取消点赞':'点赞'}
+                    </a>
+                    <span className="detail_tag_btn_count">{praises_count}</span>
+                  </span>
+                  <span className="detail_tag_btn">
+                    <a className="detail_tag_btn_name" onClick={this.forkFunc}>
+                      <img src={img_fork} alt="" width="10px"/>Fork</a>
+                    <span className="detail_tag_btn_count">{forked_count}</span>
+                  </span>
                 </span>
-                <span className="detail_tag_btn">
-                  <a className="detail_tag_btn_name" onClick={()=>this.pariseFunc(projectDetail && projectDetail.praised)}>
-                    <img src={projectDetail && projectDetail.praised ? img_parised : img_parise} width="13px" alt=""/>
-                    {projectDetail && projectDetail.praised ? '取消点赞':'点赞'}
-                  </a>
-                  <span className="detail_tag_btn_count">{praises_count}</span>
-                </span>
-                <span className="detail_tag_btn">
-                  <a className="detail_tag_btn_name" onClick={this.forkFunc}>
-                    <img src={img_fork} alt="" width="10px"/>Fork</a>
-                  <span className="detail_tag_btn_count">{forked_count}</span>
-                </span>
-              </span>
+              </div>
             </div>
           </div>
-        </div>
 
-        <Switch {...this.props}>
-          {/* 新建文件 */}
-          <Route path="/projects/:projectsId/coders/:branch/newfile/:path"
-            render={
-              (props) => (<FileNew {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
-          <Route path="/projects/:projectsId/coders/:branch/newfile"
-            render={
-              (props) => (<FileNew {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+          <Switch {...this.props}>
+            {/* 新建文件 */}
+            <Route path="/projects/:projectsId/coders/:branch/newfile/:path"
+              render={
+                (props) => (<FileNew {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
+            <Route path="/projects/:projectsId/coders/:branch/newfile"
+              render={
+                (props) => (<FileNew {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
-          {/* 标签列表 */}
-          <Route path="/projects/:projectsId/orders/tags"
-            render={
-              (props) => (<TagList {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
-          {/* 仓库设置 */}
-          <Route path="/projects/:projectsId/setting"
-            render={
-              (props) => (<Setting {...this.props} {...props} {...this.state} getDetail={this.getDetail}/>)
-            }
-          ></Route>
-          {/* 工单详情 */}
-          <Route path="/projects/:projectsId/orders/:orderId/detail"
-            render={
-              (props) => (<OrderDetail {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
-          {/* 里程碑 */}
-        <Route path="/projects/:projectsId/orders/Milepost"
-            render={
-              (props) => (<OrderMilepost {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
-          {/* 新建里程碑 */}
-          <Route path="/projects/:projectsId/orders/meilpost"
-            render={
-              (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
-           {/*里程碑详情*/ }
-           <Route path="/projects/:projectsId/orders/:meilid/MilepostDetail"
-            render={
-              (props) => (<MilepostDetail {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
-            {/*修改里程碑*/}
-            <Route path="/projects/:projectsId/orders/:meilid/meilpost"
-            render={
-              (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+            {/* 标签列表 */}
+            <Route path="/projects/:projectsId/orders/tags"
+              render={
+                (props) => (<TagList {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
+            {/* 仓库设置 */}
+            <Route path="/projects/:projectsId/setting"
+              render={
+                (props) => (<Setting {...this.props} {...props} {...this.state} getDetail={this.getDetail}/>)
+              }
+            ></Route>
+            {/* 工单详情 */}
+            <Route path="/projects/:projectsId/orders/:orderId/detail"
+              render={
+                (props) => (<OrderDetail {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
+            {/* 里程碑 */}
+          <Route path="/projects/:projectsId/orders/Milepost"
+              render={
+                (props) => (<OrderMilepost {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
+            {/* 新建里程碑 */}
+            <Route path="/projects/:projectsId/orders/meilpost"
+              render={
+                (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
+            {/*里程碑详情*/ }
+            <Route path="/projects/:projectsId/orders/:meilid/MilepostDetail"
+              render={
+                (props) => (<MilepostDetail {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
+              {/*修改里程碑*/}
+              <Route path="/projects/:projectsId/orders/:meilid/meilpost"
+              render={
+                (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
 
-          {/* 新建工单 */}
+            {/* 新建工单 */}
 
-          <Route path="/projects/:projectsId/orders/new"
-            render={
-              (props) => (<OrderNew {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+            <Route path="/projects/:projectsId/orders/new"
+              render={
+                (props) => (<OrderNew {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
-          {/* 修改详情 */}
-            <Route path="/projects/:projectsId/orders/:orderId/updatedetail"
-            render={
-              (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+            {/* 修改详情 */}
+              <Route path="/projects/:projectsId/orders/:orderId/updatedetail"
+              render={
+                (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
-            {/* 复制详情 */}
-            <Route path="/projects/:projectsId/orders/:orderId/copyetail"
-            render={
-              (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+              {/* 复制详情 */}
+              <Route path="/projects/:projectsId/orders/:orderId/copyetail"
+              render={
+                (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
-          {/* 动态 */}
-          <Route path="/projects/:projectsId/trends"
-            render={
-              (props) => (<TrendsIndex {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+            {/* 动态 */}
+            <Route path="/projects/:projectsId/trends"
+              render={
+                (props) => (<TrendsIndex {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
 
-          {/* 代码Index */}
-          <Route path="/projects/:projectsId/orders"
-            render={
-              (props) => (<OrderIndex {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+            {/* 代码Index */}
+            <Route path="/projects/:projectsId/orders"
+              render={
+                (props) => (<OrderIndex {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
-          <Route path="/projects/:projectsId/merge/new"
-            render={
-              (props) => (<CreateMerge {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+            <Route path="/projects/:projectsId/merge/new"
+              render={
+                (props) => (<CreateMerge {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
-          <Route path="/projects/:projectsId/merge/:mergeId/UpdateMerge"
-            render={
-              (props) => (<UpdateMerge {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+            <Route path="/projects/:projectsId/merge/:mergeId/UpdateMerge"
+              render={
+                (props) => (<UpdateMerge {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
-          <Route path="/projects/:projectsId/merge/:mergeId/Messagecount"
-            render={
-              (props) => (<MessageCount {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+            <Route path="/projects/:projectsId/merge/:mergeId/Messagecount"
+              render={
+                (props) => (<MessageCount {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
-          <Route path="/projects/:projectsId/merge/:mergeId/MergeSubmit"
-            render={
-              (props) => (<MergeSubmit {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
-          <Route path="/projects/:projectsId/version/new"
-            render={
-              (props) => (<NewVersionIndex {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+            <Route path="/projects/:projectsId/merge/:mergeId/MergeSubmit"
+              render={
+                (props) => (<MergeSubmit {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
+            <Route path="/projects/:projectsId/version/new"
+              render={
+                (props) => (<NewVersionIndex {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
 
-        <Route path="/projects/:projectsId/version/:versionId/upversion"
-            render={
-              (props) => (<UpVersionIndex {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+          <Route path="/projects/:projectsId/version/:versionId/upversion"
+              render={
+                (props) => (<UpVersionIndex {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
 
-          <Route path="/projects/:projectsId/version"
-            render={
-              (props) => (<VersionIndex {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
+            <Route path="/projects/:projectsId/version"
+              render={
+                (props) => (<VersionIndex {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
 
-            <Route path="/projects/:projectsId/merge"
-            render={
-              (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
-          <Route path="/projects/:projectsId/coders"
-            render={
-              (props) => (<CoderRootIndex {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
-          <Route path="/projects/:projectsId"
-            render={
-              (props) => (<CoderRootIndex {...this.props} {...props} {...this.state}/>)
-            }
-          ></Route>
-        </Switch>
+              <Route path="/projects/:projectsId/merge"
+              render={
+                (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
+            <Route path="/projects/:projectsId/coders"
+              render={
+                (props) => (<CoderRootIndex {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
+            <Route path="/projects/:projectsId"
+              render={
+                (props) => (<CoderRootIndex {...this.props} {...props} {...this.state}/>)
+              }
+            ></Route>
+          </Switch>
+        </Spin>
       </div>
     )
   }
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index 47abca3c4..4f8567b95 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -691,7 +691,7 @@ submittojoinclass=(value)=>{
 		this.setState({
 			mygetHelmetapi2: undefined
 		});
-		document.title = "EduCoder";
+		document.title = "Forge";
 		var link = document.createElement('link'),
 			oldLink = document.getElementById('dynamic-favicon');
 		link.id = 'dynamic-favicon';
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index fb57bf65b..60ceab86a 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -264,7 +264,7 @@ export function TPMIndexHOC(WrappedComponent) {
 				this.setState({
 					mygetHelmetapi: undefined
 				});
-				document.title = "EduCoder";
+				document.title = "Forge";
 				var link = document.createElement('link'),
 					oldLink = document.getElementById('dynamic-favicon');
 				link.id = 'dynamic-favicon';