diff --git a/src/forge/Team/Group/GroupForm.jsx b/src/forge/Team/Group/GroupForm.jsx index e27161e0a..9d54b034e 100644 --- a/src/forge/Team/Group/GroupForm.jsx +++ b/src/forge/Team/Group/GroupForm.jsx @@ -239,7 +239,7 @@ export default Form.create()( 合并请求(启用合并请求和代码评审) - + 版本发布(跟踪项目版本和下载) @@ -249,7 +249,7 @@ export default Form.create()( - cancelEdit()}>取消 + cancelEdit()}>取消 diff --git a/src/forge/users/Team.jsx b/src/forge/users/Team.jsx index 9378106e3..bf401d2cd 100644 --- a/src/forge/users/Team.jsx +++ b/src/forge/users/Team.jsx @@ -5,6 +5,7 @@ import Search from '../Component/Search'; import Item from './Team-item'; import Nodata from '../Nodata'; import axios from 'axios'; +import { Link } from 'react-router-dom'; const limit = 15; function Team(props){ @@ -14,7 +15,7 @@ function Team(props){ const [ sort_direction , setSort_direction ] = useState("asc"); const [ sort_by ,setSort_by ] = useState("created_at"); const [ search ,setSearch ] = useState(undefined); - + const { checkIfLogin , showLoginDialog } = props; const { username } = props.match.params; useEffect(()=>{ if(username){ @@ -47,14 +48,6 @@ function Team(props){ ) - function newFunc() { - const { checkIfLogin , showLoginDialog } = props; - if(checkIfLogin()){ - props.history.push(`/organize/new`); - }else{ - showLoginDialog && showLoginDialog(); - } - } return(
@@ -62,7 +55,10 @@ function Team(props){ setSearch(e.target.value)} placeholder="请输入组织名称关键字进行搜索" onSearch={onSearch}/>

- 新建组织 + { + checkIfLogin() && + 新建组织 + } 排序