Release v1.0.61: desktop RPA Name/Value and activate fixes

examples/real_desktop_rpa/scripts/service/desktop_session.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import ctypes
 import ntpath
+import time
 from ctypes import wintypes
 from dataclasses import dataclass
 from typing import Iterable
@@ -31,6 +32,7 @@ class WindowCandidate:
 user32 = ctypes.windll.user32
 kernel32 = ctypes.windll.kernel32
 SW_RESTORE = 9
+SW_MAXIMIZE = 3
 PROCESS_QUERY_LIMITED_INFORMATION = 0x1000
 
 
@@ -105,7 +107,23 @@ def resolve_unique_window(
     return matched[0]
 
 
-def activate_window(window: WindowCandidate) -> None:
-    user32.ShowWindow(window.hwnd, SW_RESTORE)
-    if not user32.SetForegroundWindow(window.hwnd):
-        raise DesktopRpaError("WINDOW_ACTIVATE_FAILED", f"无法激活 hwnd={window.hwnd}")
+def activate_window(window: WindowCandidate, *, maximize: bool = False) -> None:
+    """激活窗口。
+
+    maximize=True：主窗进入依赖完整侧栏的流程时使用。
+    maximize=False：只前置；**禁止**对已最大化窗口无条件 SW_RESTORE。
+    """
+    hwnd = window.hwnd
+    iconic = bool(user32.IsIconic(hwnd))
+    zoomed = bool(user32.IsZoomed(hwnd))
+    if maximize:
+        if iconic:
+            user32.ShowWindow(hwnd, SW_RESTORE)
+        if not zoomed:
+            user32.ShowWindow(hwnd, SW_MAXIMIZE)
+    else:
+        if iconic:
+            user32.ShowWindow(hwnd, SW_RESTORE)
+    if not user32.SetForegroundWindow(hwnd):
+        raise DesktopRpaError("WINDOW_ACTIVATE_FAILED", f"无法激活 hwnd={hwnd}")
+    time.sleep(0.35 if maximize else 0.2)

examples/real_desktop_rpa/scripts/service/uia_locator.py

@@ -22,6 +22,15 @@ def root_from_window(window: WindowCandidate):
     return auto.ControlFromHandle(window.hwnd)
 
 
+def control_value(control: Any) -> str:
+    try:
+        auto = require_uiautomation()
+        raw = control.GetPropertyValue(auto.PropertyId.ValueValueProperty)
+        return str(raw or "").strip()
+    except Exception:
+        return ""
+
+
 def _walk(root: Any, *, depth: int = 0, max_depth: int = 25) -> Iterator[Any]:
     if depth > max_depth:
         return
@@ -36,9 +45,21 @@ def _walk(root: Any, *, depth: int = 0, max_depth: int = 25) -> Iterator[Any]:
         yield from _walk(child, depth=depth + 1, max_depth=max_depth)
 
 
+def _child_has_value(control: Any, child_name: str, expected_value: str, *, max_depth: int = 10) -> bool:
+    for node in _walk(control, max_depth=max_depth):
+        if (getattr(node, "Name", None) or "") != child_name:
+            continue
+        if control_value(node) == expected_value:
+            return True
+    return False
+
+
 def _matches(control: Any, spec: ElementSpec) -> bool:
     if spec.name is not None and (getattr(control, "Name", None) or "") != spec.name:
         return False
+    if spec.value is not None and not spec.child_value_name:
+        if control_value(control) != spec.value:
+            return False
     if spec.automation_id is not None and (
         getattr(control, "AutomationId", None) or ""
     ) != spec.automation_id:
@@ -52,6 +73,9 @@ def _matches(control: Any, spec: ElementSpec) -> bool:
         getattr(control, "ClassName", None) or ""
     ) != spec.class_name:
         return False
+    if spec.child_value_name and spec.value:
+        if not _child_has_value(control, spec.child_value_name, spec.value):
+            return False
     return True
 
 
@@ -64,7 +88,9 @@ def locate_unique(root: Any, spec: ElementSpec, *, max_depth: int = 25):
         )
         search_root = locate_unique(root, ancestor_spec, max_depth=max_depth)
 
-    matched = [control for control in _walk(search_root, max_depth=max_depth) if _matches(control, spec)]
+    matched = [
+        control for control in _walk(search_root, max_depth=max_depth) if _matches(control, spec)
+    ]
     if not matched:
         raise DesktopRpaError("ELEMENT_NOT_FOUND", f"{spec.logical_name} 未找到")
     if len(matched) != spec.expected_count:
@@ -75,8 +101,13 @@ def locate_unique(root: Any, spec: ElementSpec, *, max_depth: int = 25):
     return matched[0]
 
 
