diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js index f365fd484..7b676cb46 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/src/forge/Merge/CreateMerge.js @@ -123,10 +123,8 @@ 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}); } - setTimeout(()=>{ - this.setState({isSpin: false}); - console.log('setTimeout state', this.state.data); - },0) + this.setState({isSpin: false}); + console.log('setTimeout state', this.state.data); // 如果url上的分支不存在,取默认值master const noMergeBranch = (result.data.branches || []).filter(