From dc01557c591c16c77ad90b20003548860337bebb Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 2 Apr 2020 11:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pr=E6=8F=90=E4=BA=A4=E4=B8=BA?=
 =?UTF-8?q?textarea?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml             | 25 +++++++++++--------------
 src/forge/Merge/MessageCount.js |  8 ++++----
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b424df457..341caf23a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
+    <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -16,8 +13,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="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" />
+            <state relative-caret-position="231">
+              <caret line="270" column="12" lean-forward="true" selection-start-line="270" selection-start-column="12" selection-end-line="270" selection-end-column="12" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
               </folding>
@@ -57,8 +54,8 @@
       <find>onMouseMove</find>
       <find>commitKey</find>
       <find>TextArea</find>
-      <find>该合并请求可以进行自动合并操作</find>
       <find>body</find>
+      <find>该合并请求可以进行自动合并操作</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$</dir>
@@ -198,18 +195,18 @@
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
       <workItem from="1585288258489" duration="17495000" />
-      <workItem from="1585732642767" duration="8986000" />
+      <workItem from="1585732642767" duration="9777000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="61522000" />
+    <option name="totallyTimeSpent" value="62313000" />
   </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" visible="true" weight="0.17095852" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.17095852" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -221,8 +218,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 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="Version Control" order="9" weight="0.45903614" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.23855421" />
       <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" />
@@ -728,8 +725,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="231">
+          <caret line="270" column="12" lean-forward="true" selection-start-line="270" selection-start-column="12" selection-end-line="270" selection-end-column="12" />
           <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 f3aa818c8..60743728f 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -251,9 +251,9 @@ class MessageCount extends Component{
       })  
     }
 
-    changbodypr=(value)=>{
+    changbodypr=(e)=>{
       this.setState({
-        body:value
+        body:e.target.value
       })
     }
     editdetail=(count,status)=>{
@@ -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, body } = this.state;
+    const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , commentsContent , quillFlag } = 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={body} onChange={this.changbodypr} />
+                           <TextArea placeholder="请输入合并描述..." style={{height:"170px",marginTop:20}} value={this.state.body} onChange={this.changbodypr} />
                         </div>
                         <p className="clearfix mt15" style={{display:this.state.buttonshow}}>
                           <a className="topWrapper_btn " type="submit" onClick={()=>this.prmerge()}>合并请求</a>