Bug Fix and Picture download update

ElectronJS/main.js

@@ -198,7 +198,7 @@ async function findElement(driver, by, value, iframe = false) {
     }
 }
 
-async function findElementAcrossAllWindows(msg, notifyBrowser = true) {
+async function findElementAcrossAllWindows(msg, notifyBrowser = true, scrollIntoView = true) {
     let handles = await driver.getAllWindowHandles();
     // console.log("handles", handles);
     let content_handle = current_handle;
@@ -266,6 +266,16 @@ async function findElementAcrossAllWindows(msg, notifyBrowser = true) {
     if (element == null && notifyBrowser) {
         notify_browser("无法找到元素，请检查XPath是否正确：" + xpath, "Cannot find the element, please check if the XPath is correct: " + xpath, "warning");
     }
+    if (element != null && scrollIntoView) {
+        // 浏览器切换到元素位置稍微靠上的位置
+        try {
+            // let script = `arguments[0].scrollIntoView(true);`;
+            let script = `arguments[0].scrollIntoView({block: "center", inline: "center"});`;
+            await driver.executeScript(script, element);
+        } catch (e) {
+            console.log("Cannot scrollIntoView");
+        }
+    }
     return element;
 }
 
@@ -308,7 +318,7 @@ async function beginInvoke(msg, ws) {
             keyInfo = keyInfo.replace(/<enter>/gi, '');
             enter = true;
         }
-        let element = await findElementAcrossAllWindows(msg);
+        let element = await findElementAcrossAllWindows(msg, notifyBrowser = true, scrollIntoView = false);
         await element.sendKeys(Key.HOME, Key.chord(Key.SHIFT, Key.END), keyInfo);
         if (enter) {
             await element.sendKeys(Key.ENTER);
@@ -321,7 +331,7 @@ async function beginInvoke(msg, ws) {
                 let type = message.type;
                 console.log("FROM Browser: ", message);
                 if (type.indexOf("Click") >= 0 || type.indexOf("Move") >= 0) {
-                    let element = await findElementAcrossAllWindows(message);
+                    let element = await findElementAcrossAllWindows(message, notifyBrowser = true, scrollIntoView = false);
                     if (type.indexOf("Click") >= 0) {
                         await click_element(element);
                     } else if (type.indexOf("Move") >= 0) {
@@ -336,7 +346,7 @@ async function beginInvoke(msg, ws) {
             console.log(e);
         }
     } else if (msg.type == 4) { //试运行功能
-        try{
+        try {
             let flowchart_url = flowchart_window.webContents.getURL();
         } catch {
             flowchart_window = null;
@@ -562,7 +572,7 @@ async function execute_js(js, element, wait_time = 3) {
     if (js.length != 0) {
         try {
             await driver.executeScript(js, element);
-            if(wait_time == 0){
+            if (wait_time == 0) {
                 wait_time = 30000;
             }
             await new Promise(resolve => setTimeout(resolve, wait_time));

ElectronJS/src/taskGrid/FlowChart.css

@@ -38,6 +38,7 @@
       border-radius: 7px;
       /*border: skyblue solid;*/
       border: #007bff solid;
+      border-color: transparent;
       /*background: rgb(73, 156, 189);*/
       background: rgb(10, 120, 200);
       color: white;

ElectronJS/src/taskGrid/FlowChart.html

@@ -113,10 +113,10 @@
                     <input onkeydown="inputDelete(event)" class="form-control" v-model.number="nowNode['parameters']['maxWaitTime']" type="number" required></input>
                     <label>After executed, whether scroll down:</label>
                     <select v-model='nowNode["parameters"]["scrollType"]' class="form-control">
-                        <option value = 0>No scrolling</option>
-                        <option value = 1>Scroll one screen</option>
-                        <option value = 2>Scroll to the end</option>
-                        <option value = 3>Keep scrolling until the page data does not change</option>
+                        <option :vaule = 0>No scrolling</option>
+                        <option :vaule = 1>Scroll one screen</option>
+                        <option :vaule = 2>Scroll to the end</option>
+                        <option :vaule = 3>Keep scrolling until the page data does not change</option>
                       </select>
                     <label>Scroll Times (the wait time after scrolling <b>ineffective</b> when the scrolling type is set to <b>no scrolling</b>):</label>
                     <input onkeydown="inputDelete(event)" class="form-control" v-model.number="nowNode['parameters']['scrollCount']" type="number" required></input>
@@ -159,10 +159,10 @@
                     </select>
                     <label>Whether to scroll down after clicking:</label>
                     <select v-model='nowNode["parameters"]["scrollType"]' class="form-control">
-                        <option value = 0>No Scrolling</option>
-                        <option value = 1>Scroll one screen</option>
-                        <option value = 2>Scroll to the end</option>
-                        <option value = 3>Keep scrolling until the page data does not change</option>
+                        <option :vaule = 0>No Scrolling</option>
+                        <option :vaule = 1>Scroll one screen</option>
+                        <option :vaule = 2>Scroll to the end</option>
+                        <option :vaule = 3>Keep scrolling until the page data does not change</option>
                       </select>
                     <label>Scroll Times:</label>
                     <input onkeydown="inputDelete(event)" class="form-control" v-model.number="nowNode['parameters']['scrollCount']" type="number" required></input>
@@ -414,8 +414,8 @@ This option is an advanced feature that allows directly returning the expression
 Please note that this feature does not support assigning values to variables. In other words, you cannot write something like `self.myVar = 1`. If you want to perform assignment operations, please select the previous option, "Run Python code on current environment (the "exec" operation)"</pre>
                         <p style="margin-top: 15px">Whether to record the output/return value of the execution as a field: </p>
                         <p><select v-model='nowNode["parameters"]["recordASField"]' class="form-control">
-                            <option value = 0>No</option>
-                            <option value = 1>Yes</option>
+                            <option :vaule = 0>No</option>
+                            <option :vaule = 1>Yes</option>
                         </select></p>
                         <p><label>Convert parameter type to:</label>
                         <select v-model='nowNode["parameters"]["paraType"]' class="form-control">
@@ -490,10 +490,10 @@ Please note that this feature does not support assigning values to variables. In
                     <div v-if="!useLoop">
                     <p>Option switch Mode</p>
                         <select class="form-control" v-model='nowNode["parameters"]["optionMode"]'>
-                            <option value=0>Switch to the next option</option>
-                            <option value=1>Switch options by index (0 is the first option)</option>
-                            <option value=2>Switch options by option value</option>
-                            <option value=3>Switch options by option text</option>
+                            <option :vaule = 0>Switch to the next option</option>
+                            <option :vaule = 1>Switch options by index (0 is the first option)</option>
+                            <option :vaule = 2>Switch options by option value</option>
+                            <option :vaule = 3>Switch options by option text</option>
                         </select>
                         <p>Set value (not applicable for "Switch to the next option" mode)</p>
                         <input class="form-control" id="selectValue" v-model='nowNode["parameters"]["optionValue"]' autoFocus="autofocus" type="text"></input>
@@ -568,9 +568,9 @@ If the expression returns a value greater than 0 or evaluates to True, the loop
                         <div>
                             <p><label>(Advanced Operation) Define loop exit condition using code/script; or you can add a <b>Custom Action</b>, then select the "Exit Loop" option:</label></p>
                             <select v-model='nowNode["parameters"]["breakMode"]' class="form-control" style="font-weight: bold">
-                                <option value=0>Do not set script (even if a script is written below, it will not be executed)</option>
-                                <option value=1>JavaScript script (start with 'return ')</option>
-                                <option value=2>Operating system-level command</option>
+                                <option :vaule = 0>Do not set script (even if a script is written below, it will not be executed)</option>
+                                <option :vaule = 1>JavaScript script (start with 'return ')</option>
+                                <option :vaule = 2>Operating system-level command</option>
                             </select>
                             <div>
                             <textarea style="margin-top: 10px" onkeydown="inputDelete(event)" class="form-control" rows="2"
@@ -584,10 +584,10 @@ If the expression returns a value greater than 0 or evaluates to True, the loop
                     <input onkeydown="inputDelete(event)" required type="number" class="form-control" v-model.number='list.nl[index.nowNodeIndex]["parameters"]["historyWait"]'></input>
                     <label>After executed, whether scroll down:</label>
                     <select v-model='nowNode["parameters"]["scrollType"]' class="form-control">
-                        <option value = 0>No Scrolling</option>
-                        <option value = 1>Scroll one screen</option>
-                        <option value = 2>Scroll to the end</option>
-                        <option value = 3>Keep scrolling until the page data does not change</option>
+                        <option :vaule = 0>No Scrolling</option>
+                        <option :vaule = 1>Scroll one screen</option>
+                        <option :vaule = 2>Scroll to the end</option>
+                        <option :vaule = 3>Keep scrolling until the page data does not change</option>
                     </select>
                     <label>Scroll Times:</label>
                     <input onkeydown="inputDelete(event)" class="form-control" v-model.number="nowNode['parameters']['scrollCount']" type="number" required></input>
@@ -604,15 +604,15 @@ If the expression returns a value greater than 0 or evaluates to True, the loop
                     <p><input onkeydown="inputDelete(event)" type="checkbox" v-model='nowNode["parameters"]["iframe"]'></input>Operation is in iframe</p>
                     <label>Condition Type:</label>
                     <select v-model='TClass' class="form-control">
-                        <option value = 0>No Condition</option>
-                        <option value = 1>Text inside current page</option>
-                        <option value = 2>Element inside current page</option>
-                        <option v-if="nowNode['isInLoop']" value = 3>Text inside current loop</option>
-                        <option v-if="nowNode['isInLoop']" value = 4>Element inside current loop</option>
-                        <option value = 5>Return value of JavaScript command (start with 'return ')</option>
-                        <option value = 6>Return value of system command</option>
-                        <option v-if="nowNode['isInLoop']" value = 7>Return value of JavaScript command for the current loop item</option>
-                        <option value = 8>Return value of Python code under current environment</option>
+                        <option :value = 0>No Condition</option>
+                        <option :value = 1>Text inside current page</option>
+                        <option :value = 2>Element inside current page</option>
+                        <option v-if="nowNode['isInLoop']" :value = 3>Text inside current loop</option>
+                        <option v-if="nowNode['isInLoop']" :value = 4>Element inside current loop</option>
+                        <option :value = 5>Return value of JavaScript command (start with 'return ')</option>
+                        <option :value = 6>Return value of system command</option>
+                        <option v-if="nowNode['isInLoop']" :value = 7>Return value of JavaScript command for the current loop item</option>
+                        <option :value = 8>Return value of Python code under current environment</option>
                       </select>
 
                     <div v-if='TClass > 0 && TClass < 5'>
@@ -653,8 +653,8 @@ If the expression returns a value greater than 0 or evaluates to True, the opera
                         <input onkeydown="inputDelete(event)" required type="number" class="form-control" v-model.number='list.nl[index.nowNodeIndex]["parameters"]["wait"]'></input>
                         <label>Wait Type</label>
                         <select v-model='list.nl[index.nowNodeIndex]["parameters"]["waitType"]' class="form-control">
-                            <option value = 0>Fixed wait (set to wait for 10 seconds then it will wait for 10 seconds)</option>
-                            <option value = 1>Random wait (set to wait for 10 seconds then it will randomly wait for 10 × 0.5 - 10 × 1.5 seconds)</option>
+                            <option :vaule = 0>Fixed wait (set to wait for 10 seconds then it will wait for 10 seconds)</option>
+                            <option :vaule = 1>Random wait (set to wait for 10 seconds then it will randomly wait for 10 × 0.5 - 10 × 1.5 seconds)</option>
                         </select>
                     </div>
                 </div>

ElectronJS/src/taskGrid/FlowChart_CN.html

@@ -113,10 +113,10 @@
                     <input onkeydown="inputDelete(event)" class="form-control" v-model.number="nowNode['parameters']['maxWaitTime']" type="number" required></input>
                     <label>打开网页后是否向下滚动：</label>
                     <select v-model='nowNode["parameters"]["scrollType"]' class="form-control">
-                        <option value = 0>不滚动</option>
-                        <option value = 1>向下滚动一屏</option>
-                        <option value = 2>滚动到底部</option>
-                        <option value = 3>一直滚动直到页面内容无变化（需设置好滚动后的等待时间用于检测页面变化）</option>
+                        <option :value = 0>不滚动</option>
+                        <option :value = 1>向下滚动一屏</option>
+                        <option :value = 2>滚动到底部</option>
+                        <option :value = 3>一直滚动直到页面内容无变化（需设置好滚动后的等待时间用于检测页面变化）</option>
                     </select>
                     <label>滚动次数（滚动类型设置为<b>不滚动</b>或<b>一直滚动</b>时请忽略此项）：</label>
                     <input onkeydown="inputDelete(event)" class="form-control" v-model.number="nowNode['parameters']['scrollCount']" type="number" required></input>
@@ -159,10 +159,10 @@
                     </select>
                     <label>点击后是否向下滚动页面：</label>
                     <select v-model='nowNode["parameters"]["scrollType"]' class="form-control">
-                        <option value = 0>不滚动</option>
-                        <option value = 1>向下滚动一屏</option>
-                        <option value = 2>滚动到底部</option>
-                        <option value = 3>一直滚动直到页面内容无变化（需设置好滚动后的等待时间用于检测页面变化）</option>
+                        <option :vaule = 0>不滚动</option>
+                        <option :vaule = 1>向下滚动一屏</option>
+                        <option :vaule = 2>滚动到底部</option>
+                        <option :vaule = 3>一直滚动直到页面内容无变化（需设置好滚动后的等待时间用于检测页面变化）</option>
                       </select>
                     <label>滚动次数（滚动类型设置为<b>不滚动</b>或<b>一直滚动</b>时请忽略此项）：</label>
                     <input onkeydown="inputDelete(event)" class="form-control" v-model.number="nowNode['parameters']['scrollCount']" type="number" required></input>
@@ -490,10 +490,10 @@ print(emotlib.emoji()) # 使用其中的函数。
                     <div v-if="!useLoop">
                         <p>切换模式</p>
                         <select class="form-control" v-model='nowNode["parameters"]["optionMode"]'>
-                            <option value=0>切换到下一个选项</option>
-                            <option value=1>按索引值切换选项（第一个选项索引值为0）</option>
-                            <option value=2>按选项值切换选项</option>
-                            <option value=3>按选项文本切换选项</option>
+                            <option :value=0>切换到下一个选项</option>
+                            <option :value=1>按索引值切换选项（第一个选项索引值为0）</option>
+                            <option :value=2>按选项值切换选项</option>
+                            <option :value=3>按选项文本切换选项</option>
                         </select>
                         <p>设定值（不适用于切换到下一个选项模式）</p>
                         <input class="form-control" id="selectValue" v-model='nowNode["parameters"]["optionValue"]' autoFocus="autofocus" type="text"></input>
@@ -568,9 +568,9 @@ print(emotlib.emoji()) # 使用其中的函数。
                         <div>
                             <p><label>（自定义操作）使用代码/脚本定义循环退出条件（也可以在流程中添加<b>自定义操作</b>，然后选择<b>退出循环</b>选项）： </label></p>
                             <select v-model='nowNode["parameters"]["breakMode"]' class="form-control" style="font-weight: bold">
-                                <option value = 0>不设置脚本（选择这个下面写了脚本也不会执行）</option>
-                                <option value = 1>JavaScript脚本返回值（需以return 开头）</option>
-                                <option value = 2>操作系统级别命令</option>
+                                <option :value = 0>不设置脚本（选择这个下面写了脚本也不会执行）</option>
+                                <option :value = 1>JavaScript脚本返回值（需以return 开头）</option>
+                                <option :value = 2>操作系统级别命令</option>
                             </select>
                             <div>
                                 <textarea style="margin-top: 10px" onkeydown="inputDelete(event)" class="form-control" rows="2"
@@ -584,10 +584,10 @@ print(emotlib.emoji()) # 使用其中的函数。
                     <input onkeydown="inputDelete(event)" required type="number" class="form-control" v-model.number='list.nl[index.nowNodeIndex]["parameters"]["historyWait"]'></input>
                     <label>执行完是否向下滚动：</label>
                     <select v-model='nowNode["parameters"]["scrollType"]' class="form-control">
-                        <option value = 0>不滚动</option>
-                        <option value = 1>向下滚动一屏</option>
-                        <option value = 2>滚动到底部</option>
-                        <option value = 3>一直滚动直到页面内容无变化（需设置好滚动后的等待时间用于检测页面变化）</option>
+                        <option :value = 0>不滚动</option>
+                        <option :value = 1>向下滚动一屏</option>
+                        <option :value = 2>滚动到底部</option>
+                        <option :value = 3>一直滚动直到页面内容无变化（需设置好滚动后的等待时间用于检测页面变化）</option>
                     </select>
                     <label>滚动次数（滚动类型设置为<b>不滚动</b>或<b>一直滚动</b>时请忽略此项）：</label>
                     <input onkeydown="inputDelete(event)" class="form-control" v-model.number="nowNode['parameters']['scrollCount']" type="number" required></input>
@@ -596,23 +596,23 @@ print(emotlib.emoji()) # 使用其中的函数。
                 </div>
 
                 <div class="elements" v-if="nodeType==9">
-                    <label>判断条件是从左往右判断的，即如果最左边的条件分支的判断条件满足，则执行最左边分支内的操作，否则判断从左向右第二个分支的条件是否满足，依此类推。</label>
+                    <label>判断条件是从左往右判断的，即如果最左边的条件分支的判断条件满足，则执行最左边分支内的操作，否则判断从左向右第二个分支的条件是否满足，以此类推。</label>
                 </div>
 
                 <div class="elements" v-if="nodeType==10">
-                    <label>判断条件是从左往右判断的，即如果最左边的条件分支的判断条件满足，则执行最左边分支内的操作，否则判断从左向右第二个分支的条件是否满足，依此类推。</label>
+                    <label>判断条件是从左往右判断的，即如果最左边的条件分支的判断条件满足，则执行最左边分支内的操作，否则判断从左向右第二个分支的条件是否满足，以此类推。</label>
                     <p><input onkeydown="inputDelete(event)" type="checkbox" v-model='nowNode["parameters"]["iframe"]'></input>在iframe内操作</p>
                     <label>条件类型：</label>
                     <select v-model='TClass' class="form-control">
-                        <option value = 0>无条件</option>
-                        <option value = 1>当前页面包括文本</option>
-                        <option value = 2>当前页面包括元素</option>
-                        <option v-if="nowNode['isInLoop']" value = 3>当前循环项包括文本</option>
-                        <option v-if="nowNode['isInLoop']" value = 4>当前循环项包括元素</option>
-                        <option value = 5>JavaScript命令返回值（需以return 开头）</option>
-                        <option value = 6>系统命令返回值</option>
-                        <option v-if="nowNode['isInLoop']" value = 7>针对当前循环项的JavaScript命令返回值（需以return 开头）</option>
-                        <option value = 8>执行环境下的Python表达式值（eval操作）</option>
+                        <option :value = 0>无条件</option>
+                        <option :value = 1>当前页面包括文本</option>
+                        <option :value = 2>当前页面包括元素</option>
+                        <option v-if="nowNode['isInLoop']" :value = 3>当前循环项包括文本</option>
+                        <option v-if="nowNode['isInLoop']" :value = 4>当前循环项包括元素</option>
+                        <option :value = 5>JavaScript命令返回值（需以return 开头）</option>
+                        <option :value = 6>系统命令返回值</option>
+                        <option v-if="nowNode['isInLoop']" :value = 7>针对当前循环项的JavaScript命令返回值（需以return 开头）</option>
+                        <option :value = 8>执行环境下的Python表达式值（eval操作）</option>
                       </select>
 
                     <div v-if='TClass > 0 && TClass < 5'>
@@ -653,8 +653,8 @@ print(emotlib.emoji()) # 使用其中的函数。
                         <input onkeydown="inputDelete(event)" required type="number" class="form-control" v-model.number='list.nl[index.nowNodeIndex]["parameters"]["wait"]'></input>
                         <label style="margin-top:5px">等待类型</label>
                         <select v-model='list.nl[index.nowNodeIndex]["parameters"]["waitType"]' class="form-control">
-                            <option value = 0>固定等待（设置等10秒就等10秒）</option>
-                            <option value = 1>随机等待（设置等10秒会随机等10×0.5 - 10 × 1.5 秒）</option>
+                            <option :value = 0>固定等待（设置等10秒就等10秒）</option>
+                            <option :value = 1>随机等待（设置等10秒会随机等10×0.5 - 10 × 1.5 秒）</option>
                         </select>
                     </div>
                 </div>

ExecuteStage/.vscode/launch.json

@@ -12,7 +12,8 @@
             "justMyCode": false,
             //  "args": ["--ids", "[7]", "--read_type", "remote", "--headless", "0"]
             // "args": ["--ids", "[9]", "--read_type", "remote", "--headless", "0", "--saved_file_name", "YOUTUBE"]
-            "args": ["--ids", "[0]", "--headless", "0", "--user_data", "0", "--keyboard", "0"]
+            "args": ["--ids", "[20]", "--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

@@ -855,40 +855,45 @@ class BrowserThread(Thread):
                 self.recordLog(e)
             self.recordLog("Wait element not found")
         self.recordLog("执行节点|Execute node:", node["title"])
-        # 根据不同选项执行不同操作
-        if node["option"] == 0 or node["option"] == 10:  # root操作,条件分支操作
-            for i in node["sequence"]:  # 从根节点开始向下读取
-                self.executeNode(i, loopValue, loopPath, index)
-        elif node["option"] == 1:  # 打开网页操作
-            # if not (nodeId == 1 and self.service["cloudflare"] == 1):
-            self.openPage(node["parameters"], loopValue)
-        elif node["option"] == 2:  # 点击元素
-            self.clickElement(node["parameters"], loopValue, loopPath, index)
-        elif node["option"] == 3:  # 提取数据
-            # 针对提取数据操作，设置操作开始的步骤，用于不小心关闭后的恢复的增量采集
-            if self.totalSteps >= self.startSteps:
-                self.getData(node["parameters"], loopValue, node["isInLoop"],
-                             parentPath=loopPath, index=index)
+        try:
+            # 根据不同选项执行不同操作
+            if node["option"] == 0 or node["option"] == 10:  # root操作,条件分支操作
+                for i in node["sequence"]:  # 从根节点开始向下读取
+                    self.executeNode(i, loopValue, loopPath, index)
+            elif node["option"] == 1:  # 打开网页操作
+                # if not (nodeId == 1 and self.service["cloudflare"] == 1):
+                self.openPage(node["parameters"], loopValue)
+            elif node["option"] == 2:  # 点击元素
+                self.clickElement(node["parameters"], loopValue, loopPath, index)
+            elif node["option"] == 3:  # 提取数据
+                # 针对提取数据操作，设置操作开始的步骤，用于不小心关闭后的恢复的增量采集
+                if self.totalSteps >= self.startSteps:
+                    self.getData(node["parameters"], loopValue, node["isInLoop"],
+                                parentPath=loopPath, index=index)
+                    self.saveData()
+                else:
+                    # self.getDataStep += 1
+                    self.print_and_log("跳过第" + str(self.totalSteps) + "次提取数据。")
+                    self.print_and_log(
+                        "Skip the " + str(self.totalSteps) + "th data extraction.")
+                self.totalSteps += 1  # 总步数加一
+            elif node["option"] == 4:  # 输入文字
+                self.inputInfo(node["parameters"], loopValue)
+            elif node["option"] == 5:  # 自定义操作
+                self.customOperation(node, loopValue, loopPath, index)
                 self.saveData()
-            else:
-                # self.getDataStep += 1
-                self.print_and_log("跳过第" + str(self.totalSteps) + "次提取数据。")
-                self.print_and_log(
-                    "Skip the " + str(self.totalSteps) + "th data extraction.")
-            self.totalSteps += 1  # 总步数加一
-        elif node["option"] == 4:  # 输入文字
-            self.inputInfo(node["parameters"], loopValue)
-        elif node["option"] == 5:  # 自定义操作
-            self.customOperation(node, loopValue, loopPath, index)
-            self.saveData()
-        elif node["option"] == 6:  # 切换下拉框
-            self.switchSelect(node["parameters"], loopValue)
-        elif node["option"] == 7:  # 鼠标移动到元素上
-            self.moveToElement(node["parameters"], loopValue, loopPath, index)
-        elif node["option"] == 8:  # 循环
-            self.loopExecute(node, loopValue, loopPath, index)  # 执行循环
-        elif node["option"] == 9:  # 条件分支
-            self.judgeExecute(node, loopValue, loopPath, index)
+            elif node["option"] == 6:  # 切换下拉框
+                self.switchSelect(node["parameters"], loopValue)
+            elif node["option"] == 7:  # 鼠标移动到元素上
+                self.moveToElement(node["parameters"], loopValue, loopPath, index)
+            elif node["option"] == 8:  # 循环
+                self.loopExecute(node, loopValue, loopPath, index)  # 执行循环
+            elif node["option"] == 9:  # 条件分支
+                self.judgeExecute(node, loopValue, loopPath, index)
+        except Exception as e:
+            self.print_and_log("执行节点<" + node["title"] + ">时出错，将继续执行，错误为：", e)
+            self.print_and_log("Error executing node <" + node["title"] + ">, will continue to execute, error is:", e)
+        
 
         # 执行完之后进行等待
         if node["option"] != 0 and node["option"] != 2:  # 点击元素操作单独定义等待时间操作
@@ -1637,7 +1642,7 @@ class BrowserThread(Thread):
                     downloadPic = 0
                 if downloadPic == 1:
                     download_image(self, content, "Data/Task_" +
-                                   str(self.id) + "/" + self.saveName + "/")
+                                   str(self.id) + "/" + self.saveName + "/", element)
             else:  # 普通节点
                 content = element.text
         elif p["contentType"] == 1:  # 只采集当期元素下的文本，不包括子元素
@@ -1662,7 +1667,7 @@ class BrowserThread(Thread):
                     downloadPic = 0
                 if downloadPic == 1:
                     download_image(self, content, "Data/Task_" +
-                                   str(self.id) + "/" + self.saveName + "/")
+                                   str(self.id) + "/" + self.saveName + "/", element)
             else:
                 command = 'var arr = [];\
                 var content = arguments[0];\

ExecuteStage/utils.py

@@ -16,6 +16,8 @@ from lxml import etree
 import smtplib
 from email.mime.text import MIMEText
 from email.header import Header
+import urllib.request
+import base64
 
 def send_email(config):
     """
@@ -151,39 +153,73 @@ def detect_optimizable(para, ignoreWaitElement=True, waitElement=""):
 
 
 
-def download_image(browser, url, save_directory):
+def download_image(browser, url, save_directory, element=None):
     # 定义浏览器头信息
     headers = {
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'
     }
-    if is_valid_url(url):
+    if url.startswith("data:image"):
+        base64_data = url.split(",")[1]
+        image_data = base64.b64decode(base64_data)
+        # 提取文件名
+        file_name = str(uuid.uuid4()) + '.png'
+        # 构建保存路径
+        save_path = os.path.join(save_directory, file_name)
+        # 保存图片到本地
+        with open(save_path, 'wb') as file:
+            file.write(image_data)
+        browser.print_and_log("图片已成功下载到:", save_path)
+        browser.print_and_log(
+            "The image has been successfully downloaded to:", save_path)
+    elif is_valid_url(url):
         try:
-            # 发送 GET 请求获取图片数据
-            response = requests.get(url, headers=headers)
-
+            # 提取文件名
+            file_name = url.split('/')[-1].split("?")[0]
+
+            # 生成唯一的新文件名
+            new_file_name = file_name + '_' + \
+                str(uuid.uuid4()) + '_' + file_name
+
+            # 构建保存路径
+            save_path = os.path.join(save_directory, new_file_name)
+            # 发送 GET 请求获取图片数据，加载浏览器的cookies
+            s = requests.session()
+            cookies = browser.browser.get_cookies()
+            for cookie in cookies:
+                s.cookies.set(cookie['name'], cookie['value'])
+            response = s.get(url, headers=headers)
             # 检查响应状态码是否为成功状态
             if response.status_code == requests.codes.ok:
-                # 提取文件名
-                file_name = url.split('/')[-1].split("?")[0]
-
-                # 生成唯一的新文件名
-                new_file_name = file_name + '_' + \
-                    str(uuid.uuid4()) + '_' + file_name
-
-                # 构建保存路径
-                save_path = os.path.join(save_directory, new_file_name)
-
                 # 保存图片到本地
                 with open(save_path, 'wb') as file:
                     file.write(response.content)
-
                 browser.print_and_log("图片已成功下载到:", save_path)
                 browser.print_and_log(
                     "The image has been successfully downloaded to:", save_path)
             else:
-                browser.print_and_log("下载图片失败，请检查此图片链接是否有效:", url)
-                browser.print_and_log(
-                    "Failed to download image, please check if this image link is valid:", url)
+                # browser.print_and_log(f"直接下载图片失败，状态码为:{response.status_code}，尝试使用Selenium下载图片...")
+                # browser.print_and_log(
+                    # f"Failed to download image directly, status code is: {response.status_code}, try to download image using Selenium...")
+                JS = "var xhr = new XMLHttpRequest(); xhr.open('GET', '" + url +"', true); xhr.responseType = 'blob'; xhr.onload = function() {var reader = new FileReader(); reader.readAsDataURL(xhr.response); reader.onloadend = function() { var base64data = reader.result;}}; xhr.send();"""
+                base64data = browser.browser.execute_script(JS)
+                if base64data:
+                    image_data = base64data.b64decode(base64data.split(",")[1])
+                    with open(save_path, 'wb') as file:
+                        file.write(image_data)
+                    browser.print_and_log("图片已成功下载到:", save_path)
+                    browser.print_and_log(
+                        "The image has been successfully downloaded to:", save_path)
+                else:
+                    browser.print_and_log("下载图片失败，只能使用元素截图功能下载图片。")
+                    browser.print_and_log("Failed to download image, can only download image using element screenshot function.")
+                    # 使用元素截图功能下载图片
+                    try:
+                        element.screenshot(save_path)
+                        browser.print_and_log("图片截图已保存到:", save_path)
+                        browser.print_and_log(
+                            "The image screenshot has been saved to:", save_path)
+                    except Exception as e:
+                        browser.print_and_log("下载图片失败|Error downloading image: ", e)
         except Exception as e:
             browser.print_and_log("下载图片失败|Error downloading image: ", e)
     else:

Extension/manifest_v3/src/popup.css

@@ -0,0 +1,11 @@
+body {
+  /*width: 400px; !* 设置popup的宽度 *!*/
+}
+
+h1 {
+  /*color: blue; !* 设置标题颜色 *!*/
+}
+
+button {
+  background-color: green; /* 设置按钮背景颜色 */
+}

Extension/manifest_v3/src/popup.html

@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+<head>
+  <title>Popup 示例</title>
+  <link rel="stylesheet" type="text/css" href="popup.css">
+</head>
+<body>
+<!--  <h2>EasySpider Extension</h2>-->
+EasySpider Extension, please do not disable me.
+</body>
+</html>

Extension/manifest_v3/src/popup.js

@@ -0,0 +1,3 @@
+document.getElementById('clickme').addEventListener('click', () => {
+  alert('Hello, World!');
+});