@@ -476,7 +476,7 @@ function CoderDepot(props){
{
projectDetail && projectDetail.license_name &&
-
+
{projectDetail.license_name}
}
@@ -492,7 +492,7 @@ function CoderDepot(props){
lesson_url &&
}
@@ -514,7 +514,12 @@ function CoderDepot(props){
{/* 贡献者 */}
{
projectDetail && projectDetail.contributors &&
-
+
}
{/* 语言 */}
{ projectDetail && projectDetail.languages &&
diff --git a/src/forge/Main/CoderDepotCatalogue.jsx b/src/forge/Main/CoderDepotCatalogue.jsx
index 004962610..37fd32696 100644
--- a/src/forge/Main/CoderDepotCatalogue.jsx
+++ b/src/forge/Main/CoderDepotCatalogue.jsx
@@ -13,7 +13,7 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}>
- {item.name}
+ {item.name}
diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx
index 59a687ddc..e5f6cbc4e 100644
--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@@ -1,8 +1,7 @@
import React, { useEffect, useState } from 'react';
import RenderHtml from '../../components/render-html';
import { AlignCenter } from '../Component/layout';
-import { Dropdown , Menu , Spin } from 'antd';
-import { Link } from 'react-router-dom';
+import { Dropdown , Anchor , Spin } from 'antd';
import ReadmeCatelogue from './sub/ReadmeCatelogue';
const $ = window.$;
@@ -33,32 +32,35 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
function menu(){
if(menuList && menuList.length > 0){
return(
-
+
)
}else{
return
}
}
+
return(
-
+
+
+
{
content &&
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index e02594703..2d17e6611 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, Button } from 'antd';
import { Link, Route, Switch } from 'react-router-dom';
-import { Content , AlignTop } from '../Component/layout';
+import { Content , AlignTop, AlignCenter } from '../Component/layout';
import DetailBanner from './sub/DetailBanner';
import { numFormat } from 'educoder';
import '../css/index.scss'
@@ -435,31 +435,19 @@ class Detail extends Component {
-
-
+
+
{project && project.author &&
- {project.author.name}
+ {project.author.name}
}
/
- {projectDetail && projectDetail.name}
+ {projectDetail && projectDetail.name}
- { projectDetail && projectDetail.private && 私有}
+ { projectDetail && projectDetail.private && 私有}
-
- {
- projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
- this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
- :""
- }
- {
- projectDetail && projectDetail.type && projectDetail.type !== 0 ?
-
镜像自 {projectDetail.mirror_url}
- :""
- }
-
{
firstSync ? "":
@@ -502,7 +490,8 @@ class Detail extends Component {
- 复刻
+
+ 复刻
{
@@ -519,7 +508,19 @@ class Detail extends Component {
}
+
+
+ {
+ projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
+ this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
+ :""
+ }
+ {
+ projectDetail && projectDetail.type && projectDetail.type !== 0 ?
+
镜像自 {projectDetail.mirror_url}
+ :""
+ }
+
{
firstSync ? "" :
img{
- margin-right: 8px;
-}
-.headerMenu-wrapper li a > span.num{
- line-height: 24px;
- margin-left: 5px;
- margin-top: 2px;
- font-size: 12px;
- float: right;
- color: #666!important;
- background-color: rgba(153, 153, 153, 0.13);;
- border-radius: 50%;
- width: 24px;
- height: 24px;
-}
-.headerMenu-wrapper li.active a,.headerMenu-wrapper li.active a i{
- color: #2A61FF!important;
-}
-.headerMenu-wrapper li.active::after{
- position: absolute;
- bottom:0px;
- height:2px;
- background-color: #2A61FF;
- content:'';
- left: 0px;
- width:100%;
+ cursor: pointer;
+ li{
+ font-size: 14px;
+ position: relative;
+ text-align: center;
+ height: 40px;
+ line-height: 28px;
+ padding:0px 20px;
+ & > a{
+ color: #666;
+ &> img{
+ margin-right: 8px;
+ }
+ &> span.num{
+ line-height: 24px;
+ margin-left: 5px;
+ margin-top: 2px;
+ font-size: 12px;
+ float: right;
+ color: #666!important;
+ background-color: rgba(153, 153, 153, 0.13);;
+ border-radius: 50%;
+ width: 24px;
+ height: 24px;
+ }
+ }
+ &.active a,&.active a i{
+ color: #2A61FF!important;
+ }
+ &.active::after,&:hover::after{
+ position: absolute;
+ bottom:0px;
+ height:2px;
+ background-color: #2A61FF;
+ content:'';
+ left: 0px;
+ width:100%;
+ }
+ &:hover::after{
+ background-color: rgba(153, 153, 153, 0.2);;
+ }
+ }
}
.detail_tag_btn{
height:34px;
@@ -271,32 +274,36 @@
border:1px solid #D0D0D0;
display: flex;
align-items: center;
- margin-left: 30px;
+ margin-left: 10px;
padding:0px;
background-color:#FAFBFC;
box-shadow: none;
-}
-.detail_tag_btn:hover{
- background-color: #F3F4F6;
+ &:hover{
+ background-color: #F3F4F6;
+ }
+ .detail_tag_btn_name{
+ padding:0px 18px;
+ min-width: 82px;
+ text-align: center;
+ &:hover>span{
+ color: #333!important;
+ }
+ img{
+ margin-right: 10px;
+ }
+ }
+ .detail_tag_btn_count{
+ width: 42px;
+ text-align: center;
+ background: #fff;
+ border-radius: 0px 4px 4px 0px;
+ height:100%;
+ border-left: 1px solid #D0D0D0;
+ }
}
.ant-tooltip {
max-width: fit-content!important;
}
-.detail_tag_btn_name{
- padding:0px 10px;
- color: #666!important;
-}
-.detail_tag_btn_name img{
- margin-right: 10px;
-}
-.detail_tag_btn_count{
- width: 42px;
- text-align: center;
- background: #fff;
- border-radius: 0px 4px 4px 0px;
- height:100%;
- border-left: 1px solid #D0D0D0;
-}
.files-md{
padding:20px;
}
@@ -347,6 +354,7 @@
.gitAddressClone{
+ margin:0px 20px 14px 20px!important;
display: flex;
height: 40px;
align-items: center;
@@ -658,9 +666,7 @@
.item:last-child{
border-bottom:none;
}
-.gitAddressClone{
- margin: 0 !important;
-}
+
.item_title small{
font-weight: 400;
margin-left: 10px;
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index ee0a0a35b..af8067741 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -18,7 +18,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
}
},[list]);
return(
-
+
{
menuName && projectDetail ?
diff --git a/src/forge/Main/sub/ReadmeCatelogue.jsx b/src/forge/Main/sub/ReadmeCatelogue.jsx
index 64eb90bab..d1e018bb6 100644
--- a/src/forge/Main/sub/ReadmeCatelogue.jsx
+++ b/src/forge/Main/sub/ReadmeCatelogue.jsx
@@ -1,11 +1,11 @@
-import React , {useState } from 'react';
+import React , { useState , useEffect } from 'react';
import { Anchor , Input } from 'antd';
import './sub.scss';
+import { Base64 } from 'js-base64';
const { Link } = Anchor;
-const { Search } = Input;
-function ReadmeCatelogue({ menuList }) {
+function ReadmeCatelogue({ menuList , hash }) {
const [ goHref , setGoHref ] = useState("");
const [ value , setValue ] = useState("");
const [ menu , setMenu] = useState(menuList);
@@ -18,7 +18,7 @@ function ReadmeCatelogue({ menuList }) {
function changeValue(e) {
setValue(e.target.value);
if(e.target.value){
- let m = menu.filter(i=>i.text.indexOf(e.target.value)>-1);
+ let m = menuList.filter(i=>i.text.indexOf(e.target.value)>-1);
setMenu(m);
}else{
setMenu(menuList);
@@ -41,7 +41,7 @@ function ReadmeCatelogue({ menuList }) {
menu.map((item,key)=>{
return(
-
+
)
})
diff --git a/src/forge/Main/sub/sub.scss b/src/forge/Main/sub/sub.scss
index d4db6208c..4e6a3d8ac 100644
--- a/src/forge/Main/sub/sub.scss
+++ b/src/forge/Main/sub/sub.scss
@@ -34,13 +34,10 @@
padding:15px;
border-bottom: 1px solid #eee;
}
- .anchorBox{
- max-height: 255px;
- overflow-y: auto;
- }
.ant-anchor-wrapper{
margin-left: 0px;
padding:5px 15px;
+ max-height: 255px!important;
.items{
border-radius: 4px;
margin-bottom: 5px;
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index 0264c73ce..e1986728e 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -11,7 +11,7 @@ ul,ol,dl{
font-size: 22px;
font-weight: normal;
line-height: 30px;
- max-width: 700px;
+ max-width: 690px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;