From ef795e9cafc36fba2141d7cb466d8ef3ea9b0524 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Tue, 14 Apr 2020 15:06:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                      | 403 ++++++++++-------------
 src/forge/Branch/CloneAddress.js         |  26 +-
 src/forge/Main/CoderRootDirectory.js     |   5 +-
 src/forge/Main/Detail.js                 |   3 +-
 src/forge/New/Index.js                   |   2 +-
 src/forge/Newfile/UserSubmitComponent.js |   2 +-
 6 files changed, 194 insertions(+), 247 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 628615820..1454e120c 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,11 @@
   <component name="ChangeListManager">
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Branch/CloneAddress.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/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" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -27,95 +31,13 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="101">
-              <caret line="304" column="20" selection-start-line="304" selection-start-column="20" selection-end-line="304" selection-end-column="20" />
-              <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$/src/forge/Merge/MessageCount.js">
+        <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="242">
-              <caret line="334" column="14" lean-forward="true" selection-start-line="334" selection-start-column="14" selection-end-line="334" selection-end-column="14" />
+            <state relative-caret-position="-371">
+              <caret line="365" column="18" selection-start-line="365" selection-start-column="18" selection-end-line="385" selection-end-column="30" />
               <folding>
-                <element signature="e#0#40#0" expanded="true" />
-                <element signature="e#1369#1443#0" />
-                <element signature="e#1832#1892#0" />
-                <element signature="e#1915#1975#0" />
-                <element signature="e#1993#2053#0" />
-                <element signature="e#2088#3195#0" />
-                <element signature="e#3244#3799#0" />
-                <element signature="e#3835#4233#0" />
-                <element signature="e#4262#4764#0" />
-                <element signature="e#4718#4755#0" />
-                <element signature="e#4800#5362#0" />
-                <element signature="e#5406#5453#0" />
-                <element signature="e#5488#5923#0" />
-                <element signature="e#5957#6020#0" />
-                <element signature="e#6043#6112#0" />
-                <element signature="e#6135#6201#0" />
-                <element signature="e#6233#6321#0" />
-                <element signature="e#6342#6601#0" />
-                <element signature="e#6622#6711#0" />
-                <element signature="e#6741#7622#0" />
-                <element signature="e#11406#11819#0" />
-                <element signature="e#11500#11606#0" />
-                <element signature="e#11623#11781#0" />
-                <element signature="e#11830#12256#0" />
-                <element signature="e#12268#12661#0" />
-                <element signature="e#8906#9244#0" />
-                <element signature="e#9748#13588#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="318">
-              <caret line="26" column="11" selection-start-line="26" selection-start-column="3" selection-end-line="26" selection-end-column="11" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="552">
-              <caret line="527" column="24" selection-start-line="527" selection-start-column="24" selection-end-line="527" selection-end-column="24" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="164" column="18" lean-forward="true" selection-start-line="164" selection-start-column="18" selection-end-line="164" selection-end-column="18" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-                <element signature="e#8046#8546#0" />
-                <element signature="e#8575#9036#0" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="192">
-              <caret line="152" column="65" lean-forward="true" selection-start-line="152" selection-start-column="10" selection-end-line="152" selection-end-column="65" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
+                <element signature="e#0#42#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -125,36 +47,36 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>代码库</find>
-      <find>href=</find>
-      <find>img_fork</find>
-      <find>branchDropdown</find>
-      <find>subFileName</find>
-      <find>shu</find>
-      <find>nonemerge</find>
-      <find>isedit</find>
-      <find>getFieldDecorator</find>
-      <find>issue_chosen</find>
-      <find>renderMergeEdit</find>
-      <find>renderSelect</find>
-      <find>menu</find>
-      <find>renderList</find>
-      <find>editMergeForm</find>
-      <find>order_line</find>
-      <find>Form</find>
-      <find>Form.I</find>
       <find>item-list-right</find>
       <find>form .ant-select</find>
       <find>form .ant-cascader-picker, form .ant-select</find>
       <find>.detailContent</find>
       <find>.ant-spin-nested-loading</find>
-      <find>该合并请求可以进行自动合并操作</find>
       <find>.newFooter</find>
       <find>topmerge_btn</find>
       <find>mergediv</find>
       <find>index</find>
       <find>prdetail</find>
       <find>showNotification</find>
+      <find>copy_rep_content</find>
+      <find>CloneAddress</find>
+      <find>branchLastCommit</find>
+      <find>CoderRootDirectory</find>
+      <find>该合并请求可以进行自动合并操作</find>
+      <find>entries</find>
+      <find>/branches</find>
+      <find>Detail</find>
+      <find>projects/:projectsId/c</find>
+      <find>branchList</find>
+      <find>getProjectRoot</find>
+      <find>changeBranch</find>
+      <find>detail</find>
+      <find>up</find>
+      <find>update</find>
+      <find>新建文件</find>
+      <find>subFileType</find>
+      <find>coders</find>
+      <find>upda</find>
     </findStrings>
     <replaceStrings>
       <replace>任务</replace>
