From 71c8f3da848b203c37a9c5fdcd7c659b06df62e0 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 24 Apr 2020 14:18:49 +0800
Subject: [PATCH] branch

---
 src/forge/Branch/SelectBranch.js     | 15 ++++++++-------
 src/forge/Main/CoderRootDirectory.js |  1 -
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/forge/Branch/SelectBranch.js b/src/forge/Branch/SelectBranch.js
index 85ae9040f..86864a010 100644
--- a/src/forge/Branch/SelectBranch.js
+++ b/src/forge/Branch/SelectBranch.js
@@ -2,7 +2,7 @@ import React , { Component } from 'react';
 import { Dropdown , Icon , Input } from 'antd';
 
 import "./branch.css"
-
+const $ = window.$;
 class SelectBranch extends Component{
   constructor(props){
     super(props);
@@ -16,6 +16,7 @@ class SelectBranch extends Component{
       if (e.target && (e.target.matches('#m-btn') || e.target.matches("#input-btn")|| e.target.matches("#ul-btn"))) { 
         return; 
       }   
+      if($(e.target)[0].className === "task-hide ulALink")return;
       this.setState({
         visible:false,
         value:undefined
@@ -45,12 +46,13 @@ class SelectBranch extends Component{
   }
 
   // 选择分支
-  changeBranch=(value)=>{
-    const { changeBranch } = this.props;
+  changeBranchs=(e,value)=>{
+    e.stopPropagation();
     this.setState({
       visible:false,
-      value:undefined
+      value
     })
+    const { changeBranch } = this.props;
     changeBranch && changeBranch(value);
   }
 
@@ -59,15 +61,14 @@ 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="请输入分支名称进行搜索" autocomplete="off" 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>
+                <li key={key}><a className="task-hide ulALink" onClick={(e)=>this.changeBranchs(e,`${item.name}`)}>{item.name}</a></li>
               )
             })
           }
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index ef2d52e9c..d7fb95286 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -254,7 +254,6 @@ class CoderRootDirectory extends Component{
   // 选择分支
   changeBranch=(value)=>{
     const { branchList } = this.props;
-
     let branchLastCommit = branchList && branchList.length >0 && branchList.filter(item=>item.name === value)[0];
     if(branchLastCommit){
       this.setState({