From c5ac0ebc319d84fba399f3d81c90fba16728ef69 Mon Sep 17 00:00:00 2001
From: yu <191972707@qq.com>
Date: Wed, 28 Oct 2026 11:17:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Excel=5FWriteRange=20=E5=AF=B9=E9=BD=90?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E9=94=AE=E5=90=8D=20cellPos/data/isSave?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 支持 cellPos（如 B2）定位起始单元格，与 column/row 双兼容
- 数据字段兼容 data 键（目录定义），保存字段兼容 isSave 键
- 新增 Excel_WriteRange 目录键名回归测试
---
 src/main/capabilities/office-aliases.test.ts |  8 ++++++++
 src/main/capabilities/office.ts              | 10 +++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/capabilities/office-aliases.test.ts b/src/main/capabilities/office-aliases.test.ts
index 3e8f33c..36d7444 100644
--- a/src/main/capabilities/office-aliases.test.ts
+++ b/src/main/capabilities/office-aliases.test.ts
@@ -49,4 +49,12 @@ describe("common Excel aliases", () => {
     const created = await run("Excel_NewExcel", { filePath: directory, name: "open-me.xlsx" }) as { path: string };
     await expect(run("Excel_OpenExcel", { filePath: created.path })).resolves.toMatchObject({ path: created.path });
   });
+
+  it("writes a range through the Excel_WriteRange catalog keys (objExcel/cellPos/data/isSave)", async () => {
+    const directory = await mkdtemp(path.join(os.tmpdir(), "rpa-excel-range-")); dirs.push(directory);
+    const created = await run("Excel_NewExcel", { filePath: directory, name: "range.xlsx" }) as { path: string };
+    await run("Excel_WriteRange", { objExcel: created, sheet: "Sheet1", cellPos: "B2", data: [[1, "壹"], [2, "贰"]], isSave: "True" });
+    const reopened = await run("Excel_OpenExcel", { filePath: created.path }) as { id: string };
+    await expect(run("Excel_Cs_ReadContentV2", { workbook: reopened, sheet: "Sheet1", excelRng: "B2:C3" })).resolves.toEqual([[1, "壹"], [2, "贰"]]);
+  });
 });
diff --git a/src/main/capabilities/office.ts b/src/main/capabilities/office.ts
index 388308d..5a8ed11 100644
--- a/src/main/capabilities/office.ts
+++ b/src/main/capabilities/office.ts
@@ -153,14 +153,18 @@ const writeCell: CapabilityHandler = async (_ctx, node, args) => {
 const writeRange: CapabilityHandler = async (_ctx, node, args) => {
   const { handle, workbook } = await resolveWorkbook(args, node.id, node.componentId);
   const sheet = sheetOf(workbook, text(args, ["sheet", "sheetName"]));
-  const start = `${text(args, ["column"], "A")}${text(args, ["row"], "1")}`;
+  const cellPos = text(args, ["cellPos"]);
+  const cellMatch = cellPos.match(/^([A-Za-z]+)(\d+)$/);
+  const column = cellMatch ? cellMatch[1] : text(args, ["column"], "A");
+  const row = cellMatch ? cellMatch[2] : text(args, ["row"], "1");
+  const start = `${column}${row}`;
   const startCell = sheet.getCell(start);
   const startRow = startCell.row;
   const startColumn = startCell.col;
-  for (const [rowIndex, row] of rowsFrom(value(args, ["contents", "table"])).entries()) {
+  for (const [rowIndex, row] of rowsFrom(value(args, ["contents", "data", "table"])).entries()) {
     for (const [columnIndex, cell] of row.entries()) sheet.getCell(startRow + rowIndex, startColumn + columnIndex).value = cell as ExcelJS.CellValue;
   }
-  if (bool(value(args, ["save"]), true)) await workbook.xlsx.writeFile(handle.path);
+  if (bool(value(args, ["save", "isSave"]), true)) await workbook.xlsx.writeFile(handle.path);
   return handle;
 };