From d9c8c7c44d7ba75570f8ccb4b0e04ec87d63de16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 28 Jul 2023 15:13:18 +0800 Subject: [PATCH] =?UTF-8?q?0728=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 10 +++++----- package.json | 2 +- public/js/editormd/editormd.min.js | 1 - src/App.css | 3 ++- src/forge/Information/Pages/newsDetail.jsx | 7 +++++++ src/forge/Issues/Component/chooseMenu.jsx | 5 ++++- src/forge/css/index.scss | 3 --- src/index.css | 7 ++++++- src/modules/tpm/challengesnew/tpm-md-editor.js | 4 ++-- 9 files changed, 27 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index a51ef317..816bd4bc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5551,8 +5551,8 @@ }, "editor.md": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/editor.md/-/editor.md-1.5.0.tgz", - "integrity": "sha1-b+Y2qIo5uFYT9T7ubst7c0irI78=" + "resolved": "https://registry.npmmirror.com/editor.md/-/editor.md-1.5.0.tgz", + "integrity": "sha512-oQBKZdXTkGogGNXV5jomogXZ2v8FNPBDbTC0NOVkicypPGr+NLKeEBfAe/gujCivkDG4Tn5yAGHCr0tsp9o44Q==" }, "ee-first": { "version": "1.1.1", @@ -11090,9 +11090,9 @@ } }, "marked": { - "version": "1.2.9", - "resolved": "http://173.15.15.82:8081/repository/npm-all/marked/-/marked-1.2.9.tgz", - "integrity": "sha512-H8lIX2SvyitGX+TRdtS06m1jHMijKN/XjfH6Ooii9fvxMlh8QdqBfBDkGUpMWH2kQNrtixjzYUa3SH8ROTgRRw==" + "version": "2.1.3", + "resolved": "https://registry.npmmirror.com/marked/-/marked-2.1.3.tgz", + "integrity": "sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==" }, "material-colors": { "version": "1.2.6", diff --git a/package.json b/package.json index 054f4ccf..c75f9cb9 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "localforage": "^1.10.0", "lodash": "^4.17.21", "loglevel": "^1.6.8", - "marked": "^1.0.0", + "marked": "^2.1.0", "material-ui": "^1.0.0-beta.40", "md5": "^2.2.1", "mini-css-extract-plugin": "^0.9.0", diff --git a/public/js/editormd/editormd.min.js b/public/js/editormd/editormd.min.js index d4173f50..844dd546 100755 --- a/public/js/editormd/editormd.min.js +++ b/public/js/editormd/editormd.min.js @@ -1595,7 +1595,6 @@ var height = $(this).height(); var scrollTop = $(this).scrollTop(); var percent = (scrollTop / ($(this)[0].scrollHeight-100)); - console.log(percent); var tocHeight = 0; preview.find(".markdown-toc-list").each(function () { diff --git a/src/App.css b/src/App.css index 0e7cdfef..2abbaf5e 100644 --- a/src/App.css +++ b/src/App.css @@ -76,7 +76,8 @@ body { } /* md多空格 */ .markdown-body p { - /* margin:10px 0px!important; */ + /* 同步gitee样式，md段落添加mb */ + margin-bottom: 16px !important; font-size: 16px !important; white-space: pre-wrap; } diff --git a/src/forge/Information/Pages/newsDetail.jsx b/src/forge/Information/Pages/newsDetail.jsx index 302ccaac..50e58767 100644 --- a/src/forge/Information/Pages/newsDetail.jsx +++ b/src/forge/Information/Pages/newsDetail.jsx @@ -20,14 +20,21 @@ function NewsDetail(props){ const zonedetail = props.data; useEffect(()=>{ + let initialContent = undefined; if(IsPC() && zonedetail){ setTimeout(()=>{ window.scrollTo(0,1); if(detail) document.title = detail.name; },100); + initialContent = document.querySelector('meta[name="viewport"]').getAttribute('content'); document.querySelector('meta[name="viewport"]').setAttribute('content','width=device-width, user-scalable=no,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0'); } + return()=>{ + if(IsPC()){ + document.querySelector('meta[name="viewport"]').setAttribute('content', initialContent); + } + } },[zonedetail,detail]) useEffect(()=>{ diff --git a/src/forge/Issues/Component/chooseMenu.jsx b/src/forge/Issues/Component/chooseMenu.jsx index 5608b2c0..4da6c5e4 100644 --- a/src/forge/Issues/Component/chooseMenu.jsx +++ b/src/forge/Issues/Component/chooseMenu.jsx @@ -46,7 +46,10 @@ function ChooseMenu({ const refBox = useRef(null); useEffect(() => { - document.addEventListener('click', clickMe , false); + document.addEventListener('mousedown', clickMe , false); + return () => { + window.removeEventListener("mousedown", clickMe, false); + } }, []) const clickMe = ({ target }) => { diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index c47e6bca..65cd5c35 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -1,9 +1,6 @@ ul,ol,dl{ margin-bottom: 0px; } -.markdown-body{ - overflow: inherit; -} .markdown-body .editormd-tex .katex-display>.katex{ white-space: pre-wrap; } diff --git a/src/index.css b/src/index.css index 90fdbe8f..25a963c6 100644 --- a/src/index.css +++ b/src/index.css @@ -43,6 +43,9 @@ .markdown-body img{ cursor: pointer; + /* 行内样式 */ + max-width: 100% !important; + height: auto !important; } .markdown-body pre ol.linenums,.markdown-body pre ul.linenums{ padding-left: 0px; @@ -52,7 +55,9 @@ } .markdown-body video{ - max-width: 100%; + /* 行内样式 */ + max-width: 100% !important; + height: auto !important; } ol, diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js index 38fd68a7..5d147a27 100644 --- a/src/modules/tpm/challengesnew/tpm-md-editor.js +++ b/src/modules/tpm/challengesnew/tpm-md-editor.js @@ -9,7 +9,7 @@ import 'codemirror/lib/codemirror.css'; import './css/newquestion.css'; const $ = window.$ -const mdIcons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear","fullscreen"]; +const mdIcons = ["bold", "italic", "del", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear","fullscreen"]; const NULL_CH = '▁'; @@ -317,7 +317,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla {users && users.map((item,key)=>{ return(
{selectAtWho(item.username)}} onMouseOver={()=>{onMouseOver(key)}}> - {item.image_url && } + {item.image_url && } {item.username}
)