From cc49b02ab5faa13953727a400ce67799517ddc57 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Fri, 27 Mar 2020 10:05:43 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml            | 151 ++++++++++++++-------------------
 src/forge/Activity/Activity.js |   2 +-
 src/forge/Merge/merge.js       |  32 +++----
 src/forge/Order/Milepost.js    |  31 +++----
 4 files changed, 99 insertions(+), 117 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f50517c47..9013af44a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,9 @@
   <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/Settings/Collaborator.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Activity/Activity.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Activity/Activity.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Merge/merge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/Milepost.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Milepost.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -14,19 +16,10 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
+        <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1275">
-              <caret line="75" column="14" selection-start-line="75" selection-start-column="14" selection-end-line="75" selection-end-column="14" />
-            </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="1360">
-              <caret line="80" column="27" selection-start-line="80" selection-start-column="27" selection-end-line="80" selection-end-column="27" />
+            <state relative-caret-position="333">
+              <caret line="264" column="19" selection-start-line="264" selection-start-column="19" selection-end-line="264" selection-end-column="19" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -35,45 +28,22 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Newfile/Index.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Order/Milepost.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="884">
-              <caret line="52" column="31" selection-start-line="52" selection-start-column="31" selection-end-line="52" selection-end-column="31" />
+            <state relative-caret-position="131">
+              <caret line="171" column="10" selection-start-line="171" selection-start-column="10" selection-end-line="171" selection-end-column="10" />
               <folding>
-                <element signature="e#0#42#0" expanded="true" />
+                <element signature="e#0#40#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/forge/Settings/Collaborator.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Activity/Activity.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="455">
-              <caret line="144" column="11" lean-forward="true" selection-start-line="144" selection-start-column="11" selection-end-line="144" selection-end-column="11" />
-              <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/Newfile/UserSubmitComponent.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="272">
-              <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
-              <folding>
-                <element signature="e#0#38#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Settings/Index.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state>
+            <state relative-caret-position="303">
+              <caret line="163" column="16" selection-start-line="163" selection-start-column="16" selection-end-line="163" selection-end-column="16" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -107,6 +77,9 @@
       <find>.idea</find>
       <find>deleteUser</find>
       <find>axios.delete</find>
+      <find>style=</find>
+      <find>width75f</find>
+      <find>max-width</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$/src/forge</dir>
@@ -126,8 +99,6 @@
         <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/forge/Order/Milepost.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
         <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/New.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
@@ -142,12 +113,16 @@
         <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/Order/Milepost.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
+        <option value="$PROJECT_DIR$/src/forge/Activity/Activity.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">
@@ -177,7 +152,7 @@
               <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" />
+              <item name="Activity" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -231,18 +206,18 @@
       <workItem from="1585210651078" duration="1600000" />
       <workItem from="1585217705353" duration="104000" />
       <workItem from="1585217834609" duration="4000" />
-      <workItem from="1585217980103" duration="418000" />
+      <workItem from="1585217980103" duration="1984000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="32053000" />
+    <option name="totallyTimeSpent" value="33619000" />
   </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.26752505" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.26752505" />
       <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" />
@@ -255,7 +230,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.24096386" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.23493975" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.53975904" />
       <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" />
@@ -351,18 +326,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="270">
-          <caret line="276" column="20" selection-start-line="276" selection-start-column="20" selection-end-line="276" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-            <element signature="e#6583#7400#0" />
-            <element signature="e#7409#9273#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
@@ -381,18 +344,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/Milepost.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="280" column="38" selection-start-line="280" selection-start-column="38" selection-end-line="280" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#4332#4367#0" />
-            <element signature="e#4350#5226#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">
@@ -587,13 +538,6 @@
         <state relative-caret-position="-9766" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1275">
-          <caret line="75" column="14" selection-start-line="75" selection-start-column="14" selection-end-line="75" selection-end-column="14" />
-        </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="1360">
@@ -624,6 +568,23 @@
         </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="237">
