From 4d99c973704c543149a66143d4d92eea9d3b9289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 23 Nov 2021 09:48:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=96=B0=E5=BB=BA=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E9=A1=B5=E9=9D=A2=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=E6=8A=A5?=
 =?UTF-8?q?=E9=94=993.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/CreateMerge.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index 80cb6d1d..f365fd48 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -123,7 +123,10 @@ class CreateMerge extends Component {
             const initUser = result.data.projects_names && result.data.projects_names.filter((item)=>item.project_user_login === branchParams.mergeOwner);
             initUser && initUser[0] && this.selectProjectName(initUser[0].id,false,{projects_names: result.data.projects_names,id: result.data.id});
           }
-          this.setState({isSpin: false});
+          setTimeout(()=>{
+            this.setState({isSpin: false});
+            console.log('setTimeout  state', this.state.data);
+          },0)
           // 如果url上的分支不存在，取默认值master
           const noMergeBranch =
             (result.data.branches || []).filter(