From 07ceddecc858c452dcbb1a6ed64231b2afb1a864 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Fri, 24 Apr 2020 11:30:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                       | 368 +++++++++++++---------
 src/forge/Main/list.css                   |   4 +
 src/forge/Merge/MessageCount.js           |  31 +-
 src/forge/Merge/NewMerge.js               |   4 +-
 src/forge/Merge/UpdateMerge.js            |   4 +-
 src/forge/Order/CopyDetail.js             |   4 +-
 src/forge/Order/Detail.js                 |  34 +-
 src/forge/Order/New.js                    |   4 +-
 src/forge/Order/OrderItem.js              |   2 +-
 src/forge/Order/UpdateDetail.js           |   4 +-
 src/forge/Order/order.css                 |   6 +-
 src/forge/Order/order.js                  |   2 +-
 src/modules/user/usersInfo/InfosBanner.js |  16 +-
 13 files changed, 279 insertions(+), 204 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 94a58cabd..4bbf98005 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,19 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/public/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" 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/Merge/NewMerge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/CopyDetail.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/New.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/New.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/UpdateDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/UpdateDetail.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/Order/order.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/order.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -27,58 +39,91 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="34">
-              <caret line="2" column="37" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="37" />
+            <state relative-caret-position="158">
+              <caret line="220" column="29" lean-forward="true" selection-start-line="220" selection-start-column="29" selection-end-line="220" selection-end-column="29" />
+              <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/common/TextUtil.js">
+        <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="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
+            <state relative-caret-position="138">
+              <caret line="203" column="23" lean-forward="true" selection-start-line="203" selection-start-column="23" selection-end-line="203" selection-end-column="23" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/public/css/css_min_all.css">
+        <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-15526">
-              <caret line="1673" column="27300" selection-start-line="1673" selection-start-column="27300" selection-end-line="1673" selection-end-column="27300" />
+            <state relative-caret-position="326">
+              <caret line="570" column="16" lean-forward="true" selection-start-line="570" selection-start-column="16" selection-end-line="570" selection-end-column="16" />
+              <folding>
+                <element signature="e#0#40#0" expanded="true" />
+                <element signature="e#15687#16216#0" />
+                <element signature="e#16233#16368#0" />
+                <element signature="e#16581#18255#0" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/public/css/edu-all.css">
+        <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="171">
-              <caret line="3481" column="26" lean-forward="true" selection-start-line="3481" selection-start-column="26" selection-end-line="3481" selection-end-column="26" />
+            <state relative-caret-position="203">
+              <caret line="62" column="54" lean-forward="true" selection-start-line="62" selection-start-column="54" selection-end-line="62" selection-end-column="54" />
+            </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="-1670">
+              <caret line="60" lean-forward="true" selection-start-line="60" selection-end-line="60" />
+              <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/MergeDetail.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="270">
+              <caret line="293" column="23" lean-forward="true" selection-start-line="293" selection-start-column="23" selection-end-line="293" selection-end-column="23" />
+              <folding>
+                <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$/public/index.html">
+        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="312">
-              <caret line="40" column="13" lean-forward="true" selection-start-line="40" selection-start-column="13" selection-end-line="40" selection-end-column="13" />
+            <state relative-caret-position="193">
+              <caret line="679" column="164" selection-start-line="679" selection-start-column="164" selection-end-line="679" selection-end-column="164" />
+              <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/Branch/CloneAddress.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="130">
-              <caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="390">
+              <caret line="270" column="1" lean-forward="true" selection-start-line="270" selection-start-column="1" selection-end-line="270" selection-end-column="1" />
             </state>
           </provider>
         </entry>
@@ -87,19 +132,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>background: url</find>
-      <find>/commit</find>
-      <find>新建文件</find>
-      <find>prevSta</find>
-      <find>users/projects</find>
-      <find>我的项目</find>
-      <find>.params</find>
-      <find>rules: [],</find>
-      <find>/attachments</find>
-      <find>te</find>
-      <find>Projects</find>
-      <find>testf</find>
-      <find>radius mr10</find>
       <find>f-wrap-alignCenter</find>
       <find>fork f</find>
       <find>fork_project_user_name</find>
