From f4b3afde6aa5caf91f07994f5446018cbfa8220b Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 16 Jun 2021 11:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E5=92=8C?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E7=9A=84=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=A7=81=E6=9C=89?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/edu-purge.css    | 11 ++++++++
 src/forge/Main/Detail.js    | 54 ++++++++++++++++++-------------------
 src/forge/Main/Index.scss   | 14 +++++++++-
 src/forge/Main/IndexItem.js |  3 ++-
 4 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index c8f7c907..047d2bc1 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -3908,6 +3908,17 @@ html>body #ajax-indicator {
   max-height: 340px;
 }/*头部导航条样式---2018-03-19--by-cs*/
 
+.privateTag{
+  display: block;
+  padding:0px 6px;
+  border-radius: 12px;
+  border:1px solid #2FC25B;
+  height: 18px;
+  line-height: 18px;
+  font-size: 12px;
+  margin-left: 10px;
+  color: #2FC25B;
+}
 .head-nav {
   text-align: center;
   height: 70px;
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index b92e5217..07bb194e 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
-import { Spin, Tooltip , message } from 'antd';
+import { Spin, Tooltip } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content , FlexAJ } from '../Component/layout';
+import { Content , FlexAJ , AlignCenter } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
 import Invite from './sub/Invite';
 import '../css/index.scss'
@@ -425,34 +425,32 @@ class Detail extends Component {
       <div>
         <div className="detailHeader-wrapper">
           <div className="normal">
-            <div className="f-wrap-between" style={{ position: "relative" }}>
-              <p className="font-22 df flex-1 lineH2 mt15" style={{ alignItems: "center" }}>
-                {project && project.author &&
-                  <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`} className="show-user-link">
-                    {project.author.name}
-                  </Link>
-                }
-                <span className="ml5 mr5">/</span>
-                <span className="hide-1 flex-1 df">
-                  <Link to={`/projects/${owner}/${projectsId}`} className="font-22">{project && project.name}</Link>
-                  
-                  {
-                    projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
-                    projectDetail.type === 2 ?
-                    <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
-                      <i className="iconfont icon-banbenku font-18 mt6" style={{ color: "#8D90E3" }}/>
-                    </Tooltip>
-                    :
-                    <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
-                      <i className="iconfont icon-jingxiang font-18 color-green mt6" />
-                    </Tooltip>
-                    :""
+            <FlexAJ style={{marginTop:"15px"}}>
+              <AlignCenter>
+                <div className="projectallName">
+                  {project && project.author &&
+                    <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`}>{project.author.name}</Link>
                   }
-                </span>
-              </p>
+                  <span className="ml5 mr5">/</span>
+                  <Link to={`/projects/${owner}/${projectsId}`} className="projectN">{project && project.name}</Link>
+                </div>
+                { projectDetail && projectDetail.private && <span className="privateTag">私有</span>}
+                {
+                  projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
+                  projectDetail.type === 2 ?
+                  <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
+                    <i className="iconfont icon-banbenku font-18 mt6" style={{ color: "#8D90E3" }}/>
+                  </Tooltip>
+                  :
+                  <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
+                    <i className="iconfont icon-jingxiang font-18 color-green mt6" />
+                  </Tooltip>
+                  :""
+                }
+              </AlignCenter>
               {
                 firstSync ? "":
-                <span className="df mt25">
+                <span className="df">
                   {
                     ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
                     <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
@@ -507,7 +505,7 @@ class Detail extends Component {
                   </span>
                 </span>
               }
-            </div>
+            </FlexAJ>
             <FlexAJ>
               <div>
                 {
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index ef3cbc0f..1c99ba3d 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -102,7 +102,19 @@
     }
   }
 }
-
+.projectallName{
+  display: flex;
+  align-items: center;
+  font-size: 22px;
+  font-weight: normal;
+  .projectN{
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    flex: 1;
+    max-width: 500px;
+  }
+}
 // coderDepot
 .Panels{
   max-width: 1200px;
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index f11ee717..4a1b126e 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -35,9 +35,10 @@ class IndexItem extends Component {
               <div className="p-r-Infos">
                 <div className="p-r-name">
                   <AlignCenter>
-                    <Link to={`/projects/${item.author.login}/${item.identifier}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 490 }}>
+                    <Link to={`/projects/${item.author.login}/${item.identifier}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
                       {item.author.name}/{item.name}
                     </Link>
+                    { !item.is_public && <span className="privateTag">私有</span> }
                     {
                       item.forked_from_project_id ?
                         <span className="ml5">