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("") - return ctx.join("") + ctx.push(""); + 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("

[TOC]

", 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"}} /> 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} /> resetSetting()}>设为默认分支 @@ -116,26 +117,16 @@ export default ((props)=>{

分支保护

- + 0?"color-blue ml20":"color-grey ml20"} onClick={()=>settingRule(protectBranch)}>设置分支保护 {