From ef229a635dd15af070e1a783be5b5311f40736b9 Mon Sep 17 00:00:00 2001
From: dinglink <837816638@qq.com>
Date: Fri, 27 Mar 2020 10:04:21 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppConfig.js                |   2 +-
 src/forge/Merge/MergeDetail.js  |   2 +-
 src/forge/Order/Milepost.js     |  34 +++++-----
 src/forge/Order/Milepostitem.js | 106 ++++++++++++++++++++++++++++++++
 src/forge/Order/order.js        |  13 ++--
 5 files changed, 135 insertions(+), 22 deletions(-)
 create mode 100644 src/forge/Order/Milepostitem.js

diff --git a/src/AppConfig.js b/src/AppConfig.js
index 406f60226..9388b124f 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -39,7 +39,7 @@ if (isDev) {
   }
   debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
     window.location.search.indexOf('debug=s') != -1 ? 'student' :
-      window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || ''
+      window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
 }
 // 超管
 // debugType="admin";
diff --git a/src/forge/Merge/MergeDetail.js b/src/forge/Merge/MergeDetail.js
index 225e031b2..6fbdd0659 100644
--- a/src/forge/Merge/MergeDetail.js
+++ b/src/forge/Merge/MergeDetail.js
@@ -251,7 +251,7 @@ class MergeDetail extends Component{
             由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""}
           </p>
         </div>
