From 51d028336fed28d23d72a73b9d7f98e820cf9ce0 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 29 Apr 2022 09:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=90=88=E5=B9=B6=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82-=E5=88=86=E6=94=AF=E4=B8=8B=E6=8B=89=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/CreateMerge.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index 81400f22..2f080bca 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)}
                   </Select>
@@ -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)}
                     </Select>