+          <caret line="137" column="24" lean-forward="true" selection-start-line="137" selection-start-column="24" selection-end-line="137" selection-end-column="24" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="444">
+          <caret line="75" column="14" selection-start-line="75" selection-start-column="14" selection-end-line="75" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Settings/Index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -633,10 +594,30 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Settings/Collaborator.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="455">
-          <caret line="144" column="11" lean-forward="true" selection-start-line="144" selection-start-column="11" selection-end-line="144" selection-end-column="11" />
+        <state relative-caret-position="333">
+          <caret line="264" column="19" selection-start-line="264" selection-start-column="19" selection-end-line="264" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/Milepost.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="131">
+          <caret line="171" column="10" selection-start-line="171" selection-start-column="10" selection-end-line="171" selection-end-column="10" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Activity/Activity.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="303">
+          <caret line="163" column="16" selection-start-line="163" selection-start-column="16" selection-end-line="163" selection-end-column="16" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js
index 2457cb512..94a93a4c4 100644
--- a/src/forge/Activity/Activity.js
+++ b/src/forge/Activity/Activity.js
@@ -157,7 +157,7 @@ class Activity extends Component{
           <div className="branchDropdown f-wrap-alignCenter">
             <span className="color-grey-9 mr3">周期:</span>
             <Dropdown overlay={menu} trigger={['click']} placement="bottomLeft">
-              <a className="ant-dropdown-link">
+              <a className="ant-dropdown-link" style={{'max-width': 75}}>
                 {name && name.length>0 && name[0].name} <Icon type="down" />
               </a>
             </Dropdown>
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index b20dd3866..9257723af 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -254,25 +254,25 @@ class merge extends Component{
               : ''
           }
         </div>
+        <div className="topWrapper" style={{borderBottom:"none"}}>
+          <p className="topWrapper_type">
+            <li className={openselect ? "active":""} onClick={()=>this.openorder(1)}>{data && data.open_count ? data.open_count : 0}个开启中</li>
+            <li className={closeselect ? "active":""} onClick={()=>this.openorder(2)}>{data && data.close_count ? data.close_count : 0}个已关闭</li>
+            {/* <span onClick={this.openorder} className={author_id ? "active":""}>{data && data.open_count}个开启中</span>
+            <span onClick={this.closeorder} className={author_id ? "active":""}>{data && data.close_count}个已关闭</span> */}
+          </p>
+          <div>
+            <Search
+              placeholder="搜索"
+              enterButton
+              onSearch={this.searchFunc}
+              style={{ width: 300 }}
+            />
+          </div>
+        </div>
         {
           data && data.search_count && data.search_count > 0 ?
             <div>
-              <div className="topWrapper" style={{borderBottom:"none"}}>
-                <p className="topWrapper_type">
-                  <li className={openselect ? "active":""} onClick={()=>this.openorder(1)}>{data && data.open_count}个开启中</li>
-                  <li className={closeselect ? "active":""} onClick={()=>this.openorder(2)}>{data && data.close_count}个已关闭</li>
-                  {/* <span onClick={this.openorder} className={author_id ? "active":""}>{data && data.open_count}个开启中</span>
-            <span onClick={this.closeorder} className={author_id ? "active":""}>{data && data.close_count}个已关闭</span> */}
-                </p>
-                <div>
-                  <Search
-                    placeholder="搜索"
-                    enterButton
-                    onSearch={this.searchFunc}
-                    style={{ width: 300 }}
-                  />
-                </div>
-              </div>
               <Spin spinning={isSpin}>
                 <div className="f-wrap-between mb20">
                   <ul >
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index e160462c1..7711283ba 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -173,21 +173,7 @@ 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)=>{
@@ -292,6 +278,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 ? data.open_count : 0}个开启中</li>
+              <li className={closeselect ? "active":""} onClick={()=>this.opneMilelist(2)}>{data && data.closed_count ? data.closed_count : 0}个已关闭</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 }

From 94a0a84303ecd2ace0320e1164a72606604e1aef Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Fri, 27 Mar 2020 15:01:28 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=83=A8=E5=88=86bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml             | 205 +++++++++++++++++++++++---------
 src/forge/Merge/MessageCount.js |   4 +-
 src/forge/Order/order.css       |   1 +
 3 files changed, 152 insertions(+), 58 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9013af44a..589e44def 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,8 @@
   <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/Activity/Activity.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Activity/Activity.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Merge/merge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/merge.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Order/Milepost.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Milepost.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/order.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/order.css" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -18,8 +17,8 @@
       <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="333">
-              <caret line="264" column="19" selection-start-line="264" selection-start-column="19" selection-end-line="264" selection-end-column="19" />
+            <state relative-caret-position="5185">
+              <caret line="296" lean-forward="true" selection-start-line="296" selection-end-line="296" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -28,10 +27,33 @@
         </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/Merge/NewMerge.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="131">
