diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index 44b8d2c9..da984543 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 c58518c6..4ac18632 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){ @@ -344,10 +362,13 @@ function CoderDepot(props){ baseOperate &&
{ - projectDetail.type !== 2 && + projectDetail.type !== 2 && pullsFlag && urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求 } - urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务 + { + issuesFlag && + urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务 + }
} { fileOperate && @@ -484,6 +505,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 af02bdbb..8ccc5aa4 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 3e395cc9..3481cc8f 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 {
)} - + */} diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index 71e504a0..ede2d314 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -154,8 +154,8 @@ class Milepost extends Component { const { projectsId , owner } = this.props.match.params; const menu = ( - 到期日从近到远 - 到期日从远到近 + 到期日从后到先 + 到期日从先到后 完成度从低到高 完成度从高到低 任务从多到少 diff --git a/src/forge/Settings/Branch.js b/src/forge/Settings/Branch.js index d0a235d8..d345f0fc 100644 --- a/src/forge/Settings/Branch.js +++ b/src/forge/Settings/Branch.js @@ -23,6 +23,7 @@ export default ((props)=>{ const [ page , setPage ] = useState(1); let defaultBranch = props.defaultBranch; + useEffect(()=>{ if(defaultBranch){ setBranch(defaultBranch); @@ -76,6 +77,8 @@ export default ((props)=>{ .then((result) => { if (result) { props.showNotification(`分支设置成功！`); + const { getDetail } = props; + getDetail && getDetail(); } }) .catch((error) => { @@ -95,7 +98,7 @@ export default ((props)=>{ return( - 分支设置 + <span className="font-18">分支设置</span>

默认分支

diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js index e5d2f01e..6f81b77c 100644 --- a/src/forge/Version/version.js +++ b/src/forge/Version/version.js @@ -58,8 +58,9 @@ class version extends Component { renderList = (releases) => { const { projectsId , owner } = this.props.match.params; - const { isManager , isDeveloper , isReporter } = this.props; - console.log(isDeveloper,isManager,isReporter); + const { isManager , isDeveloper } = this.props; + const type = this.props.projectDetail && this.props.projectDetail.type; + if (releases && releases.length > 0) { return ( releases.map((item, key) => { @@ -77,7 +78,7 @@ class version extends Component { {item.name} { - (isManager || isDeveloper) && + (isManager || isDeveloper) && type !==2 && （编辑） } @@ -106,13 +107,13 @@ class version extends Component { render() { const { projectsId ,owner } = this.props.match.params; const { data , releases , isSpin } = this.state; - + const type = this.props.projectDetail && this.props.projectDetail.type; return (
版本发布 { - data && data.user_permission ? + data && data.user_permission && type !== 2 ? + 发布新版 : '' }