@@ -114,9 +146,22 @@
       <find>readme</find>
       <find>SSH</find>
       <find>clone</find>
-      <find>ssh</find>
       <find>edu_pu</find>
+      <find>edu_</find>
       <find>.str</find>
+      <find>ssh</find>
+      <find>/projects</find>
+      <find>全部项目数</find>
+      <find>未选择标签</find>
+      <find>未选择里程碑</find>
+      <find>.issueItem</find>
+      <find>未选择</find>
+      <find>issueItem</find>
+      <find>detailContent</find>
+      <find>df mt20</find>
+      <find>.detailHeader-wrapper</find>
+      <find>headerMenu-wrapper</find>
+      <find>对话</find>
     </findStrings>
     <replaceStrings>
       <replace>任务</replace>
@@ -129,6 +174,7 @@
       <dir>$PROJECT_DIR$/src/modules/user</dir>
       <dir>$PROJECT_DIR$/src/forge</dir>
       <dir>$PROJECT_DIR$/src</dir>
+      <dir>$PROJECT_DIR$/</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -137,8 +183,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/forge/Activity/Activity.js" />
-        <option value="$PROJECT_DIR$/src/forge/Version/NewVersion.js" />
         <option value="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/UpdateMilepost.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/newMilepost.js" />
@@ -146,15 +190,11 @@
         <option value="$PROJECT_DIR$/src/forge/Settings/Index.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Tags.js" />
         <option value="$PROJECT_DIR$/src/forge/Settings/new_tags.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/order.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/Index.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
         <option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
         <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
         <option value="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" />
         <option value="$PROJECT_DIR$/src/forge/Version/version.css" />
@@ -165,7 +205,6 @@
         <option value="$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js" />
         <option value="$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css" />
         <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
-        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" />
         <option value="$PROJECT_DIR$/src/modules/login/LoginDialog.js" />
         <option value="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" />
         <option value="$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js" />
@@ -176,18 +215,25 @@
         <option value="$PROJECT_DIR$/src/forge/quillForEditor/index.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/IndexItem.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/New.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js" />
         <option value="$PROJECT_DIR$/src/forge/Activity/ActivityItem.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/list.css" />
         <option value="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" />
         <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
         <option value="$PROJECT_DIR$/public/css/css_min_all.css" />
         <option value="$PROJECT_DIR$/public/index.html" />
+        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/New.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/order.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
+        <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
+        <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/list.css" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
       </list>
     </option>
   </component>
@@ -222,8 +268,20 @@
             <path>
               <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="public" type="462c0819:PsiDirectoryNode" />
-              <item name="css" 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 />
@@ -317,13 +375,13 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="189830000" />
+    <option name="totallyTimeSpent" value="194223000" />
   </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.19098713" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19098713" />
       <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" />
@@ -335,8 +393,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.16506024" />
-      <window_info anchor="bottom" id="Terminal" order="10" weight="0.14337349" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.5337349" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.21204819" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="bottom" id="TypeScript" order="12" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -399,60 +457,6 @@
     </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewFooter.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="799">
-          <caret line="49" selection-start-line="49" selection-end-line="49" />
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/tpm/TPMIndex.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1259">
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/scripts/build.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
-        </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="136">
-          <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
-          <folding>
-            <element signature="n#MergeDetail#0" />
-            <element signature="e#749#1100#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Nodata.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="119">
-          <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1921">
-          <caret line="113" column="1" selection-start-line="113" selection-start-column="1" selection-end-line="113" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="162">
@@ -666,16 +670,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="178">
-          <caret line="144" column="25" selection-start-line="144" selection-start-column="25" selection-end-line="144" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/App.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="317">
@@ -755,16 +749,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="155" column="14" selection-start-line="155" selection-start-column="14" selection-end-line="157" selection-end-column="21" />
-          <folding>
-            <element signature="e#0#42#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="-984">
@@ -788,13 +772,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="141">
-          <caret line="554" column="1" lean-forward="true" selection-start-line="554" selection-start-column="1" selection-end-line="554" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/App.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1050">
@@ -812,13 +789,6 @@
         </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="34">
