diff --git a/.temp_to_pub/.gitignore b/.temp_to_pub/.gitignore index 659bc79..1009635 100644 --- a/.temp_to_pub/.gitignore +++ b/.temp_to_pub/.gitignore @@ -4,4 +4,5 @@ EasySpider.app/ EasySpider_windows_x64/user_data *.tmp *.7z* -config.json \ No newline at end of file +config.json +mysql_config.json \ No newline at end of file diff --git a/.temp_to_pub/compress.py b/.temp_to_pub/compress.py index 608972f..de91272 100644 --- a/.temp_to_pub/compress.py +++ b/.temp_to_pub/compress.py @@ -48,6 +48,8 @@ if __name__ == "__main__": if os.path.exists("./EasySpider_windows_x64/user_data"): shutil.rmtree("./EasySpider_windows_x64/user_data") shutil.rmtree("./EasySpider_windows_x64/Data") + shutil.rmtree("./EasySpider_windows_x64/config.json") + shutil.rmtree("./EasySpider_windows_x64/mysql_config.json") shutil.rmtree("./EasySpider_windows_x64/execution_instances") os.mkdir("./EasySpider_windows_x64/Data") os.mkdir("./EasySpider_windows_x64/execution_instances") @@ -61,6 +63,8 @@ if __name__ == "__main__": shutil.rmtree("./EasySpider_windows_x86/user_data") shutil.rmtree("./EasySpider_windows_x86/Data") shutil.rmtree("./EasySpider_windows_x86/execution_instances") + shutil.rmtree("./EasySpider_windows_x86/config.json") + shutil.rmtree("./EasySpider_windows_x86/mysql_config.json") os.mkdir("./EasySpider_windows_x86/Data") os.mkdir("./EasySpider_windows_x86/execution_instances") compress_folder_to_7z("./EasySpider_windows_x64", file_name) @@ -71,6 +75,8 @@ if __name__ == "__main__": shutil.rmtree("./EasySpider_Linux_x64/user_data") shutil.rmtree("./EasySpider_Linux_x64/Data") shutil.rmtree("./EasySpider_Linux_x64/execution_instances") + shutil.rmtree("./EasySpider_Linux_x64/config.json") + shutil.rmtree("./EasySpider_Linux_x64/mysql_config.json") os.mkdir("./EasySpider_Linux_x64/Data") os.mkdir("./EasySpider_Linux_x64/execution_instances") # compress_folder_to_7z("./EasySpider_Linux_x64", file_name) diff --git a/ElectronJS/change_version.py b/ElectronJS/change_version.py index a71b2d3..2409639 100644 --- a/ElectronJS/change_version.py +++ b/ElectronJS/change_version.py @@ -39,11 +39,11 @@ if __name__ == "__main__": file_path = "../.temp_to_pub/compress.py" update_file_version(file_path, version, key='easyspider_version = "') - file_path = "./src/taskGrid/logic.js" + file_path = "./src/taskGrid/logic_deprecated.js" update_file_version(file_path, version, key='"version": "') - file_path = "./src/taskGrid/logic_CN.js" - update_file_version(file_path, version, key='"version": "') +# file_path = "./src/taskGrid/logic.js" +# update_file_version(file_path, version, key='"version": "') file_path = "../ExecuteStage/easyspider_executestage.py" update_file_version(file_path, version, key='"version": "') diff --git a/ElectronJS/detect_chinese.py b/ElectronJS/detect_chinese.py new file mode 100644 index 0000000..bb16d13 --- /dev/null +++ b/ElectronJS/detect_chinese.py @@ -0,0 +1,7 @@ +import re + +with open('src/taskGrid/FlowChart.js', 'r', encoding='utf-8') as file: + for line in file: + line = re.split('//', line)[0] + if re.search('[\u4e00-\u9fff]', line): + print(line) \ No newline at end of file diff --git a/ElectronJS/main.js b/ElectronJS/main.js index 4fb3298..bc3daed 100644 --- a/ElectronJS/main.js +++ b/ElectronJS/main.js @@ -93,7 +93,7 @@ function createWindow() { // and load the index.html of the app. // mainWindow.loadFile('src/index.html'); - mainWindow.loadURL(server_address + '/index.html?user_data_folder=' + config.user_data_folder); + mainWindow.loadURL(server_address + '/index.html?user_data_folder=' + config.user_data_folder, { extraHeaders: 'pragma: no-cache\n' }); // 隐藏菜单栏 const {Menu} = require('electron'); Menu.setApplicationMenu(null); @@ -118,7 +118,7 @@ async function beginInvoke(msg, ws) { url = server_address + `/taskGrid/FlowChart.html?id=${msg.message.id}&wsport=${websocket_port}&backEndAddressServiceWrapper=` + server_address; } console.log(url); - flowchart_window.loadURL(url); + flowchart_window.loadURL(url, { extraHeaders: 'pragma: no-cache\n' }); } mainWindow.hide(); // Prints the currently focused window bounds. @@ -475,7 +475,7 @@ function handleOpenBrowser(event, lang = "en", user_data_folder = "", mobile = f url = server_address + `/taskGrid/FlowChart_CN.html?id=${id}&wsport=${websocket_port}&backEndAddressServiceWrapper=` + server_address+ "&mobile=" + mobile.toString(); } // and load the index.html of the app. - flowchart_window.loadURL(url); + flowchart_window.loadURL(url, { extraHeaders: 'pragma: no-cache\n' }); if(process.platform != "darwin"){ flowchart_window.hide(); } @@ -495,7 +495,7 @@ function handleOpenInvoke(event, lang = "en") { url = server_address + `/taskGrid/taskList.html?type=1&wsport=${websocket_port}&backEndAddressServiceWrapper=` + server_address + "&lang=zh"; } // and load the index.html of the app. - window.loadURL(url); + window.loadURL(url, { extraHeaders: 'pragma: no-cache\n' }); window.maximize(); mainWindow.hide(); window.on('close', function (event) { diff --git a/ElectronJS/src/index.html b/ElectronJS/src/index.html index 12267b7..202ab8d 100644 --- a/ElectronJS/src/index.html +++ b/ElectronJS/src/index.html @@ -95,7 +95,7 @@ style="margin-top: 15px; width: 300px;height:60px;padding-top:12px;color:white">Start Data Mode

- Go to Home Page + Go to Home Page
@@ -111,13 +111,13 @@

Start Design

+ style="margin-top: 15px; width: 300px;height:60px;padding-top:12px;color:white">Start Design

Start Design (Mobile)

+ style="margin-top: 15px; width: 300px;height:60px;padding-top:12px;color:white">Start Design (Mobile)

- Go to Home Page + Go to Home Page

diff --git a/ElectronJS/src/taskGrid/FlowChart.html b/ElectronJS/src/taskGrid/FlowChart.html index a63300f..2c301e4 100644 --- a/ElectronJS/src/taskGrid/FlowChart.html +++ b/ElectronJS/src/taskGrid/FlowChart.html @@ -18,8 +18,8 @@ - + + @@ -263,6 +292,11 @@ + + @@ -310,13 +344,15 @@

Action is inside iframe

- + + -
+

Whether to record the output/return value of the execution as a field:

@@ -324,6 +360,20 @@

+

+ +

@@ -403,19 +453,6 @@ - - - - - - - - -

@@ -432,6 +469,18 @@
+ + + + + + + +
@@ -452,6 +501,7 @@ +
@@ -468,7 +518,6 @@
-
@@ -495,25 +544,38 @@
-
+
+ - + - - - + + + + + - + + + + + +
@@ -527,9 +589,10 @@ + - + - + + +