From 13c58faad85f4d2619704bc78ed569337bb26218 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Thu, 21 Oct 2021 10:37:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3-=E6=A0=B9=E6=8D=AE=E6=8E=A5=E5=8F=A3=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=AF=B9=E5=BA=94=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Branch/SelectOverlay.jsx | 20 ++++++--------------
 src/forge/Main/CoderDepot.jsx      |  4 ++--
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/forge/Branch/SelectOverlay.jsx b/src/forge/Branch/SelectOverlay.jsx
index e9c4aae4f..0be567324 100644
--- a/src/forge/Branch/SelectOverlay.jsx
+++ b/src/forge/Branch/SelectOverlay.jsx
@@ -2,7 +2,7 @@ import React , { useState , useEffect } from 'react';
 import { Input , Spin , Menu } from 'antd';
 import { getBranch , getTag } from '../GetData/getData';
 
-function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owner , visible }) {
+function SelectOverlay({ changeBranch , tagflag , projectsId , owner , visible }) {
   const [ inputValue , setInputValue] = useState(undefined);
   const [ nav , setNav ] = useState(0);
   const [ isSpin , setIsSpin ] = useState(true);
@@ -11,21 +11,13 @@ function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owne
   const [ datas , setDatas ] = useState(undefined);
   const [ keys ,setKeys] = useState("branch");
 
-  // useEffect(()=>{
-  //   if(visible){
-  //     setKeys("branch");
-  //     getBranchs(projectsId,owner);
-  //     setIsSpin(true);
-  //   }
-  // },[visible])
-
   useEffect(()=>{
-    if(branchList){
-      setData(branchList);
-      setDatas(branchList);
-      setIsSpin(false);
+    if(visible){
+      setKeys("branch");
+      getBranchs(projectsId,owner);
+      setIsSpin(true);
     }
-  },[branchList])
+  },[visible])
 
   async function getBranchs(id,owner){
     let result = await getBranch(id,owner);
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 8dd5e4681..f50c134a3 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -407,14 +407,14 @@ function CoderDepot(props){
                             <Link to={`/${owner}/${projectsId}/branches`} className="iconBtn">
                               <i className="iconfont icon-master_icon font-16"></i>
                               <span>分支</span>
-                              <span>{projectDetail && projectDetail.branches && projectDetail.branches.total_count}</span>
+                              <span>{projectDetail && projectDetail.branches_count}</span>
                             </Link>
                           </AlignCenter>
                           <AlignCenter className="mr20">
                               <Link to={`/${owner}/${projectsId}/tags`} className="iconBtn">
                                   <i className="iconfont icon-biaoqianicon font-16"></i>
                                   <span>标签</span>
-                                  <span>{projectDetail && projectDetail.tags && projectDetail.tags.total_count}</span>
+                                  <span>{projectDetail && projectDetail.tags_count}</span>
                               </Link>
                           </AlignCenter>
                         </React.Fragment>