-          <caret line="2" column="37" selection-start-line="2" selection-start-column="23" selection-end-line="2" selection-end-column="37" />
-        </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="505">
@@ -836,24 +806,118 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/css_min_all.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-15526">
-          <caret line="1673" column="27300" selection-start-line="1673" selection-start-column="27300" selection-end-line="1673" selection-end-column="27300" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/public/css/edu-all.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="171">
-          <caret line="3481" column="26" lean-forward="true" selection-start-line="3481" selection-start-column="26" selection-end-line="3481" selection-end-column="26" />
+          <caret line="3481" column="26" selection-start-line="3481" selection-start-column="26" selection-end-line="3481" selection-end-column="26" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/public/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="312">
-          <caret line="40" column="13" lean-forward="true" selection-start-line="40" selection-start-column="13" selection-end-line="40" selection-end-column="13" />
+        <state relative-caret-position="72">
+          <caret line="38" column="38" selection-start-line="38" selection-start-column="38" selection-end-line="38" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/public/css/css_min_all.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="43928">
+          <caret line="1673" column="27300" selection-start-line="1673" selection-start-column="27300" selection-end-line="1673" selection-end-column="27300" />
+        </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="153">
+          <caret line="9" column="50" lean-forward="true" selection-start-line="9" selection-start-column="50" selection-end-line="9" selection-end-column="50" />
+          <folding>
+            <element signature="n#CoderRootDirectory#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="192">
+          <caret line="85" column="23" lean-forward="true" selection-start-line="85" selection-start-column="23" selection-end-line="85" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#41#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="158">
+          <caret line="220" column="29" lean-forward="true" selection-start-line="220" selection-start-column="29" selection-end-line="220" selection-end-column="29" />
+          <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="-1670">
+          <caret line="60" lean-forward="true" selection-start-line="60" selection-end-line="60" />
+          <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="203">
+          <caret line="62" column="54" lean-forward="true" selection-start-line="62" selection-start-column="54" selection-end-line="62" selection-end-column="54" />
+        </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="138">
+          <caret line="203" column="23" lean-forward="true" selection-start-line="203" selection-start-column="23" selection-end-line="203" selection-end-column="23" />
+        </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="326">
+          <caret line="570" column="16" lean-forward="true" selection-start-line="570" selection-start-column="16" selection-end-line="570" selection-end-column="16" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+            <element signature="e#15687#16216#0" />
+            <element signature="e#16233#16368#0" />
+            <element signature="e#16581#18255#0" />
+          </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="270">
+          <caret line="293" column="23" lean-forward="true" selection-start-line="293" selection-start-column="23" selection-end-line="293" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="390">
+          <caret line="270" column="1" lean-forward="true" selection-start-line="270" selection-start-column="1" selection-end-line="270" selection-end-column="1" />
+        </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="193">
+          <caret line="679" column="164" selection-start-line="679" selection-start-column="164" selection-end-line="679" selection-end-column="164" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index b621d1650..bdb9b9c09 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -267,6 +267,10 @@ body,#root{
 .headerMenu-wrapper li.active{
   background:linear-gradient(180deg,rgba(58,194,255,1) 0%,rgba(27,143,255,1) 100%);
   border-radius: 15px;
+
+}
+.headerMenu-wrapper li.active a {
+  color: #fff !important;
 }
 .detail_tag_btn{
   height:30px;
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 64a9c228a..c0839a99a 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -485,7 +485,7 @@ class MessageCount extends Component{
                 rules: [],
               })(
                 <Select>
-                  <Option value={''}>未选择标签</Option>
+                  <Option value={''}>{issue_chosen && issue_chosen.issue_tag.length > 0 ? '未选择标签':'请在仓库设置里添加标签'}</Option>
                   {this.renderSelect(issue_chosen && issue_chosen.issue_tag)}
                 </Select>
               )}
