From ba283d7c134f5dc34f1ec3dd3926d4f8f4a47f49 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 30 May 2022 14:01:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?devlop=E6=98=AF=E5=90=A6=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=20=E4=B8=A4=E4=B8=AA=E9=A1=B5=E9=9D=A2=E9=83=A8=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AEstate=E7=9A=84=E5=AD=97=E6=AE=B5=E6=9D=A5=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/DevOps/Index.jsx          |  5 +++--
 src/forge/DevOps/subIndex.jsx       | 13 +++++++++++++
 src/forge/Main/sub/DetailBanner.jsx |  2 +-
 3 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 src/forge/DevOps/subIndex.jsx

diff --git a/src/forge/DevOps/Index.jsx b/src/forge/DevOps/Index.jsx
index 424a23c43..dc3ad0aa9 100644
--- a/src/forge/DevOps/Index.jsx
+++ b/src/forge/DevOps/Index.jsx
@@ -7,7 +7,7 @@ import Loadable from 'react-loadable';
 import Loading from '../../Loading';
 
 const About = Loadable({
-  loader: () => import('./About'),
+  loader: () => import('./subIndex'),
   loading: Loading,
 })
 const New = Loadable({
@@ -66,7 +66,8 @@ 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( p.location && p.location.state && p.location.state.open_devops?<Dispose {...props} {...p}/>:<About {...props} {...p}/>)}
+            (p) =>{return(<About {...props} {...p}/>)}
           }
         ></Route>
       </Switch>
diff --git a/src/forge/DevOps/subIndex.jsx b/src/forge/DevOps/subIndex.jsx
new file mode 100644
index 000000000..b1471c335
--- /dev/null
+++ b/src/forge/DevOps/subIndex.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import About from './About';
+import Dispose from './Dispose';
+
+function SubIndex(props) {
+  return(
+    props && props.open_devops ?
+    <Dispose {...props} />
+    :
+    <About {...props} />
+  )
+}
+export default SubIndex;
\ No newline at end of file
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index c344710b8..d215936f6 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -32,7 +32,7 @@ function DetailBanner({ history,list , owner , projectsId ,showNotification , ur
       }
     }).catch(error=>{})
   }
-
+console.log("detail:",open_devops);
   return(
     <div className="f-wrap-between mt25">
       <QuitBox visible={visible} onCancel={()=>setVisible(false)} name={projectDetail && projectDetail.name} onSuccess={onSuccess}/>

From 3d8a910820c57089bf6652138bfa536df7a6da8a Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 30 May 2022 14:55:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=A7=81=E6=9C=89=E6=A0=87?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Team/ListItem.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/forge/Team/ListItem.jsx b/src/forge/Team/ListItem.jsx
index ab9d64f27..f372d2565 100644
--- a/src/forge/Team/ListItem.jsx
+++ b/src/forge/Team/ListItem.jsx
@@ -6,8 +6,9 @@ function ListItem({item,key,OIdentifier}) {
   return(
     <div className="team_project" key={key}>
       <p className="t_p_title">
-        <span className="flex1">
+        <span className="flex1" style={{display:"flex",alignItems:"center"}}>
           <Link to={`/${OIdentifier}/${item.identifier}`} className="name">{item.name}</Link>
+          {!item.is_public && <span className="privateTag">私有</span> }
           { item.forked_from_project_id && <i className="iconfont icon-fork font-18 color-orange ml8" /> }
           {
             item.type && item.type === 2 ?