修复冲突

.idea/workspace.xml

@@ -3,18 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" 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/Merge/MessageCount.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MessageCount.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/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" />
@@ -50,11 +41,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="138">
+            <state relative-caret-position="169">
-              <caret line="203" column="23" lean-forward="true" selection-start-line="203" selection-start-column="23" selection-end-line="203" selection-end-column="23" />
+              <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>
           </provider>
         </entry>
@@ -107,11 +98,23 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <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="193">
+            <state relative-caret-position="261">
-              <caret line="679" column="164" selection-start-line="679" selection-start-column="164" selection-end-line="679" selection-end-column="164" />
+              <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>
@@ -230,10 +233,10 @@
         <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" />
+        <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
       </list>
     </option>
   </component>
@@ -375,13 +378,13 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="194223000" />
+    <option name="totallyTimeSpent" value="194569000" />
   </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.19098713" />
+      <window_info 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" />
@@ -394,7 +397,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 anchor="bottom" id="Terminal" order="10" visible="true" weight="0.21204819" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.43253013" />
       <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" />
@@ -457,13 +460,6 @@
     </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="49" lean-forward="true" selection-start-line="49" selection-end-line="49" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosProject.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="6630">
@@ -874,13 +870,6 @@
         </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">
@@ -913,13 +902,30 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
+        <state relative-caret-position="261">
-          <caret line="679" column="164" selection-start-line="679" selection-start-column="164" selection-end-line="679" selection-end-column="164" />
+          <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>
+    <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>
+      </provider>
+    </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>
+      </provider>
+    </entry>
   </component>
 </project>

src/forge/Branch/SelectBranch.js

@@ -1,5 +1,5 @@
 import React , { Component } from 'react';
-import { Dropdown , Icon , Menu } from 'antd';
+import { Dropdown , Icon , Input } from 'antd';
 
 import "./branch.css"
 
@@ -59,16 +59,15 @@ class SelectBranch extends Component{
     const { branchs , branch } = this.props;
 
     let branchsFilter = value ? (branchs && branchs.length>0 && branchs.filter(item=>item.name.indexOf(value)>-1)):branchs;
-
+    console.log("value",value);
     const menu = (
       <div className="branchOptions" id="m-btn" onClick={this.stopPropagations}>
-        <input placeholder="请输入分支名称进行搜索" id="input-btn" value={value} className="OptionsInput" onChange={this.changeValue} onClick={this.InputClick}/>
+        <Input placeholder="请输入分支名称进行搜索" id="input-btn" value={value} className="OptionsInput" onChange={this.changeValue} onClick={this.InputClick}/>
         <ul className="OptionsUl" id="ul-btn">
           {
             branchsFilter && branchsFilter.map((item,key)=>{
               return(
                 <li key={key}><a className="task-hide" onClick={()=>this.changeBranch(item.name)}>{item.name}</a></li>
-                // <Menu.Item key={item.index} onClick={(value)=>changeBranch(value)}>{item.name}</Menu.Item>
               )
             })
           }

src/forge/Main/CoderRootDirectory.js

@@ -256,24 +256,23 @@ class CoderRootDirectory extends Component{
     const { branchList } = this.props;
 
     let branchLastCommit = branchList && branchList.length >0 && branchList.filter(item=>item.name === value)[0];
+    if(branchLastCommit){
       this.setState({
-      branch:branchLastCommit && branchLastCommit.name,
+        branch:value,
         branchLastCommit,
         http_url:branchLastCommit && branchLastCommit.http_url,
         isSpin: true
       })
-    if(branchLastCommit){
+      let { search } = this.props.history.location;
-      const { pathname } = this.props.location;
+      if(search && search.indexOf("?url=")>-1){
-      if(pathname && pathname.indexOf("?url=")>-1){
+        let url =search.split("?url=")[1];
-        let url =pathname.split("?url=")[1];
         this.setState({
           filePath:url
         })
-        this.getFileDetail(url, branchLastCommit.name);
+        this.getFileDetail(url, value);
       }else{
-        this.getProjectRoot( branchLastCommit.name );
+        this.getProjectRoot( value );
       }
-      // this.props.history.location.search.replace( branchLastCommit.name );
     }
   }
   render(){

src/forge/Order/order.css

@@ -198,11 +198,11 @@
   display: flex;
   flex-wrap: wrap;
   align-content: center;
-  border-bottom:1px dashed #ccc;
+  border-bottom:1px dashed #cecdcd;
   padding:16px 0px;
 }
 .issueItem:first-child{
-  border-top:1px dashed #f4f4f4;
+  border-top:1px dashed #cecdcd;
 }
 .issueNo{
   padding:0px 5px;