嵌入devops
This commit is contained in:
parent
81b3f3961f
commit
58c32c27ef
|
|
@ -32,11 +32,14 @@ const Params = Loadable({
|
|||
})
|
||||
|
||||
export default ((props)=>{
|
||||
const {jianmu_devops} = props
|
||||
|
||||
return(
|
||||
<WhiteBack className="opsPanel">
|
||||
<Switch {...props}>
|
||||
|
||||
{/* 嵌入devops */}
|
||||
<iframe title={`devopsIframe`} src={`https://ci-v3.test.jianmuhub.com/oauth2/authorize?code=${jianmu_devops}`} id={`devopsIframe`} frameBorder="0" name={`devopsIframe`} width="100%" height={600}></iframe>
|
||||
{/* 旧引擎页面 */}
|
||||
{/* <Switch {...props}>
|
||||
<Route path="/:owner/:projectsId/devops/params"
|
||||
render={
|
||||
(p) => (<Params {...props} {...p}/>)
|
||||
|
|
@ -52,7 +55,6 @@ export default ((props)=>{
|
|||
(p) => (<New {...props} {...p}/>)
|
||||
}
|
||||
></Route>
|
||||
|
||||
<Route path="/:owner/:projectsId/devops/list/:branch"
|
||||
render={
|
||||
(p) => (<Stucture {...props} {...p}/>)
|
||||
|
|
@ -63,14 +65,14 @@ export default ((props)=>{
|
|||
(p) => (<New {...props} {...p}/>)
|
||||
}
|
||||
></Route>
|
||||
{/* 原本的两种合为一个 */}
|
||||
// 原本的两种合为一个
|
||||
<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(<About {...props} {...p}/>)}
|
||||
}
|
||||
></Route>
|
||||
</Switch>
|
||||
</Switch> */}
|
||||
</WhiteBack>
|
||||
)
|
||||
})
|
||||
|
|
@ -209,7 +209,9 @@ class Detail extends Component {
|
|||
defaultBranch: undefined,
|
||||
|
||||
// 非本平台项目
|
||||
platform: false
|
||||
platform: false,
|
||||
// devops工作流code
|
||||
jianmu_devops: undefined
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -253,7 +255,8 @@ class Detail extends Component {
|
|||
this.setState({
|
||||
project: result.data,
|
||||
open_devops: result.data.open_devops,
|
||||
platform: result.data.platform && result.data.platform !== 'educoder'
|
||||
platform: result.data.platform && result.data.platform !== 'educoder',
|
||||
jianmu_devops: result.data.jianmu_devops && encodeURIComponent(result.data.jianmu_devops)
|
||||
})
|
||||
|
||||
if (result.data.type !== 0 && result.data.mirror_status === 1) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue