diff --git a/src/forge/DevOps/Index.jsx b/src/forge/DevOps/Index.jsx index 77b82eb0..23e36d69 100644 --- a/src/forge/DevOps/Index.jsx +++ b/src/forge/DevOps/Index.jsx @@ -1,4 +1,4 @@ -import React from 'react'; +import React , { useEffect } from 'react'; import { WhiteBack } from '../Component/layout'; import './ops.scss'; @@ -15,6 +15,20 @@ const Infos = Loadable({ loading: Loading, }) export default ((props)=>{ + const { projectsId , owner } = props.match.params; + const open_devops = props.projectDetail && props.projectDetail.open_devops; + + // 工作流:两种状态进入的链接不同 + useEffect(()=>{ + if(open_devops !== undefined){ + if(open_devops){ + props.history.replace(`/projects/${owner}/${projectsId}/devops/list`); + }else{ + props.history.replace(`/projects/${owner}/${projectsId}/devops`); + } + } + },[open_devops]) + return( diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 920db676..ad0f709e 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -199,17 +199,6 @@ class Detail extends Component { platform:result.data.platform && result.data.platform !== 'educoder' }) - // 工作流:两种状态进入的链接不同 - const pathname = this.props.history.location.pathname; - let p = checkPathname(pathname); - if(p==="devops"){ - if(result.data.open_devops && pathname === `/projects/${owner}/${projectsId}/devops`){ - this.props.history.push(`/projects/${owner}/${projectsId}/devops/list`); - }else if(result.data.open_devops===false && pathname !== `/projects/${owner}/${projectsId}/devops`){ - this.props.history.push(`/projects/${owner}/${projectsId}/devops`); - } - } - if (result.data.type !== 0 && result.data.mirror_status === 1) { console.log("--------start channel --------"); // 是镜像项目,且未完成迁移