@@ -498,7 +498,7 @@ class MessageCount extends Component{
                 rules: [],
               })(
                 <Select>
-                  <Option value={''}>未选择里程碑</Option>
+                  <Option value={''}>{issue_chosen && issue_chosen.issue_version.length > 0 ? '未选择里程碑': '请添加里程碑'}</Option>
                   {this.renderSelect(issue_chosen && issue_chosen.issue_version)}
                 </Select>
               )}
@@ -665,19 +665,20 @@ class MessageCount extends Component{
               }
             </span>
           </p>
-          <div className="df mt20">
-              {
-                data && data.attachments.length > 0 ?
-                  <Attachments attachments={data.attachments} showNotification={this.props.showNotification}/>
-                  :
-                  ""
-              }
-          </div>
-          <div className="detailHeader-wrapper">
+          {
+            data && data.attachments.length > 0 ?
+              <div className="df mt20">
+                <Attachments attachments={data.attachments} showNotification={this.props.showNotification}/>
+              </div>
+              :
+              ""
+          }
+
+          <div className="">
           <div className="normal f-wrap-between">
-            <ul className="headerMenu-wrapper" style={{paddingTop:42,paddingLeft:15}}>
-              <li className={url.indexOf("Messagecount")>0? "active" : ""}><Link to={`/projects/${projectsId}/merge/${mergeId}/Messagecount`}>对话内容</Link></li>
-              <li className={url.indexOf("MergeSubmit")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/merge/${mergeId}/MergeSubmit`}>代码提交</Link></li>
+            <ul className="headerMenu-wrapper" style={{paddingTop:15,paddingLeft:15}}>
+              <li className={url.indexOf("Messagecount")>0? "active" : ""}><Link to={`/projects/${projectsId}/merge/${mergeId}/Messagecount`} className="color-grey">对话内容</Link></li>
+              <li className={url.indexOf("MergeSubmit")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/merge/${mergeId}/MergeSubmit`} className="color-grey">代码提交</Link></li>
             </ul>
           </div>
         </div>
@@ -801,7 +802,7 @@ class MessageCount extends Component{
                   </div>
 
                   :
-                  <div className="list-left DetailRight mt10">
+                  <div className="list-left DetailRight mt30">
                     <p>
                       <span className="span_title">标签</span>
                       <span>{
diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index 1c09c64d5..8a8a06068 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -380,7 +380,7 @@ class NewMerge extends Component{
                     rules: [],
                   })(
                     <Select value={issue_tag_ids}>
-                      <Option value="">未选择标签</Option>
+                      <Option value="">{data && data.issue_tags.length > 0 ? '未选择标签':'请在仓库设置里添加标签'}</Option>
                       { this.renderSelect(data && data.issue_tags) }
                     </Select>
                   )}
@@ -393,7 +393,7 @@ class NewMerge extends Component{
                     rules: [],
                   })(
                     <Select value={fixed_version_id}>
-                      <Option value="">未选择里程碑</Option>
+                      <Option value="">{data && data.issue_versions.length > 0 ? '未选择里程碑': '请添加里程碑'}</Option>
                       { this.renderSelect(data && data.issue_versions) }
                     </Select>
                   )}
diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js
index de2ddb688..27b83eb45 100644
--- a/src/forge/Merge/UpdateMerge.js
+++ b/src/forge/Merge/UpdateMerge.js
@@ -260,7 +260,7 @@ class UpdateMerge extends Component{
                     rules: [],
                   })(
                     <Select>
-                      <Option value={''}>未选择标签</Option>
+                      <Option value={''}>{issue_chosen && issue_chosen.issue_tag.length > 0 ? '未选择标签':'请在仓库设置里添加标签'}</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_tag) }
                     </Select>
                   )}
@@ -273,7 +273,7 @@ class UpdateMerge extends Component{
                     rules: [],
                   })(
                     <Select>
-                      <Option value={''}>未选择里程碑</Option>
+                      <Option value={''}>{issue_chosen && issue_chosen.issue_version.length > 0 ? '未选择里程碑': '请添加里程碑'}</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_version) }
                     </Select>
                   )}
