From 62148c720503822e5fbde386a46e34212dbc699e Mon Sep 17 00:00:00 2001
From: chenos <chenlinxh@gmail.com>
Date: Mon, 23 Jun 2025 15:23:52 +0800
Subject: [PATCH] fix: shared context

---
 packages/core/flow-engine/src/models/flowModel.tsx    | 3 +--
 packages/core/flow-engine/src/models/forkFlowModel.ts | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/core/flow-engine/src/models/flowModel.tsx b/packages/core/flow-engine/src/models/flowModel.tsx
index dafcd3f289..a4d40a420a 100644
--- a/packages/core/flow-engine/src/models/flowModel.tsx
+++ b/packages/core/flow-engine/src/models/flowModel.tsx
@@ -851,8 +851,7 @@ export class FlowModel<Structure extends { parent?: any; subModels?: any } = Def
   }
 
   public setSharedContext(ctx: Record<string, any>) {
-    this._sharedContext = ctx;
-    // this._sharedContext = { ...this._sharedContext, ...ctx };
+    this._sharedContext = { ...this._sharedContext, ...ctx };
   }
 
   public getSharedContext() {
diff --git a/packages/core/flow-engine/src/models/forkFlowModel.ts b/packages/core/flow-engine/src/models/forkFlowModel.ts
index 6942c29759..3b97db9da7 100644
--- a/packages/core/flow-engine/src/models/forkFlowModel.ts
+++ b/packages/core/flow-engine/src/models/forkFlowModel.ts
@@ -121,7 +121,7 @@ export class ForkFlowModel<TMaster extends FlowModel = FlowModel> {
   }
 
   public setSharedContext(ctx: Record<string, any>) {
-    this['_sharedContext'] = ctx;
+    this['_sharedContext'] = { ...this['_sharedContext'], ...ctx };
   }
 
   public getSharedContext() {