diff --git a/app/static/js/fillword.js b/app/static/js/fillword.js index 421d972..111027a 100644 --- a/app/static/js/fillword.js +++ b/app/static/js/fillword.js @@ -8,7 +8,13 @@ function getWord() { function fillInWord() { let word = getWord(); if (isRead) Reader.read(word, inputSlider.value); - if (!isChoose) return; + if (!isChoose) { + if(isHighlight){ + const element = document.getElementById("selected-words3"); + element.value = element.value + " " + word; + } + return; + } const element = document.getElementById("selected-words"); localStorage.setItem('nowWords', element.value); element.value = element.value + " " + word; diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js index 939d691..9646ff3 100644 --- a/app/static/js/highlight.js +++ b/app/static/js/highlight.js @@ -27,6 +27,8 @@ function highLight() { 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; + highlightWords = document.getElementById("selected-words3"); + allWords = highlightWords == null ? allWords : allWords + " " + highlightWords.value; const list = allWords.split(" "); // 将所有的生词放入一个list中 if(word !== null && word !== "" && word !== " "){ let articleContent_fb2 = articleContent; diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html index 57461c1..e5c8d95 100644 --- a/app/templates/userpage_get.html +++ b/app/templates/userpage_get.html @@ -166,6 +166,7 @@ {% endif %} + {{ yml['footer'] | safe }} {% if yml['js']['bottom'] %} {% for js in yml['js']['bottom'] %} diff --git a/app/test/test_bug546_lixiaofeng.py b/app/test/test_bug546_lixiaofeng.py new file mode 100644 index 0000000..671094b --- /dev/null +++ b/app/test/test_bug546_lixiaofeng.py @@ -0,0 +1,39 @@ +from selenium.webdriver.common.action_chains import ActionChains +from helper import signup + + +def test_highlight(driver, URL): + try: + # 打开网页 + driver.get(URL) + driver.maximize_window() + + # 注册 + signup(URL, driver) + + # 取消勾选“划词入库按钮” + highlight_checkbox = driver.find_element_by_id("chooseCheckbox") + driver.execute_script("arguments[0].click();", highlight_checkbox) + + article = driver.find_element_by_id("article") + + # 创建 ActionChains 对象 + actions = ActionChains(driver) + + # 移动鼠标到起点位置 + actions.move_to_element(article) + # actions.move_to_element_with_offset(article, 50, 100) + # 按下鼠标左键 + actions.click_and_hold() + # 拖动鼠标到结束位置 + actions.move_by_offset(400,50) + # 释放鼠标左键 + actions.release() + # 执行操作链 + actions.perform() + # time.sleep(10) + + assert driver.find_elements_by_class_name("highlighted") is not None + finally: + # 测试结束后关闭浏览器 + driver.quit() \ No newline at end of file