diff --git a/src/forge/Order/CopyDetail.js b/src/forge/Order/CopyDetail.js
index 741ac11ca..01d05f9d6 100644
--- a/src/forge/Order/CopyDetail.js
+++ b/src/forge/Order/CopyDetail.js
@@ -302,7 +302,7 @@ class CopyDetail extends Component{
                       rules: [],
                     })(
                       <Select>
-                        <Option value={''}>未选择标签</Option>
+                        <Option value={''}>{issue_chosen && issue_chosen.issue_tag.length > 0 ? '未选择标签':'请在仓库设置里添加标签'}</Option>
                         {this.renderSelect(issue_chosen && issue_chosen.issue_tag)}
                       </Select>
                     )}
@@ -315,7 +315,7 @@ class CopyDetail extends Component{
                       rules: [],
                     })(
                       <Select>
-                        <Option value={''}>未选择里程碑</Option>
+                        <Option value={''}>{issue_chosen && issue_chosen.issue_version.length > 0 ? '未选择里程碑': '请添加里程碑'}</Option>
                         {this.renderSelect(issue_chosen && issue_chosen.issue_version)}
                       </Select>
                     )}
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 0c5e67b50..dcea8f5ad 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -498,23 +498,25 @@ class Detail extends Component{
                 ""
             }
           </p>
-          <div className="df mt20">
-            <Link to={``}><img className="user_img" src={getImageUrl(`images/${data && data.author_picture}`)} alt=""/></Link>
-            <div className="detail_context">
-              <div className="detail_p">
-                {data&&data.description&&(data.description.length > 0)?this.commentCtx(data.description): <span className="color-grey-9 ml3 mr3">没有描述</span>}
-              </div>
-              {
-                data && data.attachments && data.attachments.length > 0 ?
-                  <Attachments attachments={data.attachments} showNotification={this.props.showNotification}/>
-                  :
-                  ""
-              }
-            </div>
-          </div>
+
         </div>
-        <div className="f-wrap-between" style={{alignItems:"flex-start"}}>
+        <div className="f-wrap-between mt20" style={{alignItems:"flex-start"}}>
           <div className="item-list-right" >
+            <div className="df ">
+              <Link to={``}><img className="user_img" src={getImageUrl(`images/${data && data.author_picture}`)} alt=""/></Link>
+              <div className="detail_context">
+                <div className="detail_p">
+                  {data&&data.description&&(data.description.length > 0)?this.commentCtx(data.description): <span className="color-grey-9 ml3 mr3">没有描述</span>}
+                </div>
+                {
+                  data && data.attachments && data.attachments.length > 0 ?
+                    <Attachments attachments={data.attachments} showNotification={this.props.showNotification}/>
+                    :
+                    ""
+                }
+              </div>
+            </div>
+            <div className="order_line" style={{marginLeft:80}}></div>
             <Spin spinning={isSpin}>
               <ul className="ul_width">
                 {renderList()}
@@ -567,7 +569,7 @@ class Detail extends Component{
             }
 
           </div>
-          <div className="list-left DetailRight mt10" style={{backgroundColor:"#fff"}}>
+          <div className="list-left DetailRight" style={{backgroundColor:"#fff"}}>
             <p>
               <span className="span_title">分支</span>
               <span>{
diff --git a/src/forge/Order/New.js b/src/forge/Order/New.js
index 7914d6996..3cc5ff5c5 100644
--- a/src/forge/Order/New.js
+++ b/src/forge/Order/New.js
@@ -212,7 +212,7 @@ class New extends Component{
                     rules: [],
                   })(
                     <Select value={issue_tag_ids}>
-                      <Option value={""}>未选择标签</Option>
+                      <Option value={""}>{issue_chosen && issue_chosen.issue_tag.length > 0 ? '未选择标签':'请在仓库设置里添加标签'}</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_tag) }
                     </Select>
                   )}
