From 9e8f2ff569bce76040c216a637f4376abbeeab29 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 3 Aug 2021 17:37:14 +0800 Subject: [PATCH 01/32] merge pre_develop 5140bfbe77d2ca72e3a366167089aa0586bcbb9a --- src/forge/Component/Releases.jsx | 4 +-- src/forge/Main/CoderDepot.jsx | 30 ++++++++++++++++------- src/forge/Main/CoderRootBranch.js | 9 +++++-- src/forge/Main/CoderRootCommit.js | 11 +++++++-- src/forge/Main/CoderRootIndex.js | 5 ++++ src/forge/Merge/MergeItem.js | 2 +- src/forge/Order/Milepost.js | 8 +++--- src/forge/Order/UpdateMilepost.js | 4 +-- src/forge/Settings/CollaboratorMember.jsx | 8 ++++-- src/forge/Version/version.js | 9 +++++-- 10 files changed, 64 insertions(+), 26 deletions(-) diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index 67c3b47a..9330cf73 100644 --- a/src/forge/Component/Releases.jsx +++ b/src/forge/Component/Releases.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { AlignCenter , AlignTop , FlexAJ } from '../Component/layout'; import { Link } from 'react-router-dom'; -function Releases({owner,projectsId,releaseVersions}){ +function Releases({owner,projectsId,releaseVersions , baseOperate}){ return(
@@ -13,7 +13,7 @@ function Releases({owner,projectsId,releaseVersions}){ { releaseVersions && releaseVersions.total_count > 0 ? 全部 : - 新建 + baseOperate && 新建 } { diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 3676fa1a..96fdfc4b 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -282,6 +282,7 @@ function CoderDepot(props){ const mdFlag = n && n.substring(n.length-3,n.length) === ".md"; const { current_user } = props; + const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter"; const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin)); return( @@ -344,13 +345,16 @@ function CoderDepot(props){ -
- { - projectDetail.type !== 2 && - urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求 - } - urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务 -
+ { + baseOperate && +
+ { + projectDetail.type !== 2 && + urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求 + } + urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务 +
+ } { fileOperate && @@ -375,7 +379,9 @@ function CoderDepot(props){ { hideBtn && changeHide(hide)}> } {lastCommit && lastCommit.time_from_now} - { commitCount ? {commitCount}次提交:"" } + { commitCount ? + {commitCount}次提交 + :"" }
}