From 95370243396eaf5d64cc18e06cc2b4aacf928280 Mon Sep 17 00:00:00 2001 From: "1994836463@qq.com" Date: Sun, 26 May 2024 11:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E9=80=89=E6=8B=A9=E9=AB=98?= =?UTF-8?q?=E4=BA=AE=E5=8D=95=E8=AF=8D=EF=BC=8C=E7=94=B1=E4=BA=8E=E6=A0=87?= =?UTF-8?q?=E8=AE=B0=E9=AB=98=E4=BA=AE=E5=8D=95=E8=AF=8D=E7=9A=84=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=94=B1=E6=94=B9=E4=B8=BA=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E6=89=80=E4=BB=A5=E5=9C=A8=E5=8F=96=E6=B6=88=E5=8D=95?= =?UTF-8?q?=E8=AF=8D=E9=AB=98=E4=BA=AE=E7=8A=B6=E6=80=81=E6=97=B6=E5=B0=86?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=9D=87=E6=94=B9=E4=B8=BA=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E6=9B=BF=E6=8D=A2=E6=97=B6=E7=9A=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B9=9F=E5=86=97=E4=BD=99=E4=BA=86=EF=BC=8C=E6=89=80=E4=BB=A5?= =?UTF-8?q?=E4=B9=9F=E8=BF=9B=E8=A1=8C=E4=BA=86=E4=B8=80=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/js/highlight.js | 37 +++++++++---------------------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js index 245931e..939d691 100644 --- a/app/static/js/highlight.js +++ b/app/static/js/highlight.js @@ -30,15 +30,9 @@ function highLight() { const list = allWords.split(" "); // 将所有的生词放入一个list中 if(word !== null && word !== "" && word !== " "){ let articleContent_fb2 = articleContent; - if(localStorage.getItem("nowWord").indexOf(word) !== -1){ - while(articleContent_fb2.toLowerCase().indexOf(word.toLowerCase()) !== -1){ - // 找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。 - const index = articleContent_fb2.toLowerCase().indexOf(word.toLowerCase()); - word = articleContent_fb2.substring(index, index + word.length); - articleContent_fb2 = articleContent_fb2.substring(index + word.length); // 使用副本中list[i]之后的子串替换掉副本 - articleContent = articleContent.replace(new RegExp(""+word+"", "g"), word) - } - pickedWords.value = localStorage.getItem("nowWord").replace(word,""); + if(localStorage.getItem("nowWords").indexOf(word) !== -1 || localStorage.getItem("nowWords").indexOf(word.toLowerCase()) !== -1){ + articleContent = articleContent.replace(new RegExp('' + word + '', "gi"), word); + pickedWords.value = localStorage.getItem("nowWords").replace(word,""); document.getElementById("article").innerHTML = articleContent; return; } @@ -48,39 +42,26 @@ function highLight() { list[i] = list[i].replace(/(^\W*)|(\W*$)/g, ""); // 消除单词两边的非单词字符 list[i] = list[i].replace('|', ""); list[i] = list[i].replace('?', ""); - if (list[i] != "" && !totalSet.has(list[i]) && "".indexOf(list[i]) === -1 && "".indexOf(list[i]) === -1) { + if (list[i] != "" && !totalSet.has(list[i])) { // 返回所有匹配单词的集合, 正则表达式RegExp()中, "\b"匹配一个单词的边界, g 表示全局匹配, i 表示对大小写不敏感。 let matches = new Set(articleContent.match(new RegExp("\\b" + list[i] + "\\b", "gi"))); - let articleContent_fb = articleContent; //文章副本 - if (matches.has("mark")) { - // 优先处理单词为 "mark" 的情况 - totalSet = new Set(["mark", ...totalSet]); - } - while(articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()) !== -1 && list[i]!=""){ - //找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。 - const index = articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()); - list[i] = articleContent_fb.substring(index, index + list[i].length); - articleContent_fb = articleContent_fb.substring(index + list[i].length); // 使用副本中list[i]之后的子串替换掉副本 - articleContent = articleContent.replace(new RegExp("\\b"+list[i]+"\\b","g"),"" + list[i] + ""); - } totalSet = new Set([...totalSet, ...matches]); } } - // 删除所有的mark标签,防止标签发生嵌套 - articleContent = articleContent.replace(/<(mark)[^>]*>/gi, ""); - articleContent = articleContent.replace(/<(\/mark)[^>]*>/gi, ""); + // 删除所有的""标签,防止标签发生嵌套 + articleContent = articleContent.replace(new RegExp('',"gi"), "") + articleContent = articleContent.replace(new RegExp("","gi"), ""); // 将文章中所有出现该单词word的地方改为:"" + word + ""。 for (let word of totalSet) { articleContent = articleContent.replace(new RegExp("\\b" + word + "\\b", "g"), "" + word + ""); } document.getElementById("article").innerHTML = articleContent; - } function cancelHighlighting() { let articleContent = document.getElementById("article").innerHTML; - articleContent = articleContent.replace(/<(mark)[^>]*>/gi, ""); - articleContent = articleContent.replace(/<(\/mark)[^>]*>/gi, ""); + articleContent = articleContent.replace(new RegExp('',"gi"), "") + articleContent = articleContent.replace(new RegExp("","gi"), ""); document.getElementById("article").innerHTML = articleContent; }