-     
+      
   
         <div className="detailHeader-wrapper">
           <div className="normal f-wrap-between">
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index e160462c1..80365d121 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -41,6 +41,7 @@ class Milepost extends Component{
       }
     }).then((result)=>{
       if(result){
+
         this.setState({
           data:result.data
         })
@@ -173,24 +174,10 @@ class Milepost extends Component{
        if(data && data.versions && data.versions.length>0 ){
         return(
           <div>
-            <div className="topWrapper">
-              <div className="topWrapper_type">
-                <li className={openselect ? "active":""} onClick={()=>this.opneMilelist(1)}>{data && data.open_count}个开启中</li>
-                <li className={closeselect ? "active":""} onClick={()=>this.opneMilelist(2)}>{data && data.closed_count}个已关闭</li>
-                {/* <span onClick={this.opneMilelist}>{ data && data.open_count }开启中</span>
-                <span onClick={this.closeMilelist}>{ data && data.closed_count }已关闭</span> */}
-              </div>
-              <ul className="topWrapper_select">
-                <li>
-                  <Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
-                    <span>排序<Icon type="caret-down" className="ml5" /></span>
-                  </Dropdown>
-                </li>
-              </ul>
-            </div>
             <div className="tagList">
               {
-                data.versions.map((item,key)=>{
+                   
+                  data.versions.length===0?<NoneData></NoneData>:data.versions.map((item,key)=>{
                   return(
                     <div style={{display:'block'}}>
                       <div className="milepostdiv">
@@ -292,6 +279,21 @@ class Milepost extends Component{
             <span>里程碑{ data && data.issue_tags_count }已创建</span>
             </div>
           </div>
+          <div className="topWrapper">
+              <div className="topWrapper_type">
+                <li className={openselect ? "active":""} onClick={()=>this.opneMilelist(1)}>{data && data.open_count}个开启中</li>
+                <li className={closeselect ? "active":""} onClick={()=>this.opneMilelist(2)}>{data && data.closed_count}个已关闭</li>
+                {/* <span onClick={this.opneMilelist}>{ data && data.open_count }开启中</span>
+                <span onClick={this.closeMilelist}>{ data && data.closed_count }已关闭</span> */}
+              </div>
+              <ul className="topWrapper_select">
+                <li>
+                  <Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
+                    <span>排序<Icon type="caret-down" className="ml5" /></span>
+                  </Dropdown>
+                </li>
+              </ul>
+            </div>
 
           { renderList()}
           { Paginations }
diff --git a/src/forge/Order/Milepostitem.js b/src/forge/Order/Milepostitem.js
new file mode 100644
index 000000000..b61ff750d
--- /dev/null
+++ b/src/forge/Order/Milepostitem.js
@@ -0,0 +1,106 @@
+import React , { Component } from 'react';
+import { Link } from 'react-router-dom';
+
+class OrderItem extends Component{
+  set_issue_tags =(issue_tags)=>{
+    if(issue_tags && issue_tags.length > 0){
+      return(
+        issue_tags.map((item,key)=>{
+          return(
+            <span className="issue-tag-show" style={{background: item.color}}>{item.name}</span>
+          )
+        })
+      )
+    }else{
+      return("--")
+    }
+  }
+
+  render(){
+    const { issues , search_count , page , limit } = this.props;
+    const { projectsId } = this.props.match.params;
+
+    const renderList =()=>{
+        data.versions.map((item,key)=>{
+            return(
+              <div style={{display:'block'}}>
+                <div className="milepostdiv">
+                  <div className="milepostwidth">
+                    <div className="grid-item width100">
+                      <i className="iconfont icon-lubiaosignpost3 font-12 mr3"></i>
+                      <Link to={`/projects/${projectsId}/orders/${item.id}/MilepostDetail`} className="font-16">{item.name}</Link>
+                    </div>
+
+                  </div>
+                </div>
+                <div className="milepostdiv" style={{marginTop:5}}>
+                  <div className="milepostrighe">
+
+                    <div className="grid-item mr10">
+                      <i className="iconfont icon-rili font-14 mr5">
+                      </i>
+                      {
+                        item.effective_date ?
+                          <span className="color-red">{item.effective_date}</span>
+                          :
+                          <span className="color-grey-c">暂无截止时间</span>
+                      }
+                    </div>
+                    <div className="grid-item mr10 color-grey-9">
+                      <i className="iconfont icon-issue font-14 mr5"></i>
+                      <span>
+                        {item.open_issues_count}个开启
+                      </span>
+                    </div>
+                    <div className="grid-item mr10 color-grey-9">
+                      <i className="iconfont icon-shanchudiao font-14 mr5"></i>
+                      <span>
+                        {item.close_issues_count}个关闭
+                      </span>
+                    </div>
+                  </div>
+                  {
+                    data && data.user_admin_or_member ?
+                      <div className="milepostleft">
+                        <div className="grid-item mr15 color-grey-9">
+                          <i className="iconfont icon-bianji3 font-14 mr5"></i>
+                          <Link to={`/projects/${projectsId}/orders/${item.id}/meilpost`} className="color-grey-9">编辑</Link>
+                        </div>
+                        <div className="grid-item mr15 color-grey-9">
+                          <i className="iconfont icon-yiguanbi1 font-14 mr5"></i>
+                          <a onClick={()=>this.updatestatusemile(this.state.status==="closed"?"open":"closed",item)} className="color-grey-9">{this.state.status==="closed"?"开启":"关闭"}</a>
+                        </div>
+                        <div className="grid-item mr15 color-grey-9">
+                          <i className="iconfont icon-lajitong font-14 mr5" ></i>
+                          <Popconfirm placement="bottom" title={'是否删除里程碑？'}  okText="是" cancelText="否" onConfirm={()=>this.closemile(item)}>
+                            <a className="color-grey-9">删除</a>
+                          </Popconfirm>
+                        </div>
+
+                      </div>
+                      : ''
+                  }
+
+                </div>
+                <div className="milepostdiv"style={{marginTop:5}}>
+                  <div className="textwidth">
+                    <Text
+                      type="secondary"
+                      ellipsis={{rows: 30, expandable: false, onExpand: Function}}
+                    >
+                      {item.description}</Text>
+                  </div>
+                </div>
+              </div>
+            )
+          })
+    }
+    return(
+      <div>
+        {renderList()}
+      </div>
+    )
+  }
+}
+
+export default OrderItem;
\ No newline at end of file
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index a985086af..52c8de62e 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -217,12 +217,14 @@ class order extends Component{
 
   openorder=(type)=>{
     if(type){
-
+      console.log(this.state.closeselect+"|"+this.state.openselect)
       const { current_user } = this.props;
       if(type===1){
         this.setState({
           status_type:'1',
           closeselect:undefined,
+          openselect:1,
+
           issue_tag_ids:'标签',
           tracker_ids:'所有分类',
           author_ids:'发布人',
@@ -237,6 +239,8 @@ class order extends Component{
         this.setState({
           status_type:'2',
           openselect:undefined,
+          closeselect:1,
+
           issue_tag_ids:'标签',
           tracker_ids:'所有分类',
           author_ids:'发布人',
@@ -260,12 +264,13 @@ class order extends Component{
     this.setState({
       isSpin:true
     })
+    console.log(current_user)
+
     if(type){
       if(current_user===undefined){
         this.setState({
           isSpin:false
         })
-        alert("请登录后查看")
         return;
       }
       if(type===1){
@@ -373,8 +378,8 @@ class order extends Component{
             <ul className="topWrapper_type">
               <li className={!author_id && !assigned_to_id ? "active":""} onClick={()=>this.ChangeAssign()}>全部</li>
               {}
-              <li style={{display:current_user===undefined?'none':'flex'}} className={assigned_to_id ? "active":""} onClick={ ()=>this.ChangeAssign(1)}>指派给我</li>
-              <li style={{display:current_user===undefined?'none':'flex'}} className={author_id ? "active":""} onClick={()=>this.ChangeAssign(2)}>由我创建</li>
+              <li style={{display:current_user&&current_user.login===""?'none':'flex'}} className={assigned_to_id ? "active":""} onClick={ ()=>this.ChangeAssign(1)}>指派给我</li>
+              <li style={{display:current_user&&current_user.login===""?'none':'flex'}} className={author_id ? "active":""} onClick={()=>this.ChangeAssign(2)}>由我创建</li>
               {/* <li>@我的</li> */}
             </ul>
             <ul className="topWrapper_select">

From d65f771b6bd164c847428f35230636b4b2f7ab66 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 1 Apr 2020 18:23:57 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                | 436 +++++++++++++++--------------
 src/forge/Branch/branch.css        |  10 +-
 src/forge/Main/Detail.js           |   7 +-
 src/forge/Merge/MergeDetail.js     |  15 +-
 src/forge/Merge/MergeItem.js       |  35 ++-
 src/forge/Merge/MessageCount.js    |   4 +-
 src/forge/Order/Detail.js          |   4 +-
 src/forge/Order/OrderItem.js       |   6 +-
 src/forge/Order/order.css          |   9 +
 src/forge/Settings/Collaborator.js |  21 +-
 src/forge/Settings/setting.css     |   2 +-
 11 files changed, 305 insertions(+), 244 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aba950566..f01b417b0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,19 @@
 <?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="" />
+    <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/Branch/branch.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Branch/branch.css" 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/Merge/MergeDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" 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/Order/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Detail.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/OrderItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/OrderItem.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/order.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/order.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Settings/setting.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/setting.css" afterDir="false" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -10,6 +22,36 @@
   </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/merge.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="246">
+              <caret line="295" column="142" selection-start-line="295" selection-start-column="142" selection-end-line="295" selection-end-column="142" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="663">
+              <caret line="331" column="19" lean-forward="true" selection-start-line="331" selection-start-column="19" selection-end-line="331" selection-end-column="19" />
+              <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/Order/order.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="150">
+              <caret line="166" column="16" selection-start-line="166" selection-start-column="16" selection-end-line="166" selection-end-column="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/forge/Settings/Setting.js">
           <provider selected="true" editor-type-id="text-editor">
@@ -23,67 +65,19 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/Milepost.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Settings/setting.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-513">
-              <caret line="97" selection-start-line="97" selection-end-line="97" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="85">
+              <caret line="47" column="22" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="22" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Settings/Collaborator.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="253">
-              <caret line="17" column="37" lean-forward="true" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <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" lean-forward="true" 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>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="98">
-              <caret line="110" column="77" selection-start-line="110" selection-start-column="67" selection-end-line="110" selection-end-column="77" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="199">
-              <caret line="245" column="59" lean-forward="true" selection-start-line="245" selection-start-column="59" selection-end-line="245" selection-end-column="59" />
-              <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/version.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="61">
-              <caret line="91" column="34" selection-start-line="91" selection-start-column="34" selection-end-line="91" selection-end-column="34" />
+            <state relative-caret-position="415">
+              <caret line="75" column="51" selection-start-line="75" selection-start-column="51" selection-end-line="75" selection-end-column="51" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -94,8 +88,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2193">
-              <caret line="352" column="14" selection-start-line="352" selection-start-column="14" selection-end-line="352" selection-end-column="14" />
+            <state relative-caret-position="314">
+              <caret line="447" column="157" selection-start-line="447" selection-start-column="125" selection-end-line="447" selection-end-column="157" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -106,8 +100,8 @@
       <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="461">
-              <caret line="41" column="22" selection-start-line="41" selection-start-column="22" selection-end-line="41" selection-end-column="22" />
+            <state relative-caret-position="325">
+              <caret line="41" column="19" selection-start-line="41" selection-start-column="19" selection-end-line="41" selection-end-column="19" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -116,13 +110,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Branch/branch.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="246">
-              <caret line="504" column="20" selection-start-line="504" selection-start-column="20" selection-end-line="504" selection-end-column="20" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="155">
+              <caret line="19" column="20" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
             </state>
           </provider>
         </entry>
@@ -131,16 +122,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>Educoder</find>
-      <find>title</find>
-      <find>textcount</find>
-      <find>forks</find>
-      <find>commentCtx</find>
-      <find>上传文件</find>
-      <find>subFileType</find>
-      <find>.ide</find>
-      <find>.idea</find>
-      <find>deleteUser</find>
       <find>axios.delete</find>
       <find>style=</find>
       <find>width75f</find>
@@ -157,10 +138,20 @@
       <find>创建工单</find>
       <find>可读权限</find>
       <find>sub_entries</find>
-      <find>可读</find>
-      <find>icon-bianji</find>
-      <find>readOnly</find>
       <find>isRe</find>
+      <find>icon-bianji</find>
+      <find>可读</find>
+      <find>journals_count &gt;</find>
+      <find>readOnly</find>
+      <find>Fork</find>
+      <find>forked</find>
+      <find>.OptionsUl</find>
+      <find>deletedetail</find>
+      <find>tyle=</find>
+      <find>overflo</find>
+      <find>orderid</find>
+      <find>&lt;span className=&quot;span_title&quot;&gt;里程碑&lt;/span&gt;</find>
+      <find>&lt;span className=&quot;span_title&quot;&gt;里程碑</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$</dir>
@@ -179,7 +170,6 @@
         <option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/newMilepost.js" />
         <option value="$PROJECT_DIR$/src/forge/Index.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Tags.js" />
         <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/New.js" />
@@ -187,35 +177,40 @@
         <option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
         <option value="$PROJECT_DIR$/src/forge/Settings/Setting.js" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" />
-        <option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
         <option value="$PROJECT_DIR$/src/forge/Activity/Activity.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
+        <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
+        <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Branch/branch.css" />
+        <option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" />
+        <option value="$PROJECT_DIR$/src/forge/Settings/setting.css" />
+        <option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
-        <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" fullScreen="true">
+    <option name="y" value="23" />
     <option name="width" value="1440" />
-    <option name="height" value="900" />
+    <option name="height" value="877" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -223,35 +218,11 @@
               <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="forge" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="forge" type="462c0819:PsiDirectoryNode" />
-              <item name="New" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="forge" type="462c0819:PsiDirectoryNode" />
-              <item name="Settings" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -300,18 +271,19 @@
       <workItem from="1585217705353" duration="104000" />
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
-      <workItem from="1585288258489" duration="15174000" />
+      <workItem from="1585288258489" duration="17495000" />
+      <workItem from="1585732642767" duration="2723000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="50215000" />
+    <option name="totallyTimeSpent" value="55259000" />
   </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.16881259" />
+      <window_info active="true" 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" />
@@ -323,8 +295,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.4566265" />
-      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.38795182" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.27228916" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.2879518" />
       <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" />
@@ -370,6 +342,20 @@
         </entry>
       </map>
     </option>
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/forge/Version/UpdateVersion.js">
@@ -381,16 +367,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="698">
-          <caret line="67" column="25" lean-forward="true" selection-start-line="67" selection-start-column="25" selection-end-line="67" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/newMilepost.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="87">
@@ -549,34 +525,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/DetailTop.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-3990">
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4777">
-          <caret line="303" column="11" selection-start-line="303" selection-start-column="11" selection-end-line="303" selection-end-column="11" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-9766" />
@@ -628,15 +576,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-12">
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1216">
@@ -666,23 +605,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="464" column="1" lean-forward="true" selection-start-line="464" selection-start-column="1" selection-end-line="464" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="143">
-          <caret line="244" column="11" selection-start-line="244" selection-start-column="11" selection-end-line="244" selection-end-column="11" />
-          <folding>
-            <element signature="e#0#40#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="63">
@@ -696,13 +618,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
-          <caret line="299" column="61" selection-start-line="299" selection-start-column="61" selection-end-line="299" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/MilepostDetail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-3903">
@@ -722,20 +637,37 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2193">
-          <caret line="352" column="14" selection-start-line="352" selection-start-column="14" selection-end-line="352" selection-end-column="14" />
+        <state relative-caret-position="307">
+          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="461">
-          <caret line="41" column="22" selection-start-line="41" selection-start-column="22" selection-end-line="41" selection-end-column="22" />
+        <state relative-caret-position="199">
+          <caret line="245" column="59" selection-start-line="245" selection-start-column="59" selection-end-line="245" selection-end-column="59" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </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>
@@ -744,24 +676,62 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="246">
-          <caret line="504" column="20" selection-start-line="504" selection-start-column="20" selection-end-line="504" selection-end-column="20" />
+        <state relative-caret-position="235">
+          <caret line="102" column="27" selection-start-line="102" selection-start-column="27" selection-end-line="102" selection-end-column="27" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="61">
-          <caret line="91" column="34" selection-start-line="91" selection-start-column="34" selection-end-line="91" selection-end-column="34" />
+        <state relative-caret-position="258">
+          <caret line="145" column="20" selection-start-line="145" selection-start-column="20" selection-end-line="145" selection-end-column="20" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/DetailTop.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="306">
+          <caret line="18" column="10" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="10" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="267">
+          <caret line="188" column="19" selection-start-line="188" selection-start-column="19" selection-end-line="188" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Branch/branch.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="155">
+          <caret line="19" column="20" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Settings/Collaborator.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="109">
+          <caret line="189" column="35" lean-forward="true" selection-start-line="189" selection-start-column="35" selection-end-line="189" selection-end-column="35" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+            <element signature="e#4421#5690#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Settings/Setting.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -772,42 +742,76 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Settings/Collaborator.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="17" column="37" lean-forward="true" selection-start-line="17" selection-start-column="37" selection-end-line="17" selection-end-column="37" />
+        <state relative-caret-position="225">
+          <caret line="245" column="39" lean-forward="true" selection-start-line="245" selection-start-column="39" selection-end-line="245" selection-end-column="39" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="98">
-          <caret line="110" column="77" selection-start-line="110" selection-start-column="67" selection-end-line="110" selection-end-column="77" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="245" column="59" lean-forward="true" selection-start-line="245" selection-start-column="59" selection-end-line="245" selection-end-column="59" />
+        <state relative-caret-position="314">
+          <caret line="447" column="157" selection-start-line="447" selection-start-column="125" selection-end-line="447" selection-end-column="157" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="65" column="28" lean-forward="true" selection-start-line="65" selection-start-column="28" selection-end-line="65" selection-end-column="28" />
+        <state relative-caret-position="246">
+          <caret line="295" column="142" selection-start-line="295" selection-start-column="142" selection-end-line="295" selection-end-column="142" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Settings/setting.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="85">
+          <caret line="47" column="22" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="150">
+          <caret line="166" column="16" selection-start-line="166" selection-start-column="16" selection-end-line="166" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="415">
+          <caret line="75" column="51" selection-start-line="75" selection-start-column="51" selection-end-line="75" selection-end-column="51" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="325">
+          <caret line="41" column="19" selection-start-line="41" selection-start-column="19" selection-end-line="41" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="663">
+          <caret line="331" column="19" lean-forward="true" selection-start-line="331" selection-start-column="19" selection-end-line="331" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/forge/Branch/branch.css b/src/forge/Branch/branch.css
index a8c1deeec..f9c4dbd5b 100644
--- a/src/forge/Branch/branch.css
+++ b/src/forge/Branch/branch.css
@@ -22,15 +22,17 @@
 .OptionsUl{
   max-height: 200px;
   overflow-y: auto;
+  margin-top: 10px;
 }
 .OptionsUl li{
-  height: 22px;
-  line-height: 22px;
-  cursor: pointer;;
+  height: 30px;
+  /*line-height: 22px;*/
+  cursor: pointer;
 }
 .OptionsUl li a{
   display: block;
-  padding-left: 2px;
+  padding: 4px;
+  /*padding-left: 2px;*/
 }
 .OptionsInput{
   height: 32px;
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 0d83e1aa5..c2bfa4dee 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -249,7 +249,9 @@ class Detail extends Component{
 				this.setState({
           isSpin:false
         })
-        this.props.showNotification(result.data.message);
+        if(result.data.status !== 401){
+          this.props.showNotification(result.data.message);
+        }
       }else{
         this.setState({
           isSpin:false
@@ -258,6 +260,9 @@ class Detail extends Component{
         this.props.showNotification(`服务器开小差了`);
       }
     }).catch(error=>{
+      this.setState({
+        isSpin:false
+      })
       console.log(error);
     })
   }
diff --git a/src/forge/Merge/MergeDetail.js b/src/forge/Merge/MergeDetail.js
index 6a6b82a19..3312ba8f1 100644
--- a/src/forge/Merge/MergeDetail.js
+++ b/src/forge/Merge/MergeDetail.js
@@ -255,10 +255,15 @@ class MergeDetail extends Component{
             </div>
           </p>
           <p className="mt15">{ data && data.issue.description}</p>
-          <p className="mt10 color-grey-c">
+          <p className="mt10">
            <div className={data&&data.issue_status==="关闭"?"closedetail":"opendetail"}>{data&&data.issue_status==="关闭"?"关闭中!":"开启中!"} </div>
-           请求从{data && data.pull_request.head}分支合并到{data && pull_request.base}分支
-            {/* 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} */}
+            <span className="color-grey-c">
+              由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""}
+            </span>
+
+             <span className="span_title ml10">
+               请求从<strong> {data && data.pull_request.head} </strong>分支合并到<strong> {data && data.pull_request.base} </strong>分支
+             </span>
           </p>
         </div>
       
@@ -314,9 +319,9 @@ class MergeDetail extends Component{
               <span className="span_title">指派给</span>
               <span>{data && data.issue.assign_user_name}</span>
             </p>
-            <p>
+            <p style={{display: "inline-block",'white-space': "nowrap" }}>
               <span className="span_title">里程碑</span>
-              <span>{data&&data.issue.version===null?"未添加里程碑":data&&data.issue.version.length===0?data.issue.version:'未添加里程碑'}</span>
+              <span className="title_overflow">{data&&data.issue.version===null?"未添加里程碑":data&&data.issue.version.length===0?data.issue.version:'未添加里程碑'}</span>
             </p>
           </div>
         </div>
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index ea55f1bf4..b7bea6e03 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -1,7 +1,29 @@
 import React , { Component } from 'react';
 import { Link } from 'react-router-dom';
+import {Popconfirm} from "antd";
 
 class MergeItem extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      //显示 隐藏
+      isdisplay:false,
+      orderid:'',
+    }
+  }
+
+  onMouseMove=(type)=>{
+    this.setState({
+      isdisplay:true,
+      orderid:type
+    })
+  }
+
+  onMouseOut=()=>{
+    this.setState({
+      isdisplay:false
+    })
+  }
 
   set_issue_tags =(issue_tags)=>{
     if(issue_tags && issue_tags.length > 0){
@@ -46,7 +68,18 @@ class MergeItem extends Component{
                   {/*<li>{item.issue_type || "--"}</li>*/}
                   <li>{item.version || "--"}</li>
                   <li>{item.assign_user_name || "--"}</li>
-                  <li>{ item.journals_count ? <span><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</span> : "" }</li>
+                  <li>
+                    <div className="flex-1">
+                      <p>
+                        { item.journals_count ? <Link to={`/projects/${projectsId}/merge/${item.pull_request_id}/Messagecount`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link> : "" }
+                      </p>
+                      <div className="milepostleft" style={{display:this.state.orderid===item.id&&this.state.isdisplay?'flex':'none'}}>
+                        <div className="grid-item mr15 color-grey-9">
+                          <Link to={`/projects/${projectsId}/merge/${item.pull_request_id}/updatemerge`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
+                        </div>
+                      </div>
+                    </div>
+                  </li>
                 </ul>
               </div>
             )
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 22c0f4a7e..ed7cf0354 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -636,9 +636,9 @@ class MessageCount extends Component{
                     data && data.issue.issue_tags ? <span className="issue-tag-show" style={{background: data.issue.issue_tags[0].color}}>{data.issue.issue_tags[0].name}</span> : "--"
                   }</span>
                 </p>
-                <p>
+                <p style={{display: "inline-block",'white-space': "nowrap" }}>
                   <span className="span_title">里程碑</span>
-                  <span>{
+                  <span className="title_overflow">{
                     data && data.issue.version ? data.issue.version : "--"
                   }</span>
                 </p>
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 6f2dba645..aa2360656 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -574,9 +574,9 @@ class Detail extends Component{
                 data && data.issue_tags ? <span className="issue-tag-show" style={{background: data.issue_tags[0].color}}>{data.issue_tags[0].name}</span> : "--"
               }</span>
             </p>
-            <p>
+            <p style={{display: "inline-block",'white-space': "nowrap" }}>
               <span className="span_title">里程碑</span>
-              <span>{
+              <span className="title_overflow">{
                 data && data.version ? data.version : "--"
               }</span>
             </p>
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index af851218d..ba09be430 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -77,7 +77,8 @@ class OrderItem extends Component{
                   <li>{item.assign_user_name || "--"}</li>
                   <li><p style={{width:60,height:25,margin:'auto', paddingTop:2,background:item.priority==='高'?'#e67e22':item.priority==='正常'?'#28be6c':item.priority==='低'?'#1abc9c':'#e74c3c',color:'#ffffff',borderRadius:4}}>{item.priority|| "--"}</p></li>
                   <li>{item.done_ratio || "--"}</li>
-                  <li><div className="flex-1">
+                  <li>
+                    <div className="flex-1">
                   <p>
                   { item.journals_count ? <Link to={`/projects/${projectsId}/orders/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link> : "" }
                   </p>
@@ -91,7 +92,8 @@ class OrderItem extends Component{
                      </Popconfirm>
                     </div>                                              
                   </div>
-                </div></li>
+                </div>
+                  </li>
                   
 
                 </ul>
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index 6fc05c65b..78b1b22be 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -164,6 +164,15 @@
 .topWrapper .ant-btn.ant-input-search-button{
   height: 30px;
 }
+.title_overflow{
+  max-width: 220px;
+  white-space: nowrap;
+  overflow: hidden;
+  display: inline-flex;
+  white-space: nowrap;
+  -o-text-overflow: ellipsis;
+  text-overflow: ellipsis;
+}
 .topWrapper_select li{
   text-align: center;
   cursor: pointer;
diff --git a/src/forge/Settings/Collaborator.js b/src/forge/Settings/Collaborator.js
index d94c5967e..da0ae8b00 100644
--- a/src/forge/Settings/Collaborator.js
+++ b/src/forge/Settings/Collaborator.js
@@ -191,6 +191,16 @@ class Collaborator extends Component{
           <div className="normalBox-title font-16">
             协作者
           </div>
+          <div className="addPanel">
+            <AutoComplete
+              dataSource={source}
+              style={{ width: 200 }}
+              onChange={this.changeInputUser}
+              onSelect={this.selectInputUser}
+              placeholder="搜索用户"
+            />
+            <a className="small_submitBtn ml20" onClick={this.addCollaborator}>增加协作者</a>
+          </div>
           <Spin spinning={isSpin}>
             <div className="collaboratorList">
               {
@@ -224,16 +234,7 @@ class Collaborator extends Component{
 
             </div>
           </Spin>
-          <div className="addPanel">
-            <AutoComplete
-              dataSource={source}
-              style={{ width: 200 }}
-              onChange={this.changeInputUser}
-              onSelect={this.selectInputUser}
-              placeholder="搜索用户"
-            />
-            <a className="small_submitBtn ml20" onClick={this.addCollaborator}>增加协作者</a>
-          </div>
+
         </div>
         {
           total_count && total_count > LIMIT ?
diff --git a/src/forge/Settings/setting.css b/src/forge/Settings/setting.css
index 95b03efec..f0ca416d0 100644
--- a/src/forge/Settings/setting.css
+++ b/src/forge/Settings/setting.css
@@ -62,7 +62,7 @@
 }
 .collaboratorItem{
   display: flex;
-  border-bottom: 1px solid #f4f4f4;
+  border-top: 1px solid #f4f4f4;
   padding:15px;
 }
 .collaboratorItem>span{

From 630e2536ec1d0962950815b139d37d171d564804 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 1 Apr 2020 18:57:58 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml             | 266 +++++++++++++-------------------
 src/forge/Merge/MergeItem.js    |   2 +-
 src/forge/Merge/MessageCount.js |  10 +-
 src/forge/Version/NewVersion.js |   4 +-
 4 files changed, 115 insertions(+), 167 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f01b417b0..51fa0abde 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,17 +2,9 @@
 <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/Branch/branch.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Branch/branch.css" 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/Merge/MergeDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" 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/Order/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Detail.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Order/OrderItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/OrderItem.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Order/order.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/order.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Settings/setting.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/setting.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Version/NewVersion.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/NewVersion.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -23,19 +15,10 @@
   <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/merge.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="246">
-              <caret line="295" column="142" selection-start-line="295" selection-start-column="142" selection-end-line="295" selection-end-column="142" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="663">
-              <caret line="331" column="19" lean-forward="true" selection-start-line="331" selection-start-column="19" selection-end-line="331" selection-end-column="19" />
+            <state relative-caret-position="182">
+              <caret line="257" column="23" lean-forward="true" 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>
@@ -43,53 +26,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="166" column="16" selection-start-line="166" selection-start-column="16" selection-end-line="166" selection-end-column="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Settings/Setting.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="144">
-              <caret line="145" column="58" selection-start-line="145" selection-start-column="58" selection-end-line="145" 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/Settings/setting.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="47" column="22" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="22" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="415">
-              <caret line="75" column="51" selection-start-line="75" selection-start-column="51" selection-end-line="75" selection-end-column="51" />
-              <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/order.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="314">
-              <caret line="447" column="157" selection-start-line="447" selection-start-column="125" selection-end-line="447" selection-end-column="157" />
+            <state relative-caret-position="218">
+              <caret line="70" column="22" lean-forward="true" selection-start-line="70" selection-start-column="22" selection-end-line="70" selection-end-column="22" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -100,8 +41,8 @@
       <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="325">
-              <caret line="41" column="19" selection-start-line="41" selection-start-column="19" selection-end-line="41" selection-end-column="19" />
+            <state relative-caret-position="183">
+              <caret line="71" column="128" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="128" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -109,23 +50,10 @@
           </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="155">
-              <caret line="19" column="20" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>axios.delete</find>
-      <find>style=</find>
-      <find>width75f</find>
-      <find>max-width</find>
       <find>请输入合并</find>
       <find>journal-list-item</find>
       <find>issue-tag-show</find>
@@ -146,12 +74,16 @@
       <find>Fork</find>
       <find>forked</find>
       <find>.OptionsUl</find>
-      <find>deletedetail</find>
       <find>tyle=</find>
       <find>overflo</find>
-      <find>orderid</find>
       <find>&lt;span className=&quot;span_title&quot;&gt;里程碑&lt;/span&gt;</find>
       <find>&lt;span className=&quot;span_title&quot;&gt;里程碑</find>
+      <find>分支合并到</find>
+      <find>Input</find>
+      <find>新建标签</find>
+      <find>orderid</find>
+      <find>deletedetail</find>
+      <find>onMouseMove</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$</dir>
@@ -167,7 +99,6 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/src/AppConfig.js" />
-        <option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/newMilepost.js" />
         <option value="$PROJECT_DIR$/src/forge/Index.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Tags.js" />
@@ -193,11 +124,12 @@
         <option value="$PROJECT_DIR$/src/forge/Settings/setting.css" />
         <option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
+        <option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
       </list>
     </option>
   </component>
@@ -218,6 +150,24 @@
               <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
+              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
+              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="forge" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
+              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="forge" type="462c0819:PsiDirectoryNode" />
+              <item name="Merge" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -272,12 +222,12 @@
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
       <workItem from="1585288258489" duration="17495000" />
-      <workItem from="1585732642767" duration="2723000" />
+      <workItem from="1585732642767" duration="3810000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="55259000" />
+    <option name="totallyTimeSpent" value="56346000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -296,7 +246,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.2879518" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.24819277" />
       <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" />
@@ -429,17 +379,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/Tags.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="337">
-          <caret line="319" column="18" selection-start-line="319" selection-start-column="18" selection-end-line="319" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#6599#6910#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/quillForEditor/index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="125">
@@ -605,19 +544,6 @@
         </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="63">
-          <caret line="580" column="22" selection-start-line="580" selection-start-column="22" selection-end-line="580" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#16273#18539#0" />
-            <element signature="e#17250#18162#0" />
-            <element signature="e#18177#18487#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/MilepostDetail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-3903">
@@ -637,16 +563,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="307">
-          <caret line="145" column="6" lean-forward="true" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="199">
@@ -684,16 +600,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="258">
-          <caret line="145" column="20" selection-start-line="145" selection-start-column="20" selection-end-line="145" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Main/DetailTop.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="306">
@@ -732,16 +638,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Settings/Setting.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="144">
-          <caret line="145" column="58" selection-start-line="145" selection-start-column="58" selection-end-line="145" selection-end-column="58" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
@@ -752,16 +648,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="314">
-          <caret line="447" column="157" selection-start-line="447" selection-start-column="125" selection-end-line="447" selection-end-column="157" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="246">
@@ -783,10 +669,70 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Settings/Setting.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="415">
-          <caret line="75" column="51" selection-start-line="75" selection-start-column="51" selection-end-line="75" selection-end-column="51" />
+        <state relative-caret-position="144">
+          <caret line="145" column="58" selection-start-line="145" selection-start-column="58" selection-end-line="145" selection-end-column="58" />
+          <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="313">
+          <caret line="507" lean-forward="true" selection-start-line="507" selection-end-line="507" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="354">
+          <caret line="145" column="6" selection-start-line="145" selection-start-column="6" selection-end-line="145" selection-end-column="6" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/Tags.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="284">
+          <caret line="354" column="57" selection-start-line="354" selection-start-column="43" selection-end-line="354" selection-end-column="57" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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" lean-forward="true" 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>
+    <entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="193">
+          <caret line="165" column="28" lean-forward="true" selection-start-line="165" selection-start-column="28" selection-end-line="165" 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/order.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="427" column="36" selection-start-line="427" selection-start-column="36" selection-end-line="427" selection-end-column="36" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
@@ -795,20 +741,20 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="325">
-          <caret line="41" column="19" selection-start-line="41" selection-start-column="19" selection-end-line="41" selection-end-column="19" />
+        <state relative-caret-position="183">
+          <caret line="71" column="128" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="128" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="663">
-          <caret line="331" column="19" lean-forward="true" selection-start-line="331" selection-start-column="19" selection-end-line="331" selection-end-column="19" />
+        <state relative-caret-position="218">
+          <caret line="70" column="22" lean-forward="true" selection-start-line="70" selection-start-column="22" selection-end-line="70" selection-end-column="22" />
           <folding>
-            <element signature="e#0#40#0" expanded="true" />
+            <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index b7bea6e03..553a4a6d7 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -63,7 +63,7 @@ class MergeItem extends Component{
                     }
                   </p>
                 </div>
-                  <ul className="topWrapper_select">
+                  <ul className="topWrapper_select" onMouseMove={()=>this.onMouseMove(item.id)} onMouseOut={()=>this.onMouseOut()}>
                   <li>{this.set_issue_tags(item.issue_tags)}</li>
                   {/*<li>{item.issue_type || "--"}</li>*/}
                   <li>{item.version || "--"}</li>
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index ed7cf0354..2ea07020c 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -502,11 +502,13 @@ class MessageCount extends Component{
           }
           <p className="mt10 color-grey-c">
            <span className={data&&data.issue.issue_status==="关闭"?"closedetail":data&&data.pull_request.status===0?"opendetail":"prdetail"}>{data&&data.issue.issue_status==="关闭"?"关闭中":data&&data.pull_request.status===0?"开启中":"已合并"} </span>
-            <span className="ml10 lineH32">
-              请求从{data && data.pull_request.head}分支合并到{data && data.pull_request.base}分支
-           
-              {/* 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} */}
+            <span className="color-grey-c">
+              由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""}
             </span>
+
+            <span className="span_title ml10">
+               请求从<strong> {data && data.pull_request.head} </strong>分支合并到<strong> {data && data.pull_request.base} </strong>分支
+             </span>
             <span className="pull-right lineH32">
                {
                  data && data.issue.user_permission ?
diff --git a/src/forge/Version/NewVersion.js b/src/forge/Version/NewVersion.js
index 350a929a4..6cda959cb 100644
--- a/src/forge/Version/NewVersion.js
+++ b/src/forge/Version/NewVersion.js
@@ -145,7 +145,7 @@ class NewVersion extends Component{
           <h5 style={{marginLeft:15}}>版本发布组织项目的版本。</h5>
           <Divider/>
           <div  style={{display:'flex'}}>
-          <Input placeholder="标签名称" style={{width:180,marginLeft:15}} value={tag_name} onChange={this.changmodelname}/>
+          <Input placeholder="标签名称" style={{width:180,marginLeft:15}} value={tag_name} onChange={this.changmodelname} />
            <div style={{marginLeft:20,marginRight:20,lineHeight: '32px'}}>@ </div>
           <Dropdown overlay={this.renderMenu(branches &&branches,'pull')} trigger={['click']} placement="bottomCenter">
           <Button style={{width:180}}>{pull}</Button>
@@ -161,7 +161,7 @@ class NewVersion extends Component{
                       required: true, message: '请输入标题'
                     }],
                   })(
-                    <Input placeholder="标题"/>
+                    <Input placeholder="标题" maxLength="32"/>
                   )}
                 </Form.Item>
               </div>

From 3cfb5a037030195b7c9471a2cab1863fa79674af Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Wed, 1 Apr 2020 19:08:52 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                | 98 +++++++++++++++++++-----------
 src/forge/Version/UpdateVersion.js |  2 +-
 2 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 51fa0abde..86b49613c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +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$/src/forge/Merge/MergeItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" 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/Version/NewVersion.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/NewVersion.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -18,7 +16,7 @@
         <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" lean-forward="true" selection-start-line="257" selection-start-column="23" selection-end-line="257" selection-end-column="23" />
+              <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>
@@ -26,11 +24,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="218">
-              <caret line="70" column="22" lean-forward="true" selection-start-line="70" selection-start-column="22" selection-end-line="70" selection-end-column="22" />
+            <state relative-caret-position="308">
+              <caret line="80" column="26" lean-forward="true" 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>
@@ -41,8 +39,32 @@
       <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="183">
-              <caret line="71" column="128" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="128" />
+            <state relative-caret-position="-40">
+              <caret line="63" column="21" lean-forward="true" 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="true">
+        <entry file="file://$PROJECT_DIR$/src/forge/Version/UpdateVersion.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="324">
+              <caret line="154" column="60" lean-forward="true" selection-start-line="154" selection-start-column="60" selection-end-line="154" selection-end-column="60" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -130,6 +152,7 @@
         <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
         <option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
+        <option value="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" />
       </list>
     </option>
   </component>
@@ -166,7 +189,7 @@
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="forge" type="462c0819:PsiDirectoryNode" />
-              <item name="Merge" type="462c0819:PsiDirectoryNode" />
+              <item name="Version" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -222,12 +245,12 @@
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
       <workItem from="1585288258489" duration="17495000" />
-      <workItem from="1585732642767" duration="3810000" />
+      <workItem from="1585732642767" duration="4703000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="56346000" />
+    <option name="totallyTimeSpent" value="57239000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -246,7 +269,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.24819277" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.36506024" />
       <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" />
@@ -308,15 +331,6 @@
     </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/UpdateVersion.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-755">
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/newMilepost.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="87">
@@ -712,23 +726,13 @@
     <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" lean-forward="true" selection-start-line="257" selection-start-column="23" selection-end-line="257" selection-end-column="23" />
+          <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>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="165" column="28" lean-forward="true" selection-start-line="165" selection-start-column="28" selection-end-line="165" 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/order.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -741,8 +745,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
-          <caret line="71" column="128" selection-start-line="71" selection-start-column="50" selection-end-line="71" selection-end-column="128" />
+        <state relative-caret-position="-40">
+          <caret line="63" column="21" lean-forward="true" 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>
@@ -751,8 +755,28 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="218">
-          <caret line="70" column="22" lean-forward="true" selection-start-line="70" selection-start-column="22" selection-end-line="70" selection-end-column="22" />
+        <state relative-caret-position="308">
+          <caret line="80" column="26" lean-forward="true" 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>
+    <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>
+    <entry file="file://$PROJECT_DIR$/src/forge/Version/UpdateVersion.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="324">
+          <caret line="154" column="60" lean-forward="true" selection-start-line="154" selection-start-column="60" selection-end-line="154" selection-end-column="60" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
diff --git a/src/forge/Version/UpdateVersion.js b/src/forge/Version/UpdateVersion.js
index 07c82b3ec..6f873cbc4 100644
--- a/src/forge/Version/UpdateVersion.js
+++ b/src/forge/Version/UpdateVersion.js
@@ -152,7 +152,7 @@ class NewVersion extends Component{
                     initialValue:this.state.data&&this.state.data.name
                     
                   })(
-                    <Input placeholder="标题"/>
+                    <Input placeholder="标题" maxLength="32"/>
                   )}
                 </Form.Item>
               </div>

From aae855bda50f312cb23e54de84a0974d2c416fc4 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 2 Apr 2020 10:09:38 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=A0=B7=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             | 88 ++++++++++++++++++++-------------
 src/forge/Branch/branch.css     |  2 +-
 src/forge/Merge/MessageCount.js |  2 +-
 3 files changed, 57 insertions(+), 35 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 86b49613c..e1e91cf60 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,8 @@
 <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/Version/UpdateVersion.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" afterDir="false" />
+      <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" />
     <option name="SHOW_DIALOG" value="false" />
@@ -28,7 +29,7 @@
         <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" lean-forward="true" selection-start-line="80" selection-start-column="26" selection-end-line="80" selection-end-column="26" />
+              <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>
@@ -40,7 +41,7 @@
         <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" lean-forward="true" selection-start-line="63" selection-start-column="21" selection-end-line="63" selection-end-column="21" />
+              <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>
@@ -60,11 +61,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="324">
-              <caret line="154" column="60" lean-forward="true" selection-start-line="154" selection-start-column="60" selection-end-line="154" selection-end-column="60" />
+            <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>
@@ -72,6 +73,27 @@
           </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" />
+              <folding>
+                <element signature="e#0#40#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -141,7 +163,6 @@
         <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Branch/branch.css" />
         <option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" />
         <option value="$PROJECT_DIR$/src/forge/Settings/setting.css" />
         <option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
@@ -149,10 +170,11 @@
         <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
         <option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
         <option value="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" />
+        <option value="$PROJECT_DIR$/src/forge/Branch/branch.css" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
       </list>
     </option>
   </component>
@@ -189,7 +211,7 @@
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="forge" type="462c0819:PsiDirectoryNode" />
-              <item name="Version" type="462c0819:PsiDirectoryNode" />
+              <item name="Merge" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -245,12 +267,12 @@
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
       <workItem from="1585288258489" duration="17495000" />
-      <workItem from="1585732642767" duration="4703000" />
+      <workItem from="1585732642767" duration="5680000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="57239000" />
+    <option name="totallyTimeSpent" value="58216000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -269,7 +291,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.36506024" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.3698795" />
       <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" />
@@ -634,13 +656,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Branch/branch.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="155">
-          <caret line="19" column="20" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Settings/Collaborator.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="109">
@@ -693,16 +708,6 @@
         </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="313">
-          <caret line="507" lean-forward="true" selection-start-line="507" selection-end-line="507" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="354">
@@ -746,7 +751,7 @@
     <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" lean-forward="true" selection-start-line="63" selection-start-column="21" selection-end-line="63" selection-end-column="21" />
+          <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>
@@ -756,7 +761,7 @@
     <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" lean-forward="true" selection-start-line="80" selection-start-column="26" selection-end-line="80" selection-end-column="26" />
+          <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>
@@ -775,13 +780,30 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Version/UpdateVersion.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="154" column="60" lean-forward="true" selection-start-line="154" selection-start-column="60" selection-end-line="154" selection-end-column="60" />
+        <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>
+    <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>
+    <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" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/forge/Branch/branch.css b/src/forge/Branch/branch.css
index f9c4dbd5b..5f9ae58f6 100644
--- a/src/forge/Branch/branch.css
+++ b/src/forge/Branch/branch.css
@@ -17,7 +17,7 @@
   box-shadow: 0px 0px 1px 1px rgba(134, 134, 134, 0.1);
   border-radius: 3px;
   background: #fff;
-  max-height: 200px;
+  max-height: 300px;
 }
 .OptionsUl{
   max-height: 200px;
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 2ea07020c..69c364ab4 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -502,7 +502,7 @@ class MessageCount extends Component{
           }
           <p className="mt10 color-grey-c">
            <span className={data&&data.issue.issue_status==="关闭"?"closedetail":data&&data.pull_request.status===0?"opendetail":"prdetail"}>{data&&data.issue.issue_status==="关闭"?"关闭中":data&&data.pull_request.status===0?"开启中":"已合并"} </span>
-            <span className="color-grey-c">
+            <span className="color-grey-c ml10">
               由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""}
             </span>
 

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 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E8=AF=B7=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 e1e91cf60..b73c5f511 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 69c364ab4..201b9c4c3 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>

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 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9pr=E7=9A=84=E6=8F=8F?=
 =?UTF-8?q?=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>

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 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9pr=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=B8=BAtextarea?=
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>

From dc00ffc34bb683cdb8f23bd7491e4ceefb53c06d Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 2 Apr 2020 13:35:56 +0800
Subject: [PATCH 9/9] build

---
 .idea/workspace.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 341caf23a..e81ee7eb6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -13,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="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" />
+            <state relative-caret-position="206">
+              <caret line="594" lean-forward="true" selection-start-line="594" selection-end-line="594" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
               </folding>
@@ -26,8 +26,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>创建</find>
-      <find>.map((item,key)=&gt;{</find>
       <find>.map((item,key)</find>
       <find>评论成</find>
       <find>没有</find>
@@ -56,6 +54,8 @@
       <find>TextArea</find>
       <find>body</find>
       <find>该合并请求可以进行自动合并操作</find>
+      <find>title</find>
+      <find>changbodypr</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$</dir>
@@ -195,12 +195,12 @@
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
       <workItem from="1585288258489" duration="17495000" />
-      <workItem from="1585732642767" duration="9777000" />
+      <workItem from="1585732642767" duration="10719000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="62313000" />
+    <option name="totallyTimeSpent" value="63255000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -218,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 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="Version Control" order="9" weight="0.61566263" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.48433736" />
       <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" />
@@ -725,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="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" />
+        <state relative-caret-position="206">
+          <caret line="594" lean-forward="true" selection-start-line="594" selection-end-line="594" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>