From 902b078172188904a99057b125600ef891dd82e1 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Tue, 7 Apr 2020 18:24:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=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    | 113 ++++++++++++++++++++---------------------
 src/forge/New/Index.js |   3 +-
 2 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f93051f77..46e68133c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Detail.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/New/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/New/Index.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -13,18 +12,6 @@
   </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/Order/UpdateDetail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="6647">
-              <caret line="391" column="26" selection-start-line="391" selection-start-column="26" selection-end-line="391" selection-end-column="26" />
-              <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/Main/Index.js">
           <provider selected="true" editor-type-id="text-editor">
@@ -64,8 +51,20 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1020">
-              <caret line="60" column="26" selection-start-line="60" selection-start-column="26" selection-end-line="60" selection-end-column="26" />
+            <state relative-caret-position="143">
+              <caret line="49" column="19" lean-forward="true" selection-start-line="49" selection-start-column="19" selection-end-line="49" selection-end-column="19" />
+              <folding>
+                <element signature="e#0#42#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="259">
+              <caret line="290" column="19" lean-forward="true" selection-start-line="290" selection-start-column="19" selection-end-line="290" selection-end-column="19" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -76,17 +75,17 @@
       <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="3893">
-              <caret line="239" selection-start-line="239" selection-end-line="239" />
+            <state relative-caret-position="-111">
+              <caret line="241" column="45" lean-forward="true" selection-start-line="241" selection-start-column="45" selection-end-line="241" selection-end-column="45" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="263">
-              <caret line="245" column="39" selection-start-line="245" selection-start-column="39" selection-end-line="245" selection-end-column="39" />
+            <state relative-caret-position="186">
+              <caret line="256" column="25" lean-forward="true" selection-start-line="256" selection-start-column="25" selection-end-line="256" selection-end-column="25" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -128,7 +127,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>&lt;span className=&quot;span_title&quot;&gt;里程碑&lt;/span&gt;</find>
       <find>&lt;span className=&quot;span_title&quot;&gt;里程碑</find>
       <find>分支合并到</find>
       <find>Input</find>
@@ -158,6 +156,7 @@
       <find>pository</find>
       <find>projectDe</find>
       <find>fork</find>
+      <find>仓库名称</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$</dir>
@@ -189,7 +188,6 @@
         <option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
         <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
-        <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" />
         <option value="$PROJECT_DIR$/src/forge/Settings/setting.css" />
@@ -209,6 +207,7 @@
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/list.css" />
         <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
+        <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
       </list>
     </option>
   </component>
@@ -245,7 +244,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="New" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -306,18 +305,18 @@
       <workItem from="1585900267463" duration="136000" />
       <workItem from="1585902299727" duration="2113000" />
       <workItem from="1586153685130" duration="10062000" />
-      <workItem from="1586245827209" duration="329000" />
+      <workItem from="1586245827209" duration="1172000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="78759000" />
+    <option name="totallyTimeSpent" value="79602000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.17811158" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17811158" />
       <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" />
@@ -330,7 +329,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.61566263" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.3313253" />
+      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.3421687" />
       <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" />
@@ -569,16 +568,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="245" column="59" selection-start-line="245" selection-start-column="59" selection-end-line="245" selection-end-column="59" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Main/DetailTop.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="306">
@@ -786,23 +775,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1020">
-          <caret line="60" column="26" selection-start-line="60" selection-start-column="26" selection-end-line="60" selection-end-column="26" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3893">
-          <caret line="239" selection-start-line="239" selection-end-line="239" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/css/index.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1411">
@@ -829,8 +801,35 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="263">
-          <caret line="245" column="39" selection-start-line="245" selection-start-column="39" selection-end-line="245" selection-end-column="39" />
+        <state relative-caret-position="186">
+          <caret line="256" column="25" lean-forward="true" selection-start-line="256" selection-start-column="25" selection-end-line="256" selection-end-column="25" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-111">
+          <caret line="241" column="45" lean-forward="true" selection-start-line="241" selection-start-column="45" selection-end-line="241" selection-end-column="45" />
+        </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="143">
+          <caret line="49" column="19" lean-forward="true" selection-start-line="49" selection-start-column="19" selection-end-line="49" selection-end-column="19" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="259">
+          <caret line="290" column="19" lean-forward="true" selection-start-line="290" selection-start-column="19" selection-end-line="290" selection-end-column="19" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index 5920f0ff0..a4cd86eb6 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -283,14 +283,13 @@ class Index extends Component{
               </Form.Item>
               <Form.Item
                 label="仓库名称"
-                style={{marginBottom:"0px"}}
               > 
               {getFieldDecorator('repository_name', {
                   rules: [{
                     required: true, message: '请填写仓库名称'
                   }],
                 })(
-                    <Input placeholder="仓库名称请使用简单、深刻和独特的关键字"/>
+                    <Input placeholder="仓库名称请使用与项目相关的英文关键字"/>
                 )}
               </Form.Item>
               {/*<p className="formTip">好的存储库名称使用简单、深刻和独特的关键字</p>*/}