JavaScript输入文字！！！

ElectronJS/main.js

@@ -741,6 +741,22 @@ async function beginInvoke(msg, ws) {
                         keyInfo = keyInfo.replace(/<enter>/gi, "");
                         enter = true;
                     }
+                    // 如果返回值中包含JS
+                    if (/JS\(/i.test(keyInfo)) {
+                        // 创建一个新的正则表达式来匹配JS语句
+                        let pattern = /JS\("(.+?)"\)/gi;
+
+                        // 找出所有的匹配项
+                        let matches = [...keyInfo.matchAll(pattern)];
+
+                        // 处理每一个匹配项
+                        for (let match of matches) {
+                            // 执行 JS 代码并等待结果
+                            let jsReplacedText = await execute_js(match[1], null, 0);
+                            // 替换匹配到的 JS 语句
+                            keyInfo = keyInfo.replace(match[0], jsReplacedText.toString());
+                        }
+                    }
                     if (keyInfo.indexOf("Field(") >= 0 || keyInfo.indexOf("eval(") >= 0) {
                         //两秒后通知浏览器
                         await new Promise((resolve) => setTimeout(resolve, 2000));
@@ -1184,6 +1200,12 @@ wss.on("connection", function (ws) {
     });
 });
 
+wss.on("error", function (err) {
+    dialog.showErrorBox("端口占用错误 Port Occupied Error", "端口" + websocket_port + "被占用，大概率是重复打开了多个EasySpider程序导致，小概率是其他程序占用了此端口，请关闭所有已打开的EasySpider程序及其他占用此端口的程序，或重启系统后再次尝试打开软件。\nPort " + websocket_port + " is occupied, it is most likely that multiple EasySpider programs are opened repeatedly, or other programs occupy this port. Please close all opened EasySpider programs and other programs that occupy this port, or restart the system and try to open the software again.");
+    //退出程序
+    app.quit();
+});
+
 console.log(process.platform);
 
 async function runBrowser(lang = "en", user_data_folder = "", mobile = false) {

ElectronJS/src/taskGrid/FlowChart.html

@@ -349,8 +349,8 @@
                     </div>
 
                 <div v-if='!useLoop'>
-                    <label>Input value (Use Field["FieldName"] to input the latest extracted/returned value of a field or custom operation. Use &lt;enter&gt; or &lt;ENTER&gt; to simulate pressing the Enter key):</label>
-                    <input spellcheck=false onkeydown="inputDelete(event)" class="form-control" v-model='nowNode["parameters"]["value"]'></input>
+                    <label>Input value (Use Field["FieldName"] to input the latest extracted/returned value of a field or custom operation. Use &lt;enter&gt; or &lt;ENTER&gt; to simulate pressing the Enter key, use JS("return JS code") and eval("Python code") to replace with the return values of JavaScript and Python code:</label>
+                    <textarea spellcheck=false onkeydown="inputDelete(event)" class="form-control" v-model='nowNode["parameters"]["value"]'></textarea>
                 </div>
 
                     <label>XPath: <span style="font-size: 30px!important;" title="Relative XPATH writing: start with /, e.g. the loop item XPATH is /html/body/div[1], your input is /*[@id='tab-customer'], then the final addressed xpath is: /html/body/div[1]/*[@id='tab-customer']">☺</span></label>

ElectronJS/src/taskGrid/FlowChart_CN.html

@@ -349,8 +349,8 @@
                     </div>
 
                     <div v-if='!useLoop'>
-                        <label>输入值（用Field["字段名"]来输入某字段/自定义操作的最新提取/返回值，用&lt;enter&gt;或&lt;ENTER&gt;表示模拟按下回车键）：</label>
-                        <input spellcheck=false onkeydown="inputDelete(event)" class="form-control" v-model='nowNode["parameters"]["value"]'></input>
+                        <label>输入值（用Field["字段名"]来输入某字段/自定义操作的最新提取/返回值，用&lt;enter&gt;或&lt;ENTER&gt;表示模拟按下回车键），用JS("return JS代码")和eval("Python代码")来替换成JavaScript和Python代码返回值：</label>
+                        <textarea spellcheck=false onkeydown="inputDelete(event)" class="form-control" v-model='nowNode["parameters"]["value"]'></textarea>
                     </div>
 
                     <label>XPath： <span style="font-size: 30px!important;" title="相对XPATH写法：以/开头，如循环项XPATH为/html/body/div[1],您的输入为/*[@id='tab-customer'],则最终寻址的xpath为：/html/body/div[1]/*[@id='tab-customer']">☺</span></label>

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

ExecuteStage/easyspider_executestage.py

@@ -1588,10 +1588,11 @@ class BrowserThread(Thread):
             else:
                 value = param["value"]
             # 将value中的Field[""]替换为outputParameters中的键值
-            pattern = r'Field\["([^"]+)"\]'
+            # pattern = r'Field\["([^"]+)"\]'
             try:
-                replaced_text = re.sub(
-                    pattern, lambda match: self.outputParameters.get(match.group(1), ''), value)
+                # replaced_text = re.sub(
+                    # pattern, lambda match: self.outputParameters.get(match.group(1), ''), value)
+                replaced_text = replace_field_values(value, self.outputParameters, self)
                 replaced_text = re.sub(
                     '<enter>', '', replaced_text, flags=re.IGNORECASE)
             except:

ExecuteStage/utils.py

@@ -308,6 +308,18 @@ def replace_field_values(orginal_text, outputParameters, browser=None):
                 eval_replaced_text = str(eval(match.group(1)))
                 # 替换eval语句
                 replaced_text = replaced_text.replace(match.group(0), eval_replaced_text)
+        if re.search(r'JS\(', replaced_text, re.IGNORECASE): # 如果返回值中包含JS
+            replaced_text = replaced_text.replace("self.", "browser.")
+            pattern = re.compile(r'(?i)JS\("(.+?)"\)')
+            # 循环替换所有匹配到的JS语句
+            while True:
+                match = pattern.search(replaced_text)
+                if not match:
+                    break
+                # 执行JS并将其结果转换为字符串形式
+                JS_replaced_text = str(browser.browser.execute_script(match.group(1)))
+                # 替换JS语句
+                replaced_text = replaced_text.replace(match.group(0), JS_replaced_text)
     except Exception as e:
         print("eval替换失败，请检查eval语句是否正确。| Failed to replace eval, please check if the eval statement is correct.")
         print(e)