From fd58da2f63e719a71f995483f4d9b9fdb72db9b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Tue, 23 Sep 2025 11:41:49 +0800 Subject: [PATCH] fix --- src/forge/About/Index.jsx | 2 +- src/forge/About/index.scss | 8 +++++++ src/forge/Head/Header.js | 17 +++++++++++++- src/forge/Index.js | 2 +- src/forge/Main/CoderDepot.jsx | 4 ++-- src/forge/Main/projectHomeNew/index.scss | 3 +++ src/forge/Server/sbom/index.jsx | 2 +- src/forge/users/Index.jsx | 28 +++++++++++++----------- 8 files changed, 47 insertions(+), 19 deletions(-) diff --git a/src/forge/About/Index.jsx b/src/forge/About/Index.jsx index 6c8224bab..5a5244601 100644 --- a/src/forge/About/Index.jsx +++ b/src/forge/About/Index.jsx @@ -158,7 +158,7 @@ function Index(props){ :
{content ? - + :
暂无概览~
} diff --git a/src/forge/About/index.scss b/src/forge/About/index.scss index a009b45de..99e31b7c2 100644 --- a/src/forge/About/index.scss +++ b/src/forge/About/index.scss @@ -24,4 +24,12 @@ border-top: none; } } +} +.project_about_info{ + table{ + width: 100%; + th:last-of-type, td:last-of-type{ + text-align: center; + } + } } \ No newline at end of file diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 2f229e421..5bde74efc 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -362,6 +362,21 @@ class NewHeader extends Component { {current_user && current_user.login &&
  • +申请创建
  • } : '' + }else if(item.name.includes("开源")){ + return ( +
  • + { + if(current_user && !current_user.login){ + this.props.showLoginDialog(); + }else{ + current_user && window.open(`${item.link}?token=${current_user.admin ? "admin123" : current_user.user_id}`) + } + }}>{item.name} +
  • + ) } else { return (
  • {/* { search_url && } */} { - current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)? + current_user && (current_user.admin) && (settings && settings.add && settings.add.length>0)? :"" diff --git a/src/forge/Index.js b/src/forge/Index.js index 1f1a122a4..dc4bb8707 100644 --- a/src/forge/Index.js +++ b/src/forge/Index.js @@ -23,7 +23,7 @@ const ProjectIndex = Loadable({ }); const ProjectHome = Loadable({ - loader: () => import("./Main/projectHomeNew"), + loader: () => import("./Main/projecthome/Index"), loading: Loading, }); diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index b573ac231..f6105d689 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -574,10 +574,10 @@ function CoderDepot(props){
  • - { + {/* { projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter" && {setCheckVisible(true)}}>代码克隆检测 - } + } */} { baseOperate && + 合并请求 diff --git a/src/forge/Main/projectHomeNew/index.scss b/src/forge/Main/projectHomeNew/index.scss index 266439a34..06671fd29 100644 --- a/src/forge/Main/projectHomeNew/index.scss +++ b/src/forge/Main/projectHomeNew/index.scss @@ -4,6 +4,9 @@ body { } .project_homePage { + .task-hide-2{ + word-break: break-all; + } .color-464 { color: #464F66; } diff --git a/src/forge/Server/sbom/index.jsx b/src/forge/Server/sbom/index.jsx index f13b2db17..f29192799 100644 --- a/src/forge/Server/sbom/index.jsx +++ b/src/forge/Server/sbom/index.jsx @@ -38,7 +38,7 @@ function Sbom(props) { // } return
    - +
    } diff --git a/src/forge/users/Index.jsx b/src/forge/users/Index.jsx index f6caa8507..c1d953acc 100644 --- a/src/forge/users/Index.jsx +++ b/src/forge/users/Index.jsx @@ -33,20 +33,22 @@ class DetailTop extends Component { let userRouterArr = ['statistics', 'projects', 'notice', 'devops', 'organizes', 'info', 'following', 'followers', 'password' , "general", "blockchain"]; return ( - - {secondRouter && (!userRouterArr.includes(secondRouter)) ? ( - - )} - > : ( - - )} - >} +
    + + {secondRouter && (!userRouterArr.includes(secondRouter)) ? ( + + )} + > : ( + + )} + >} - + +
    ) } }