From 655026c157d92afc8b94a9bc7cdf0acd7e120fb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 4 Apr 2023 14:11:15 +0800
Subject: [PATCH] =?UTF-8?q?pull=20=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html              | 8 ++++++++
 src/common/marked.js           | 3 ++-
 src/components/render-html.jsx | 6 +++---
 src/forge/Wiki/Index.jsx       | 3 ++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/public/index.html b/public/index.html
index 0cd671ef0..a23396321 100755
--- a/public/index.html
+++ b/public/index.html
@@ -55,6 +55,14 @@
       $('#ie_info').css({ display: 'block' });
       $('#root').css({ display: 'none' });
     }
+    window.onload=function(){
+      $(".newContainer").delegate("a.anchors","click",function(){
+        let h = $(this).offset().top - 180;
+        $("html,body").animate({scrollTop:h},10);
+        window.location.hash = $(this).attr("name");
+        return false;
+      });
+    }
   </script>
   <script src="%PUBLIC_URL%js/js_min_all.js"></script>
   <script src="%PUBLIC_URL%js/codemirror/codemirror.js"></script>
diff --git a/src/common/marked.js b/src/common/marked.js
index abfd657a0..674b986c5 100644
--- a/src/common/marked.js
+++ b/src/common/marked.js
@@ -155,7 +155,8 @@ renderer.heading = function (text, level, raw) {
     level: level,
     text: text
   })
-  return '<h' + level + ' id="' + anchor + '">' + text + '</h' + level + '>'
+  let id = anchor.replace(/[.,/#!$%^&*;:{}=\-_`~()：，。¥；「」｜？》《～·【】‘、！]/g,"");
+  return '<h' + level + ' id="' + id + '" class="markdown_anchors"><a name="#'+id+'" class="anchors"><i class="iconfont icon-lianjieicon font-14"></i></a>' + text + '</h' + level + '>'
 }
 marked.setOptions({
   silent: true,
diff --git a/src/components/render-html.jsx b/src/components/render-html.jsx
index bcebb663a..7f7db76b6 100644
--- a/src/components/render-html.jsx
+++ b/src/components/render-html.jsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useRef, useMemo } from 'react'
 import 'katex/dist/katex.min.css'
 import marked, { getTocContent, cleanToc, getMathExpressions, resetMathExpressions } from '../common/marked';
-import 'code-prettify'
+import 'code-prettify';
 import dompurify from 'dompurify';
 
 import { renderToString } from 'katex'
 
-const preRegex = /<pre[^>]*>/g
+const preRegex = /<pre[^>]*>/g;
 function _unescape(str) {
   let div = document.createElement('div')
   div.innerHTML = str
@@ -46,7 +46,7 @@ export default ({
         let id = decodeURIComponent(u.split("#")[1]);
         let ele = document.getElementById(id);
         if(ele){
-          window.scrollTo(0, ele.offsetTop + 120);
+          window.scrollTo(0, ele.offsetTop);
         }
       }
     }
diff --git a/src/forge/Wiki/Index.jsx b/src/forge/Wiki/Index.jsx
index f15b19686..2ac1c6326 100644
--- a/src/forge/Wiki/Index.jsx
+++ b/src/forge/Wiki/Index.jsx
@@ -9,6 +9,7 @@ import { wikiPages, getWiki, deleteWiki } from './api';
 import { httpUrl, TokenKey } from './fetch';
 import './Index.scss';
 import { isArray } from 'lodash';
+import RenderHtml from '../../components/render-html';
 const Search = Input.Search;
 const InputGroup = Input.Group;
 const { Option } = Select;
@@ -271,7 +272,7 @@ export default (props) => {
                 {permission && <Button type="primary" onClick={goEdit}>编辑</Button>}
               </div>
 
-              <div className="wiki-content-detail editor-content-panel markdown-body" dangerouslySetInnerHTML={{ __html: itemDetail && itemDetail.simple_content }} ></div>
+              {itemDetail && itemDetail.md_content && <RenderHtml className="wiki-content-detail editor-content-panel" value={ itemDetail.md_content } url={history.location}/>}
             </div>
           </div>
         </div >