From 2438ee2e6cfd883829b0ec0b6f26664a7bc2c7ea Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 9 Jan 2023 16:29:23 +0800
Subject: [PATCH] issue

---
 src/forge/Activity/Activity.js  | 20 ++++++++++++++------
 src/forge/Activity/activity.css |  6 +++---
 src/forge/Order/Detail.js       |  2 +-
 src/forge/Order/order.scss      | 21 ---------------------
 src/forge/css/index.scss        | 24 ++++++++++++++++++++++++
 5 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js
index 42e51d186..342ce388a 100644
--- a/src/forge/Activity/Activity.js
+++ b/src/forge/Activity/Activity.js
@@ -212,18 +212,26 @@ class Activity extends Component{
               {codeStatus.commit_count_in_all_branches && codeStatus.commit_count_in_all_branches>0?<span> {projectDetail && projectDetail.default_branch} 和 <span>{codeStatus.commit_count_in_all_branches} 提交</span> 到所有分支</span>:""}。 在 {projectDetail && projectDetail.default_branch} 上， 
               {codeStatus.change_files && codeStatus.change_files >0 ? <span><span className="fontbold">{codeStatus.change_files} 文件</span> 已经改变 而且</span>:""} 
               {codeStatus.additions && codeStatus.additions >0 ?<span><span className="fontbold greencount">新增 {codeStatus.additions} 行</span></span>:""} 
-              {(codeStatus.additions && codeStatus.additions >0) &&(codeStatus.deletions && codeStatus.deletions >0) ?<span>和</span>:""}
-              {codeStatus.deletions && codeStatus.deletions >0 ?<span><span className="fontbold redcount">删除 {codeStatus.deletions} 行</span></span>:""}.</div>
+              {(codeStatus.additions && codeStatus.additions >0) &&(codeStatus.deletions && codeStatus.deletions >0) ?<span> 和</span>:""}
+              {codeStatus.deletions && codeStatus.deletions >0 ?<span><span className="fontbold redcount"> 删除 {codeStatus.deletions} 行</span></span>:""}.</div>
               {
                 codeStatus.authors && codeStatus.authors.length > 0 &&
                 <ul className="prAuthor">
                   {
                     codeStatus.authors.map((i,v)=>{
                       return(
-                        <a href={`/${i.author && i.author.login}`}>
-                          <img src={getImageUrl(i.author && i.author.image_url)} width="38px" alt=""/>
-                          <Tooltip title={i.author && i.author.name} placement="bottom"><span>{i.author && i.author.name}</span></Tooltip>
-                        </a>
+                        i.author ?
+                          (!i.author.login && !i.author.email) ?
+                          <span>
+                            <img src={getImageUrl(i.author && i.author.image_url)} width="38px" alt=""/>
+                            <Tooltip title={i.author && i.author.name} placement="bottom"><span>{i.author && i.author.name}</span></Tooltip>
+                          </span>
+                          :
+                          <a href={i.author.login ? `/${i.author.login}` : `mailto:${i.author.email}`}>
+                            <img src={getImageUrl(i.author && i.author.image_url)} width="38px" alt=""/>
+                            <Tooltip title={i.author && i.author.name} placement="bottom"><span>{i.author && i.author.name}</span></Tooltip>
+                          </a>
+                        :""
                       )
                     })
                   }
diff --git a/src/forge/Activity/activity.css b/src/forge/Activity/activity.css
index f1ac39be7..d53c52490 100644
--- a/src/forge/Activity/activity.css
+++ b/src/forge/Activity/activity.css
@@ -86,16 +86,16 @@
   width: 50%;
   flex-wrap: wrap;
 }
-.prAuthor a{
+.prAuthor a,.prAuthor> span{
   display: flex;
   flex-direction: column;
   align-items: center;
   width: 78px;
 }
-.prAuthor a img{
+.prAuthor a img,.prAuthor> span img{
   border-radius: 50%;
 }
-.prAuthor a span{
+.prAuthor a span,.prAuthor> span span{
   display: block;
   max-width: 78px;
   overflow: hidden;
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 5dc19bb8c..e76c24451 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -1,4 +1,4 @@
-import React, { Component, useRef } from "react";
+import React, { Component } from "react";
 import { Link } from "react-router-dom";
 
 import axios from "axios";
diff --git a/src/forge/Order/order.scss b/src/forge/Order/order.scss
index 036fd1613..bff07c9a8 100644
--- a/src/forge/Order/order.scss
+++ b/src/forge/Order/order.scss
@@ -5,27 +5,6 @@
   justify-content: space-between;
   flex-wrap: wrap;
 }
-.markdown-body{
-  overflow: inherit;
-}
-.markdown_anchors{
-  position: relative;
-}
-.markdown_anchors:hover {
-  .anchors{
-    display: inline-block;
-  }
-}
-.markdown_anchors {
-  .anchors:hover{
-    text-decoration: none;
-  }
-}
-.markdown_anchors .anchors {
-  color: inherit;
-  margin-left: -14px;
-  display: none;
-}
 .quillContent {
   position: relative;
   margin-bottom: 4px;
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index ddb307636..943b9ab4d 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -1,6 +1,30 @@
 ul,ol,dl{
   margin-bottom: 0px;
 }
+.markdown-body{
+  overflow: inherit;
+}
+.markdown-body a{
+  color: #6e90ff;
+}
+.markdown_anchors{
+  position: relative;
+}
+.markdown_anchors:hover {
+  .anchors{
+    display: inline-block;
+  }
+}
+.markdown_anchors {
+  .anchors:hover{
+    text-decoration: none;
+  }
+}
+.markdown_anchors .anchors {
+  color: inherit;
+  margin-left: -14px;
+  display: none;
+}
 .newMain{
   background-color: #fff;
 }