From c2f0462811f9bfd93d7963c299a2520365ed52e5 Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Sat, 9 Oct 2021 15:16:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=88=86=E6=94=AF=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E6=8B=89=E9=80=89=E9=A1=B9=E6=9C=AA=E5=8F=8A?=
 =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Branch/Select.jsx        |  1 +
 src/forge/Branch/SelectOverlay.jsx | 18 +++++++++++++++---
 src/forge/Branch/branch.scss       |  1 +
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/forge/Branch/Select.jsx b/src/forge/Branch/Select.jsx
index b74d558fc..ff3dd829e 100644
--- a/src/forge/Branch/Select.jsx
+++ b/src/forge/Branch/Select.jsx
@@ -41,6 +41,7 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag
   const menu = (
     <div ref={refFa}>
       <SelectOverlay 
+        visible={visible}
         changeBranch={ChangeB} 
         tagflag={tagflag} 
         projectsId={projectsId}
diff --git a/src/forge/Branch/SelectOverlay.jsx b/src/forge/Branch/SelectOverlay.jsx
index bb1774daa..618b13dde 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 }) {
+function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owner , visible }) {
   const [ inputValue , setInputValue] = useState(undefined);
   const [ nav , setNav ] = useState(0);
   const [ isSpin , setIsSpin ] = useState(true);
@@ -11,6 +11,14 @@ 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);
@@ -68,12 +76,16 @@ function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owne
       <Spin spinning={isSpin}>
         <ul className="OptionsUl" id="ul-btn">
           {
-            datas && datas.length>0 ?
+            datas && datas.length>0 &&
             datas.map((item,key)=>{
               return(
                 <li key={key} onClick={()=>chooseitem(item.name)}><a className="task-hide ulALink">{item.name}</a></li>
               )
-            }):
+            })
+           
+          }
+          {
+            datas && datas.length === 0 &&
             <p className="listTips">暂无{inputValue}{nav === 0 ?"分支":"标签"}~</p>
           }
         </ul>
diff --git a/src/forge/Branch/branch.scss b/src/forge/Branch/branch.scss
index 1b632fa29..030b05cd1 100644
--- a/src/forge/Branch/branch.scss
+++ b/src/forge/Branch/branch.scss
@@ -23,6 +23,7 @@
   max-height: 300px;
 }
 .OptionsUl{
+  min-height: 50px;
   max-height: 220px;
   overflow-y: auto;
 }