{
- lastCommit &&
+ ((lastCommit && lastCommit.message) || lastCommitAuthor) &&
{
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 5f3692929..dbdf4b1c1 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -246,11 +246,14 @@
display: flex;
justify-content: space-between;
align-items: flex-start;
- border-bottom: 1px solid #d9d9d9;
padding:12px 20px 11px;
border-radius: 4px 4px 0px 0px;
border: 1px solid rgba(42, 97, 255, 0.23);
+ border-bottom: none;
background-color: #FAFCFF;
+ &+.listtablebody{
+ border-top-color: rgba(42, 97, 255, 0.23);
+ }
.ellipsistxt{
&:hover .markdown-body{
color: #466AFF;
@@ -331,7 +334,6 @@
.listtablebody{
border-radius:0px 0px 4px 4px ;
border: 1px solid #D0D0D0;
- border-top: none;
li.listtablepath{
a{color: #40a9ff;}
p{
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index 703158319..5f16b9e26 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -67,16 +67,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
:""
}
{
- item.menu_name === "versions" &&
-
-
-
- 维基(Wiki)
-
-
- }
- {
- item.menu_name === "wiki" && platform ?
+ item.menu_name === "devops" ?
{/* */}
@@ -97,7 +88,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
} */}
{
- item.menu_name === "devops" &&
+ item.menu_name === "versions" &&
@@ -106,6 +97,15 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
}
+ {
+ item.menu_name === "wiki" &&
+
+
+
+ 维基(Wiki)
+
+
+ }
{
item.menu_name === "activity" &&
@@ -116,7 +116,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
}
{
- item.menu_name === "settings" &&
+ item.menu_name === "settings" && platform &&
0 ? "iconfont icon-cangkushezhiicon color-grey-3 mr5 font-14":"iconfont icon-cangkushezhiicon color-grey-6 font-14 mr5"}>
diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx
index 714bf3533..d2dde0894 100644
--- a/src/forge/Main/tree/Index.jsx
+++ b/src/forge/Main/tree/Index.jsx
@@ -5,11 +5,21 @@ import { Link } from 'react-router-dom';
import { getImageUrl } from 'educoder';
import { Dropdown , Menu , Spin } from 'antd';
import './Index.scss';
+import { Base64 } from 'js-base64';
import Tree from '../img/tree.png';
import Axios from 'axios';
function turnbar(str){
+ // const s = '!!@/::"“”<《》>||??%$¥';
+ // for(var i=0;i -1){
+ // return Base64.encode(str);
+ // }else{
+ // continue;
+ // }
+ // }
if(str && str.length>0 && str.indexOf("/")>-1){
return str.replaceAll('/','%2F');
}
@@ -91,7 +101,7 @@ function Index(props) {
{
(isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
-
+ 合并请求
+
+ 合并请求
}
下载
diff --git a/src/modules/courses/css/Courses.css b/src/modules/courses/css/Courses.css
index 0d550a5c0..06466b072 100644
--- a/src/modules/courses/css/Courses.css
+++ b/src/modules/courses/css/Courses.css
@@ -1,6 +1,3 @@
-i.iconfont {
- cursor: pointer;
-}
.overflowHidden1 {
overflow: hidden;