From 58228e90c77ed3b09611460938aaab0772ce2515 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 6 Feb 2021 10:42:32 +0800
Subject: [PATCH] =?UTF-8?q?project=20=E9=95=9C=E5=83=8F=E3=80=81fork?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Team/Group/GroupForm.jsx                |  5 +++--
 .../Team/Group/Setting/GroupMemberSetting.jsx     |  2 +-
 src/forge/Team/ListItem.jsx                       | 15 ++++++++++++---
 src/forge/Team/Setting/TeamSettingMember.jsx      |  2 +-
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/forge/Team/Group/GroupForm.jsx b/src/forge/Team/Group/GroupForm.jsx
index e006e9a1..7626c833 100644
--- a/src/forge/Team/Group/GroupForm.jsx
+++ b/src/forge/Team/Group/GroupForm.jsx
@@ -181,7 +181,7 @@ export default Form.create()(
                 </Radio.Group>, false
               )}
             </Form>
-            <p className="required">允许访问项目单元：</p>
+            {/* <p className="required">允许访问项目单元：</p>
             <AlignCenter className="mb10">
               <Switch checked={switch_box_code} onClick={switch_code_types} />
               <span className="ml30 color-grey-3">代码库<span className="color-grey-8 ml15">(查看源码、文件、提交和分支)</span></span>
@@ -198,7 +198,8 @@ export default Form.create()(
               <Switch checked={switch_box_release} onClick={switch_releas_types} />
               <span className="ml30 color-grey-3">版本发布<span className="color-grey-8 ml15">(跟踪项目版本和下载)</span></span>
             </AlignCenter>
-            <Button type={"primary"} onClick={saveGroupFrom}>{groupId ? "更新团队设置" : "新建团队"}</Button>
+             */}
+             <Button type={"primary"} onClick={saveGroupFrom}>{groupId ? "更新团队设置" : "新建团队"}</Button>
             <Cancel className="ml30" onClick={() => cancelEdit()}><span className="pl30 pr30">取消</span></Cancel>
           </Div>
         </WhiteBack>
diff --git a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
index d49406b5..10914346 100644
--- a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
+++ b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
@@ -111,7 +111,7 @@ export default ((props) => {
           okText="确认"
           cancelText="取消"
         >
-          <a className="color-grey-8">移除成员</a>
+          <a className="color-red">移除成员</a>
         </Popconfirm>
       }
     }
diff --git a/src/forge/Team/ListItem.jsx b/src/forge/Team/ListItem.jsx
index 8dd8fd36..767a23c2 100644
--- a/src/forge/Team/ListItem.jsx
+++ b/src/forge/Team/ListItem.jsx
@@ -1,15 +1,24 @@
 import React from 'react';
 import ListCount from '../Component/ListCount';
 import { Link } from 'react-router-dom';
+import { Tooltip } from 'antd';
 function ListItem({item,key,OIdentifier}) {
   return(
     <div className="team_project" key={key}>
       <p className="t_p_title">
         <span className="flex1">
           <Link to={`/projects/${OIdentifier}/${item.identifier}`} className="name">{item.identifier}</Link>
-          <i className="iconfont icon-banbenku font-20 color-green ml8" />
-          <i className="iconfont icon-jingxiang font-18 color-green ml8" />
-          <i className="iconfont icon-fork font-18 color-orange ml8" />
+          { item.forked_from_project_id && <i className="iconfont icon-fork font-18 color-orange ml8" /> }
+          {
+            item.type && item.type !== 0 ? 
+            item.type === 2 ?
+            <Tooltip title="该项目是一个镜像" className="ml8">
+              <i className="iconfont icon-banbenku font-18 color-green" />
+            </Tooltip>:
+            <span className="ml8">
+              <i className="iconfont icon-jingxiang font-18 color-green" />
+            </span>:""
+          }
         </span>
         <ListCount fork={item.forked_count} parise={item.praises_count}/>
       </p>
diff --git a/src/forge/Team/Setting/TeamSettingMember.jsx b/src/forge/Team/Setting/TeamSettingMember.jsx
index 657acdb5..4871def6 100644
--- a/src/forge/Team/Setting/TeamSettingMember.jsx
+++ b/src/forge/Team/Setting/TeamSettingMember.jsx
@@ -105,7 +105,7 @@ export default (({organizeDetail})=>{
         let c_isAdmin = organizeDetail && organizeDetail.is_admin;
         let last = (data && data.length === 1) && (item.team_names && item.team_names.length === 1 && item.team_names[0]==="Owners");
         return (
-          c_isAdmin && !last && <Popconfirm title="是否将此成员移出组织？" okText={"是"} cancelText={"否"} onConfirm={()=>deleteMember(item.user && item.user.login)}><a className="color-grey-8">移除成员</a></Popconfirm>
+          c_isAdmin && !last && <Popconfirm title="是否将此成员移出组织？" okText={"是"} cancelText={"否"} onConfirm={()=>deleteMember(item.user && item.user.login)}><a className="color-red">移除成员</a></Popconfirm>
         )
       }
     }