From 58c32c27ef82575453564721833034e563aa05de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 2 Aug 2022 10:15:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B5=8C=E5=85=A5devops?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/DevOps/Index.jsx | 12 +++++++-----
 src/forge/Main/Detail.js   |  7 +++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/forge/DevOps/Index.jsx b/src/forge/DevOps/Index.jsx
index dc3ad0aa9..2f05d13aa 100644
--- a/src/forge/DevOps/Index.jsx
+++ b/src/forge/DevOps/Index.jsx
@@ -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>
   )
 })
\ No newline at end of file
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index b6b90b9bf..69f2098b8 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -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) {