diff --git a/ElectronJS/src/taskGrid/logic.js b/ElectronJS/src/taskGrid/logic.js index d13f807..b1a6fcc 100644 --- a/ElectronJS/src/taskGrid/logic.js +++ b/ElectronJS/src/taskGrid/logic.js @@ -376,7 +376,17 @@ function modifyParameters(t, param) { if (param["nextPage"]) { //循环点击下一页的情况下 t["title"] = LANG("循环点击下一页", "Loop Click Next Page"); } else if (param["type"] == "loopClickSingle") { //循环点击单个元素 - t["title"] = LANG("循环点击单个元素", "Loop Click Single Element"); + t["title"] = LANG("循环点击", "Loop Click"); + let content = param["content"].trim(); + if (content.length > 15) { + content = content.substring(0, 15) + "..."; + content = LANG(":", ": ") + content; + } else if(content.length == 0){ + content = LANG("单个元素", " Single Element"); + } else { + content = LANG(":", ": ") + content; + } + t["title"] += content; } else if (param["type"] == "loopClickEvery") { //循环点击每个元素 t["title"] = LANG("循环点击每个元素", "Loop click Every Element"); } else if (param["type"] == "loopMouseMove") { //循环移动到单个元素 diff --git a/ExecuteStage/.vscode/launch.json b/ExecuteStage/.vscode/launch.json index ddf20a3..1ecb89d 100644 --- a/ExecuteStage/.vscode/launch.json +++ b/ExecuteStage/.vscode/launch.json @@ -12,7 +12,7 @@ "justMyCode": false, // "args": ["--ids", "[7]", "--read_type", "remote", "--headless", "0"] // "args": ["--ids", "[9]", "--read_type", "remote", "--headless", "0", "--saved_file_name", "YOUTUBE"] - "args": ["--ids", "[1]", "--headless", "0", "--user_data", "0", "--keyboard", "0", + "args": ["--ids", "[8]", "--headless", "0", "--user_data", "0", "--keyboard", "0", "--read_type", "remote"] // "args": "--ids '[97]' --user_data 1 --server_address http://localhost:8074 --config_folder '/Users/naibo/Documents/EasySpider/ElectronJS/' --headless 0 --read_type remote --config_file_name config.json --saved_file_name" } diff --git a/ExecuteStage/easyspider_executestage.py b/ExecuteStage/easyspider_executestage.py index a978d86..8019d6a 100644 --- a/ExecuteStage/easyspider_executestage.py +++ b/ExecuteStage/easyspider_executestage.py @@ -1565,7 +1565,7 @@ class BrowserThread(Thread): try: newTab = int(param["newTab"]) except: - newTab = 1 + newTab = 0 try: if click_way == 0: # 用selenium的点击方法 try: diff --git a/Extension/manifest_v3/src/content-scripts/messageInteraction.js b/Extension/manifest_v3/src/content-scripts/messageInteraction.js index f3c0c3a..2598f39 100644 --- a/Extension/manifest_v3/src/content-scripts/messageInteraction.js +++ b/Extension/manifest_v3/src/content-scripts/messageInteraction.js @@ -258,7 +258,7 @@ export function collectMultiWithPattern() { } //循环点击单个元素 -export function sendLoopClickSingle(name="") { +export function sendLoopClickSingle(name = "") { let message = { "type": "loopClickSingle", "id": global.id, @@ -275,7 +275,7 @@ export function sendLoopClickSingle(name="") { }; if (name == "下一页元素") { message.nextPage = true; - } else if(name == "nextPageFromIndexPage") { + } else if (name == "nextPageFromIndexPage") { message.nextPage = true; message.type = "loopClickNextPage"; }