From ec48f4be0c80e670ee4a8a1fd0e3ba65165bd17b Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 16 Apr 2020 17:04:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml           | 141 ++++++++++++++++------------------
 src/forge/Version/version.css |   5 +-
 src/forge/Version/version.js  |   6 +-
 3 files changed, 73 insertions(+), 79 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8cc8d3b3..ec8265b8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +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/modules/tpm/NewHeader.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Version/version.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/version.css" 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" />
@@ -27,11 +28,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
+      <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="3196">
-              <caret line="211" column="38" selection-start-line="211" selection-start-column="38" selection-end-line="211" selection-end-column="38" />
+            <state relative-caret-position="314">
+              <caret line="110" column="32" lean-forward="true" selection-start-line="110" selection-start-column="32" selection-end-line="110" selection-end-column="32" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -39,30 +40,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="226">
-              <caret line="1423" column="58" lean-forward="true" selection-start-line="1423" selection-start-column="58" selection-end-line="1423" selection-end-column="58" />
-              <folding>
-                <element signature="e#1358#2042#0" />
-                <element signature="n#!!block;n#componentDidMount#0;n#NewHeader#0" />
-                <element signature="e#2353#2665#0" />
-                <element signature="e#2760#2816#0" />
-                <element signature="e#2954#2960#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewFooter.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/Version/version.css">
           <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 relative-caret-position="339">
+              <caret line="113" column="1" selection-start-line="113" selection-start-column="1" selection-end-line="113" selection-end-column="11" />
             </state>
           </provider>
         </entry>
@@ -71,7 +53,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>该合并请求可以进行自动合并操作</find>
       <find>entries</find>
       <find>/branches</find>
       <find>Detail</find>
@@ -101,6 +82,7 @@
       <find>chrome</find>
       <find>geturlsdata</find>
       <find>edu-menu-list</find>
+      <find>ver</find>
     </findStrings>
     <replaceStrings>
       <replace>任务</replace>
@@ -118,7 +100,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/AppConfig.js" />
         <option value="$PROJECT_DIR$/src/forge/Index.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
@@ -129,7 +110,6 @@
         <option value="$PROJECT_DIR$/src/forge/Settings/setting.css" />
         <option value="$PROJECT_DIR$/src/forge/Branch/branch.css" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectorytext.js" />
-        <option value="$PROJECT_DIR$/src/forge/Version/version.css" />
         <option value="$PROJECT_DIR$/src/forge/Main/IndexItem.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
@@ -149,7 +129,6 @@
         <option value="$PROJECT_DIR$/src/forge/Merge/UpdateMerge.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/Version/version.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/Index.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/list.css" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
@@ -163,6 +142,9 @@
         <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
         <option value="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" />
         <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
+        <option value="$PROJECT_DIR$/src/AppConfig.js" />
+        <option value="$PROJECT_DIR$/src/forge/Version/version.css" />
+        <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
       </list>
     </option>
   </component>
@@ -176,6 +158,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -199,11 +182,17 @@
               <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="Version" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -273,18 +262,20 @@
       <workItem from="1586741565210" duration="25216000" />
       <workItem from="1586946208505" duration="2914000" />
       <workItem from="1587004932342" duration="7698000" />
-      <workItem from="1587020811560" duration="99000" />
+      <workItem from="1587020811560" duration="543000" />
+      <workItem from="1587021467416" duration="8000" />
+      <workItem from="1587022017639" duration="1851000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="136672000" />
+    <option name="totallyTimeSpent" value="138975000" />
   </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.18669528" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18669528" />
       <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" />
@@ -297,7 +288,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.31084338" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.54337347" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.3987952" />
       <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" />
@@ -360,23 +351,6 @@
     </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/forge/css/index.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="458">
-          <caret line="83" column="7" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/UpdateVersion.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="494">
-          <caret line="178" column="62" lean-forward="true" selection-start-line="178" selection-start-column="62" selection-end-line="178" selection-end-column="62" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-2583">
@@ -523,16 +497,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="804">
-          <caret line="143" column="11" selection-start-line="143" selection-start-column="11" selection-end-line="143" selection-end-column="11" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Images/fork.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -805,16 +769,6 @@
     <entry file="file://$PROJECT_DIR$/build/favicon.ico">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3196">
-          <caret line="211" column="38" selection-start-line="211" selection-start-column="38" selection-end-line="211" selection-end-column="38" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewFooter.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="799">
@@ -825,10 +779,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="177">
+          <caret line="130" column="25" lean-forward="true" selection-start-line="130" selection-start-column="25" selection-end-line="130" selection-end-column="25" />
+          <folding>
+            <element signature="e#0#26#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="226">
-          <caret line="1423" column="58" lean-forward="true" selection-start-line="1423" selection-start-column="58" selection-end-line="1423" selection-end-column="58" />
+        <state relative-caret-position="237">
+          <caret line="1427" column="71" selection-start-line="1427" selection-start-column="71" selection-end-line="1427" selection-end-column="71" />
           <folding>
             <element signature="e#1358#2042#0" />
             <element signature="n#!!block;n#componentDidMount#0;n#NewHeader#0" />
@@ -839,5 +803,32 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="618">
+          <caret line="211" column="38" selection-start-line="211" selection-start-column="38" selection-end-line="211" selection-end-column="38" />
+          <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="339">
+          <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$/src/forge/Version/version.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="314">
+          <caret line="110" column="32" lean-forward="true" selection-start-line="110" selection-start-column="32" selection-end-line="110" selection-end-column="32" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/forge/Version/version.css b/src/forge/Version/version.css
index fb53a6cf..a03013da 100644
--- a/src/forge/Version/version.css
+++ b/src/forge/Version/version.css
@@ -110,4 +110,7 @@
   margin-left: -4px;
   margin-bottom: 10px;
   background: rgb(83, 81, 81);
-  }
\ No newline at end of file
+  }
+.ver-middle{
+    vertical-align: middle;
+}
\ No newline at end of file
diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js
index 0f6c0e04..2d7551ed 100644
--- a/src/forge/Version/version.js
+++ b/src/forge/Version/version.js
@@ -104,9 +104,9 @@ class version extends Component{
                           <div className="versionrighe">
                             <h5 style={{marginLeft:15,marginTop:10}}>{item.body} </h5>
                             <div className="ml15">
-                              <img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
-                              <span className="mr10">{item.user_name}</span>
-                              <span className="color-grey-9">发布于{item.created_at}</span>
+                              <img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr5 radius"/>
+                              <span className="mr10 ver-middle">{item.user_name}</span>
+                              <span className="color-grey-9 ver-middle">发布于{item.created_at}</span>
                             </div>
                           </div>
                         </div>