feat: baidu#11128 dialog动作的data支持dataMergeData配置

thinkingc · Oct 29, 2024 · ee5c93c · ee5c93c
1 parent 2298198
commit ee5c93c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/amis-core/src/store/iRenderer.ts b/packages/amis-core/src/store/iRenderer.ts
@@ -253,7 +253,12 @@ export const iRendererStore = StoreNode.named('iRendererStore')
         }
 
         const data = createObjectFromChain(chain);
-        const mappingData = self.action.data ?? self.action.dialog?.data;
+        const dataMergeMode = self.action.dataMergeMode || 'merge';
+        // 当配置了 data 的时候，可以控制数据追加方式，支持合并(merge)和覆盖(override)两种模式
+        const mappingData =
+          dataMergeMode === 'override'
+            ? self.action.data ?? self.action.dialog?.data
+            : {...self.action.data, ...self.action.dialog?.data};
         if (mappingData) {
           self.dialogData = createObjectFromChain([
             top?.context,