From 346e2ad3424a28c6a93dfdab87001d1b5c32ff3b Mon Sep 17 00:00:00 2001
From: yu <1919727607@qq.com>
Date: Tue, 3 Nov 2026 13:46:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=B8=8D=E4=BE=BF=E8=BE=93=E5=85=A5=E7=9A=84displayType?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6(mouseRecord/clickPosition=E5=9D=90=E6=A0=87?=
 =?UTF-8?q?=E6=8B=BE=E5=8F=96=E3=80=81excelRange=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E3=80=81USB=E4=B8=B2=E5=8F=A3=E4=B8=8B=E6=8B=89=E3=80=81?=
 =?UTF-8?q?=E9=94=AE=E9=BC=A0=E9=A9=B1=E5=8A=A8=E4=B8=8B=E6=8B=89=E3=80=81?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1email=E8=BE=93=E5=85=A5=E3=80=81previewDataTa?=
 =?UTF-8?q?ble=E5=8F=AA=E8=AF=BB=E3=80=81customModal/itemGroup=20JSON=20te?=
 =?UTF-8?q?xtarea);=20pickPointToField=E5=87=BD=E6=95=B0;=20flowValidation?=
 =?UTF-8?q?=20match=5Ftype=E4=BC=98=E5=85=88=E7=BA=A7=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/panels/Properties.tsx        | 113 +++++++++++++++++-
 src/renderer/src/validation/flowValidation.ts |  12 +-
 .../src/validation/window-fields.test.ts      |  63 ++++++++++
 3 files changed, 182 insertions(+), 6 deletions(-)
 create mode 100644 src/renderer/src/validation/window-fields.test.ts

