Merge branch 'gitlink_server_issue' into gitlink_server

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 ? 
               <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
-                <Link key={key} to={`/${item.login}`}>
+                <a key={key} href={`/${item.login}`}>
                   <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
-                </Link>
+                </a>
               </Popover>
+              :
+              <a key={key} href={`mailto:${item.email}`}>
+                <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
+              </a>
             )
           })
         }

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);
     }

src/forge/Main/CoderDepotCatalogue.jsx

@@ -29,12 +29,22 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId , platform
           <span><i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}</span>
           :
           (item.type === "submodule" ? 
-            <React.Fragment>
-              <a href={`${item.submodule_git_url.slice(0,item.submodule_git_url.length-4)}`} target="_self">
-                <i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name} 
-              </a>
-              <span className="ml2">@</span><a href={`${item.submodule_git_url.slice(0,item.submodule_git_url.length-4)}/commits/${truncateCommitId(item.sha)}`} title={item.sha}>{truncateCommitId(item.sha)}</a>
-            </React.Fragment>
+            (
+              item.submodule_git_url ? 
+              <React.Fragment>
+                <a href={`${item.submodule_git_url.slice(0,item.submodule_git_url.length-4)}`} target="_self">
+                  <i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name} 
+                </a>
+                <span className="ml2">@</span>
+                <a href={`${item.submodule_git_url.slice(0,item.submodule_git_url.length-4)}/commits/${truncateCommitId(item.sha)}`} title={item.sha}>{truncateCommitId(item.sha)}</a>
+              </React.Fragment>
+              :
+              <React.Fragment>
+                 <i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name} 
+                 <span className="ml2">@</span>
+                 <span title={item.sha}>{truncateCommitId(item.sha)}</span>
+              </React.Fragment>
+            )
             :
             <a onClick={()=>goToSubRoot(item.path,item.type,item.name)}>
               <i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}

src/forge/Main/sub/Contribute.jsx

@@ -63,7 +63,7 @@ function Contribute(props){
                     <AlignCenter className='mb15'>
                       <img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`/${item.image_url}`)} width="50px" height="50px"/>
                       <div>
-                        <Link to={`/${item.login}`} className="font-16">{item.name}</Link>
+                        <a href={item.id ? `/${item.login}` : `mailto:${item.email}`} className="font-16">{item.name}</a>
                         <p className="font-12 color-grey-9">提交{item.contributions}次{item.contribution_perc ? `  I  贡献占比${item.contribution_perc}` : ''}</p>
                       </div>
                     </AlignCenter>

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)
         }

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;

src/forge/claims/claims.js

@@ -294,7 +294,7 @@ class claims extends React.Component {
               <span className="infoCount">{claimerData.length}</span>
             </div>
             <div
-              className="attrPerson"
+              className="claimattrPerson"
               onMouseLeave={() => this.setVisibleFunc(false)}
             >
               {claimerData.map((item, key) => {

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;