diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx index 294fdf03..304d8a16 100644 --- a/src/forge/Component/Contributors.jsx +++ b/src/forge/Component/Contributors.jsx @@ -174,11 +174,16 @@ function Contributors({owner,projectsId,currentLogin}){ { list && list.length>0 && list.map((item,key)=>{ return( + item.id ? - + setVisibleFunc(true,item.login,key)}/> - + + : + + setVisibleFunc(true,item.login,key)}/> + ) }) } diff --git a/src/forge/Issues/Component/newPanel.jsx b/src/forge/Issues/Component/newPanel.jsx index 0094be5a..78298cd7 100644 --- a/src/forge/Issues/Component/newPanel.jsx +++ b/src/forge/Issues/Component/newPanel.jsx @@ -38,7 +38,7 @@ function NewPanel(props,ref){ function deleteLoad(id){ let arr = []; - let list = files + let list = files; if(list && list.length>0 ){ arr = list.filter(i=>i.id !== id); } diff --git a/src/forge/Main/CoderDepotCatalogue.jsx b/src/forge/Main/CoderDepotCatalogue.jsx index 375266ce..c292ee73 100644 --- a/src/forge/Main/CoderDepotCatalogue.jsx +++ b/src/forge/Main/CoderDepotCatalogue.jsx @@ -29,12 +29,22 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId , platform {item.name} : (item.type === "submodule" ? - - - {item.name} - - @{truncateCommitId(item.sha)} - + ( + item.submodule_git_url ? + + + {item.name} + + @ + {truncateCommitId(item.sha)} + + : + + {item.name} + @ + {truncateCommitId(item.sha)} + + ) : goToSubRoot(item.path,item.type,item.name)}> {item.name} diff --git a/src/forge/Main/sub/Contribute.jsx b/src/forge/Main/sub/Contribute.jsx index 1db9f7e5..cc3f9743 100644 --- a/src/forge/Main/sub/Contribute.jsx +++ b/src/forge/Main/sub/Contribute.jsx @@ -63,7 +63,7 @@ function Contribute(props){
- {item.name} + {item.name}

提交{item.contributions}次{item.contribution_perc ? ` I 贡献占比${item.contribution_perc}` : ''}

diff --git a/src/forge/Upload/Index.js b/src/forge/Upload/Index.js index 616c9014..4c254405 100644 --- a/src/forge/Upload/Index.js +++ b/src/forge/Upload/Index.js @@ -59,8 +59,9 @@ class Index extends Component { return { fileList: newFileList, }; + },()=>{ + this.fileIdList(this.state.fileList); }); - this.fileIdList(this.state.fileList); } else { this.props.showNotification(response.data.message) } diff --git a/src/forge/claims/claim.scss b/src/forge/claims/claim.scss index 2a0e5248..d01d7a22 100644 --- a/src/forge/claims/claim.scss +++ b/src/forge/claims/claim.scss @@ -57,15 +57,13 @@ padding-bottom: 10px; word-break: break-all; } - .attrPerson{ - padding-top: 12px; + .claimattrPerson{ display: flex; flex-wrap: wrap; padding-bottom: 2px; a{ - margin: 0px 2px 0px 0px; - height: 22px; - line-height: 20px; + margin: 12px 2px 0px 0px; + height: 30px; img{ border-radius: 50%; width: 30px; diff --git a/src/forge/claims/claims.js b/src/forge/claims/claims.js index 57a0c5e8..d480b178 100644 --- a/src/forge/claims/claims.js +++ b/src/forge/claims/claims.js @@ -294,7 +294,7 @@ class claims extends React.Component { {claimerData.length}
this.setVisibleFunc(false)} > {claimerData.map((item, key) => { diff --git a/src/index.css b/src/index.css index d94c4c6f..1fff67d5 100644 --- a/src/index.css +++ b/src/index.css @@ -99,9 +99,11 @@ li { pre.prettyprint { border: 0px solid transparent; - padding: 10px 38px; + padding: 10px; +} +.markdown-body pre ol>li, .markdown-body pre ol>li{ + list-style: none!important; } - .-flex-basic0 { flex-basis: 0% !important; -webkit-flex-basis: 0% !important;