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() { ); } +