-def click_control(control: Any, *, window: WindowCandidate) -> None:
-    activate_window(window)
+def click_control(
+    control: Any,
+    *,
+    window: WindowCandidate,
+    maximize: bool = False,
+) -> None:
+    activate_window(window, maximize=maximize)
     rect = control.BoundingRectangle
     if rect.width() <= 0 or rect.height() <= 0 or rect.left < -10000:
         raise DesktopRpaError("ELEMENT_NOT_READY", "目标元素不可见或边界矩形无效")
@@ -89,7 +120,7 @@ def click_control(control: Any, *, window: WindowCandidate) -> None:
 
 def type_text(control: Any, text: str, *, window: WindowCandidate) -> None:
     auto = require_uiautomation()
-    click_control(control, window=window)
+    click_control(control, window=window, maximize=False)
     auto.SendKeys("{Ctrl}a", waitTime=0.05)
     auto.SendKeys("{Delete}", waitTime=0.05)
     for char in text:

examples/real_desktop_rpa/scripts/service/wecom_reference_flow.py

@@ -5,28 +5,49 @@ from __future__ import annotations
 from dataclasses import asdict
 from typing import Any
 
-from service.desktop_session import resolve_unique_window
+from service.desktop_session import activate_window, resolve_unique_window
 from service.uia_locator import locate_unique, root_from_window, type_text
-from util.selectors import ADD_CUSTOMER_WINDOW, CONTACTS_ENTRY, MAIN_WINDOW, SEARCH_INPUT
+from util.selectors import (
+    ADD_CUSTOMER_WINDOW,
+    CONTACTS_ENTRY,
+    MAIN_WINDOW,
+    NEW_CUSTOMER_ROW,
+    SEARCH_INPUT,
+)
 
 
 def probe() -> dict[str, Any]:
+    """最小 probe：主窗 + 通讯录入口。
+
+    生产技能应对「新的客户 / 添加」等关键节点做更深探测；本函数不等于生产完整度。
+    调用前会 maximize 主窗，避免侧栏折叠导致 org_op_new 抖动。
+    """
     main = resolve_unique_window(MAIN_WINDOW)
+    activate_window(main, maximize=True)
     root = root_from_window(main)
     contacts = locate_unique(root, CONTACTS_ENTRY)
-    return {
+    payload: dict[str, Any] = {
         "success": True,
+        "minimized_probe": True,
         "main_window": asdict(main),
         "contacts_entry": {
             "name": getattr(contacts, "Name", ""),
             "control_type": getattr(contacts, "ControlTypeName", ""),
         },
     }
+    # 可选：若已在通讯录页，尝试按 Value 定位「新的客户」行（失败不视为 probe 失败）
+    try:
+        row = locate_unique(root, NEW_CUSTOMER_ROW)
+        payload["new_customer_row"] = {"name": getattr(row, "Name", "")}
+    except Exception:
+        payload["new_customer_row"] = None
+    return payload
 
 
 def fill_search_dry_run(target: str) -> dict[str, Any]:
     """要求操作者已打开“添加客户”窗口；只填写搜索框，不提交。"""
     search_window = resolve_unique_window(ADD_CUSTOMER_WINDOW)
+    activate_window(search_window, maximize=False)
     root = root_from_window(search_window)
     search_input = locate_unique(root, SEARCH_INPUT)
     type_text(search_input, target, window=search_window)

examples/real_desktop_rpa/scripts/util/selectors.py

@@ -18,10 +18,16 @@ class WindowSpec:
 class ElementSpec:
     logical_name: str
     name: Optional[str] = None
+    """UIA Name（内部 id，未必是界面中文）。"""
+    value: Optional[str] = None
+    """UIA Value（可见中文文案常在此）。"""
     automation_id: Optional[str] = None
     control_type: Optional[str] = None
     class_name: Optional[str] = None
     ancestor_name: Optional[str] = None
+    """先定位到该 Name 的祖先，再在其下搜索。"""
+    child_value_name: Optional[str] = None
+    """在候选控件子树中查找该 Name 的子控件，并用 value 匹配其 Value。"""
     expected_count: int = 1
 
 
@@ -37,6 +43,19 @@ CONTACTS_ENTRY = ElementSpec(
     name="org_op_new",
     control_type="TreeItem",
 )
+# 示意：用子控件 main_chattext 的 Value 定位「新的客户」行（禁止全树第一个 status_layout）
+NEW_CUSTOMER_ROW = ElementSpec(
+    "new_customer_row",
+    name="status_layout",
+    ancestor_name="wlist_view",
+    child_value_name="main_chattext",
+    value="新的客户",
+)
+ADD_BUTTON = ElementSpec(
+    "add_customer_button",
+    name="wbtn_container",
+    ancestor_name="search_external",
+)
 SEARCH_INPUT = ElementSpec(
     "search_input",
     name="searchedit",