From 2f595d750a032b36c93ef255cdb2e2e2eb43c8dd Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 7 Apr 2021 18:44:20 +0800
Subject: [PATCH] =?UTF-8?q?entries=E6=8E=A5=E5=8F=A3=E4=BC=A0=E7=9A=84bran?=
 =?UTF-8?q?ch=E5=80=BC=E4=B8=BAundefined?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderDepot.jsx      | 7 +++----
 src/forge/Team/Group/GroupForm.jsx | 2 +-
 src/forge/Team/Sub/Detail.jsx      | 2 +-
 src/forge/Team/Sub/SubDetail.jsx   | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 2e4f82da4..14e46ff3d 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -47,7 +47,6 @@ function CoderDepot(props){
   const projectsId = props.match.params.projectsId;
   const branchName = props.match.params.branchName;
   let pathname = props.history.location.pathname;
-
   useEffect(()=>{
     if(props.projectDetail){
       setProjectDetail(props.projectDetail);
@@ -65,17 +64,17 @@ function CoderDepot(props){
   },[treeValue])
 
   useEffect(()=>{
-    if (pathname){
+    if (pathname && projectDetail){
       if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${branchName}/`) > -1) {
         let url = pathname.split(`/tree/${branchName}/`)[1];
         setTreeValue(url);
         getFileInfo(url,branchName);
       }else{
         setTreeValue(undefined);
-        getDirInfo(branchName ||(projectDetail && projectDetail.default_branch));
+        getDirInfo(branchName ||projectDetail.default_branch);
       }
     } 
-  },[pathname])
+  },[pathname,projectDetail])
 
   // 获取主目录列表
   function getDirInfo(branch){
diff --git a/src/forge/Team/Group/GroupForm.jsx b/src/forge/Team/Group/GroupForm.jsx
index 55829374d..cae0efd27 100644
--- a/src/forge/Team/Group/GroupForm.jsx
+++ b/src/forge/Team/Group/GroupForm.jsx
@@ -139,7 +139,7 @@ export default Form.create()(
     }
     return (
       <Spin spinning={isSpin}>
-        <WhiteBack className="mb30" style={{border:"1px solid #eee"}}>
+        <WhiteBack className="mb30">
           <Banner>{groupId ? "基本设置" : "新建团队"}</Banner>
           <Div>
             <Form>
diff --git a/src/forge/Team/Sub/Detail.jsx b/src/forge/Team/Sub/Detail.jsx
index bba0b7de8..3979c4c4f 100644
--- a/src/forge/Team/Sub/Detail.jsx
+++ b/src/forge/Team/Sub/Detail.jsx
@@ -78,7 +78,7 @@ function Detail(props){
         detail &&
         <Cards
           src={`/organize/${detail.name}`}
-          title={detail.nickname}
+          title={detail.name}
           desc={!buttonflag && detail.description}
           img={detail.avatar_url}
           rightBtn={
diff --git a/src/forge/Team/Sub/SubDetail.jsx b/src/forge/Team/Sub/SubDetail.jsx
index fa87e86d9..7b653c55c 100644
--- a/src/forge/Team/Sub/SubDetail.jsx
+++ b/src/forge/Team/Sub/SubDetail.jsx
@@ -56,7 +56,7 @@ export default ((props)=>{
         detail && 
         <Cards
           src={`/organize/${OIdentifier}/group/${groupId}`}
-          title={detail.nickname}
+          title={detail.nickname||detail.name}
           rightBtn={
             flag && <span className="subNavs">
               <Link to={`/organize/${OIdentifier}/member`} className={pathname ===`/organize/${OIdentifier}/member` ? "active":""}><span>组织成员</span>{detail.num_users && <lable>{detail.num_users}</lable>}</Link>