-              <caret line="171" column="10" selection-start-line="171" selection-start-column="10" selection-end-line="171" selection-end-column="10" />
+            <state relative-caret-position="-1216">
+              <caret line="202" column="10" lean-forward="true" selection-start-line="202" selection-start-column="10" selection-end-line="202" selection-end-column="10" />
+              <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/UpdateMerge.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-3457">
+              <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/MessageCount.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="353">
+              <caret line="294" column="73" lean-forward="true" selection-start-line="294" selection-start-column="59" selection-end-line="294" selection-end-column="73" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
               </folding>
@@ -40,12 +62,34 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/forge/Activity/Activity.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="303">
-              <caret line="163" column="16" selection-start-line="163" selection-start-column="16" selection-end-line="163" selection-end-column="16" />
+            <state relative-caret-position="85">
+              <caret line="457" column="11" lean-forward="true" selection-start-line="457" selection-start-column="11" selection-end-line="457" selection-end-column="11" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/index.css">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="454">
+              <caret line="31" column="23" lean-forward="true" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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>
               <folding>
-                <element signature="e#0#42#0" expanded="true" />
+                <element signature="e#0#40#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -80,11 +124,15 @@
       <find>style=</find>
       <find>width75f</find>
       <find>max-width</find>
+      <find>请输入合并</find>
+      <find>journal-list-item</find>
+      <find>issue-tag-show</find>
     </findStrings>
     <dirStrings>
-      <dir>$PROJECT_DIR$/src/forge</dir>
       <dir>$PROJECT_DIR$</dir>
       <dir>$PROJECT_DIR$/src</dir>
+      <dir>$PROJECT_DIR$/src/forge/Merge</dir>
+      <dir>$PROJECT_DIR$/src/forge</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -105,7 +153,6 @@
         <option value="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" />
         <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/MessageCount.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" />
@@ -116,19 +163,22 @@
         <option value="$PROJECT_DIR$/src/forge/Order/Milepost.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/MessageCount.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
+        <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" fullScreen="true">
-    <option name="y" value="23" />
     <option name="width" value="1440" />
-    <option name="height" value="877" />
+    <option name="height" value="900" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -152,13 +202,12 @@
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="forge" type="462c0819:PsiDirectoryNode" />
-              <item name="Activity" type="462c0819:PsiDirectoryNode" />
+              <item name="Merge" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -206,18 +255,18 @@
       <workItem from="1585210651078" duration="1600000" />
       <workItem from="1585217705353" duration="104000" />
       <workItem from="1585217834609" duration="4000" />
-      <workItem from="1585217980103" duration="1984000" />
+      <workItem from="1585217980103" duration="3406000" />
+      <workItem from="1585288258489" duration="1225000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="33619000" />
+    <option name="totallyTimeSpent" value="36266000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.26752505" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.26752505" />
       <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" />
@@ -230,7 +279,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.24096386" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.53975904" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.49759036" />
       <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" />
@@ -351,16 +400,6 @@
         </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="101">
-          <caret line="202" column="40" selection-start-line="202" selection-start-column="40" selection-end-line="202" selection-end-column="40" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/CopyDetail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="360">
@@ -448,16 +487,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="32">
-          <caret line="428" column="11" selection-start-line="428" selection-start-column="11" selection-end-line="428" selection-end-column="238" />
-          <folding>
-            <element signature="e#0#40#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="2872">
@@ -594,19 +623,9 @@
         </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="333">
-          <caret line="264" column="19" selection-start-line="264" selection-start-column="19" selection-end-line="264" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/Milepost.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="131">
+        <state relative-caret-position="2822">
           <caret line="171" column="10" selection-start-line="171" selection-start-column="10" selection-end-line="171" selection-end-column="10" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
@@ -616,13 +635,87 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Activity/Activity.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="303">
-          <caret line="163" column="16" selection-start-line="163" selection-start-column="16" selection-end-line="163" selection-end-column="16" />
+        <state relative-caret-position="354">
+          <caret line="166" column="11" selection-start-line="166" selection-start-column="11" selection-end-line="166" selection-end-column="11" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
         </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">