diff --git a/src/renderer/src/panels/Properties.tsx b/src/renderer/src/panels/Properties.tsx
index 7482ed3..162e0c7 100644
--- a/src/renderer/src/panels/Properties.tsx
+++ b/src/renderer/src/panels/Properties.tsx
@@ -655,6 +655,21 @@ function FieldControl({
   };
   
 
+  const pickPointToField = async () => {
+    setPicking(true);
+    try {
+      const region = await window.rpa.desktop.pickRegion();
+      const cx = region.x + Math.floor(region.width / 2);
+      const cy = region.y + Math.floor(region.height / 2);
+      onChange(field.key, JSON.stringify({ x: cx, y: cy }));
+      onToast("已拾取坐标：" + cx + " , " + cy);
+    } catch (error) {
+      onToast(error instanceof Error ? error.message : String(error), "error");
+    } finally {
+      setPicking(false);
+    }
+  };
+
   if (field.widget === "boolean") {
     return (
       <label className="checkbox-row">
@@ -767,7 +782,49 @@ function FieldControl({
             </button>
           )}
         </div>
-      ) : field.widget === "secret" ? (
+      ) : field.displayType === "colorPicker" ? (
+        <div className="field-row">
+          <input className="text-input" value={textOf(raw)} placeholder="#FF0000" onChange={(e) => onChange(field.key, e.target.value)} />
+          <input type="color" value={/^#[0-9a-fA-F]{6}$/.test(textOf(raw)) ? textOf(raw) : "#000000"} style={{ width: 32, height: 28, padding: 0, border: "none", cursor: "pointer" }} onChange={(e) => onChange(field.key, e.target.value)} title="选择颜色" />
+          <VarMenu variables={variables} onPick={insertVariable} />
+        </div>
+      ) : field.displayType === "similaritySlider" ? (
+        <div className="field-row">
+          <input type="range" min={0} max={1} step={0.01} value={Number(textOf(raw)) || 0.8} style={{ flex: 1 }} onChange={(e) => onChange(field.key, e.target.value)} />
+          <input className="text-input" style={{ width: 72 }} type="number" min={0} max={1} step={0.01} value={textOf(raw)} placeholder="0.8" onChange={(e) => onChange(field.key, e.target.value)} />
+        </div>
+      ) : field.displayType === "dateFormatSelector" ? (
+        <div className="field-row">
+          <input className="text-input" value={textOf(raw)} placeholder="%Y-%m-%d %H:%M:%S" onChange={(e) => onChange(field.key, e.target.value)} />
+          <select className="select-input" style={{ width: 160 }} value="" onChange={(e) => { if (e.target.value) onChange(field.key, e.target.value); }}>
+            <option value="">选择常用格式…</option>
+            {["%Y-%m-%d %H:%M:%S", "%Y-%m-%d", "%Y/%m/%d", "%H:%M:%S", "%Y年%m月%d日", "%Y%m%d%H%M%S"].map((f) => (
+              <option key={f} value={f}>{f}</option>
+            ))}
+          </select>
+          <VarMenu variables={variables} onPick={insertVariable} />
+        </div>
+      ) : field.displayType === "variableTypeSelect" ? (
+        <select className="select-input" value={textOf(raw)} onChange={(e) => onChange(field.key, e.target.value)}>
+          <option value="">请选择类型</option>
+          {["rpa_str", "rpa_int", "rpa_double", "rpa_bool", "rpa_list", "rpa_dict", "rpa_datetimes", "rpa_any"].map((v) => (
+            <option key={v} value={v}>{v.replace("rpa_", "")}</option>
+          ))}
+        </select>
+      ) : field.displayType === "LLMModelSelect" ? (
+        <div className="field-row">
+          <input className="text-input" value={textOf(raw)} placeholder="输入模型名称" onChange={(e) => onChange(field.key, e.target.value)} />
+          <select className="select-input" style={{ width: 180 }} value="" onChange={(e) => { if (e.target.value) onChange(field.key, e.target.value); }}>
+            <option value="">选择常用模型…</option>
+            {["gpt-4o", "gpt-4o-mini", "claude-3.5-sonnet", "deepseek-chat", "qwen-plus", "glm-4", "moonshot-v1-8k"].map((m) => (
+              <option key={m} value={m}>{m}</option>
+            ))}
+          </select>
+          <VarMenu variables={variables} onPick={insertVariable} />
+        </div>
+      ) : field.displayType === "databaseConfig" || field.displayType === "dictConfig" ? (
+        <textarea className="textarea-input" value={textOf(raw)} placeholder={field.placeholder || '{"key": "value"}'} rows={3} onChange={(e) => onChange(field.key, e.target.value)} />
+) : field.widget === "secret" ? (
         <div className="field-row">
           <input
             className="text-input"
@@ -818,6 +875,31 @@ function FieldControl({
             {picking ? "框选中" : "屏幕框选"}
           </button>
         </div>
+      ) : field.widget === "region" && (field.displayType === "mouseRecord" || field.displayType === "clickPosition" || field.displayType === "clickPositionV2" || field.displayType === "clickPositionV3") ? (
+        // 坐标点类字段: 用户需要的是(x,y)坐标, 不是矩形区域, 用拾取坐标按钮
+        <div className="field-row">
+          <input
+            className="text-input"
+            value={textOf(raw)}
+            placeholder={field.placeholder || "填坐标对象如 {\"x\":100,\"y\":200}，或点「拾取坐标」在屏幕上点选"}
+            onChange={(event) => onChange(field.key, event.target.value)}
+          />
+          <VarMenu variables={variables} onPick={insertVariable} />
+          <button type="button" className="mini-btn" disabled={picking} onClick={() => void pickPointToField()} title="在屏幕上点击拾取一个坐标点">
+            {picking ? "拾取中" : "拾取坐标"}
+          </button>
+        </div>
+      ) : field.widget === "region" && field.displayType === "excelRange" ? (
+        // Excel 区域字段: 值是 A1:B10 这样的单元格范围, 不是屏幕区域, 不应显示框选按钮
+        <div className="field-row">
+          <input
+            className="text-input"
+            value={textOf(raw)}
+            placeholder={field.placeholder || "如 A1:B10 或 $A$1:$B$10"}
+            onChange={(event) => onChange(field.key, event.target.value)}
+          />
+          <VarMenu variables={variables} onPick={insertVariable} />
+        </div>
       ) : field.widget === "region" ? (
         <div className="field-row">
           <input
@@ -831,6 +913,35 @@ function FieldControl({
             {picking ? "框选中" : "屏幕框选"}
           </button>
         </div>
+      ) : field.displayType === "USBGetComs" ? (
+        <div className="field-row">
+          <input className="text-input" value={textOf(raw)} placeholder={field.placeholder || "如 COM3"} onChange={(e) => onChange(field.key, e.target.value)} />
+          <select className="select-input" style={{ width: 100 }} value="" onChange={(e) => { if (e.target.value) onChange(field.key, e.target.value); }}>
+            <option value="">选择串口…</option>
+            {["COM1","COM2","COM3","COM4","COM5","COM6","COM7","COM8"].map((v) => (<option key={v} value={v}>{v}</option>))}
+          </select>
+          <VarMenu variables={variables} onPick={insertVariable} />
+        </div>
+      ) : field.displayType === "keyboardDriverSelect" ? (
+        <div className="field-row">
+          <input className="text-input" value={textOf(raw)} placeholder={field.placeholder || "驱动名称"} onChange={(e) => onChange(field.key, e.target.value)} />
+          <select className="select-input" style={{ width: 120 }} value="" onChange={(e) => { if (e.target.value) onChange(field.key, e.target.value); }}>
+            <option value="">选择驱动…</option>
+            {["win32", "winio", "sendinput"].map((v) => (<option key={v} value={v}>{v}</option>))}
+          </select>
+          <VarMenu variables={variables} onPick={insertVariable} />
+        </div>
+      ) : field.displayType === "mailSelection" ? (
+        <div className="field-row">
+          <input className="text-input" type="email" value={textOf(raw)} placeholder={field.placeholder || "user@example.com"} onChange={(e) => onChange(field.key, e.target.value)} />
+          <VarMenu variables={variables} onPick={insertVariable} />
+        </div>
+      ) : field.displayType === "previewDataTable" ? (
+        <textarea className="textarea-input" value={textOf(raw)} readOnly disabled rows={2} placeholder="(运行时自动生成)" style={{ opacity: 0.5 }} />
+      ) : field.displayType === "customModal" || field.displayType === "customModalV4" || field.displayType === "customModalLocal" ? (
+        <textarea className="textarea-input" value={textOf(raw)} placeholder={field.placeholder || "[{\"label\":\"\u5B57\u6BB5\u540D\",\"type\":\"text\",\"key\":\"field1\"}]"} rows={4} onChange={(e) => onChange(field.key, e.target.value)} />
+      ) : field.displayType === "itemGroup" ? (
+        <textarea className="textarea-input" value={textOf(raw)} placeholder={field.placeholder || "筛选条件 JSON"} rows={3} onChange={(e) => onChange(field.key, e.target.value)} />
       ) : (
         <div className="field-row">
           <input
diff --git a/src/renderer/src/validation/flowValidation.ts b/src/renderer/src/validation/flowValidation.ts
index aa47a52..29bc6bb 100644
--- a/src/renderer/src/validation/flowValidation.ts
+++ b/src/renderer/src/validation/flowValidation.ts
@@ -32,16 +32,18 @@ export function fieldIsActive(componentId: string, key: string, values: Record<s
   // Window_*_v1 series: conditional fields based on get_type mode
   if (/^Window_.*_v1$/.test(componentId) || componentId === "Window_WindowExists" || componentId === "Window_WaitWindow") {
     const gt = String(values.get_type ?? "");
+    if (gt === "2") {
+      // get_type=2: match_type determines which title field is active
+      if (key === "match_type") return true;
+      const mt = String(values.match_type ?? "0");
+      if (key === "select_title") return mt === "0";
+      if (key === "match_title") return mt === "1";
+    }
     if (gt !== "") {
       if (key === "target_window") return gt === "0";
       if (key === "window_obj") return gt === "1";
       if (key === "match_type" || key === "select_title" || key === "match_title") return gt === "2";
     }
-    if (gt === "2") {
-      const mt = String(values.match_type ?? "0");
-      if (key === "select_title") return mt === "0";
-      if (key === "match_title") return mt === "1";
-    }
   }
   return true;
 }
diff --git a/src/renderer/src/validation/window-fields.test.ts b/src/renderer/src/validation/window-fields.test.ts
new file mode 100644
index 0000000..1003f05
--- /dev/null
+++ b/src/renderer/src/validation/window-fields.test.ts
@@ -0,0 +1,63 @@
+import { describe, it, expect } from "vitest";
+import { fieldIsActive } from "./flowValidation";
+
+describe("Window component conditional fields", () => {
+  const componentId = "Window_CloseWindow_v1";
+
+  it("get_type=0 (拾取窗口): only target_window visible", () => {
+    const values = { get_type: "0" };
+    expect(fieldIsActive(componentId, "target_window", values)).toBe(true);
+    expect(fieldIsActive(componentId, "window_obj", values)).toBe(false);
+    expect(fieldIsActive(componentId, "match_type", values)).toBe(false);
+    expect(fieldIsActive(componentId, "select_title", values)).toBe(false);
+    expect(fieldIsActive(componentId, "match_title", values)).toBe(false);
+    expect(fieldIsActive(componentId, "isProcess", values)).toBe(true);
+  });
+
+  it("get_type=1 (选择窗口对象): only window_obj visible", () => {
+    const values = { get_type: "1" };
+    expect(fieldIsActive(componentId, "target_window", values)).toBe(false);
+    expect(fieldIsActive(componentId, "window_obj", values)).toBe(true);
+    expect(fieldIsActive(componentId, "match_type", values)).toBe(false);
+    expect(fieldIsActive(componentId, "select_title", values)).toBe(false);
+    expect(fieldIsActive(componentId, "match_title", values)).toBe(false);
+  });
+
+  it("get_type=2 + match_type=0: match_type + select_title visible", () => {
+    const values = { get_type: "2", match_type: "0" };
+    expect(fieldIsActive(componentId, "match_type", values)).toBe(true);
+    expect(fieldIsActive(componentId, "select_title", values)).toBe(true);
+    expect(fieldIsActive(componentId, "match_title", values)).toBe(false);
+    expect(fieldIsActive(componentId, "target_window", values)).toBe(false);
+    expect(fieldIsActive(componentId, "window_obj", values)).toBe(false);
+  });
+
+  it("get_type=2 + match_type=1: match_type + match_title visible", () => {
+    const values = { get_type: "2", match_type: "1" };
+    expect(fieldIsActive(componentId, "match_type", values)).toBe(true);
+    expect(fieldIsActive(componentId, "select_title", values)).toBe(false);
+    expect(fieldIsActive(componentId, "match_title", values)).toBe(true);
+  });
+
+  it("no get_type: all fields default visible", () => {
+    const values = {};
+    expect(fieldIsActive(componentId, "target_window", values)).toBe(true);
+    expect(fieldIsActive(componentId, "window_obj", values)).toBe(true);
+    expect(fieldIsActive(componentId, "match_type", values)).toBe(true);
+  });
+
+  it("Window_WindowExists also follows the pattern", () => {
+    expect(fieldIsActive("Window_WindowExists", "window_obj", { get_type: "1" })).toBe(true);
+    expect(fieldIsActive("Window_WindowExists", "target_window", { get_type: "1" })).toBe(false);
+  });
+
+  it("Window_WaitWindow also follows the pattern", () => {
+    expect(fieldIsActive("Window_WaitWindow", "match_title", { get_type: "2", match_type: "1" })).toBe(true);
+    expect(fieldIsActive("Window_WaitWindow", "select_title", { get_type: "2", match_type: "1" })).toBe(false);
+  });
+
+  it("non-window components unaffected", () => {
+    expect(fieldIsActive("System_ExecuteCommandV1", "dos_command", { command_type: "1" })).toBe(true);
+    expect(fieldIsActive("App_KillV1", "pid", { close_type: "id" })).toBe(true);
+  });
+});