@@ -180,7 +102,6 @@
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" />
         <option value="$PROJECT_DIR$/src/forge/Settings/Setting.js" />
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" />
         <option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" />
         <option value="$PROJECT_DIR$/src/forge/Settings/setting.css" />
         <option value="$PROJECT_DIR$/src/forge/Branch/branch.css" />
@@ -192,7 +113,6 @@
         <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/New/Index.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" />
@@ -209,12 +129,15 @@
         <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/CoderRootDirectory.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
         <option value="$PROJECT_DIR$/src/forge/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/Branch/CloneAddress.js" />
+        <option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
+        <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
       </list>
     </option>
   </component>
@@ -236,6 +159,11 @@
               <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
+              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
+              <item name="build" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
@@ -252,7 +180,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 />
@@ -268,6 +196,7 @@
     <property name="node.js.selected.package.eslint" value="$PROJECT_DIR$/node_modules/eslint" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="nodejs_package_manager_path" value="npm" />
     <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
   </component>
   <component name="RecentsManager">
@@ -322,18 +251,17 @@
       <workItem from="1586330226261" duration="658000" />
       <workItem from="1586400014081" duration="18358000" />
       <workItem from="1586517058808" duration="1607000" />
-      <workItem from="1586741565210" duration="16598000" />
+      <workItem from="1586741565210" duration="24702000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="117343000" />
+    <option name="totallyTimeSpent" value="125447000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
-    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18454936" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18454936" />
       <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="TypeScript" />
@@ -346,8 +274,8 @@
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
-      <window_info anchor="bottom" id="Version Control" order="9" weight="0.20722891" />
-      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.26987952" />
+      <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.6650602" />
       <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" />
@@ -409,60 +337,6 @@
     </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/forge/Newfile/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="884">
-          <caret line="52" column="31" selection-start-line="52" selection-start-column="31" selection-end-line="52" selection-end-column="31" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="16" column="25" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#38#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="444">
-          <caret line="75" column="14" selection-start-line="75" selection-start-column="14" selection-end-line="75" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.css">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/DetailTop.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="306">
-          <caret line="18" column="10" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="10" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Settings/setting.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="85">
-          <caret line="47" column="22" selection-start-line="47" selection-start-column="22" selection-end-line="47" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Branch/branch.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="291">
-          <caret line="27" column="15" selection-start-line="27" selection-start-column="15" selection-end-line="27" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/build/asset-manifest.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
@@ -477,16 +351,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/IndexItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="255">
-          <caret line="21" column="10" selection-start-line="21" selection-start-column="10" selection-end-line="21" selection-end-column="10" />
-          <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="458">
@@ -531,16 +395,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="412">
-          <caret line="396" column="54" selection-start-line="396" selection-start-column="54" selection-end-line="396" selection-end-column="54" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/newMilepost.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="325">
@@ -707,16 +561,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="205">
-          <caret line="175" column="51" selection-start-line="175" selection-start-column="51" selection-end-line="175" selection-end-column="51" />
-          <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>
@@ -741,16 +585,6 @@
         </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="112">
-          <caret line="323" column="46" lean-forward="true" selection-start-line="323" selection-start-column="46" selection-end-line="323" selection-end-column="46" />
-          <folding>
-            <element signature="e#0#42#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="181">
@@ -758,16 +592,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="324">
-          <caret line="79" column="33" lean-forward="true" selection-start-line="79" selection-start-column="33" selection-end-line="79" selection-end-column="33" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Main/RootTable.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="102">
@@ -806,16 +630,6 @@
         </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="101">
-          <caret line="304" column="20" selection-start-line="304" selection-start-column="20" selection-end-line="304" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="318">
@@ -826,7 +640,7 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="285">
-          <caret line="164" column="18" lean-forward="true" selection-start-line="164" selection-start-column="18" selection-end-line="164" selection-end-column="18" />
+          <caret line="164" column="18" selection-start-line="164" selection-start-column="18" selection-end-line="164" selection-end-column="18" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
             <element signature="e#8046#8546#0" />
@@ -838,7 +652,7 @@
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="192">
-          <caret line="152" column="65" lean-forward="true" selection-start-line="152" selection-start-column="10" selection-end-line="152" selection-end-column="65" />
+          <caret line="152" column="65" selection-start-line="152" selection-start-column="10" selection-end-line="152" selection-end-column="65" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
           </folding>
@@ -847,8 +661,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="334" column="14" lean-forward="true" selection-start-line="334" selection-start-column="14" selection-end-line="334" selection-end-column="14" />
+        <state relative-caret-position="193">
+          <caret line="338" column="38" selection-start-line="338" selection-start-column="38" selection-end-line="338" selection-end-column="38" />
           <folding>
             <element signature="e#0#40#0" expanded="true" />
             <element signature="e#1369#1443#0" />