@@ -224,7 +224,7 @@ class New extends Component{
                     rules: [],
                   })(
                     <Select value={fixed_version_id}>
-                      <Option value={""}>未选择里程碑</Option>
+                      <Option value={""}>{issue_chosen && issue_chosen.issue_version.length > 0 ? '未选择里程碑': '请添加里程碑'}</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_version) }
                     </Select>
                   )}
diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js
index 5104b08ef..7d9ebf2b1 100644
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@@ -57,7 +57,7 @@ class OrderItem extends Component{
               <div className="issueItem" key={key}>
                 <div className="flex-1">
                   <p className="mb15 df">
-                    <span className="issueNo"># {search_count - (key + (page-1) * limit)}</span>
+                    <span className={item.issue_status==="关闭"? "issueNo":"issueNo issueOpen"}># {search_count - (key + (page-1) * limit)}</span>
                     <Link to={`/projects/${projectsId}/orders/${item.id}/detail`} className="flex-1 hide-1 font-16 color-grey-3 lineh-30">{item.name}</Link>
                   </p>
                   <p className="color-grey-6 font-12">
diff --git a/src/forge/Order/UpdateDetail.js b/src/forge/Order/UpdateDetail.js
index 61c0f3168..0432c1061 100644
--- a/src/forge/Order/UpdateDetail.js
+++ b/src/forge/Order/UpdateDetail.js
@@ -318,7 +318,7 @@ class UpdateDetail extends Component{
                     rules: [],
                   })(
                     <Select>
-                      <Option value={''}>未选择标签</Option>
+                      <Option value={''}>{issue_chosen && issue_chosen.issue_tag.length > 0 ? '未选择标签':'请在仓库设置里添加标签'}</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_tag) }
                     </Select>
                   )}
@@ -331,7 +331,7 @@ class UpdateDetail extends Component{
                     rules: [],
                   })(
                     <Select>
-                      <Option value={''}>未选择里程碑</Option>
+                      <Option value={''}>{issue_chosen && issue_chosen.issue_version.length > 0 ? '未选择里程碑': '请添加里程碑'}</Option>
                       { this.renderSelect(issue_chosen && issue_chosen.issue_version) }
                     </Select>
                   )}
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index de328091d..5f0900775 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -198,7 +198,7 @@
   display: flex;
   flex-wrap: wrap;
   align-content: center;
-  border-bottom:1px dashed #f4f4f4;
+  border-bottom:1px dashed #ccc;
   padding:16px 0px;
 }
 .issueItem:first-child{
@@ -214,6 +214,10 @@
   height: 30px;
   line-height: 30px;
 }
