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

Merge pull request '增加PRloading状态' (#89) from tongChong/forgeplus-react:hotfix-issue into pre_develop_dev

This commit is contained in:
baladiwei 2021-09-29 09:21:19 +08:00
parent 8818bafad2 dd62dd1704
commit f34b8f8756
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/NewMerge.js
View File

@ -110,6 +110,7 @@ class NewMerge extends Component {
const { author , identifier } =oldProject; const { author , identifier } =oldProject;
url += `/${mergeBranch}...${author && author.login}/${identifier}:${localBranch}.json`; url += `/${mergeBranch}...${author && author.login}/${identifier}:${localBranch}.json`;
} }
this.setState({isSpin: true});
axios.get(url).then(result=>{ axios.get(url).then(result=>{
if(result){ if(result){
if (result.data.status === 0) { if (result.data.status === 0) {
@ -128,7 +129,9 @@ class NewMerge extends Component {
comparesData:result.data comparesData:result.data
}) })
} }
}).catch(error=>{}) }).catch(error=>{
this.setState({isSpin: false});
})
} }
} }