From b08f056abafe9636b2d960b3b4db8873ab46608d Mon Sep 17 00:00:00 2001
From: yu <191972707@qq.com>
Date: Wed, 28 Oct 2026 18:05:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=B9=E4=BA=8C=20h?=
 =?UTF-8?q?andler=20=E7=BC=BA=E5=A4=B1=E5=A3=B0=E6=98=8E=E4=B8=8E=20FlowSa?=
 =?UTF-8?q?veResult=20=E7=B1=BB=E5=9E=8B=E6=94=B6=E7=AA=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/capabilities/web-batch2.ts | 4 ++++
 src/renderer/src/App.tsx            | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/capabilities/web-batch2.ts b/src/main/capabilities/web-batch2.ts
index 88c5a88..c3de32e 100644
--- a/src/main/capabilities/web-batch2.ts
+++ b/src/main/capabilities/web-batch2.ts
@@ -44,16 +44,19 @@ register("WebBrowser_Switch_V1", async (ctx, node, args) => {
 });
 
 register("WebBrowser_Maximize", async (ctx, node) => {
+  const browser = await browserSession();
   browser.maximize();
   return true;
 });
 
 register("WebBrowser_Minimize", async (ctx, node) => {
+  const browser = await browserSession();
   browser.minimize();
   return true;
 });
 
 register("WebBrowser_Stop", async (ctx, node) => {
+  const browser = await browserSession();
   browser.stopLoading();
   return true;
 });
@@ -87,3 +90,4 @@ register("Element_StopAutoClosePopup", async (ctx, node) => {
   return { active: false, stopped };
 });
 
+
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index 914b018..f3e954e 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -124,8 +124,8 @@ export function App() {
       if (flow !== loaded) {
         // 归一化改写了布局：强制写盘后必须用保存返回的新 meta 加载，
         // 否则编辑器持有旧 updatedAt，首次保存会误判磁盘版本冲突
-        const saved = await window.rpa.flows.save(flow, { force: true });
-        loadFlow(saved.flow);
+        const result = await window.rpa.flows.save(flow, { force: true });
+        loadFlow(result.conflict ? flow : result.flow);
       } else {
         loadFlow(flow);
       }
@@ -271,3 +271,4 @@ export function App() {
   );
 }
 
+