naibo 1 year ago
parent
commit
dde63bdd2e

+ 2 - 0
.temp_to_pub/EasySpider_windows_x64/Code/easyspider_executestage.py

@@ -1913,6 +1913,8 @@ class BrowserThread(Thread):
                 content = element.get_attribute(attribute_name)
             except:
                 content = ""
+        if content == None:
+            content = ""
         return content
 
     def clearOutputParameters(self):

BIN
ElectronJS/EasySpider_en.crx


BIN
ElectronJS/EasySpider_zh.crx


+ 1 - 0
ElectronJS/src/taskGrid/FlowChart.js

@@ -277,6 +277,7 @@ let app = new Vue({
                 "afterJSWaitTime": 0,
                 "downloadPic": 0,
                 "paraType": "text",
+                "splitLine": 0,
             });
             notifyParameterNum(1);
             this.paraIndex = this.nowNode["parameters"]["params"].length - 1;

+ 1 - 0
ElectronJS/src/taskGrid/logic.js

@@ -71,6 +71,7 @@ function changeOutputFormat(param) {
 }
 
 function changeGetDataParameters(msg, i) {
+    //Flowchart.js的addParam函数要配套跟上!!!
     msg["parameters"][i]["default"] = ""; //找不到元素时候的默认值
     msg["parameters"][i]["paraType"] = "text"; //参数类型
     msg["parameters"][i]["recordASField"] = 1; //是否记录为字段值

File diff suppressed because it is too large
+ 0 - 0
ElectronJS/tasks/301.json


+ 1 - 1
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", "[2]", "--headless", "0", "--user_data", "0", "--keyboard", "0",
+            "args": ["--ids", "[43]", "--headless", "0", "--user_data", "1", "--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"
         }

+ 2 - 0
ExecuteStage/easyspider_executestage.py

@@ -1913,6 +1913,8 @@ class BrowserThread(Thread):
                 content = element.get_attribute(attribute_name)
             except:
                 content = ""
+        if content == None:
+            content = ""
         return content
 
     def clearOutputParameters(self):

Some files were not shown because too many files changed in this diff