From bbe3766a40087d20865eae02ca4be31b33e9ebf3 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 5 Jan 2021 10:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=B7=B2=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E5=92=8C=E6=9C=AA=E5=BC=80=E5=90=AF=E4=B8=A4=E7=A7=8D?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=93=BE=E6=8E=A5=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/forge/DevOps/Index.jsx b/src/forge/DevOps/Index.jsx
index 77b82eb0c..23e36d69e 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(
     <WhiteBack className="opsPanel">
       <Switch {...props}>
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 920db6762..ad0f709ee 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 --------");
           // 是镜像项目，且未完成迁移