From cfd85a50357e5d60e4d3e4291b7f9583ec8d5c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E5=B0=9A=E6=B5=B7?= <1337633392@qq.com> Date: Mon, 27 May 2024 22:58:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=87=B3=20app/static/js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/js/highlight.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js index c9c3a02..0349c60 100644 --- a/app/static/js/highlight.js +++ b/app/static/js/highlight.js @@ -43,12 +43,12 @@ function highLight() { // 删除所有的mark标签,防止标签发生嵌套 articleContent = articleContent.replace(/<(mark)[^>]*>/gi, ""); articleContent = articleContent.replace(/<(\/mark)[^>]*>/gi, ""); - // 将文章中所有出现该单词word的地方改为："" + word + ""。 + // 将文章中所有出现该单词word的地方改为："" + word + ""。 for (let word of totalSet) { - articleContent = articleContent.replace(new RegExp("\\b" + word + "\\b", "g"), "" + word + ""); + articleContent = articleContent.replace(new RegExp("\\b" + word + "\\b", "g"), "" + word + ""); } document.getElementById("article").innerHTML = articleContent; - + $('mark').css('padding', 0); } function cancelHighlighting() { -- 2.17.1 From ea64351aa9dbe5d5da33c14deec155050710e8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E5=B0=9A=E6=B5=B7?= <1337633392@qq.com> Date: Mon, 27 May 2024 22:59:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=87=B3=20app/test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/test/test_bug551_XieShangHai.py | 30 +++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 app/test/test_bug551_XieShangHai.py diff --git a/app/test/test_bug551_XieShangHai.py b/app/test/test_bug551_XieShangHai.py new file mode 100644 index 0000000..3e0783b --- /dev/null +++ b/app/test/test_bug551_XieShangHai.py @@ -0,0 +1,30 @@ +from selenium.webdriver.common.action_chains import ActionChains +import time +from helper import signup + +def test_highlight(driver, URL): + try: + # 打开网页 + driver.maximize_window() + driver.get(URL) + + # 注册 + time.sleep(1) + signup(URL, driver) + time.sleep(2) + + # 选中单词（移动鼠标到起点位置、按下鼠标左键、拖动鼠标到结束位置、释放鼠标左键、执行操作链） + article = driver.find_element_by_id("article") + actions = ActionChains(driver) + actions.move_to_element(article).click_and_hold().move_by_offset(450,60).release().perform() + time.sleep(1) + + # 判断所有高亮单词是否有间隔 + marks = driver.find_elements_by_tag_name("mark") + for mark in marks: + assert mark.value_of_css_property("padding") == '0px' + time.sleep(5) + finally: + # 测试结束后关闭浏览器 + driver.quit() + \ No newline at end of file -- 2.17.1 From abd3448e0103c6fb797bf6b1477a249a37bb5604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E5=B0=9A=E6=B5=B7?= <1337633392@qq.com> Date: Tue, 28 May 2024 18:06:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=87=B3=20app/static/js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/js/highlight.js | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js index 0349c60..939d691 100644 --- a/app/static/js/highlight.js +++ b/app/static/js/highlight.js @@ -22,39 +22,46 @@ function getWord() { function highLight() { if (!isHighlight) return; + let word = (getWord() + "").trim(); let articleContent = document.getElementById("article").innerHTML; // innerHTML保留HTML标签来保持部分格式，且适配不同的浏览器 let pickedWords = document.getElementById("selected-words"); // words picked to the text area let dictionaryWords = document.getElementById("selected-words2"); // words appearing in the user's new words list let allWords = dictionaryWords === null ? pickedWords.value + " " : pickedWords.value + " " + dictionaryWords.value; const list = allWords.split(" "); // 将所有的生词放入一个list中 + if(word !== null && word !== "" && word !== " "){ + let articleContent_fb2 = articleContent; + 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; + } + } let totalSet = new Set(); for (let i = 0; i < list.length; ++i) { 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])) { // 返回所有匹配单词的集合, 正则表达式RegExp()中, "\b"匹配一个单词的边界, g 表示全局匹配, i 表示对大小写不敏感。 let matches = new Set(articleContent.match(new RegExp("\\b" + list[i] + "\\b", "gi"))); - if (matches.has("mark")) { - // 优先处理单词为 "mark" 的情况 - totalSet = new Set(["mark", ...totalSet]); - } totalSet = new Set([...totalSet, ...matches]); } } - // 删除所有的mark标签,防止标签发生嵌套 - articleContent = articleContent.replace(/<(mark)[^>]*>/gi, ""); - articleContent = articleContent.replace(/<(\/mark)[^>]*>/gi, ""); - // 将文章中所有出现该单词word的地方改为："" + word + ""。 + // 删除所有的""标签,防止标签发生嵌套 + 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 + ""); + articleContent = articleContent.replace(new RegExp("\\b" + word + "\\b", "g"), "" + word + ""); } document.getElementById("article").innerHTML = articleContent; - $('mark').css('padding', 0); } 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; } -- 2.17.1