mergegitlink date:2022-04-12

This commit is contained in:
caishi 2022-02-23 14:26:58 +08:00
parent e8b1dcb037
commit 3a717d818a
3 changed files with 12 additions and 6 deletions

View File

@ -1,4 +1,4 @@
import React , { useEffect } from 'react';
import React from 'react';
import { WhiteBack } from '../Component/layout';
import './ops.scss';
@ -32,7 +32,6 @@ const Params = Loadable({
})
export default ((props)=>{
return(
<WhiteBack className="opsPanel">
<Switch {...props}>
@ -66,7 +65,11 @@ export default ((props)=>{
{/* 原本的两种合为一个 */}
<Route path="/:owner/:projectsId/devops"
render={
(p) =>{return( p.location && p.location.state && p.location.state.open_devops?<Dispose {...props} {...p}/>:<About {...props} {...p}/>)}
(p) =>{
return( (props && props.project && props.project.open_devops) ?
<Dispose {...props} {...p}/>
:
<About {...props} {...p}/>)}
}
></Route>
</Switch>

View File

@ -276,9 +276,10 @@ class Detail extends Component {
// 工作流激活后修改状态
changeOpenDevops = (flag) => {
this.setState({
open_devops: flag
})
// this.setState({
// open_devops: flag
// })
this.getProject();
}
/**
*

View File

@ -17,6 +17,8 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
setMenuName(list);
}
},[list]);
return(
<div className="f-wrap-between mt25">
{