From 2fcb645d42945b863ce1abd2972d9cf0163d0269 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 28 Apr 2021 20:17:30 +0800
Subject: [PATCH] =?UTF-8?q?04-28=E4=BC=91=E5=81=87=E6=9C=9F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9issue=20--=E9=9C=80=E5=90=88=E5=B9=B6=E8=87=B3?=
 =?UTF-8?q?=E5=85=B6=E5=AE=83=E5=88=86=E6=94=AF=EF=BC=88=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E7=9B=B8=E5=85=B3=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/NewMerge.js           |  2 +-
 src/forge/Merge/merge_form.js         | 14 ++++++++------
 src/forge/Order/MilepostDetail.js     |  2 +-
 src/forge/Order/order.js              |  4 ++--
 src/forge/Order/order_form.js         |  4 ++--
 src/forge/Team/Group/GroupDetails.jsx |  5 +++--
 src/modules/tpm/TPMBanner.js          |  2 +-
 7 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index 2ef27efad..3cbe4ddcd 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -178,7 +178,7 @@ class NewMerge extends Component {
     let arr = projects_names && projects_names.filter(item=>item.id===value);
     let identifier = arr && arr[0].project_id;
     let login = arr && arr[0].project_user_login;
-    let is_fork_id = parseInt(value) !== parseInt(id)
+    let is_fork_id = parseInt(value) !== parseInt(id);
     this.setState({
       isSpin: true, 
       merge_head: is_fork_id,
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 57886d042..1c75a9f9a 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -34,17 +34,19 @@ class MergeForm extends Component {
     this.set_defatul();
   };
   componentDidUpdate=(prevPros)=>{
+    const { projectsId ,owner } = this.props.match.params;
+    const pId = prevPros.match.params.projectsId;
+    const oId = prevPros.match.params.owner;
+    if(pId !== projectsId || oId !== owner ){
+      // console.log("切换了项目分支···········");
+      this.get_default_selects();
+    }
     if(prevPros && this.props && !this.props.checkIfLogin()){
       this.props.history.push("/403")
       return
     }
   }
-  // check_is_login =() =>{
-  //   if(!this.props.checkIfLogin()){
-  //     this.props.history.push("/403")
-  //     return
-  //   }
-  // };
+  
   get_default_selects = () => {
     const { projectsId ,owner } = this.props.match.params;
     this.setState({ isSpin: true });
diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js
index 2cfb2f89d..7954630dd 100644
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@@ -218,7 +218,7 @@ class MilepostDetail extends Component {
             </span>
             <div className="milepostdiv">
               <Link to={`/projects/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
-              <Link to={`/projects/${owner}/${projectsId}/issues/${meilid}/new`} className="topWrapper_btn">创建任务</Link>
+              <Link to={`/projects/${owner}/${projectsId}/issues/${meilid}/new`} className="topWrapper_btn">创建易修</Link>
             </div>
           </FlexAJ>
         </div>
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index ac9e7a0ef..8875aa850 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -352,12 +352,12 @@ class order extends Component {
     if (this.props.checkIfLogin()) {
       return(
         <Link className="topWrapper_btn ml10" target="_blank" to={`/projects/${owner}/${projectsId}/issues/new`}>
-          +&nbsp;创建任务
+          +&nbsp;创建易修
         </Link>
       )
     }else{
       return(
-        <a className="topWrapper_btn ml10" onClick={this.islogin}>+&nbsp;创建任务</a>
+        <a className="topWrapper_btn ml10" onClick={this.islogin}>+&nbsp;创建易修</a>
       )
     }
   }
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index db36c3ea0..ed8d4d8b7 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -310,14 +310,14 @@ class order_form extends Component {
             <div className="list-right">
               <div className="pd20">
                 <h3 className="mb15">
-                  {form_type === "new" ? "新建" :( form_type === "copy" ? "复制" : "编辑")}任务
+                  {form_type === "new" ? "新建" :( form_type === "copy" ? "复制" : "编辑")}易修
                 </h3>
                 <Form.Item>
                   {getFieldDecorator("subject", {
                     rules: [
                       {
                         required: true,
-                        message: "请填写任务标题",
+                        message: "请填写易修标题",
                       },
                     ]
                   })(<Input placeholder="标题" size="large" />)}
diff --git a/src/forge/Team/Group/GroupDetails.jsx b/src/forge/Team/Group/GroupDetails.jsx
index 8d1c519b5..49720c171 100644
--- a/src/forge/Team/Group/GroupDetails.jsx
+++ b/src/forge/Team/Group/GroupDetails.jsx
@@ -84,11 +84,12 @@ export default ((props) => {
 
   // 移除成员
   function removeUser(username) {
-    const url = `/organizations/${OIdentifier}/teams/${groupId}/team_users/${username}.json`;
     if (username) {
+      const url = `/organizations/${OIdentifier}/teams/${groupId}/team_users/quit.json`;
       axios.delete(url).then((result) => {
         if (result && result.data) {
-          
+          props.showNotification(`已成功退出团队！`); 
+          props.history.push(`/organize/${OIdentifier}`);
         }
       }).catch((error) => { });
     }
diff --git a/src/modules/tpm/TPMBanner.js b/src/modules/tpm/TPMBanner.js
index 3f591a40b..6760fe04b 100644
--- a/src/modules/tpm/TPMBanner.js
+++ b/src/modules/tpm/TPMBanner.js
@@ -1062,7 +1062,7 @@ class TPMBanner extends Component {
                             </div> :
                             <div className="task-popup-content">
                               <p className="task-popup-text-center font-16  mt10 mb10">
-                                尚未创建任务的实训，不能申请发布
+                                尚未创建易修的实训，不能申请发布
                           </p>
                             </div>
                   }