From 0a0705d42cb335b08beef0b26ddbafe5a34ea24b Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 9 Dec 2021 11:03:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?educoder=E9=A1=B9=E7=9B=AE=E6=97=A0?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=B0=E5=BD=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/CoderDepot.jsx | 16 +++++++++++----- src/forge/Main/Index.scss | 6 ++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 76bce5c7..daf4b803 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -463,12 +463,18 @@ function CoderDepot(props){ (dirInfo && dirInfo.length>0) || fileInfo ?
{ - lastCommit && + ((lastCommit && lastCommit.message) || lastCommitAuthor) &&
- -
-
-
+ { + lastCommitAuthor && + + } + { + lastCommit.message && +
+
+
+ } { hideBtn && changeHide(hide)}> } {lastCommit.time_from_now} diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index 5f369292..dbdf4b1c 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{ From 4db125545f98b86e99aa2029db0e37cbe06956fa Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 9 Dec 2021 14:04:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?educoder=E9=A1=B9=E7=9B=AE-=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B8=8D=E8=83=BD=E7=82=B9=E5=87=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/CoderDepot.jsx | 2 ++ src/forge/Main/CoderDepotCatalogue.jsx | 13 +++++++++---- src/modules/courses/css/Courses.css | 3 --- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index daf4b803..46ff1201 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -279,6 +279,7 @@ function CoderDepot(props){ // 子目录路径返回链接 function returnUlr(url){ let enBranch = turnbar(branchName); + setType('dir'); props.history.push(`/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`); } // 点击跳转到子目录 @@ -496,6 +497,7 @@ function CoderDepot(props){ item={item} projectsId={projectsId} goToSubRoot={goToSubRoot} + platform={props.platform} /> ) }) diff --git a/src/forge/Main/CoderDepotCatalogue.jsx b/src/forge/Main/CoderDepotCatalogue.jsx index 4f5d86c1..f36448a8 100644 --- a/src/forge/Main/CoderDepotCatalogue.jsx +++ b/src/forge/Main/CoderDepotCatalogue.jsx @@ -8,13 +8,18 @@ const typeIco = { "dir":"icon-wenjianjia4 font-15 color-blue_4C" } -function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){ +function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId , platform }){ return(
  • - goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}> - {item.name} - + { + (!platform && item.image_type) ? + {item.name} + : + goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}> + {item.name} + + } diff --git a/src/modules/courses/css/Courses.css b/src/modules/courses/css/Courses.css index 0d550a5c..06466b07 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; From 56c8f7fa82ec376aa2e7688d472c1cba5ea15d34 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 9 Dec 2021 17:31:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?educoder=E9=A1=B9=E7=9B=AE=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=8F=AA=E8=AF=BB=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 | 4 +++ src/forge/Main/CoderDepot.jsx | 42 ++++++++++++++++++++--------- src/forge/Main/Detail.js | 1 + src/forge/Main/sub/DetailBanner.jsx | 24 ++++++++--------- src/forge/Main/tree/Index.jsx | 12 ++++++++- 5 files changed, 58 insertions(+), 25 deletions(-) diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 694ef054..6191978d 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -3945,6 +3945,10 @@ html>body #ajax-indicator { margin-left: 10px; color: #2FC25B; } +.privateTag.red{ + color: #FF6832; + border:1px solid #FF6832; +} .head-nav { text-align: center; height: 58px; diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 46ff1201..6090c69e 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -23,6 +23,7 @@ import Nodata from '../Nodata'; import Invite from './sub/Invite'; import CheckProfile from '../Component/ProfileModal/Profile'; import RenderHtml from '../../components/render-html'; +import { Base64 } from 'js-base64'; /** * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能) */ @@ -352,7 +353,7 @@ function CoderDepot(props){ const { current_user } = props; const baseOper = current_user && current_user.login && issuesFlag; - const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter" && projectDetail.type !== 2 && pullsFlag; + const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter" && projectDetail.type !== 2 && pullsFlag && props.platform; const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin)); return( @@ -402,7 +403,7 @@ function CoderDepot(props){ 分支：{branchName || defaultBranch} }
    • - { + { treeValuePath && treeValuePath.length > 0 ? - - - 分支 - {projectDetail && projectDetail.branches_count} - + { + props.platform ? + + + 分支 + {projectDetail && projectDetail.branches_count} + + : + + + 分支 + {projectDetail && projectDetail.branches_count} + + } + { + props.platform ? - - 标签 - {projectDetail && projectDetail.tags_count} - + + 标签 + {projectDetail && projectDetail.tags_count} + : + + + 标签 + {projectDetail && projectDetail.tags_count} + + } } @@ -577,7 +595,7 @@ function CoderDepot(props){ } {/* 发布 */} { - releaseVersions && + releaseVersions && props.platform && {projectDetail && projectDetail.name}
    {projectDetail && projectDetail.private && 私有} + { !platform && 只读 }
    { diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index 70315831..5f16b9e2 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 714bf353..d2dde089 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) && - + 合并请求 + + 合并请求 } 下载