Date: Thu, 5 Aug 2021 10:53:29 +0800
Subject: [PATCH 05/32] merge pre_develop
2aad9c67f5ac6577bc94787509e67a6f71bf992c
---
src/forge/Main/sub/UpdateDescModal.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/forge/Main/sub/UpdateDescModal.jsx b/src/forge/Main/sub/UpdateDescModal.jsx
index 63e14fcd6..72ba0fd6b 100644
--- a/src/forge/Main/sub/UpdateDescModal.jsx
+++ b/src/forge/Main/sub/UpdateDescModal.jsx
@@ -53,7 +53,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
{getFieldDecorator("lesson_url",{
rules:[]
})(
-
+
)}
From ababcbfdd6586ef05812d6dc4a3701c3970da46f Mon Sep 17 00:00:00 2001
From: hc1913847458 <1422588487@qq.com>
Date: Thu, 5 Aug 2021 10:57:43 +0800
Subject: [PATCH 06/32] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=AD=97=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/CoderDepot.jsx | 2 +-
src/forge/Main/sub/UpdateDescModal.jsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 96fdfc4b3..afd8e4bc4 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -475,7 +475,7 @@ function CoderDepot(props){
}
{/* 发布 */}
diff --git a/src/forge/Main/sub/UpdateDescModal.jsx b/src/forge/Main/sub/UpdateDescModal.jsx
index 72ba0fd6b..5039123a4 100644
--- a/src/forge/Main/sub/UpdateDescModal.jsx
+++ b/src/forge/Main/sub/UpdateDescModal.jsx
@@ -53,7 +53,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
{getFieldDecorator("lesson_url",{
rules:[]
})(
-
+
)}
From 61c55276de719ae2ba898e4349df4b5174c85749 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 5 Aug 2021 17:13:57 +0800
Subject: [PATCH 07/32] =?UTF-8?q?issue-=E5=90=8C=E6=AD=A5=E9=95=9C?=
=?UTF-8?q?=E5=83=8F=E9=A1=B9=E7=9B=AE=E4=B8=8D=E8=83=BD=E5=AF=B9=E4=BB=93?=
=?UTF-8?q?=E5=BA=93=E8=BF=9B=E8=A1=8C=E6=93=8D=E4=BD=9C=EF=BC=88=E6=96=B0?=
=?UTF-8?q?=E5=BB=BA=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=E3=80=81=E6=96=B0?=
=?UTF-8?q?=E5=BB=BA=E5=8F=91=E8=A1=8C=E7=89=88=E7=AD=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Component/Releases.jsx | 4 ++--
src/forge/Main/CoderDepot.jsx | 26 ++++++++++++++++++++++++--
src/forge/Main/CoderRootBranch.js | 5 ++---
src/forge/Merge/merge_form.js | 4 ++--
src/forge/Order/Milepost.js | 4 ++--
src/forge/Settings/Branch.js | 5 ++++-
src/forge/Version/version.js | 11 ++++++-----
7 files changed, 42 insertions(+), 17 deletions(-)
diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx
index 9330cf732..80328ef92 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 , baseOperate}){
+function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}){
return(
@@ -10,7 +10,7 @@ function Releases({owner,projectsId,releaseVersions , baseOperate}){
发行版
{ releaseVersions && releaseVersions.total_count > 0 && {releaseVersions.total_count}}
- { releaseVersions && releaseVersions.total_count > 0 ?
+ { (releaseVersions && releaseVersions.total_count > 0) || projectType ===2 ?
全部
:
baseOperate &&
新建
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index afd8e4bc4..93db0b8dc 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -63,6 +63,8 @@ function CoderDepot(props){
const [ readme , setReadme ] = useState(undefined);
const [ defaultBranch , setDefaultBranch ] = useState(undefined);
const [ editReadme , setEditReadme ] = useState(false);
+ const [ pullsFlag , setPullsFlag ] = useState(true);
+ const [ issuesFlag , setIssuesFlag ] = useState(true);
const owner = props.match.params.owner;
const projectsId = props.match.params.projectsId;
@@ -70,6 +72,22 @@ function CoderDepot(props){
branchName = returnbar(branchName);
const details = props.projectDetail;
let pathname = props.history.location.pathname;
+
+ const { bannerList } = props;
+
+ useEffect(()=>{
+ if(bannerList && bannerList.length>0){
+ let a = bannerList.filter(i=>i.menu_name === "pulls");
+ let i = bannerList.filter(i=>i.menu_name === "issues");
+ if(a && a.length === 0){
+ setPullsFlag(false);
+ }
+ if(i && i.length === 0){
+ setIssuesFlag(false);
+ }
+ }
+ },[bannerList])
+
useEffect(()=>{
if(details){
@@ -349,10 +367,13 @@ function CoderDepot(props){
baseOperate &&
}
{ fileOperate &&
@@ -489,6 +510,7 @@ function CoderDepot(props){
releaseVersions={projectDetail.release_versions}
history={props.history}
baseOperate={baseOperate}
+ projectType={projectDetail.type}
/>
}
diff --git a/src/forge/Main/CoderRootBranch.js b/src/forge/Main/CoderRootBranch.js
index af02bdbbe..8ccc5aa42 100644
--- a/src/forge/Main/CoderRootBranch.js
+++ b/src/forge/Main/CoderRootBranch.js
@@ -17,8 +17,7 @@ export default ((props)=>{
const [ isSpin , setIsSpin ] =useState(true);
const { projectsId , owner } = props.match.params;
- const { isManager , isDeveloper} = props;
- console
+ const { isManager , isDeveloper , projectDetail } = props;
useEffect(()=>{
getBranchs(projectsId, owner);
},[projectsId])
@@ -48,7 +47,7 @@ export default ((props)=>{
{
- (isManager || isDeveloper) &&
+ (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
创建合并请求
}
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 3e395cc9a..3481cc8f0 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -346,7 +346,7 @@ class MergeForm extends Component {
)}
-
+ {/*
{getFieldDecorator("checkbox-group")(
@@ -360,7 +360,7 @@ class MergeForm extends Component {
)}
-
+ */}