From 65df8b01466c6de5c2bbbbc44112cb0db19b1fef Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 2 Apr 2020 11:00:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E7=9A=84=E6=8F=8F=E8=BF=B0=E4=B8=BAtextarea?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml             | 126 +++++++-------------------------
 src/forge/Merge/MessageCount.js |  33 +++++----
 2 files changed, 45 insertions(+), 114 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e1e91cf6..b73c5f51 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/forge/Branch/branch.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Branch/branch.css" 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" />
@@ -13,80 +12,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="182">
-              <caret line="257" column="23" selection-start-line="257" selection-start-column="23" selection-end-line="257" selection-end-column="23" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="308">
-              <caret line="80" column="26" selection-start-line="80" selection-start-column="26" selection-end-line="80" selection-end-column="26" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-40">
-              <caret line="63" column="21" selection-start-line="63" selection-start-column="21" selection-end-line="63" selection-end-column="21" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="256">
-              <caret line="163" column="58" selection-start-line="163" selection-start-column="44" selection-end-line="163" selection-end-column="58" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Version/UpdateVersion.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="115">
-              <caret line="155" column="20" selection-start-line="155" selection-start-column="20" selection-end-line="155" selection-end-column="20" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Branch/branch.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="291">
-              <caret line="27" column="15" lean-forward="true" selection-start-line="27" selection-start-column="15" selection-end-line="27" selection-end-column="15" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <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="245">
-              <caret line="504" column="46" selection-start-line="504" selection-start-column="46" selection-end-line="504" selection-end-column="46" />
+            <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" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
               </folding>
@@ -98,8 +28,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>请输入合并</find>
-      <find>journal-list-item</find>
       <find>issue-tag-show</find>
       <find>创建</find>
       <find>.map((item,key)=&gt;{</find>
@@ -128,6 +56,8 @@
       <find>orderid</find>
       <find>deletedetail</find>
       <find>onMouseMove</find>
+      <find>commitKey</find>
+      <find>TextArea</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$</dir>
@@ -267,18 +197,18 @@
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
       <workItem from="1585288258489" duration="17495000" />
-      <workItem from="1585732642767" duration="5680000" />
+      <workItem from="1585732642767" duration="7588000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="58216000" />
+    <option name="totallyTimeSpent" value="60124000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17095852" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" 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" />
@@ -291,7 +221,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.27228916" />
-      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.3698795" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.49879518" />
       <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" />
@@ -609,23 +539,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="117" column="11" selection-start-line="117" selection-start-column="11" selection-end-line="117" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="65" column="28" selection-start-line="65" selection-start-column="28" selection-end-line="65" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="235">
@@ -791,14 +704,31 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Branch/branch.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="291">
-          <caret line="27" column="15" lean-forward="true" selection-start-line="27" selection-start-column="15" selection-end-line="27" selection-end-column="15" />
+          <caret line="27" column="15" selection-start-line="27" selection-start-column="15" selection-end-line="27" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="252">
+          <caret line="91" column="17" lean-forward="true" selection-start-line="91" selection-start-column="17" selection-end-line="91" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="282">
+          <caret line="241" column="69" lean-forward="true" selection-start-line="241" selection-start-column="69" selection-end-line="241" selection-end-column="69" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="245">
-          <caret line="504" column="46" selection-start-line="504" selection-start-column="46" selection-end-line="504" selection-end-column="46" />
+        <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" />
           <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 69c364ab..201b9c4c 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -11,7 +11,7 @@ import './merge.css';
 import QuillForEditor from '../quillForEditor';
 import MergeSubmit from './MergeSubmit';
 
-// const TextArea = Input.TextArea;
+const TextArea = Input.TextArea;
 
 const options = [
   ['bold', 'italic', 'underline'],
@@ -20,6 +20,7 @@ const options = [
   ['link', 'image'],
   ['formula']
 ];
+
 class MessageCount extends Component{
   constructor(props){
     super(props);
@@ -566,21 +567,21 @@ class MessageCount extends Component{
 
                         <div style={{display:this.state.ismesrge,marginTop:15}}>
                           <Input placeholder="标题" value={this.state.title} onChange={this.changtitlepr}/>
-                          <div className="quillContent" style={{marginTop:"20px"}}>
-                            <QuillForEditor
-                              value = {this.state.body}
-                              wrapStyle={{
-                                height: '220px',
-                                opacity:1,
-                              }}
-                              // autoFocus={true}
-                              style={{ height: '170px' }}
-                              placeholder="请输入合并请求描述..."
-                              options={options}
-                              onContentChange={this.changbodypr}
-                            />
-                          </div>
-                          {/* <TextArea placeholder="请输入合并描述..." style={{height:"300px",marginTop:15}} value={this.state.body} onChange={this.changbodypr} /> */}
+                          {/*<div className="quillContent" style={{marginTop:"20px"}}>*/}
+                            {/*<QuillForEditor*/}
+                              {/*value = {this.state.body}*/}
+                              {/*wrapStyle={{*/}
+                                {/*height: '220px',*/}
+                                {/*opacity:1,*/}
+                              {/*}}*/}
+                              {/*// autoFocus={true}*/}
+                              {/*style={{ height: '170px' }}*/}
+                              {/*placeholder="请输入合并请求描述..."*/}
+                              {/*options={options}*/}
+                              {/*onContentChange={this.changbodypr}*/}
+                            {/*/>*/}
+                          {/*</div>*/}
+                           <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>