+.issueOpen{
+  background: #21ba45 !important;
+  color: #fff !important;
+}
 
 .margin_detail{
   margin-left: 15px;
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index f1c53921b..e36ffdb73 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -56,7 +56,7 @@ class order extends Component{
 
   componentDidMount=()=>{
     this.getSelectList();
-    this.getIssueList();
+    this.getIssueList("","","","","","1","","","","");
   }
 
   getSelectList=()=>{
diff --git a/src/modules/user/usersInfo/InfosBanner.js b/src/modules/user/usersInfo/InfosBanner.js
index 9226e084e..f4326759a 100644
--- a/src/modules/user/usersInfo/InfosBanner.js
+++ b/src/modules/user/usersInfo/InfosBanner.js
@@ -80,15 +80,15 @@ class InfosBanner extends Component{
                 <span className="username task-hide" style={{"maxWidth":'370px'}}>
                   {data && data.name}
                 </span>
-                {
-                  data && data.identity &&
-                  <span className="userpost"><label>{data && data.identity}</label></span>
-                }
+                {/*{*/}
+                  {/*data && data.identity &&*/}
+                  {/*<span className="userpost"><label>{data && data.identity}</label></span>*/}
+                {/*}*/}
               </p>
-              {
-                data && data.brief_introduction &&
-                <p className="mt15 text-grey-e">{data.brief_introduction}</p>
-              }
+              {/*{*/}
+                {/*data && data.brief_introduction &&*/}
+                {/*<p className="mt15 text-grey-e">{data.brief_introduction}</p>*/}
+              {/*}*/}
               {/*<p className="mt15">*/}
                 {/*<Tooltip placement='bottom' title={ data && data.professional_certification ?"已职业认证":"未职业认证"}>*/}
                   {/*<i className={ data && data.professional_certification ? "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-blue mr20 ml2":"iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-B8 mr20 ml2"}></i>*/}

From e3f0df25d3fd83de396af79be938667801cc7951 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Fri, 24 Apr 2020 12:12:33 +0800
Subject: [PATCH 2/2] =?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=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml          | 160 ++++++++++++-----------------------
 src/forge/Merge/MergeItem.js |   2 +-
 2 files changed, 54 insertions(+), 108 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d54c96232..1e3fc2a08 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,7 @@
   <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/SelectBranch.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Branch/SelectBranch.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.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/MergeItem.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -33,7 +31,7 @@
         <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="158">
-              <caret line="220" column="29" lean-forward="true" selection-start-line="220" selection-start-column="29" selection-end-line="220" selection-end-column="29" />
+              <caret line="220" column="29" selection-start-line="220" selection-start-column="29" selection-end-line="220" selection-end-column="29" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -41,25 +39,22 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="169">
-              <caret line="201" column="19" lean-forward="true" selection-start-line="201" selection-start-column="19" selection-end-line="201" selection-end-column="19" />
+            <state relative-caret-position="152">
+              <caret line="200" column="35" lean-forward="true" selection-start-line="200" selection-start-column="35" selection-end-line="200" selection-end-column="35" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
+      <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="326">
-              <caret line="570" column="16" lean-forward="true" selection-start-line="570" selection-start-column="16" selection-end-line="570" selection-end-column="16" />
+            <state relative-caret-position="145">
+              <caret line="51" column="38" lean-forward="true" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
               <folding>
-                <element signature="e#0#40#0" expanded="true" />
-                <element signature="e#15687#16216#0" />
-                <element signature="e#16233#16368#0" />
-                <element signature="e#16581#18255#0" />
+                <element signature="e#0#42#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -68,56 +63,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="203">
-              <caret line="62" column="54" lean-forward="true" selection-start-line="62" selection-start-column="54" selection-end-line="62" selection-end-column="54" />
-            </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="-1670">
-              <caret line="60" lean-forward="true" selection-start-line="60" selection-end-line="60" />
-              <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/MergeDetail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="293" column="23" lean-forward="true" selection-start-line="293" selection-start-column="23" selection-end-line="293" 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/MessageCount.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="261">
-              <caret line="682" column="16" lean-forward="true" selection-start-line="682" selection-start-column="16" selection-end-line="682" selection-end-column="16" />
-              <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/MergeSubmit.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="230">
-              <caret line="23" column="15" lean-forward="true" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="15" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="187">
+              <caret line="59" column="93" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="93" />
             </state>
           </provider>
         </entry>
@@ -125,8 +72,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="390">
-              <caret line="270" column="1" lean-forward="true" selection-start-line="270" selection-start-column="1" selection-end-line="270" selection-end-column="1" />
+            <state relative-caret-position="326">
+              <caret line="375" column="28" lean-forward="true" selection-start-line="375" selection-start-column="28" selection-end-line="375" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -135,7 +82,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>f-wrap-alignCenter</find>
       <find>fork f</find>
       <find>fork_project_user_name</find>
       <find>reposit</find>
@@ -165,6 +111,7 @@
       <find>.detailHeader-wrapper</find>
       <find>headerMenu-wrapper</find>
       <find>对话</find>
+      <find>issueNo</find>
     </findStrings>
     <replaceStrings>
       <replace>任务</replace>
@@ -186,7 +133,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/forge/Version/UpdateVersion.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/UpdateMilepost.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/newMilepost.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
@@ -237,12 +183,12 @@
         <option value="$PROJECT_DIR$/src/forge/Main/list.css" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
+        <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" fullScreen="true">
-    <option name="x" value="76" />
-    <option name="y" value="72" />
+    <option name="y" value="23" />
     <option name="width" value="1440" />
     <option name="height" value="877" />
   </component>
@@ -284,7 +230,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="Order" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -378,13 +324,13 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="194569000" />
+    <option name="totallyTimeSpent" value="196430000" />
   </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.19098713" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19098713" />
       <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" />
@@ -397,7 +343,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.5337349" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.43253013" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.2614458" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="bottom" id="TypeScript" order="12" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -460,16 +406,6 @@
     </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosProject.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="6630">
-          <caret line="389" column="27" selection-start-line="389" selection-start-column="15" selection-end-line="389" selection-end-column="27" />
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="4318">
@@ -846,7 +782,7 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="158">
-          <caret line="220" column="29" lean-forward="true" selection-start-line="220" selection-start-column="29" selection-end-line="220" selection-end-column="29" />
+          <caret line="220" column="29" selection-start-line="220" selection-start-column="29" selection-end-line="220" selection-end-column="29" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
@@ -856,24 +792,17 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-1670">
-          <caret line="60" lean-forward="true" selection-start-line="60" selection-end-line="60" />
+          <caret line="60" selection-start-line="60" selection-end-line="60" />
           <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="203">
-          <caret line="62" column="54" lean-forward="true" selection-start-line="62" selection-start-column="54" selection-end-line="62" selection-end-column="54" />
-        </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="326">
-          <caret line="570" column="16" lean-forward="true" selection-start-line="570" selection-start-column="16" selection-end-line="570" selection-end-column="16" />
+          <caret line="570" column="16" selection-start-line="570" selection-start-column="16" selection-end-line="570" selection-end-column="16" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
             <element signature="e#15687#16216#0" />
@@ -886,24 +815,17 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
-          <caret line="293" column="23" lean-forward="true" selection-start-line="293" selection-start-column="23" selection-end-line="293" selection-end-column="23" />
+          <caret line="293" column="23" selection-start-line="293" selection-start-column="23" selection-end-line="293" selection-end-column="23" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="270" column="1" lean-forward="true" selection-start-line="270" selection-start-column="1" selection-end-line="270" selection-end-column="1" />
-        </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="261">
-          <caret line="682" column="16" lean-forward="true" selection-start-line="682" selection-start-column="16" selection-end-line="682" selection-end-column="16" />
+          <caret line="682" column="16" selection-start-line="682" selection-start-column="16" selection-end-line="682" selection-end-column="16" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>
@@ -913,7 +835,7 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="230">
-          <caret line="23" column="15" lean-forward="true" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="15" />
+          <caret line="23" column="15" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="15" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>
@@ -922,8 +844,32 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="169">
-          <caret line="201" column="19" lean-forward="true" selection-start-line="201" selection-start-column="19" selection-end-line="201" selection-end-column="19" />
+        <state relative-caret-position="152">
+          <caret line="200" column="35" lean-forward="true" selection-start-line="200" selection-start-column="35" selection-end-line="200" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="326">
+          <caret line="375" column="28" lean-forward="true" selection-start-line="375" selection-start-column="28" selection-end-line="375" selection-end-column="28" />
+        </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="187">
+          <caret line="59" column="93" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="93" />
+        </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="145">
+          <caret line="51" column="38" lean-forward="true" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 3d524fc5e..c8fd34c1e 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -51,7 +51,7 @@ class MergeItem extends Component{
               <div className="issueItem">
               <div className="flex-1">
                   <p className="mb15 df">
-                    <span className="issueNo"># {search_count - (key + (page-1) * limit)}</span>
+                    <span className={item.issue_status==="关闭"? "issueNo":"issueNo issueOpen"}># {search_count - (key + (page-1) * limit)}</span>
                     <Link to={`/projects/${projectsId}/merge/${item.pull_request_id}/Messagecount`} className="flex-1 hide-1 font-16 color-grey-3 lineh-30">{item.name}</Link>
                   </p>
                   <p className="color-grey-6 font-12">