From a4dbda8c5d1a6c58943fa1225c4f67aa03330cc8 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 18 Dec 2020 14:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=94=AF=E8=AE=BE=E7=BD=AE=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E5=88=97=E8=A1=A8=E4=B8=8D=E5=8F=AF=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/marked.js           |  4 ++--
 src/components/render-html.jsx |  5 +----
 src/forge/Branch/Select.jsx    |  6 +++---
 src/forge/Settings/Branch.js   | 31 +++++++++++--------------------
 4 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/src/common/marked.js b/src/common/marked.js
index 3be3ba2b..d3220a9f 100644
--- a/src/common/marked.js
+++ b/src/common/marked.js
@@ -55,8 +55,8 @@ function buildToc(coll, k, level, ctx) {
 
 export function getTocContent() {
   buildToc(toc, 0, 0, ctx)
-  ctx.push("</ul>")
-  return ctx.join("")
+  ctx.push("</ul>");
+  return ctx.join("");
 }
 
 const tokenizer = {
diff --git a/src/components/render-html.jsx b/src/components/render-html.jsx
index 0445f624..3601ea32 100644
--- a/src/components/render-html.jsx
+++ b/src/components/render-html.jsx
@@ -22,9 +22,8 @@ export default ({
   url
 }) => {
   let str = String(value);
-
   const html = useMemo(() => {
-    let rs = marked(str)
+    let rs = marked(str);
     const math_expressions = getMathExpressions();
     if (str.match(/\[TOC\]/)) {
       rs = rs.replace("<p>[TOC]</p>", getTocContent())
@@ -37,14 +36,12 @@ export default ({
     rs = rs.replace(/▁/g, "▁▁▁")
     resetMathExpressions()
     return dompurify.sanitize(rs)
-
   }, [str]);
 
   // 锚点跳转，链接地址里含#对应的id
   useEffect(()=>{
     if(url && url.hash && html){
       let u = url.hash;
-      debugger;
       if(u){
         let id = decodeURIComponent(u.split("#")[1]);
         let ele = document.getElementById(id);
diff --git a/src/forge/Branch/Select.jsx b/src/forge/Branch/Select.jsx
index c9d1212e..4c10177a 100644
--- a/src/forge/Branch/Select.jsx
+++ b/src/forge/Branch/Select.jsx
@@ -4,7 +4,7 @@ import './branch.css';
 import { getBranch , getTag } from '../GetData/getData';
 
 
-export default (({ projectsId , branch , owner , changeBranch , branchList })=>{
+export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{
   const [ showValue , setShowValue ] = useState(branch);
   const [ inputValue , setInputValue] = useState(undefined);
   const [ nav , setNav ] = useState(0);
@@ -82,8 +82,8 @@ export default (({ projectsId , branch , owner , changeBranch , branchList })=>{
           onChange={changeInputValue} style={{width:"220px"}}
         />
         <ul className="navUl">
-          <li className={nav==0?"navli active":"navli"} onClick={()=>changeNav(0)}><i className="iconfont icon-fenzhi1 font-14 mr3"></i>分支列表</li>
-          <li className={nav==1?"navli active":"navli"} onClick={()=>changeNav(1)}><i className="iconfont icon-biaoqian3 font-14 mr3"></i>标签列表</li>
+          <li className={nav === 0?"navli active":"navli"} onClick={()=>changeNav(0)}><i className="iconfont icon-fenzhi1 font-14 mr3"></i>分支列表</li>
+          { tagflag && <li className={nav === 1?"navli active":"navli"} onClick={()=>changeNav(1)}><i className="iconfont icon-biaoqian3 font-14 mr3"></i>标签列表</li> }
         </ul>
       </div>
       <Spin spinning={isSpin}>
diff --git a/src/forge/Settings/Branch.js b/src/forge/Settings/Branch.js
index fc9c9636..d0a235d8 100644
--- a/src/forge/Settings/Branch.js
+++ b/src/forge/Settings/Branch.js
@@ -109,6 +109,7 @@ export default ((props)=>{
             owner={owner}
             history={props.history}
             branchList = {branchList}
+            tagflag={false}
             />
             <a className="color-blue ml20" onClick={()=>resetSetting()}>设为默认分支</a>
           </AlignCenter>
@@ -116,26 +117,16 @@ export default ((props)=>{
         <div className="mt10">
           <p className="color-grey-3 mb10 font-18">分支保护</p>
           <AlignCenter>
-            <Select
-              showSearch
-              defaultValue={branch}
-              className="setHeight"
-              style={{ width: 240, height: 40 }}
-              placeholder="选择分支"
-              optionFilterProp="children"
-              filterOption={(input, option) =>
-                option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-              }
-              onChange={setProtectBranch}
-            >
-              {
-                branchList && branchList.length > 0 && branchList.map((item,key)=>{
-                  return(
-                    <Select.Option value={item.name}>{item.name}</Select.Option>
-                  )
-                })
-              }
-            </Select>
+            <SelectBranch 
+            branch={protectBranch}
+            repo_id={ projectDetail && projectDetail.repo_id}
+            projectsId={projectsId} 
+            changeBranch={setProtectBranch}
+            owner={owner}
+            history={props.history}
+            branchList = {branchList}
+            tagflag={false}
+            />
             <a className={ protectBranchList && protectBranchList.length > 0?"color-blue ml20":"color-grey ml20"} onClick={()=>settingRule(protectBranch)}>设置分支保护</a>
           </AlignCenter>
           {