Merge branch 'gitlink_server' of http://106.75.45.236:3000/Gitlink/forgeplus-react into feature_GLCC

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>

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;

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}/>

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 ?