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

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: