PyClickerRPA 0.3.0__tar.gz → 0.3.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyClickerRPA
-Version: 0.3.0
+Version: 0.3.1
 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.
 Author: Equinox
 License-Expression: MIT

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyClickerRPA
-Version: 0.3.0
+Version: 0.3.1
 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.
 Author: Equinox
 License-Expression: MIT

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

@@ -13,6 +13,7 @@ autoclicker/app.py
 autoclicker/capture.py
 autoclicker/clicker.py
 autoclicker/dpi.py
+autoclicker/expr.py
 autoclicker/matcher.py
 autoclicker/models.py
 autoclicker/ocr.py

pyclickerrpa-0.3.1/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.3.1}/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.3.1}/autoclicker/gui/main_window.py

@@ -67,6 +67,7 @@ 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._recorder = Recorder(self)
         self._recorder.stepRecorded.connect(self._on_step_recorded)
@@ -236,6 +237,14 @@ 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)
@@ -245,6 +254,9 @@ class MainWindow(QMainWindow):
         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 +339,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 +417,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 +453,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)
@@ -503,10 +545,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 +564,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.3.1}/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()

{pyclickerrpa-0.3.0 → pyclickerrpa-0.3.1}/autoclicker/gui/task_widget.py

@@ -10,6 +10,7 @@ from __future__ import annotations
 import copy
 
 from PySide6.QtCore import Qt, Signal
+from PySide6.QtGui import QColor, QKeySequence, QShortcut
 from PySide6.QtWidgets import (
     QCheckBox, QComboBox, QDialog, QDialogButtonBox, QDoubleSpinBox, QFileDialog,
     QFormLayout, QHBoxLayout, QLabel, QLineEdit, QListWidget, QListWidgetItem,
@@ -73,6 +74,14 @@ _ACTION_TYPES = {StepType.ClickImage, StepType.ClickText, StepType.ClickPosition
                  StepType.MergeImage, StepType.ClickAll}
 _UNTIL_TYPES = {StepType.DoUntil, StepType.WhileCondition}
 
+# 变量比较运算符 (显示标签, 存储 token)。前 6 个 label==token 兼容旧任务。
+_COMPARE_OPS = [
+    ("==", "=="), ("!=", "!="), (">", ">"), ("<", "<"), (">=", ">="), ("<=", "<="),
+    ("介于 [a,b]", "between"), ("不介于 [a,b]", "not_between"),
+    ("包含", "contains"), ("不包含", "not_contains"),
+    ("开头是", "startswith"), ("结尾是", "endswith"),
+]
+
 
 class ImageListEditor(QWidget):
     """Edit one-or-more template image paths."""
@@ -278,16 +287,20 @@ class StepEditorDialog(QDialog):
             self.form.addRow("子任务路径", self._line("subTaskPath", s.subTaskPath))
         if t == StepType.SetVar:
             self.form.addRow("变量名", self._line("varName", s.varName))
-            self.form.addRow("值 (++/-- 支持)", self._line("varValue", s.varValue))
+            self.form.addRow("值 (=表达式 / ++ / -- / 字面量)", self._line("varValue", s.varValue))
         if t in (StepType.IfVar, StepType.WhileCondition):
             self.form.addRow("变量名", self._line("varName", s.varName))
             op = QComboBox()
-            op.addItems(["==", "!=", ">", "<", ">=", "<="])
-            if s.compareOp:
-                op.setCurrentText(s.compareOp)
+            for label, token in _COMPARE_OPS:
+                op.addItem(label, token)
+            idx = op.findData(s.compareOp)
+            if idx < 0 and s.compareOp:      # legacy op not in list → keep it
+                op.addItem(s.compareOp, s.compareOp)
+                idx = op.count() - 1
+            op.setCurrentIndex(max(0, idx))
             self.w["compareOp"] = op
             self.form.addRow("比较", op)
-            self.form.addRow("比较值", self._line("compareValue", s.compareValue))
+            self.form.addRow("比较值 (区间填 a,b)", self._line("compareValue", s.compareValue))
         if t == StepType.KeyPress:
             self.form.addRow("按键", self._line("keyName", s.keyName))
         if t == StepType.Hotkey:
@@ -394,7 +407,7 @@ class StepEditorDialog(QDialog):
         if "script" in w:
             s.text = w["script"].toPlainText()
         if "compareOp" in w:
-            s.compareOp = w["compareOp"].currentText()
+            s.compareOp = w["compareOp"].currentData() or w["compareOp"].currentText()
         if "readmode" in w:
             s.varValue = w["readmode"].currentData()
         if "use_var" in w:
@@ -427,6 +440,8 @@ class TaskWidget(QWidget):
         super().__init__(parent)
         self._task = Task()
         self._clipboard: list[Step] = []
+        self._breakpoints: set[int] = set()
+        self._running_row: int = -1
 
         lay = QVBoxLayout(self)
         top = QHBoxLayout()
@@ -440,30 +455,63 @@ class TaskWidget(QWidget):
         lay.addLayout(top)
 
         self.list = QListWidget()
+        self.list.setSelectionMode(QListWidget.ExtendedSelection)
         self.list.itemDoubleClicked.connect(self._edit_item)
         lay.addWidget(self.list, 1)
 
         row = QHBoxLayout()
         for text, slot in [("↑", self._move_up), ("↓", self._move_down),
                            ("删除", self._remove), ("复制", self._copy), ("粘贴", self._paste),
-                           ("试跑选中步", self._test_step)]:
+                           ("断点", self._toggle_breakpoint), ("试跑选中步", self._test_step)]:
             b = QPushButton(text)
             b.clicked.connect(slot)
             row.addWidget(b)
         lay.addLayout(row)
 
+        for seq, slot in [(QKeySequence.Copy, self._copy), (QKeySequence.Paste, self._paste)]:
+            sc = QShortcut(seq, self)
+            sc.setContext(Qt.WidgetWithChildrenShortcut)
+            sc.activated.connect(slot)
+
     # -- task <-> ui ----
     def get_task(self) -> Task:
         return self._task
 
     def set_task(self, task: Task):
         self._task = task
+        self._breakpoints.clear()   # step indices change with the task
+        self._running_row = -1
         self._refresh()
 
     def _refresh(self):
         self.list.clear()
         for i, step in enumerate(self._task.steps):
-            self.list.addItem(QListWidgetItem(f"{i + 1}. {step.display_name()}"))
+            mark = "● " if i in self._breakpoints else ""
+            item = QListWidgetItem(f"{mark}{i + 1}. {step.display_name()}")
+            if i == self._running_row:
+                item.setBackground(QColor(60, 90, 40))
+            self.list.addItem(item)
+
+    # -- step debugging ----
+    def _toggle_breakpoint(self):
+        rows = [self.list.row(it) for it in self.list.selectedItems()] or [self._selected_row()]
+        for r in rows:
+            if 0 <= r < len(self._task.steps):
+                self._breakpoints.discard(r) if r in self._breakpoints else self._breakpoints.add(r)
+        self._refresh()
+
+    def breakpoints(self) -> set[int]:
+        return set(self._breakpoints)
+
+    def set_running_row(self, i: int):
+        self._running_row = i
+        self._refresh()
+        if 0 <= i < self.list.count():
+            self.list.setCurrentRow(i)
+
+    def clear_running_row(self):
+        self._running_row = -1
+        self._refresh()
 
     def get_selected_steps(self) -> list[Step]:
         rows = sorted(self.list.row(it) for it in self.list.selectedItems())
@@ -487,6 +535,7 @@ class TaskWidget(QWidget):
         at = row + 1 if row >= 0 else len(self._task.steps)
         for i, s in enumerate(steps):
             self._task.steps.insert(at + i, copy.deepcopy(s))
+        self._breakpoints.clear()   # indices shift
         self._refresh()
         self.taskChanged.emit()
 
@@ -519,9 +568,16 @@ class TaskWidget(QWidget):
                 self.taskChanged.emit()
 
     def _remove(self):
-        row = self._selected_row()
-        if 0 <= row < len(self._task.steps):
-            del self._task.steps[row]
+        rows = sorted((self.list.row(it) for it in self.list.selectedItems()), reverse=True)
+        if not rows:
+            rows = [self._selected_row()]
+        removed = False
+        for row in rows:
+            if 0 <= row < len(self._task.steps):
+                del self._task.steps[row]
+                removed = True
+        if removed:
+            self._breakpoints.clear()   # indices shift
             self._refresh()
             self.taskChanged.emit()
 
@@ -529,6 +585,7 @@ class TaskWidget(QWidget):
         row = self._selected_row()
         if row > 0:
             self._task.steps[row - 1], self._task.steps[row] = self._task.steps[row], self._task.steps[row - 1]
+            self._breakpoints.clear()
             self._refresh()
             self.list.setCurrentRow(row - 1)
             self.taskChanged.emit()
@@ -537,14 +594,15 @@ class TaskWidget(QWidget):
         row = self._selected_row()
         if 0 <= row < len(self._task.steps) - 1:
             self._task.steps[row + 1], self._task.steps[row] = self._task.steps[row], self._task.steps[row + 1]
+            self._breakpoints.clear()
             self._refresh()
             self.list.setCurrentRow(row + 1)
             self.taskChanged.emit()
 
     def _copy(self):
-        row = self._selected_row()
-        if 0 <= row < len(self._task.steps):
-            self._clipboard = [copy.deepcopy(self._task.steps[row])]
+        steps = self.get_selected_steps()
+        if steps:
+            self._clipboard = steps
 
     def _test_step(self):
         step = self.step_at(self._selected_row())
@@ -558,6 +616,7 @@ class TaskWidget(QWidget):
         insert_at = row + 1 if row >= 0 else len(self._task.steps)
         for i, s in enumerate(self._clipboard):
             self._task.steps.insert(insert_at + i, copy.deepcopy(s))
+        self._breakpoints.clear()   # indices shift
         self._refresh()
         self.taskChanged.emit()
 

{pyclickerrpa-0.3.0 → pyclickerrpa-0.3.1}/autoclicker/runner.py

@@ -31,6 +31,7 @@ class RunnerCallbacks:
     def match_found(self, x: int, y: int, confidence: float) -> None: ...
     def log(self, msg: str) -> None: ...
     def var_changed(self, name: str, value: str) -> None: ...
+    def paused(self, index: int, description: str) -> None: ...
     def finished(self) -> None: ...
 
 
@@ -61,6 +62,11 @@ class TaskRunner(threading.Thread):
 
         self._running = False
         self._paused = False
+        # Step-debugging: pause before a step when in step-mode or on a breakpoint;
+        # _advance is released by debug_step()/debug_continue().
+        self._breakpoints: set[int] = set()
+        self._step_mode = False
+        self._advance = threading.Event()
         self._loop_counters: dict[int, int] = {}
         self._vars: dict[str, str] = {}
         self._last_condition = False
@@ -85,6 +91,23 @@ class TaskRunner(threading.Thread):
     def resume(self) -> None:
         self._paused = False
 
+    # ---- step debugging ----
+    def set_breakpoints(self, indices) -> None:
+        self._breakpoints = set(indices or ())
+
+    def enable_step_mode(self, on: bool) -> None:
+        self._step_mode = bool(on)
+
+    def debug_step(self) -> None:
+        """Advance one step, then pause again at the next step."""
+        self._step_mode = True
+        self._advance.set()
+
+    def debug_continue(self) -> None:
+        """Leave step-mode; run until the next breakpoint (or the end)."""
+        self._step_mode = False
+        self._advance.set()
+
     def get_var(self, name: str) -> str:
         return self._vars.get(name, "")
 
@@ -167,6 +190,7 @@ class TaskRunner(threading.Thread):
 
     def run(self) -> None:
         self._running = True
+        self._advance.clear()
         self._loop_counters.clear()
         self._vars.clear()
         self._vars.update({str(k): str(v) for k, v in self._initial_vars.items()})
@@ -200,6 +224,15 @@ class TaskRunner(threading.Thread):
                 i = skip
                 continue
 
+            if self._running and (self._step_mode or i in self._breakpoints):
+                self.cb.paused(i, log_prefix + step.display_name())
+                self._advance.clear()
+                while self._running and not self._advance.is_set():
+                    time.sleep(0.05)
+                self._advance.clear()
+                if not self._running:
+                    break
+
             self.cb.step_started(i, log_prefix + step.display_name())
             self._snap_timeline(i, log_prefix + step.display_name())
             result = self._execute_with_repeat(i)
@@ -329,7 +362,30 @@ class TaskRunner(threading.Thread):
         self.cb.log(f"  重试 {step.retry.count} 次后仍失败")
         return StepResult.Fail
 
-    def _compare(self, val: str, op: str, cmp: str) -> bool:
+    @staticmethod
+    def _compare(val: str, op: str, cmp: str) -> bool:
+        # Range ops: cmp is "a,b" or "a~b" (inclusive)
+        if op in ("between", "not_between"):
+            parts = cmp.replace("，", ",").replace("~", ",").split(",")
+            try:
+                x = float(val)
+                lo, hi = float(parts[0]), float(parts[1])
+            except (ValueError, IndexError):
+                return False
+            if lo > hi:
+                lo, hi = hi, lo
+            inside = lo <= x <= hi
+            return inside if op == "between" else not inside
+        # String ops (compare raw strings, no numeric coercion)
+        if op == "contains":
+            return cmp in val
+        if op == "not_contains":
+            return cmp not in val
+        if op == "startswith":
+            return val.startswith(cmp)
+        if op == "endswith":
+            return val.endswith(cmp)
+        # Numeric-first ordering ops, string fallback for ==/!=
         try:
             a, b = float(val), float(cmp)
         except ValueError:
@@ -485,6 +541,13 @@ class TaskRunner(threading.Thread):
                 value = str(int(self._vars.get(step.varName, "0")) + 1)
             elif value.startswith("--"):
                 value = str(int(self._vars.get(step.varName, "0")) - 1)
+            elif value.startswith("="):
+                from autoclicker import expr
+                try:
+                    value = expr.safe_eval(value[1:], self._vars)
+                except Exception as e:  # noqa: BLE001 - bad expr is a recoverable step failure
+                    self.cb.log(f"  表达式错误: {e}")
+                    return StepResult.Fail
             self._vars[step.varName] = value
             self.cb.var_changed(step.varName, value)
             self.cb.log(f"  变量 {step.varName} = {value}")

{pyclickerrpa-0.3.0 → pyclickerrpa-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "PyClickerRPA"
-version = "0.3.0"
+version = "0.3.1"
 description = "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."
 readme = "README.md"
 license = "MIT"