From fa2b68e58bae9b9b43e74bf3112b4d6d6f5d08c3 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Mon, 13 Apr 2020 18:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9merge=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml             | 29 ++++++++++++-----------------
 src/forge/Merge/MessageCount.js | 11 +++++++----
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index abb1cd7a2..d7da52ad3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,13 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Detail.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Merge/merge.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge.css" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -36,7 +30,7 @@
         <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="101">
-              <caret line="304" column="20" lean-forward="true" selection-start-line="304" selection-start-column="20" selection-end-line="304" selection-end-column="20" />
+              <caret line="304" column="20" selection-start-line="304" selection-start-column="20" selection-end-line="304" selection-end-column="20" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
               </folding>
@@ -47,14 +41,15 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="120">
-              <caret line="331" lean-forward="true" selection-start-line="331" selection-end-line="331" />
+            <state relative-caret-position="347">
+              <caret line="346" column="29" lean-forward="true" selection-start-line="346" selection-start-column="29" selection-end-line="346" selection-end-column="29" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
                 <element signature="e#1369#1443#0" />
                 <element signature="e#1832#1892#0" />
                 <element signature="e#1915#1975#0" />
                 <element signature="e#1993#2053#0" />
+                <element signature="e#2088#3195#0" />
                 <element signature="e#3244#3799#0" />
                 <element signature="e#3835#4233#0" />
                 <element signature="e#4262#4764#0" />
@@ -76,7 +71,6 @@
                 <element signature="e#12268#12661#0" />
                 <element signature="e#8906#9244#0" />
                 <element signature="e#9748#13588#0" />
-                <element signature="e#21123#24189#0" />
               </folding>
             </state>
           </provider>
@@ -317,15 +311,16 @@
       <workItem from="1586330226261" duration="658000" />
       <workItem from="1586400014081" duration="18358000" />
       <workItem from="1586517058808" duration="1607000" />
-      <workItem from="1586741565210" duration="15365000" />
+      <workItem from="1586741565210" duration="16104000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="116110000" />
+    <option name="totallyTimeSpent" value="116849000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
+    <editor active="true" />
     <layout>
       <window_info content_ui="combo" id="Project" order="0" weight="0.18454936" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -341,7 +336,7 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Version Control" order="9" weight="0.20722891" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.7493976" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.10120482" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -813,7 +808,7 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="101">
-          <caret line="304" column="20" lean-forward="true" selection-start-line="304" selection-start-column="20" selection-end-line="304" selection-end-column="20" />
+          <caret line="304" column="20" selection-start-line="304" selection-start-column="20" selection-end-line="304" selection-end-column="20" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>
@@ -843,14 +838,15 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="331" lean-forward="true" selection-start-line="331" selection-end-line="331" />
+        <state relative-caret-position="347">
+          <caret line="346" column="29" lean-forward="true" selection-start-line="346" selection-start-column="29" selection-end-line="346" selection-end-column="29" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
             <element signature="e#1369#1443#0" />
             <element signature="e#1832#1892#0" />
             <element signature="e#1915#1975#0" />
             <element signature="e#1993#2053#0" />
+            <element signature="e#2088#3195#0" />
             <element signature="e#3244#3799#0" />
             <element signature="e#3835#4233#0" />
             <element signature="e#4262#4764#0" />
@@ -872,7 +868,6 @@
             <element signature="e#12268#12661#0" />
             <element signature="e#8906#9244#0" />
             <element signature="e#9748#13588#0" />
-            <element signature="e#21123#24189#0" />
           </folding>
         </state>
       </provider>
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index f1367f941..f8667b7fe 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -342,11 +342,13 @@ class MessageCount extends Component{
         axios.post(url,{
           ...values
         }).then(result=>{
-          if(result){
+          if(result.data.status === 0){
             this.setState({
               editMerge:false
             })
+            this.getDetail()
             this.props.showNotification(result.data.message);
+
           }
 
         }).catch(error=>{
@@ -473,7 +475,7 @@ class MessageCount extends Component{
 
     const editMergeForm =()=>{
       return(
-        <div className="list-l-panel">
+        <div>
           <Form>
             <Form.Item
               label="标签"
@@ -703,7 +705,7 @@ class MessageCount extends Component{
                               data&&data.pull_request.status===0 ?
                                 <div className="pull-right">
                                   <a className="Closeor_btn fr" type="submit"
-                                     onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "点击开启" : "已关闭"}</a>
+                                     onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "点击开启" : "关闭"}</a>
                                   {/*<a className="cancel_btn fr" type="submit"*/}
                                   {/*onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "开启" : "关闭"}</a>*/}
                                 </div>
@@ -737,8 +739,9 @@ class MessageCount extends Component{
                             <a className="a_btn cancel_btn " type="submit" style={{marginLeft:15}} onClick={this.nonemerge}>取消</a>
                           </p>
                         </div>
-                      <div className="order_line" style={{marginLeft:80}}></div>
+
                     </div>
+                      <div className="order_line" style={{marginLeft:80}}></div>
 
 
                     </div>