From a5bdf26f96c820d31f56ee101cceb29a03016227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com> Date: Fri, 3 Sep 2021 11:38:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 20 +++++++++++--------- src/forge/Main/CoderDepot.jsx | 2 +- src/forge/Main/CoderRootIndex.js | 2 +- src/forge/Main/Detail.js | 4 ++-- src/forge/Main/DetailTop.js | 2 +- src/forge/Main/sub/DetailBanner.jsx | 1 - src/forge/Order/OrderItem.js | 2 +- src/forge/Settings/Index.js | 12 ++++++------ src/forge/Team/Index.jsx | 21 +++++++++++---------- src/forge/Team/Setting/TeamSettingGroup.jsx | 4 ++-- src/forge/Team/TeamGroup.jsx | 4 ++-- src/forge/Team/TeamGroupItems.jsx | 3 ++- src/forge/users/Infos.js | 4 ++-- 13 files changed, 42 insertions(+), 39 deletions(-) diff --git a/src/App.js b/src/App.js index 5bda37165..af5532ad5 100644 --- a/src/App.js +++ b/src/App.js @@ -118,7 +118,7 @@ class App extends Component { this.unlisten = this.props.history.listen((location) => { let newPathname = location.pathname.split('/')[1]; if (this.state.pathName !== newPathname) { - this.setState({ pathType: '' }); + // this.setState({ pathType: '' }); newPathname && this.getPathnameType(newPathname); } }); @@ -313,6 +313,16 @@ class App extends Component { } /> + + {/* 组织 */} + { + return () + } + }> + + {/*新建项目等*/} { - return () - } - }> - {/* 个人主页 */} - + {projectDetail && projectDetail.branches && projectDetail.branches.total_count}个分支 diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js index d754d525d..0fb30c4e1 100644 --- a/src/forge/Main/CoderRootIndex.js +++ b/src/forge/Main/CoderRootIndex.js @@ -137,7 +137,7 @@ class CoderRootIndex extends Component{ () => () } > - () } diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index a2ca67b97..99b3803b5 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -544,7 +544,7 @@ class Detail extends Component { { forked_count > 0 ? platform ? - + {forked_count} : @@ -739,7 +739,7 @@ class Detail extends Component { (props) => () } > - () } diff --git a/src/forge/Main/DetailTop.js b/src/forge/Main/DetailTop.js index 8806f12d3..ecd5ab9f5 100644 --- a/src/forge/Main/DetailTop.js +++ b/src/forge/Main/DetailTop.js @@ -16,7 +16,7 @@ class DetailTop extends Component { {(coderCount && coderCount.commits_count) || 0}个提交 - 0 ? "active" : ""}> + 0 ? "active" : ""}> {(coderCount && coderCount.branches_count) || 0}个分支 diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index 7f8fddc07..abce4003a 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -16,7 +16,6 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa setMenuName(list); } },[list]); - console.log('open_devops:'+open_devops) return(
{ diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js index 4d1b0cb9b..081788641 100644 --- a/src/forge/Order/OrderItem.js +++ b/src/forge/Order/OrderItem.js @@ -89,7 +89,7 @@ class OrderItem extends Component {
  • {item.done_ratio || "--"}
  • - {item.journals_count} + {item.journals_count} { user_admin_or_member ?
    diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js index 89b4f88b2..92b60aaf6 100644 --- a/src/forge/Settings/Index.js +++ b/src/forge/Settings/Index.js @@ -63,11 +63,11 @@ class Index extends Component {
  • -1 ? "active" : "" + pathname.indexOf("settings/collaborators") > -1 ? "active" : "" } >

    - + 协作者管理 @@ -98,10 +98,10 @@ class Index extends Component {

  • -1 ? "active" : ""} + className={pathname.indexOf("settings/lables") > -1 ? "active" : ""} >

    - + 项目标签 @@ -146,14 +146,14 @@ class Index extends Component { > {/* 协作者 */} ( )} > {/* 修改仓库信息 */} ( )} diff --git a/src/forge/Team/Index.jsx b/src/forge/Team/Index.jsx index 7076d5a91..1a3bfde99 100644 --- a/src/forge/Team/Index.jsx +++ b/src/forge/Team/Index.jsx @@ -36,11 +36,11 @@ export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC( return (

    - {/* 组织团队-设置 */} + {/* 新建组织 */} { - return + return }} > {/* 组织团队-新建 */} @@ -50,6 +50,13 @@ export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC( return }} > + {/* 组织团队-设置 */} + { + return + }} + > {/* 组织团队-子级（包含组织团队列表） */} }} > - {/* 新建组织 */} - { - return - }} - > + {/* 组织详情（包含组织设置） */} 组织团队管理 - + ) } diff --git a/src/forge/Team/TeamGroup.jsx b/src/forge/Team/TeamGroup.jsx index 38725e7d1..1920caed6 100644 --- a/src/forge/Team/TeamGroup.jsx +++ b/src/forge/Team/TeamGroup.jsx @@ -3,11 +3,11 @@ import { Banner } from '../Component/layout'; import GroupItems from './TeamGroupItems'; const limit = 14; -function TeamGroup({organizeDetail,history}){ +function TeamGroup({organizeDetail,history,current_user}){ return(
    组织团队 - +
    ) } diff --git a/src/forge/Team/TeamGroupItems.jsx b/src/forge/Team/TeamGroupItems.jsx index 7b7188783..5a9558180 100644 --- a/src/forge/Team/TeamGroupItems.jsx +++ b/src/forge/Team/TeamGroupItems.jsx @@ -17,7 +17,7 @@ const ImgContent = styled.img`{ border-radius:50%; margin:5px 10px; }` -function TeamGroupItems({organizeDetail,limit, count , history}){ +function TeamGroupItems({organizeDetail,limit, count , history ,current_user}){ const [ page , setPage ] = useState(1); const [ isSpin , setIsSpin ] = useState(true); const [ total , setTotal ] = useState(0); @@ -48,6 +48,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){ axios.delete(url).then(result =>{ if(result && result.data){ getData(); + history.push(`/${current_user && current_user.login}`); } }).catch(error=>{}) } diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js index 44bf2f39d..0e56aaef2 100644 --- a/src/forge/users/Infos.js +++ b/src/forge/users/Infos.js @@ -282,7 +282,7 @@ class Infos extends Component { 概览 数据统计 - 项目 + 项目 { current_user && user && user.login === current_user.login ? @@ -338,7 +338,7 @@ class Infos extends Component { }} > { return ; }}