diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index 3aeaa4a2..81400f22 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -338,6 +338,28 @@ class CreateMerge extends Component {
return
;
};
+ // 源分支-分支搜索
+ changePullValue=(value,cate)=>{
+ const branchParams = getBranchParams(this.props.location.pathname);
+ const { pullOwner , projectId } = branchParams;
+ const url = `/${pullOwner}/${projectId}/pulls/new.json`;
+ axios.get(url,{
+ params:{branch_name:value || undefined}
+ }).then(result=>{
+ if(result){
+ if(cate === "pull"){
+ this.setState({
+ pullBranch:result.data.branches
+ })
+ }else{
+ this.setState({
+ mergeBranch:result.data.branches
+ })
+ }
+ }
+ }).catch(error=>{})
+ }
+
render() {
const {
data,
@@ -380,6 +402,7 @@ class CreateMerge extends Component {
className="merge-flex1 flex1 matchwidth"
dropdownMatchSelectWidth={false}
dropdownClassName="overlihide"
+ onSearch={(e)=>this.changePullValue(e,"pull")}
>
{this.renderBrances(pullBranches)}
@@ -408,6 +431,7 @@ class CreateMerge extends Component {
className="merge-flex1 flex1 matchwidth"
dropdownMatchSelectWidth={false}
dropdownClassName="overlihide"
+ onSearch={(e)=>this.changePullValue(e,"merge")}
>
{this.renderBrances(mergeBranches)}
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index 0ac43c7d..0fc5effb 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -226,4 +226,7 @@ form .ant-cascader-picker, form .ant-select {
/* 距离底部加大 @列表被遮挡 */
.updateMerge{
margin: 30px auto 60px;
+ }
+ .searchIcon .ant-select-arrow{
+ margin-top:-9px
}
\ No newline at end of file
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index c6de9638..f9ab0f3b 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -315,7 +315,16 @@ class MergeForm extends Component {
{getFieldDecorator("assigned_to_id", {
initialValue: assigned_to_id,
})(
-