Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

刷新合并请求页面之后新建合并请求报错（恢复2.0版）

This commit is contained in:
谢思 2021-11-23 10:13:11 +08:00
parent 4d99c97370
commit a04b8de39e
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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); 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}); initUser && initUser[0] && this.selectProjectName(initUser[0].id,false,{projects_names: result.data.projects_names,id: result.data.id});
} }
setTimeout(()=>{ this.setState({isSpin: false});
this.setState({isSpin: false}); console.log('setTimeout state', this.state.data);
console.log('setTimeout state', this.state.data);
},0)
// 如果url上的分支不存在，取默认值master // 如果url上的分支不存在，取默认值master
const noMergeBranch = const noMergeBranch =
(result.data.branches || []).filter( (result.data.branches || []).filter(