From 4b832f40c0ea0226990ec0e3e6825a88d22bfddb Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 29 Jun 2021 14:03:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=EF=BC=9A?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E4=BF=A1=E6=81=AF=E6=8E=92=E7=89=88=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/Detail.js      | 181 +++++++++++++++++-----------------
 src/forge/Main/sub/Invite.jsx |   4 +-
 src/forge/css/index.scss      |  13 ++-
 3 files changed, 96 insertions(+), 102 deletions(-)

diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index c0d0ee72..7bfcfa56 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 } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content , FlexAJ , AlignCenter } from '../Component/layout';
+import { Content , FlexAJ , AlignTop } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
 import Invite from './sub/Invite';
 import '../css/index.scss'
@@ -393,11 +393,11 @@ class Detail extends Component {
   textFunc = (forked_from_project_id,fork_info)=>{
     let type = fork_info && fork_info.fork_project_user_type;
     return forked_from_project_id && fork_info ?
-      <div className="color-grey-9">
-        <span>复刻自 </span>
-        <Link to={`${type ==="Organization" ? "/organize":'/users'}/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6">{fork_info.fork_project_user_name}</Link>
+      <div className="color-grey-9 df">
+        <span>复刻自</span>
+        <Link to={`${type ==="Organization" ? "/organize":'/users'}/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
         <span> / </span>
-        <Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6">{fork_info.fork_form_name}</Link>
+        <Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{maxWidth:"400px"}} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
       </div> : ""
   }
   
@@ -426,100 +426,95 @@ class Detail extends Component {
       <div>
         <div className="detailHeader-wrapper">
           <div className="normal">
-            <FlexAJ style={{paddingTop:"15px"}}>
-              <AlignCenter>
-                <div className="projectallName">
-                  {project && project.author &&
-                    <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`}>{project.author.name}</Link>
-                  }
-                  <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">
+            <AlignTop style={{padding:"20px 0px 10px",justifyContent:"space-between"}}>
+              <div>
+                <AlignTop>
+                  <div className="projectallName">
+                    {project && project.author &&
+                      <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`}>{project.author.name}</Link>
+                    }
+                    <span className="ml5 mr5">/</span>
+                    <Link to={`/projects/${owner}/${projectsId}`} className="projectN mt6">{project && project.name}</Link>
+                  </div>
+                  { projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
+                </AlignTop>
+                <div className="mt8">
                   {
-                    ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
-                    <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
+                    projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
+                    this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
+                    :""
                   }
-                  <span className="detail_tag_btn">
-                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
-                      <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3":"iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
-                      <span>{watched ? '取消关注' : '关注'}</span>
-                    </a>
-                    {
-                      watchers_count > 0 ?
-                      platform ?
-                      <Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
-                        {watchers_count}
-                      </Link>
-                      :
-                      <span className="detail_tag_btn_count">{watchers_count}</span>
-                      :""
-                    }
-                  </span>
-                  <span className="detail_tag_btn">
-                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
-                      <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
-                      <span>{praised ? '取消点赞' : '点赞'}</span>
-                    </a>
-                    {
-                      praises_count > 0 ?
-                      platform ?
-                      <Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
-                        {praises_count}
-                      </Link>:
-                      <span className="detail_tag_btn_count">{praises_count}</span>
-                      :""
-                    }
-                  </span>
-                  <span className="detail_tag_btn">
-                    <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
-                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
-                        <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
-                      </a>
-                    </Tooltip>
-                    {
-                      forked_count > 0 ?
-                      platform ?
-                      <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
-                        {forked_count}
-                      </Link>
-                      :
-                      <span className="detail_tag_btn_count">{forked_count}</span>
-                      :""
-                    }
-                  </span>
-                </span>
-              }
-            </FlexAJ>
-            <FlexAJ>
+                  {
+                    projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
+                    <span className="color-grey-9">镜像自 <span className="color-grey-6">{projectDetail.mirror_url}</span></span>
+                    :""
+                  }
+                </div>
+              </div>
               <div>
                 {
-                  projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-                  this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
-                  :""
+                  firstSync ? "":
+                  <span className="df">
+                    {
+                      ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
+                      <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
+                    }
+                    <span className="detail_tag_btn">
+                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
+                        <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3":"iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
+                        <span>{watched ? '取消关注' : '关注'}</span>
+                      </a>
+                      {
+                        watchers_count > 0 ?
+                        platform ?
+                        <Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
+                          {watchers_count}
+                        </Link>
+                        :
+                        <span className="detail_tag_btn_count">{watchers_count}</span>
+                        :""
+                      }
+                    </span>
+                    <span className="detail_tag_btn">
+                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
+                        <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
+                        <span>{praised ? '取消点赞' : '点赞'}</span>
+                      </a>
+                      {
+                        praises_count > 0 ?
+                        platform ?
+                        <Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
+                          {praises_count}
+                        </Link>:
+                        <span className="detail_tag_btn_count">{praises_count}</span>
+                        :""
+                      }
+                    </span>
+                    <span className="detail_tag_btn">
+                      <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
+                        <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
+                          <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
+                        </a>
+                      </Tooltip>
+                      {
+                        forked_count > 0 ?
+                        platform ?
+                        <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
+                          {forked_count}
+                        </Link>
+                        :
+                        <span className="detail_tag_btn_count">{forked_count}</span>
+                        :""
+                      }
+                    </span>
+                  </span>
+                }
+                {
+                  projectDetail && projectDetail.invite_code &&
+                  <Invite code={projectDetail.invite_code} className={"mt8 textRight"}/>
                 }
               </div>
-              {
-                projectDetail && projectDetail.invite_code &&
-                <Invite code={projectDetail.invite_code} />
-              }
-            </FlexAJ>
+            </AlignTop>
             {
               firstSync ? "" :
               <DetailBanner 
diff --git a/src/forge/Main/sub/Invite.jsx b/src/forge/Main/sub/Invite.jsx
index bda40b33..b03ec41c 100644
--- a/src/forge/Main/sub/Invite.jsx
+++ b/src/forge/Main/sub/Invite.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Tooltip , message } from 'antd';
 
-function Invite({code}) {
+function Invite({code,className}) {
 
   function jsCopy(id) {
     const copyEle = document.querySelector(id); // 获取要复制的节点
@@ -13,7 +13,7 @@ function Invite({code}) {
     message.success('复制成功');
   }
   return(
-    <div>
+    <div className={className}>
       <span>邀请码: <span id="devitecode">{code}</span></span>
       <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>}  placement={"bottom"}>
         <i className="iconfont icon-fuzhi2 font-16 color-blue ml8" onClick={()=>jsCopy("#devitecode")}></i>
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index 917ebb18..e8e8e85f 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -8,18 +8,17 @@ ul,ol,dl{
   color: #333;
 }
 .projectallName{
-  display: flex;
-  align-items: center;
   font-size: 22px;
   font-weight: normal;
+  line-height: 30px;
+  max-width: 850px;
   .projectN{
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    flex: 1;
-    max-width: 500px;
+    word-break: break-all;
   }
 }
+.textRight{
+  text-align: right;
+}
 .main{
   width: 1200px;
   padding:20px;