diff --git a/src/forge/Branch/SelectBranch.js b/src/forge/Branch/SelectBranch.js index 85ae9040..86864a01 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 = (
- +