diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js index 81400f220..2f080bcac 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/src/forge/Merge/CreateMerge.js @@ -349,11 +349,11 @@ class CreateMerge extends Component { if(result){ if(cate === "pull"){ this.setState({ - pullBranch:result.data.branches + pullBranches:result.data.branches }) }else{ this.setState({ - mergeBranch:result.data.branches + mergeBranches:result.data.branches }) } } @@ -403,6 +403,7 @@ class CreateMerge extends Component { dropdownMatchSelectWidth={false} dropdownClassName="overlihide" onSearch={(e)=>this.changePullValue(e,"pull")} + filterOption={(input,option)=>option} > {this.renderBrances(pullBranches)} @@ -432,6 +433,7 @@ class CreateMerge extends Component { dropdownMatchSelectWidth={false} dropdownClassName="overlihide" onSearch={(e)=>this.changePullValue(e,"merge")} + filterOption={(input,option)=>option} > {this.renderBrances(mergeBranches)}