PyClickerRPA 0.3.0__tar.gz → 0.4.0__tar.gz

{pyclickerrpa-0.3.0 → pyclickerrpa-0.4.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: PyClickerRPA
-Version: 0.3.0
-Summary: Visual UI automation & testing tool: Windows + Android(ADB) automation, robust/self-healing image matching, OCR, node flow editor, recorder, a visual test framework (assertions, visual regression, HTML/JUnit reports) and a web console.
+Version: 0.4.0
+Summary: Visual UI automation & testing tool: Windows + Android(ADB) automation, robust/self-healing image matching, OCR, node flow editor, a smart recorder that records images instead of coordinates, a visual test framework (assertions, visual regression, HTML/JUnit reports) and a web console.
 Author: Equinox
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/Equinox/PyClickerRPA
@@ -82,7 +82,7 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 - **Smart wait**: `wait_stable` waits until the screen (or an ROI) stops
   changing — replaces guessed `sleep`s (fast when ready, patient when slow).
 - **~30+ step types**: click image/text/position, click-all, relative/offset
-  clicks, wait / random / wait-stable, drag / long-press / pinch / scroll,
+  clicks, wait / random / wait-stable, drag / **drag-from-image** / long-press / pinch / scroll,
   key / type / hotkey, loop / goto / while / do-until, if image/text/color/
   count/var with **true/false branching** (if-else), set-var, read-text→variable,
   activate-window, HTTP request, run-Python-script, call sub-task, groups, and a
@@ -93,12 +93,33 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 Drag-and-drop **node flow graph** (condition nodes have **true/false branch
 ports** for visual if-else; a terminal **stop** node ends the flow) and an
 interoperable **step list** with a full
-per-step dialog; an action **recorder** (global hooks), snippet library, task
+per-step dialog; snippet library, task
 packages (`.zip` with templates), on-preview coordinate/color picking, template
 crop, single-step test run; global hotkeys (F6 run/stop, ESC stop), scheduler,
 and an image/color **monitor/trigger** with tray icon; a **Test** tab to load and
 run visual test suites.
 
+### Smart recorder
+
+The action **recorder** (global hooks) doesn't just replay coordinates and
+sleeps — with **智能录制 / smart mode** on (default) it records what things *look
+like* instead of where they *were*:
+
+- **Clicks become image steps.** A patch is cropped around the click and grown
+  (48 → 192 px) until it is both textured enough and **unique on screen**, then
+  emitted as a `click_image` step — so the flow still works after the window
+  moves or the resolution changes. Identical patches are de-duplicated by
+  content hash.
+- **Drags become `drag_image`.** The drag's *start* is anchored to an image and
+  the *displacement* is stored, so start and end move together.
+- **Pauses become `wait_stable`.** A long pause is only converted if the
+  recorder actually **observed the screen settle** during it; on a permanently
+  animating screen it keeps the fixed wait (a `wait_stable` that never settles
+  would fail the run).
+
+Anything that can't be made robust falls back to the plain coordinate/fixed-wait
+step and says why in the log.
+
 ## Visual test framework (`autoclicker.testkit`)
 
 Turn automation into tests:

{pyclickerrpa-0.3.0 → pyclickerrpa-0.4.0}/PyClickerRPA.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: PyClickerRPA
-Version: 0.3.0
-Summary: Visual UI automation & testing tool: Windows + Android(ADB) automation, robust/self-healing image matching, OCR, node flow editor, recorder, a visual test framework (assertions, visual regression, HTML/JUnit reports) and a web console.
+Version: 0.4.0
+Summary: Visual UI automation & testing tool: Windows + Android(ADB) automation, robust/self-healing image matching, OCR, node flow editor, a smart recorder that records images instead of coordinates, a visual test framework (assertions, visual regression, HTML/JUnit reports) and a web console.
 Author: Equinox
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/Equinox/PyClickerRPA
@@ -82,7 +82,7 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 - **Smart wait**: `wait_stable` waits until the screen (or an ROI) stops
   changing — replaces guessed `sleep`s (fast when ready, patient when slow).
 - **~30+ step types**: click image/text/position, click-all, relative/offset
-  clicks, wait / random / wait-stable, drag / long-press / pinch / scroll,
+  clicks, wait / random / wait-stable, drag / **drag-from-image** / long-press / pinch / scroll,
   key / type / hotkey, loop / goto / while / do-until, if image/text/color/
   count/var with **true/false branching** (if-else), set-var, read-text→variable,
   activate-window, HTTP request, run-Python-script, call sub-task, groups, and a
@@ -93,12 +93,33 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 Drag-and-drop **node flow graph** (condition nodes have **true/false branch
 ports** for visual if-else; a terminal **stop** node ends the flow) and an
 interoperable **step list** with a full
-per-step dialog; an action **recorder** (global hooks), snippet library, task
+per-step dialog; snippet library, task
 packages (`.zip` with templates), on-preview coordinate/color picking, template
 crop, single-step test run; global hotkeys (F6 run/stop, ESC stop), scheduler,
 and an image/color **monitor/trigger** with tray icon; a **Test** tab to load and
 run visual test suites.
 
+### Smart recorder
+
+The action **recorder** (global hooks) doesn't just replay coordinates and
+sleeps — with **智能录制 / smart mode** on (default) it records what things *look
+like* instead of where they *were*:
+
+- **Clicks become image steps.** A patch is cropped around the click and grown
+  (48 → 192 px) until it is both textured enough and **unique on screen**, then
+  emitted as a `click_image` step — so the flow still works after the window
+  moves or the resolution changes. Identical patches are de-duplicated by
+  content hash.
+- **Drags become `drag_image`.** The drag's *start* is anchored to an image and
+  the *displacement* is stored, so start and end move together.
+- **Pauses become `wait_stable`.** A long pause is only converted if the
+  recorder actually **observed the screen settle** during it; on a permanently
+  animating screen it keeps the fixed wait (a `wait_stable` that never settles
+  would fail the run).
+
+Anything that can't be made robust falls back to the plain coordinate/fixed-wait
+step and says why in the log.
+
 ## Visual test framework (`autoclicker.testkit`)
 
 Turn automation into tests:

{pyclickerrpa-0.3.0 → pyclickerrpa-0.4.0}/PyClickerRPA.egg-info/SOURCES.txt

@@ -13,11 +13,13 @@ autoclicker/app.py
 autoclicker/capture.py
 autoclicker/clicker.py
 autoclicker/dpi.py
+autoclicker/expr.py
 autoclicker/matcher.py
 autoclicker/models.py
 autoclicker/ocr.py
 autoclicker/run.py
 autoclicker/runner.py
+autoclicker/templatize.py
 autoclicker/windows.py
 autoclicker/gui/__init__.py
 autoclicker/gui/flow_connection.py
@@ -55,7 +57,9 @@ tests/test_adb.py
 tests/test_flow_branch.py
 tests/test_matcher.py
 tests/test_models.py
+tests/test_recorder_gui.py
 tests/test_runner.py
+tests/test_templatize.py
 tests/test_testkit.py
 tests/test_testkit_gui.py
 tests/test_web.py

{pyclickerrpa-0.3.0 → pyclickerrpa-0.4.0}/README.md

@@ -44,7 +44,7 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 - **Smart wait**: `wait_stable` waits until the screen (or an ROI) stops
   changing — replaces guessed `sleep`s (fast when ready, patient when slow).
 - **~30+ step types**: click image/text/position, click-all, relative/offset
-  clicks, wait / random / wait-stable, drag / long-press / pinch / scroll,
+  clicks, wait / random / wait-stable, drag / **drag-from-image** / long-press / pinch / scroll,
   key / type / hotkey, loop / goto / while / do-until, if image/text/color/
   count/var with **true/false branching** (if-else), set-var, read-text→variable,
   activate-window, HTTP request, run-Python-script, call sub-task, groups, and a
@@ -55,12 +55,33 @@ autoclicker-web --suites-dir examples          # web console at http://127.0.0.1
 Drag-and-drop **node flow graph** (condition nodes have **true/false branch
 ports** for visual if-else; a terminal **stop** node ends the flow) and an
 interoperable **step list** with a full
-per-step dialog; an action **recorder** (global hooks), snippet library, task
+per-step dialog; snippet library, task
 packages (`.zip` with templates), on-preview coordinate/color picking, template
 crop, single-step test run; global hotkeys (F6 run/stop, ESC stop), scheduler,
 and an image/color **monitor/trigger** with tray icon; a **Test** tab to load and
 run visual test suites.
 
+### Smart recorder
+
+The action **recorder** (global hooks) doesn't just replay coordinates and
+sleeps — with **智能录制 / smart mode** on (default) it records what things *look
+like* instead of where they *were*:
+
+- **Clicks become image steps.** A patch is cropped around the click and grown
+  (48 → 192 px) until it is both textured enough and **unique on screen**, then
+  emitted as a `click_image` step — so the flow still works after the window
+  moves or the resolution changes. Identical patches are de-duplicated by
+  content hash.
+- **Drags become `drag_image`.** The drag's *start* is anchored to an image and
+  the *displacement* is stored, so start and end move together.
+- **Pauses become `wait_stable`.** A long pause is only converted if the
+  recorder actually **observed the screen settle** during it; on a permanently
+  animating screen it keeps the fixed wait (a `wait_stable` that never settles
+  would fail the run).
+
+Anything that can't be made robust falls back to the plain coordinate/fixed-wait
+step and says why in the log.
+
 ## Visual test framework (`autoclicker.testkit`)
 
 Turn automation into tests:

pyclickerrpa-0.4.0/autoclicker/expr.py

@@ -0,0 +1,94 @@
+"""Safe arithmetic/string expression evaluator for the SetVar step.
+
+`SetVar` values starting with ``=`` are evaluated here (e.g. ``=count + 1``,
+``=max(a, b) * 2``, ``=upper(name)``). Variable names resolve against the
+runner's variable dict — numeric-looking values become numbers, everything
+else stays a string; unknown names default to 0.
+
+Security: this never calls the builtin ``eval``. It walks a whitelisted AST
+and rejects attribute access, subscripting, comprehensions, and any call to a
+function outside a fixed safe set — so ``__import__(...)`` / ``().__class__``
+style escapes raise ``ValueError`` instead of executing.
+"""
+from __future__ import annotations
+
+import ast
+import operator
+
+_BIN_OPS = {
+    ast.Add: operator.add, ast.Sub: operator.sub, ast.Mult: operator.mul,
+    ast.Div: operator.truediv, ast.FloorDiv: operator.floordiv,
+    ast.Mod: operator.mod, ast.Pow: operator.pow,
+}
+_UNARY_OPS = {ast.UAdd: operator.pos, ast.USub: operator.neg, ast.Not: operator.not_}
+_CMP_OPS = {
+    ast.Eq: operator.eq, ast.NotEq: operator.ne, ast.Lt: operator.lt,
+    ast.LtE: operator.le, ast.Gt: operator.gt, ast.GtE: operator.ge,
+}
+
+_FUNCS = {
+    "int": int, "float": float, "str": str, "round": round, "abs": abs,
+    "min": min, "max": max, "len": len,
+    "upper": lambda s: str(s).upper(), "lower": lambda s: str(s).lower(),
+}
+
+
+def _coerce(value: str):
+    """A variable value string → number when it looks numeric, else the string."""
+    try:
+        f = float(value)
+        return int(f) if f.is_integer() else f
+    except (TypeError, ValueError):
+        return value
+
+
+def _eval(node, variables):
+    if isinstance(node, ast.Expression):
+        return _eval(node.body, variables)
+    if isinstance(node, ast.Constant):  # numbers, strings, True/False/None
+        return node.value
+    if isinstance(node, ast.Name):
+        return _coerce(variables.get(node.id, "0"))
+    if isinstance(node, ast.BinOp) and type(node.op) in _BIN_OPS:
+        return _BIN_OPS[type(node.op)](_eval(node.left, variables), _eval(node.right, variables))
+    if isinstance(node, ast.UnaryOp) and type(node.op) in _UNARY_OPS:
+        return _UNARY_OPS[type(node.op)](_eval(node.operand, variables))
+    if isinstance(node, ast.BoolOp):
+        vals = [_eval(v, variables) for v in node.values]
+        result = vals[0]
+        for v in vals[1:]:
+            result = (result and v) if isinstance(node.op, ast.And) else (result or v)
+        return result
+    if isinstance(node, ast.Compare):
+        left = _eval(node.left, variables)
+        for op, comparator in zip(node.ops, node.comparators):
+            if type(op) not in _CMP_OPS:
+                raise ValueError(f"不支持的比较运算符: {type(op).__name__}")
+            right = _eval(comparator, variables)
+            if not _CMP_OPS[type(op)](left, right):
+                return False
+            left = right
+        return True
+    if isinstance(node, ast.Call):
+        if not isinstance(node.func, ast.Name) or node.func.id not in _FUNCS:
+            raise ValueError("只允许调用: " + ", ".join(sorted(_FUNCS)))
+        if node.keywords:
+            raise ValueError("函数不支持关键字参数")
+        args = [_eval(a, variables) for a in node.args]
+        return _FUNCS[node.func.id](*args)
+    raise ValueError(f"表达式包含不允许的语法: {type(node).__name__}")
+
+
+def safe_eval(expr: str, variables: dict) -> str:
+    """Evaluate `expr` against `variables`, returning a string result.
+
+    Integer-valued floats render without a trailing ``.0`` so counters stay clean.
+    Raises ``ValueError`` (or SyntaxError) on anything outside the whitelist.
+    """
+    tree = ast.parse(expr, mode="eval")
+    result = _eval(tree, variables)
+    if isinstance(result, float) and result.is_integer():
+        return str(int(result))
+    if isinstance(result, bool):
+        return "1" if result else "0"
+    return str(result)

{pyclickerrpa-0.3.0 → pyclickerrpa-0.4.0}/autoclicker/gui/flow_editor.py

@@ -7,10 +7,11 @@ recreates loop/do-until back-edges.
 """
 from __future__ import annotations
 
+import copy
 from collections import deque
 
-from PySide6.QtCore import QLineF, Qt, Signal
-from PySide6.QtGui import QColor, QPainter, QPen
+from PySide6.QtCore import QLineF, QPointF, Qt, Signal
+from PySide6.QtGui import QColor, QKeySequence, QPainter, QPen
 from PySide6.QtWidgets import (
     QDialog, QGraphicsScene, QGraphicsView, QInputDialog, QMenu,
 )
@@ -52,7 +53,7 @@ class FlowEditor(QGraphicsView):
         self._scene.setSceneRect(-2000, -2000, 4000, 4000)
         self.setScene(self._scene)
         self.setRenderHint(QPainter.Antialiasing)
-        self.setDragMode(QGraphicsView.NoDrag)
+        self.setDragMode(QGraphicsView.RubberBandDrag)
         self.setBackgroundBrush(QColor(30, 30, 30))
         self.setMinimumSize(400, 300)
 
@@ -64,6 +65,7 @@ class FlowEditor(QGraphicsView):
 
         self.nodes: list[FlowNode] = []
         self.connections: list[FlowConnection] = []
+        self._clip: dict | None = None
         self._dragging = False
         self._drag_start_port: FlowPort | None = None
         self._drag_line = None
@@ -165,11 +167,61 @@ class FlowEditor(QGraphicsView):
         self.scale(factor, factor)
 
     def keyPressEvent(self, event):
+        if event.matches(QKeySequence.Copy):
+            self._copy_selected()
+            return
+        if event.matches(QKeySequence.Paste):
+            self._paste_clip()
+            return
         if event.key() in (Qt.Key_Delete, Qt.Key_Backspace):
             self._delete_selected()
             return
         super().keyPressEvent(event)
 
+    # ---- copy / paste selected nodes ----
+    def selected_nodes(self) -> list[FlowNode]:
+        return [n for n in self.nodes if n.isSelected()]
+
+    def get_selected_steps(self) -> list[Step]:
+        nodes = sorted(self.selected_nodes(), key=lambda n: (n.pos().y(), n.pos().x()))
+        return [copy.deepcopy(n.step()) for n in nodes]
+
+    def _copy_selected(self):
+        nodes = self.selected_nodes()
+        if not nodes:
+            return
+        idx = {n: i for i, n in enumerate(nodes)}
+        edges = []
+        for conn in self.connections:
+            fn = conn.from_port.parentItem()
+            tn = conn.to_port.parentItem()
+            if fn in idx and tn in idx:
+                # 记录出边走的是「真」还是「假」分支(条件节点有 false_port)
+                branch = "false" if conn.from_port is fn.false_port else "true"
+                edges.append((idx[fn], idx[tn], branch, conn.repeat_count))
+        self._clip = {
+            "steps": [copy.deepcopy(n.step()) for n in nodes],
+            "pos": [(n.pos().x(), n.pos().y()) for n in nodes],
+            "edges": edges,
+        }
+
+    def _paste_clip(self):
+        if not self._clip or not self._clip["steps"]:
+            return
+        new_nodes = []
+        for step, (px, py) in zip(self._clip["steps"], self._clip["pos"]):
+            new_nodes.append(self.add_node(copy.deepcopy(step), QPointF(px + 40, py + 40)))
+        for fi, ti, branch, rc in self._clip["edges"]:
+            src = new_nodes[fi].false_port if branch == "false" else new_nodes[fi].output_port
+            if src is None:      # 终止节点没有输出口
+                continue
+            conn = self.connect_nodes(src, new_nodes[ti].input_port)
+            if conn:
+                conn.set_repeat_count(rc)
+        self._scene.clearSelection()
+        for n in new_nodes:
+            n.setSelected(True)
+
     def contextMenuEvent(self, event):
         menu = QMenu(self)
         scene_pos = self.mapToScene(event.pos())
@@ -183,6 +235,11 @@ class FlowEditor(QGraphicsView):
             menu.addAction("设置重复次数", lambda: self._set_repeat(conn))
         if node or conn:
             menu.addAction("删除", self._delete_selected)
+        if self.selected_nodes():
+            menu.addAction("复制选中节点 (Ctrl+C)", self._copy_selected)
+        if self._clip and self._clip["steps"]:
+            menu.addAction("粘贴 (Ctrl+V)", self._paste_clip)
+        if node or conn or self.selected_nodes() or self._clip:
             menu.addSeparator()
 
         add_menu = menu.addMenu("添加节点")

{pyclickerrpa-0.3.0 → pyclickerrpa-0.4.0}/autoclicker/gui/main_window.py

@@ -12,10 +12,10 @@ import tempfile
 import uuid
 import zipfile
 
-from PySide6.QtCore import Qt, QThread, Signal
+from PySide6.QtCore import Qt, QSettings, QThread, Signal
 from PySide6.QtGui import QAction, QGuiApplication, QKeySequence
 from PySide6.QtWidgets import (
-    QComboBox, QDockWidget, QFileDialog, QHBoxLayout, QInputDialog, QLabel,
+    QCheckBox, QComboBox, QDockWidget, QFileDialog, QHBoxLayout, QInputDialog, QLabel,
     QMainWindow, QMessageBox, QPushButton, QSplitter, QTableWidget,
     QTableWidgetItem, QTabWidget, QTextEdit, QVBoxLayout, QWidget,
 )
@@ -67,9 +67,13 @@ class MainWindow(QMainWindow):
         self._runner.matchFound.connect(
             lambda x, y, c: self._append_log(f"  → 命中 ({x},{y}) {c:.3f}"))
         self._runner.runFinished.connect(self._on_finished)
+        self._runner.pausedAt.connect(self._on_paused)
+
+        self._settings = QSettings("AutoClicker", "AutoClicker")
 
         self._recorder = Recorder(self)
         self._recorder.stepRecorded.connect(self._on_step_recorded)
+        self._recorder.note.connect(self._append_log)
 
         self._build_ui()
         self._build_menu()
@@ -228,6 +232,16 @@ class MainWindow(QMainWindow):
         capture_btn.clicked.connect(self.capture)
         self.record_btn = QPushButton("● 录制")
         self.record_btn.clicked.connect(self.toggle_record)
+        self.template_mode_chk = QCheckBox("智能录制")
+        self.template_mode_chk.setToolTip(
+            "录出来的任务尽量不依赖绝对坐标和绝对时间:\n"
+            "· 点击处裁一小块图当模板 → 位置无关的「找图点击」\n"
+            "· 长间隔改成「等画面稳定」→ 换台机器也不会等不够\n"
+            "抽不出好模板、或录制时画面一直在动,则各自退回坐标点击/固定等待。")
+        self.template_mode_chk.setChecked(
+            self._settings.value("recorder/templateMode", True, type=bool))
+        self.template_mode_chk.toggled.connect(
+            lambda on: self._settings.setValue("recorder/templateMode", on))
         self.run_btn = QPushButton("▶ 运行")
         self.run_btn.clicked.connect(self.run_task)
         self.pause_btn = QPushButton("⏸ 暂停")
@@ -236,15 +250,27 @@ class MainWindow(QMainWindow):
         self.stop_btn = QPushButton("■ 停止")
         self.stop_btn.clicked.connect(self.stop_task)
         self.stop_btn.setEnabled(False)
+        self.debug_btn = QPushButton("🐞 调试")
+        self.debug_btn.clicked.connect(self.debug_run)
+        self.step_btn = QPushButton("单步")
+        self.step_btn.clicked.connect(lambda: self._runner.debug_step())
+        self.step_btn.setEnabled(False)
+        self.continue_btn = QPushButton("继续")
+        self.continue_btn.clicked.connect(lambda: self._runner.debug_continue())
+        self.continue_btn.setEnabled(False)
         bar.addWidget(QLabel("目标窗口"))
         bar.addWidget(self.window_combo, 1)
         bar.addWidget(refresh_btn)
         bar.addWidget(capture_btn)
         bar.addStretch()
+        bar.addWidget(self.template_mode_chk)
         bar.addWidget(self.record_btn)
         bar.addWidget(self.run_btn)
         bar.addWidget(self.pause_btn)
         bar.addWidget(self.stop_btn)
+        bar.addWidget(self.debug_btn)
+        bar.addWidget(self.step_btn)
+        bar.addWidget(self.continue_btn)
         root.addLayout(bar)
 
         splitter = QSplitter(Qt.Horizontal)
@@ -327,6 +353,9 @@ class MainWindow(QMainWindow):
         e = self.menuBar().addMenu("编辑")
         e.addAction(QAction("选中步骤存为片段…", self, triggered=self.save_snippet))
         e.addSeparator()
+        e.addAction(QAction("导出选中步骤为文件(.json)…", self, triggered=self.export_steps_file))
+        e.addAction(QAction("从文件导入步骤(.json)…", self, triggered=self.import_steps_file))
+        e.addSeparator()
         e.addAction(QAction("复制步骤到剪贴板(JSON)", self, triggered=self.copy_steps_json))
         e.addAction(QAction("从剪贴板粘贴步骤(JSON)", self, triggered=self.paste_steps_json))
 
@@ -402,6 +431,29 @@ class MainWindow(QMainWindow):
         self._runner.start(task, target_hwnd=self._target_hwnd(),
                            screenshot_on_fail=True, screenshot_dir=".failures")
 
+    def debug_run(self):
+        if self._runner.is_running():
+            return
+        self.tabs.setCurrentWidget(self.task_widget)
+        task = self._current_task()
+        if not task.steps:
+            self._append_log("任务为空")
+            return
+        self.log.clear()
+        self._clear_vars()
+        self.preview.clear_markers()
+        self._set_running(True)
+        self._append_log("调试模式:停在第 1 步，用「单步」/「继续」推进")
+        self._runner.start(task, target_hwnd=self._target_hwnd(),
+                           screenshot_on_fail=True, screenshot_dir=".failures",
+                           breakpoints=self.task_widget.breakpoints(), step_mode=True)
+
+    def _on_paused(self, index: int, desc: str):
+        self._append_log(f"⏸ 暂停于 [{index + 1}] {desc}")
+        self.task_widget.set_running_row(index)
+        self.step_btn.setEnabled(True)
+        self.continue_btn.setEnabled(True)
+
     def stop_task(self):
         self._runner.stop()
 
@@ -415,16 +467,20 @@ class MainWindow(QMainWindow):
 
     def _set_running(self, running: bool):
         self.run_btn.setEnabled(not running)
+        self.debug_btn.setEnabled(not running)
         self.stop_btn.setEnabled(running)
         self.pause_btn.setEnabled(running)
         if not running:
             self.pause_btn.setText("⏸ 暂停")
+            self.step_btn.setEnabled(False)
+            self.continue_btn.setEnabled(False)
 
     def _on_step_started(self, index: int, desc: str):
         self._append_log(f"[{index + 1}] {desc}")
 
     def _on_finished(self):
         self._set_running(False)
+        self.task_widget.clear_running_row()
 
     def _append_log(self, msg: str):
         self.log.append(msg)
@@ -471,10 +527,12 @@ class MainWindow(QMainWindow):
             self._append_log("录制结束")
             return
         hwnd = self._target_hwnd()
-        self._recorder.start(hwnd)
+        tmpl = self.template_mode_chk.isChecked()
+        self._recorder.start(hwnd, template_mode=tmpl)
         self.record_btn.setText("■ 停止录制")
         self.tabs.setCurrentWidget(self.task_widget)
-        self._append_log("开始录制(在目标窗口内操作;再次点击结束)")
+        self._append_log("开始录制(在目标窗口内操作;再次点击结束)"
+                         + ("[智能录制]" if tmpl else ""))
 
     def _on_step_recorded(self, step: Step):
         self.task_widget.append_step(step)
@@ -503,10 +561,16 @@ class MainWindow(QMainWindow):
         self.tabs.setCurrentWidget(self.task_widget)
         self._append_log(f"插入片段: {len(steps)} 步")
 
+    def _selected_steps(self) -> list[Step]:
+        """Selected steps from whichever editor tab is active."""
+        if self.tabs.currentWidget() is self.flow_editor:
+            return self.flow_editor.get_selected_steps()
+        return self.task_widget.get_selected_steps()
+
     def save_snippet(self):
-        steps = self.task_widget.get_selected_steps()
+        steps = self._selected_steps()
         if not steps:
-            self._append_log("请先在「步骤列表」中选中要保存的步骤")
+            self._append_log("请先在「步骤列表」或「流程图」中选中要保存的步骤")
             return
         name, ok = QInputDialog.getText(self, "存为片段", "片段名称:")
         if ok and name:
@@ -516,13 +580,56 @@ class MainWindow(QMainWindow):
     # ---- step clipboard (JSON) ----
     def copy_steps_json(self):
         import json
-        steps = self.task_widget.get_selected_steps()
+        steps = self._selected_steps()
         if not steps:
-            self._append_log("请先在「步骤列表」中选中要复制的步骤")
+            self._append_log("请先在「步骤列表」或「流程图」中选中要复制的步骤")
             return
         QGuiApplication.clipboard().setText(json.dumps([s.to_json() for s in steps], ensure_ascii=False, indent=2))
         self._append_log(f"已复制 {len(steps)} 步到剪贴板(JSON)")
 
+    def export_steps_file(self):
+        import json
+        steps = self._selected_steps()
+        if not steps:
+            self._append_log("请先在「步骤列表」或「流程图」中选中要导出的步骤")
+            return
+        path, _ = QFileDialog.getSaveFileName(self, "导出选中步骤", "", "步骤文件 (*.json)")
+        if not path:
+            return
+        if not path.lower().endswith(".json"):
+            path += ".json"
+        try:
+            with open(path, "w", encoding="utf-8") as f:
+                json.dump([s.to_json() for s in steps], f, ensure_ascii=False, indent=4)
+        except OSError as ex:
+            QMessageBox.warning(self, "导出失败", str(ex))
+            return
+        self._append_log(f"已导出 {len(steps)} 步到: {path}")
+
+    def import_steps_file(self):
+        import json
+        path, _ = QFileDialog.getOpenFileName(self, "导入步骤", "", "步骤文件 (*.json)")
+        if not path:
+            return
+        try:
+            with open(path, "r", encoding="utf-8") as f:
+                data = json.load(f)
+        except (OSError, json.JSONDecodeError) as ex:
+            QMessageBox.warning(self, "导入失败", str(ex))
+            return
+        if isinstance(data, dict) and "steps" in data:  # accept a full task file too
+            data = data["steps"]
+        if not isinstance(data, list):
+            QMessageBox.warning(self, "导入失败", "文件内容既不是步骤数组也不是任务")
+            return
+        steps = [Step.from_json(o) for o in data]
+        if not steps:
+            self._append_log("文件里没有步骤")
+            return
+        self.task_widget.insert_steps(steps)
+        self.tabs.setCurrentWidget(self.task_widget)
+        self._append_log(f"已从文件导入 {len(steps)} 步: {path}")
+
     def paste_steps_json(self):
         import json
         text = QGuiApplication.clipboard().text()

{pyclickerrpa-0.3.0 → pyclickerrpa-0.4.0}/autoclicker/gui/qt_runner.py

@@ -32,6 +32,9 @@ class _SignalCallbacks(RunnerCallbacks):
     def var_changed(self, name, value):
         self._o.varChanged.emit(name, value)
 
+    def paused(self, index, description):
+        self._o.pausedAt.emit(index, description)
+
     def finished(self):
         self._o.runFinished.emit()
 
@@ -42,19 +45,31 @@ class QtRunner(QObject):
     matchFound = Signal(int, int, float)
     logMessage = Signal(str)
     varChanged = Signal(str, str)
+    pausedAt = Signal(int, str)
     runFinished = Signal()
 
     def __init__(self, parent=None) -> None:
         super().__init__(parent)
         self._runner: TaskRunner | None = None
 
-    def start(self, task: Task, target_hwnd=None, screenshot_on_fail=False, screenshot_dir=None) -> None:
+    def start(self, task: Task, target_hwnd=None, screenshot_on_fail=False, screenshot_dir=None,
+              breakpoints=None, step_mode=False) -> None:
         self._runner = TaskRunner(task, target_hwnd=target_hwnd, callbacks=_SignalCallbacks(self))
         self._runner.screenshot_on_fail = screenshot_on_fail
         if screenshot_dir:
             self._runner.screenshot_dir = screenshot_dir
+        self._runner.set_breakpoints(breakpoints)
+        self._runner.enable_step_mode(step_mode)
         self._runner.start()
 
+    def debug_step(self) -> None:
+        if self._runner:
+            self._runner.debug_step()
+
+    def debug_continue(self) -> None:
+        if self._runner:
+            self._runner.debug_continue()
+
     def stop(self) -> None:
         if self._runner:
             self._runner.stop()