+          <caret line="202" column="10" lean-forward="true" selection-start-line="202" selection-start-column="10" selection-end-line="202" selection-end-column="10" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3457">
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/index.css">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <folding>
+            <element signature="e#0#40#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="5185">
+          <caret line="296" lean-forward="true" selection-start-line="296" selection-end-line="296" />
+          <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="353">
+          <caret line="294" column="73" lean-forward="true" selection-start-line="294" selection-start-column="59" selection-end-line="294" selection-end-column="73" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="454">
+          <caret line="31" column="23" lean-forward="true" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
+        </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="85">
+          <caret line="457" column="11" lean-forward="true" selection-start-line="457" selection-start-column="11" selection-end-line="457" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index bb840f777..e803510e8 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -554,7 +554,7 @@ class MessageCount extends Component{
                       }}
                       // autoFocus={true}
                       style={{ height: '170px' }}
-                      placeholder="评论内容..."
+                      placeholder="请输入合并请求描述..."
                       options={options}
                       onContentChange={this.changbodypr}
                     />
@@ -590,7 +590,7 @@ class MessageCount extends Component{
                     }}
                     // autoFocus={true}
                     style={{ height: '170px' }}
-                    placeholder="请输入合并描述..."
+                    placeholder="请输入评论内容..."
                     options={options}
                     onContentChange={this.changeComments}
                   />
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index 49b8587f2..6fc05c65b 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -464,6 +464,7 @@
   flex-wrap: wrap;
 }
 .issue-tag-show{padding: 3px 8px; color: #fff; border-radius: 6px;}
+.journal-list-item{padding: 12px 15px}
 
 /*.DetailRight > p >span:nth-child(1){*/
   /*min-width: 90px;*/

From ce0a97e0ad0ea525317b2eebbf25664b4f65328f Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Fri, 27 Mar 2020 16:48:33 +0800
Subject: [PATCH 3/5] =?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            | 225 +++++++++++++++++----------------
 src/forge/Merge/MergeDetail.js |  15 ++-
 src/forge/Order/Detail.js      |  13 +-
 src/forge/Version/version.js   | 109 ++++++++--------
 4 files changed, 193 insertions(+), 169 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 589e44def..9c23ce58b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +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/Merge/MessageCount.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MessageCount.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/Merge/MergeDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeDetail.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/Version/version.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/version.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -15,22 +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">
+        <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="5185">
-              <caret line="296" lean-forward="true" selection-start-line="296" selection-end-line="296" />
-              <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/Merge/NewMerge.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1216">
-              <caret line="202" column="10" lean-forward="true" selection-start-line="202" selection-start-column="10" selection-end-line="202" selection-end-column="10" />
+            <state relative-caret-position="282">
+              <caret line="456" column="10" selection-start-line="456" selection-start-column="10" selection-end-line="460" selection-end-column="11" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
               </folding>
@@ -39,21 +27,10 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-3457">
-              <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/MessageCount.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="353">
-              <caret line="294" column="73" lean-forward="true" selection-start-line="294" selection-start-column="59" selection-end-line="294" selection-end-column="73" />
+            <state relative-caret-position="203">
+              <caret line="246" column="13" lean-forward="true" selection-start-line="246" selection-start-column="13" selection-end-line="246" selection-end-column="13" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
               </folding>
@@ -62,34 +39,40 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
+        <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="85">
-              <caret line="457" column="11" lean-forward="true" selection-start-line="457" selection-start-column="11" selection-end-line="457" selection-end-column="11" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/index.css">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="454">
-              <caret line="31" column="23" lean-forward="true" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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>
+            <state relative-caret-position="502">
+              <caret line="134" column="21" selection-start-line="134" selection-start-column="21" selection-end-line="134" selection-end-column="21" />
               <folding>
-                <element signature="e#0#40#0" expanded="true" />
+                <element signature="e#0#42#0" expanded="true" />
+                <element signature="e#1926#2824#0" />
+                <element signature="e#2843#3359#0" />
+                <element signature="e#3376#4117#0" />
+                <element signature="e#4134#4538#0" />
+              </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="110">
+              <caret line="344" column="8" selection-start-line="344" selection-start-column="8" selection-end-line="352" selection-end-column="14" />
+              <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="-33">
+              <caret line="19" column="25" selection-start-line="19" selection-start-column="25" selection-end-line="19" selection-end-column="25" />
+              <folding>
+                <element signature="e#0#42#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -99,8 +82,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>versions</find>
-      <find>缺陷</find>
       <find>contents/file</find>
       <find>新建翻转课堂</find>
       <find>nHeader</find>
@@ -127,6 +108,10 @@
       <find>请输入合并</find>
       <find>journal-list-item</find>
       <find>issue-tag-show</find>
+      <find>创建工单</find>
+      <find>创建</find>
+      <find>.map((item,key)=&gt;{</find>
+      <find>.map((item,key)</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$</dir>
@@ -149,7 +134,6 @@
         <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" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
@@ -166,6 +150,9 @@
         <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
         <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
+        <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
       </list>
     </option>
   </component>
@@ -202,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 />
@@ -256,17 +243,18 @@
       <workItem from="1585217705353" duration="104000" />
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
-      <workItem from="1585288258489" duration="1225000" />
+      <workItem from="1585288258489" duration="4319000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="36266000" />
+    <option name="totallyTimeSpent" value="39360000" />
   </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.26752505" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16881259" />
       <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" />
@@ -279,7 +267,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.24096386" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.49759036" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.21686748" />
       <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" />
@@ -487,26 +475,6 @@
         </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="2872">
-          <caret line="327" lean-forward="true" selection-start-line="327" selection-end-line="327" />
-          <folding>
-            <element signature="e#0#40#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="323">
-          <caret line="19" column="25" selection-start-line="19" selection-start-column="25" selection-end-line="19" selection-end-column="25" />
-          <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>
@@ -525,16 +493,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="-5010">
-          <caret line="23" column="19" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
-          <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="-1049">
@@ -655,7 +613,7 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1216">
-          <caret line="202" column="10" lean-forward="true" selection-start-line="202" selection-start-column="10" selection-end-line="202" selection-end-column="10" />
+          <caret line="202" column="10" selection-start-line="202" selection-start-column="10" selection-end-line="202" selection-end-column="10" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>
@@ -674,19 +632,10 @@
     <entry file="file://$PROJECT_DIR$/src/index.css">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <folding>
-            <element signature="e#0#40#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="5185">
-          <caret line="296" lean-forward="true" selection-start-line="296" selection-end-line="296" />
+          <caret line="296" selection-start-line="296" selection-end-line="296" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
@@ -696,7 +645,7 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="353">
-          <caret line="294" column="73" lean-forward="true" selection-start-line="294" selection-start-column="59" selection-end-line="294" selection-end-column="73" />
+          <caret line="294" column="73" selection-start-line="294" selection-start-column="59" selection-end-line="294" selection-end-column="73" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>
@@ -706,14 +655,68 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="454">
-          <caret line="31" column="23" lean-forward="true" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
+          <caret line="31" column="23" selection-start-line="31" selection-start-column="23" selection-end-line="31" selection-end-column="23" />
         </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="85">
-          <caret line="457" column="11" lean-forward="true" selection-start-line="457" selection-start-column="11" selection-end-line="457" selection-end-column="11" />
+        <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/Order/OrderItem.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-33">
+          <caret line="19" column="25" selection-start-line="19" selection-start-column="25" selection-end-line="19" 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/order.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="110">
+          <caret line="344" column="8" selection-start-line="344" selection-start-column="8" selection-end-line="352" selection-end-column="14" />
+          <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="282">
+          <caret line="456" column="10" selection-start-line="456" selection-start-column="10" selection-end-line="460" 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/MergeDetail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="203">
+          <caret line="246" column="13" lean-forward="true" selection-start-line="246" selection-start-column="13" selection-end-line="246" selection-end-column="13" />
+          <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="502">
+          <caret line="134" column="21" selection-start-line="134" selection-start-column="21" selection-end-line="134" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+            <element signature="e#1926#2824#0" />
+            <element signature="e#2843#3359#0" />
+            <element signature="e#3376#4117#0" />
+            <element signature="e#4134#4538#0" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/forge/Merge/MergeDetail.js b/src/forge/Merge/MergeDetail.js
index 225e031b2..9a9754098 100644
--- a/src/forge/Merge/MergeDetail.js
+++ b/src/forge/Merge/MergeDetail.js
@@ -235,14 +235,23 @@ class MergeDetail extends Component{
       <div className="main">
       <div className="topWrapper">
         <Nav  {...this.props} {...this.state}/>
-        <Link to={`/projects/${projectsId}/merge/new`} className="topWrapper_btn">创建合并请求</Link>
+        {
+          data && data.issue.user_permission ?
+            <Link to={`/projects/${projectsId}/merge/new`} className="topWrapper_btn">创建合并请求</Link>
+            : ''
+        }
+
       </div>
       <div>
         <div className="detailContent">
           <p>
             <span className="font-16" > { data && data.issue.subject}</span>
-            <div>       
-            <Link to={`/projects/${projectsId}/merge/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
+            <div>
+              {
+                data && data.issue.user_permission ?
+                  <Link to={`/projects/${projectsId}/merge/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
+                  : ''
+              }
             </div>
           </p>
           <p className="mt15">{ data && data.issue.description}</p>
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 70b0b08f3..92f129791 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -452,10 +452,15 @@ class Detail extends Component{
 
     return(
       <div className="main">
-      <div className="topWrapper">
-        <Nav  {...this.props} {...this.state}/>
-        <Link to={`/projects/${projectsId}/orders/new`} className="topWrapper_btn">创建工单</Link>
-      </div>
+        <div className="topWrapper">
+          <Nav  {...this.props} {...this.state}/>
+          {
+            data && data.user_permission ?
+              <Link to={`/projects/${projectsId}/orders/new`} className="topWrapper_btn">创建工单</Link>
+              : ''
+          }
+
+        </div>
       <div>
         <div className="detailContent">
           <p>
diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js
index c089a76ad..7dd0288d6 100644
--- a/src/forge/Version/version.js
+++ b/src/forge/Version/version.js
@@ -73,59 +73,66 @@ class version extends Component{
           <div>{
               data.releases.map((item,key)=>{
                 return(
-                  <div>
-                <div style={{display:'flex'}}>
-                  <div className="versionleft">
-                    <div className="versionrighe"></div><span  className={item&&item.draft==="稳定"?"opendversionetail":"closedversionetail"} style={{marginTop:5,margin:'auto',marginRight:15}}>{item.draft} </span>
-                    </div>
-                    <div className="version_line_one">
-                      <p className="versionrectangle"> </p>
-                    </div>
-                  {
-                    data && data.user_permission ?
-                      <div className="versionrighe">
-                        <h1 style={{marginLeft:15,marginTop:5}}>{item.name}<Link to={`/projects/${projectsId}/version/${item.version_id}/upversion`} style={{color:'blue',fontSize:10,marginLeft:5}}>(编辑)</Link> </h1>
-                      </div>
-                      : ''
-                  }
+                  <div key={key}>
+                    {
+                      item && item.id ?
+                        <div>
+                          <div style={{display:'flex'}}>
+                            <div className="versionleft">
+                              <div className="versionrighe"></div><span  className={item&&item.draft==="稳定"?"opendversionetail":"closedversionetail"} style={{marginTop:5,margin:'auto',marginRight:15}}>{item.draft} </span>
+                            </div>
+                            <div className="version_line_one">
+                              <p className="versionrectangle"> </p>
+                            </div>
+                            {
+                              data && data.user_permission ?
+                                <div className="versionrighe">
+                                  <h1 style={{marginLeft:15,marginTop:5}}>{item.name}<Link to={`/projects/${projectsId}/version/${item.version_id}/upversion`} style={{color:'blue',fontSize:10,marginLeft:5}}>(编辑)</Link> </h1>
+                                </div>
+                                : ''
+                            }
 
-                </div>
-                  <div style={{display:'flex'}}>
-                  <div className="versionleft">
-                   <span style={{marginTop:5,margin:'auto',marginRight:15}}>{item.tag_name} </span>
-                    </div>
-                    <div className="version_line_one">
-                    <p  style={{width:4}}> </p>
+                          </div>
+                          <div style={{display:'flex'}}>
+                            <div className="versionleft">
+                              <span style={{marginTop:5,margin:'auto',marginRight:15}}>{item.tag_name} </span>
+                            </div>
+                            <div className="version_line_one">
+                              <p  style={{width:4}}> </p>
 
-                    </div>
-                    <div className="versionrighe">
-                    <h5 style={{marginLeft:15,marginTop:10}}>{item.body} </h5>
-                    </div>
-                </div>
-                <div style={{display:'flex'}}>
-                  <div className="versionleft">
-                   <span style={{marginTop:5,marginRight:15}}></span>
-                    </div>
-                    <div className="version_line_tpw">
-                    <p  style={{width:4}}> </p>
-                    </div>
-                    <div className="versionrighe">
-                    <h1 style={{marginLeft:15,marginTop:10}}>下载附件 
-                    </h1>
-                      <a href={item.zipball_url} download="源代码(ZIP)" style={{color:'blue',marginLeft:15}}>源代码(ZIP)</a>
-                      <a href={item.tarball_url} download="源文件(TAR.GZ)" style={{color:'blue',marginLeft:15}}>源文件(TAR.GZ)</a>
-                  </div>
-                </div>
-                <div style={{display:'flex'}}>
-                  <div className="versionleft">
-                   <span style={{marginTop:5,marginRight:15}}></span>
-                    </div>
-                    <div className="version_line_tpw">
-                    <p  style={{width:4}}> </p>
-                    </div>
-                    <div className="versionrighe">
-                  </div>
-                </div>
+                            </div>
+                            <div className="versionrighe">
+                              <h5 style={{marginLeft:15,marginTop:10}}>{item.body} </h5>
+                            </div>
+                          </div>
+                          <div style={{display:'flex'}}>
+                            <div className="versionleft">
+                              <span style={{marginTop:5,marginRight:15}}></span>
+                            </div>
+                            <div className="version_line_tpw">
+                              <p  style={{width:4}}> </p>
+                            </div>
+                            <div className="versionrighe">
+                              <h1 style={{marginLeft:15,marginTop:10}}>下载附件
+                              </h1>
+                              <a href={item.zipball_url} download="源代码(ZIP)" style={{color:'blue',marginLeft:15}}>源代码(ZIP)</a>
+                              <a href={item.tarball_url} download="源文件(TAR.GZ)" style={{color:'blue',marginLeft:15}}>源文件(TAR.GZ)</a>
+                            </div>
+                          </div>
+                          <div style={{display:'flex'}}>
+                            <div className="versionleft">
+                              <span style={{marginTop:5,marginRight:15}}></span>
+                            </div>
+                            <div className="version_line_tpw">
+                              <p  style={{width:4}}> </p>
+                            </div>
+                            <div className="versionrighe">
+                            </div>
+                          </div>
+                        </div>
+                        :
+                        ""
+                    }
                 </div>
                 )
               })

From 424fe4980e1009efad5cfaeeabf971f08b2f15c3 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Fri, 27 Mar 2020 17:06:23 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml          | 24 ++++++++++--------------
 src/forge/Version/version.js | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9c23ce58b..7d3b97802 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +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/Merge/MergeDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeDetail.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/Version/version.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/version.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -30,7 +28,7 @@
         <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="203">
-              <caret line="246" column="13" lean-forward="true" selection-start-line="246" selection-start-column="13" selection-end-line="246" selection-end-column="13" />
+              <caret line="246" column="13" selection-start-line="246" selection-start-column="13" selection-end-line="246" selection-end-column="13" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
               </folding>
@@ -41,11 +39,10 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="502">
-              <caret line="134" column="21" selection-start-line="134" selection-start-column="21" selection-end-line="134" selection-end-column="21" />
+            <state relative-caret-position="359">
+              <caret line="93" column="35" lean-forward="true" selection-start-line="93" selection-start-column="35" selection-end-line="93" selection-end-column="35" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
-                <element signature="e#1926#2824#0" />
                 <element signature="e#2843#3359#0" />
                 <element signature="e#3376#4117#0" />
                 <element signature="e#4134#4538#0" />
@@ -243,18 +240,18 @@
       <workItem from="1585217705353" duration="104000" />
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
-      <workItem from="1585288258489" duration="4319000" />
+      <workItem from="1585288258489" duration="5521000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="39360000" />
+    <option name="totallyTimeSpent" value="40562000" />
   </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 content_ui="combo" id="Project" order="0" weight="0.16881259" />
       <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" />
@@ -267,7 +264,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.24096386" />
-      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.21686748" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.30361447" />
       <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" />
@@ -699,7 +696,7 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="203">
-          <caret line="246" column="13" lean-forward="true" selection-start-line="246" selection-start-column="13" selection-end-line="246" selection-end-column="13" />
+          <caret line="246" column="13" selection-start-line="246" selection-start-column="13" selection-end-line="246" selection-end-column="13" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>
@@ -708,11 +705,10 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="502">
-          <caret line="134" column="21" selection-start-line="134" selection-start-column="21" selection-end-line="134" selection-end-column="21" />
+        <state relative-caret-position="359">
+          <caret line="93" column="35" lean-forward="true" selection-start-line="93" selection-start-column="35" selection-end-line="93" selection-end-column="35" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
-            <element signature="e#1926#2824#0" />
             <element signature="e#2843#3359#0" />
             <element signature="e#3376#4117#0" />
             <element signature="e#4134#4538#0" />
diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js
index 7dd0288d6..2455f2128 100644
--- a/src/forge/Version/version.js
+++ b/src/forge/Version/version.js
@@ -84,13 +84,16 @@ class version extends Component{
                             <div className="version_line_one">
                               <p className="versionrectangle"> </p>
                             </div>
-                            {
-                              data && data.user_permission ?
-                                <div className="versionrighe">
-                                  <h1 style={{marginLeft:15,marginTop:5}}>{item.name}<Link to={`/projects/${projectsId}/version/${item.version_id}/upversion`} style={{color:'blue',fontSize:10,marginLeft:5}}>(编辑)</Link> </h1>
-                                </div>
-                                : ''
-                            }
+                            <div className="versionrighe">
+                              <h1 style={{marginLeft:15,marginTop:5}}>{item.name}
+                                {
+                                  data && data.user_permission ?
+                                    <Link to={`/projects/${projectsId}/version/${item.version_id}/upversion`} style={{color:'blue',fontSize:10,marginLeft:5}}>(编辑)</Link>
+                                    : ''
+                                }
+                              </h1>
+                            </div>
+
 
                           </div>
                           <div style={{display:'flex'}}>

From 2299e7cefbd8068e4066711bdefe092bdc79d11c Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Fri, 27 Mar 2020 17:18:17 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml       | 55 ++++++++++++++++++++++-----------------
 src/forge/Order/Detail.js |  2 +-
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7d3b97802..efce6d8f3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +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/Version/version.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/version.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Detail.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -12,11 +12,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="282">
-              <caret line="456" column="10" selection-start-line="456" selection-start-column="10" selection-end-line="460" selection-end-column="11" />
+            <state relative-caret-position="397">
+              <caret line="109" column="30" lean-forward="true" selection-start-line="109" selection-start-column="30" selection-end-line="109" selection-end-column="30" />
               <folding>
                 <element signature="e#0#40#0" expanded="true" />
               </folding>
@@ -36,11 +36,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/version.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="359">
-              <caret line="93" column="35" lean-forward="true" selection-start-line="93" selection-start-column="35" selection-end-line="93" selection-end-column="35" />
+            <state relative-caret-position="112">
+              <caret line="94" column="34" lean-forward="true" selection-start-line="94" selection-start-column="34" selection-end-line="94" selection-end-column="34" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
                 <element signature="e#2843#3359#0" />
@@ -147,9 +147,9 @@
         <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
         <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
       </list>
     </option>
   </component>
@@ -181,6 +181,13 @@
               <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="Order" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
@@ -240,18 +247,18 @@
       <workItem from="1585217705353" duration="104000" />
       <workItem from="1585217834609" duration="4000" />
       <workItem from="1585217980103" duration="3406000" />
-      <workItem from="1585288258489" duration="5521000" />
+      <workItem from="1585288258489" duration="6092000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="40562000" />
+    <option name="totallyTimeSpent" value="41133000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.16881259" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16881259" />
       <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" />
@@ -264,7 +271,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.24096386" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.30361447" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.20481928" />
       <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" />
@@ -683,16 +690,6 @@
         </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="282">
-          <caret line="456" column="10" selection-start-line="456" selection-start-column="10" selection-end-line="460" 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/MergeDetail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="203">
@@ -705,8 +702,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="359">
-          <caret line="93" column="35" lean-forward="true" selection-start-line="93" selection-start-column="35" selection-end-line="93" selection-end-column="35" />
+        <state relative-caret-position="112">
+          <caret line="94" column="34" lean-forward="true" selection-start-line="94" selection-start-column="34" selection-end-line="94" selection-end-column="34" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
             <element signature="e#2843#3359#0" />
@@ -716,5 +713,15 @@
         </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="397">
+          <caret line="109" column="30" lean-forward="true" selection-start-line="109" selection-start-column="30" selection-end-line="109" selection-end-column="30" />
+          <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/Order/Detail.js b/src/forge/Order/Detail.js
index 92f129791..2d42fe851 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -101,7 +101,7 @@ class Detail extends Component{
             issue_id:data.id,
             attachment_ids:fileList
           }).then(result=>{
-            if(result){
+            if(result && result.journals_count > 0){
               this.props.form.setFieldsValue({
                 content: ""
               });