@@ -881,5 +695,124 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/build/manifest.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="10" column="30" lean-forward="true" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Branch/CloneAddress.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="13" column="11" lean-forward="true" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="356">
+          <caret line="319" column="64" lean-forward="true" selection-start-line="319" selection-start-column="64" selection-end-line="319" selection-end-column="64" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootBranch.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="187">
+          <caret line="11" column="7" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="61">
+          <caret line="90" column="3" lean-forward="true" selection-start-line="90" selection-start-column="3" selection-end-line="90" selection-end-column="3" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="45" column="44" lean-forward="true" selection-start-line="45" selection-start-column="24" selection-end-line="45" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Newfile/Index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="455">
+          <caret line="56" column="22" lean-forward="true" selection-start-line="56" selection-start-column="22" selection-end-line="56" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootIndex.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="56">
+          <caret line="31" column="14" selection-start-line="31" selection-start-column="14" selection-end-line="31" selection-end-column="14" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </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="340">
+          <caret line="82" column="39" lean-forward="true" selection-start-line="82" selection-start-column="39" selection-end-line="82" selection-end-column="39" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/IndexItem.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-267">
+          <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="27" column="34" lean-forward="true" selection-start-line="27" selection-start-column="34" selection-end-line="27" selection-end-column="34" />
+        </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="172">
+          <caret line="147" column="27" lean-forward="true" selection-start-line="147" selection-start-column="27" selection-end-line="147" selection-end-column="27" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+            <element signature="e#6461#6922#0" />
+          </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="-371">
+          <caret line="365" column="18" selection-start-line="365" selection-start-column="18" selection-end-line="385" selection-end-column="30" />
+          <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/Branch/CloneAddress.js b/src/forge/Branch/CloneAddress.js
index 35feffe46..7d3cec9eb 100644
--- a/src/forge/Branch/CloneAddress.js
+++ b/src/forge/Branch/CloneAddress.js
@@ -24,16 +24,26 @@ class CloneAddress extends Component{
         <Tooltip title="复制链接">
           <span onClick={()=>this.jsCopy()}><i className="iconfont icon-fuzhi"></i></span>
         </Tooltip>
-        <span>
         {
-          !downloadUrl && 
-          <Dropdown overlay={downloadUrl} trigger={['click']} placement="bottomRight">
-            <a className="ant-dropdown-link">
-              <Icon type="cloud-download" className="font-18 fl"/>
-            </a>
-          </Dropdown>
+          downloadUrl &&
+            <span>
+              <Dropdown overlay={downloadUrl} trigger={['click']} placement="bottomRight">
+                <a className="ant-dropdown-link">
+                  <Icon type="cloud-download" className="font-18 fl"/>
+                </a>
+              </Dropdown>
+            </span>
         }
-        </span>
+        {/*<span>*/}
+        {/*{*/}
+          {/*!downloadUrl &&*/}
+          {/*<Dropdown overlay={downloadUrl} trigger={['click']} placement="bottomRight">*/}
+            {/*<a className="ant-dropdown-link">*/}
+              {/*<Icon type="cloud-download" className="font-18 fl"/>*/}
+            {/*</a>*/}
+          {/*</Dropdown>*/}
+        {/*}*/}
+        {/*</span>*/}
       </div>
     )
   }
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 641aa3c82..a7f63915e 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -83,7 +83,8 @@ class CoderRootDirectory extends Component{
           this.renderData(result.data);
         }
         this.setState({
-          rootData:result.data
+          rootData:result.data,
+          subFileType: "dir"
         })
       }
 
@@ -91,6 +92,7 @@ class CoderRootDirectory extends Component{
   }
 
   ChangeFile=(arr,readOnly)=>{
+    console.log("atrr", arr)
     this.renderUrl(arr.name,arr.path,arr.type);
     //点击直接跳转页面 加载一次路由
     
@@ -215,6 +217,7 @@ class CoderRootDirectory extends Component{
   changeBranch=(value)=>{
     const { branchList } = this.props;
 
+
     let branchLastCommit = branchList && branchList.length >0 && branchList.filter(item=>item.name === value)[0];
     this.setState({
       branch:branchLastCommit && branchLastCommit.name,
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 8a9ca5e5b..438960c29 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -155,7 +155,8 @@ class Detail extends Component{
   }
 
   componentDidUpdate=(prevState)=>{
-    if(prevState.match.params.projectsId !== this.props.match.params.projectsId){
+
+    if((prevState.match.params.projectsId !== this.props.match.params.projectsId) || (prevState.location.pathname.indexOf("newfile") !== -1)){
       this.getDetail();
     }
   }
diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index 690db894c..da0b804d1 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -118,7 +118,7 @@ class Index extends Component{
     if(data && data.length > 0){
       let _data = data;
       if(name){
-        _data = data.filter(item=>item.name.indexOf(name)>-1);
+        _data = data.filter(item=>item.name.toLowerCase().indexOf(name.toLowerCase())>-1);
       }
       let list = _data && _data.map((item) => (
         <Option key={item.id} value={item.name}>
diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js
index e286b00e4..b139b6ae4 100644
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@@ -37,7 +37,7 @@ class UserSubmitComponent extends Component{
           message:values.desc
         }).then((result)=>{
           if(result && result.data.name){
-            this.props.history.push(`/projects/${projectsId}/coders`);
+            this.props.history.push(`/projects/${projectsId}/coders?branch=${values.branchname}`);
           }
         }).catch(error=>{
           console.log(error);