zhangxzz
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

刷新新建合并请求页面之后新建合并请求报错3.0

This commit is contained in:
谢思 2021-11-23 09:48:36 +08:00
parent 58f7c984a2
commit 4d99c97370
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/forge/Merge/CreateMerge.js
View File

@ -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(