From 6664077f215c8a5e1665e9b022f1404acdc0f0a6 Mon Sep 17 00:00:00 2001 From: naibo Date: Wed, 24 May 2023 04:15:08 +0800 Subject: [PATCH] Version 0.3.1 --- ElectronJS/main.js | 9 +- ElectronJS/package.json | 4 +- ElectronJS/src/taskGrid/FlowChart_CN.html | 39 ++++-- ElectronJS/src/taskGrid/FlowChart_CN.js | 16 ++- ElectronJS/src/taskGrid/invokeTask.html | 58 +++++---- ElectronJS/src/taskGrid/logic_CN.js | 42 +++++-- ElectronJS/src/taskGrid/newTask.html | 2 +- ElectronJS/src/taskGrid/taskInfo.html | 5 +- ElectronJS/src/taskGrid/taskList.html | 33 ++--- ElectronJS/tasks/66.json | 1 + ElectronJS/tasks/67.json | 1 + ElectronJS/tasks/68.json | 1 + ElectronJS/tasks/69.json | 1 + ExecuteStage/.vscode/launch.json | 2 +- ExecuteStage/easyspider_executestage.py | 112 +++++++++++++---- Extension/manifest_v3/README.md | 12 +- Extension/manifest_v3/package.json | 2 +- .../manifest_v3/src/content-scripts/global.js | 27 ++-- .../src/content-scripts/iframe.vue | 9 +- .../src/content-scripts/messageInteraction.js | 42 +++++++ .../src/content-scripts/toolkit.vue | 115 ++++++++++++++++-- Extension/manifest_v3/src/manifest.json | 2 +- Extension/manifest_v3/src/style/toolkit.css | 12 ++ 23 files changed, 427 insertions(+), 120 deletions(-) create mode 100644 ElectronJS/tasks/66.json create mode 100644 ElectronJS/tasks/67.json create mode 100644 ElectronJS/tasks/68.json create mode 100644 ElectronJS/tasks/69.json diff --git a/ElectronJS/main.js b/ElectronJS/main.js index bd58c26..07ba27f 100644 --- a/ElectronJS/main.js +++ b/ElectronJS/main.js @@ -223,6 +223,12 @@ async function beginInvoke(msg, ws) { } else { ws.send(JSON.stringify({"config_folder": task_server.getDir() + "/", "easyspider_location": task_server.getEasySpiderLocation()})); } + } else if (msg.type == 6) { + try{ + flowchart_window.openDevTools(); + } catch { + + } } } @@ -254,7 +260,8 @@ wss.on('connection', function (ws) { console.log("New tab opened, change current_handle to: ", current_handle); } handle_pairs[msg.message.id] = current_handle; - console.log("Set handle_pair for id: ", msg.message.id, " to ", current_handle); + console.log("Set handle_pair for id: ", msg.message.id, " to ", current_handle, ", title is: ", msg.message.title); + socket_flowchart.send(JSON.stringify({"type": "title", "data": {"title":msg.message.title}})); // console.log("handle_pairs: ", handle_pairs); } } else if (msg.type == 10) { diff --git a/ElectronJS/package.json b/ElectronJS/package.json index ebc7f07..0196072 100644 --- a/ElectronJS/package.json +++ b/ElectronJS/package.json @@ -1,7 +1,7 @@ { "name": "easy-spider", "productName": "EasySpider", - "version": "0.3.0", + "version": "0.3.1", "icon": "./favicon", "description": "NoCode Visual Web Crawler", "main": "main.js", @@ -60,7 +60,7 @@ ], "packagerConfig": { "icon": "./favicon", - "appVersion": "0.3.0", + "appVersion": "0.3.1", "name": "EasySpider", "executableName": "EasySpider", "appCopyright": "Naibo Wang (naibowang@foxmail.com)", diff --git a/ElectronJS/src/taskGrid/FlowChart_CN.html b/ElectronJS/src/taskGrid/FlowChart_CN.html index 650b208..1451265 100644 --- a/ElectronJS/src/taskGrid/FlowChart_CN.html +++ b/ElectronJS/src/taskGrid/FlowChart_CN.html @@ -62,7 +62,7 @@

-
+
@@ -111,8 +111,10 @@ - + + +
@@ -133,8 +135,10 @@ - + + +