From bc496c6d8b202be053a66247765668b641b6256a Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 2 Apr 2020 11:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pr=E7=9A=84=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml             | 21 +++++++++++----------
 src/forge/Merge/MessageCount.js |  6 +++---
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b73c5f511..b424df457 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,6 +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/Merge/MessageCount.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -15,8 +16,8 @@
       <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="300">
-              <caret line="580" column="62" lean-forward="true" selection-start-line="580" selection-start-column="62" selection-end-line="580" selection-end-column="62" />
+            <state relative-caret-position="273">
+              <caret line="583" column="95" lean-forward="true" selection-start-line="583" selection-start-column="95" selection-end-line="583" selection-end-column="95" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
               </folding>
@@ -28,12 +29,10 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>issue-tag-show</find>
       <find>创建</find>
       <find>.map((item,key)=&gt;{</find>
       <find>.map((item,key)</find>
       <find>评论成</find>
-      <find>该合并请求可以进行自动合并操作</find>
       <find>没有</find>
       <find>创建工单</find>
       <find>可读权限</find>
@@ -58,6 +57,8 @@
       <find>onMouseMove</find>
       <find>commitKey</find>
       <find>TextArea</find>
+      <find>该合并请求可以进行自动合并操作</find>
+      <find>body</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$</dir>
@@ -197,12 +198,12 @@
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
       <workItem from="1585288258489" duration="17495000" />
-      <workItem from="1585732642767" duration="7588000" />
+      <workItem from="1585732642767" duration="8986000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="60124000" />
+    <option name="totallyTimeSpent" value="61522000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -220,8 +221,8 @@
       <window_info anchor="bottom" id="TODO" order="6" />
       <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.27228916" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.49879518" />
+      <window_info active="true" anchor="bottom" id="Version Control" order="9" visible="true" weight="0.40963855" />
+      <window_info anchor="bottom" id="Terminal" order="10" weight="0.3120482" />
       <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" />
@@ -727,8 +728,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="580" column="62" lean-forward="true" selection-start-line="580" selection-start-column="62" selection-end-line="580" selection-end-column="62" />
+        <state relative-caret-position="273">
+          <caret line="583" column="95" lean-forward="true" selection-start-line="583" selection-start-column="95" selection-end-line="583" selection-end-column="95" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 201b9c4c3..f3aa818c8 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -183,7 +183,7 @@ class MessageCount extends Component{
         project_id:projectsId,
         id:data.pull_request.id,
         do:mergekey,
-        body:JSON.stringify(body),
+        body:body,
         title:title,
       }).then(result=>{
         if(result){
@@ -378,7 +378,7 @@ class MessageCount extends Component{
 
   render(){
     const { projectsId,mergeId } = this.props.match.params;
-    const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , commentsContent , quillFlag } = this.state;
+    const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , commentsContent , quillFlag, body } = this.state;
     const { getFieldDecorator } = this.props.form;
     const { current_user } = this.props;
     const url = this.props.history.location.pathname;
@@ -581,7 +581,7 @@ class MessageCount extends Component{
                               {/*onContentChange={this.changbodypr}*/}
                             {/*/>*/}
                           {/*</div>*/}
-                           <TextArea placeholder="请输入合并描述..." style={{height:"170px",marginTop:20}} value={this.state.body} onChange={this.changbodypr} />
+                           <TextArea placeholder="请输入合并描述..." style={{height:"170px",marginTop:20}} value={body} onChange={this.changbodypr} />
                         </div>
                         <p className="clearfix mt15" style={{display:this.state.buttonshow}}>
                           <a className="topWrapper_btn " type="submit" onClick={()=>this.prmerge()}>合并请求</a>