From 78de1e7c21d61a058b719465ab64cb1eca56f3e7 Mon Sep 17 00:00:00 2001 From: chengjinyang0 <92133492+chengjinyang0@users.noreply.github.com> Date: Thu, 4 Jan 2024 10:50:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E6=96=B0=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=A8=E4=BD=9C=E6=95=B0=E6=8D=AE=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E8=BF=BD=E5=8A=A0=E5=8F=82=E6=95=B0&=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E6=95=B0=E6=8D=AE=E6=96=B9=E5=BC=8F=E5=A4=84=E7=90=86?= =?UTF-8?q?=20(#9300)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/amis-editor/src/renderer/event-control/helper.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/amis-editor/src/renderer/event-control/helper.tsx b/packages/amis-editor/src/renderer/event-control/helper.tsx index 59fb00c01..38b37b2e6 100644 --- a/packages/amis-editor/src/renderer/event-control/helper.tsx +++ b/packages/amis-editor/src/renderer/event-control/helper.tsx @@ -3101,12 +3101,12 @@ export const getEventControlConfig = ( if ( (config.data && typeof config.data === 'object') || (config.args && - !Object.keys(config.args).length && + Object.keys(config.args).length && config.data === undefined) ) { config.__addParam = true; config.__containerType = 'appoint'; - config.dataMergeMode = 'override'; + config.dataMergeMode = config.dataMergeMode || 'merge'; } if (config.__addParam && config.data) { @@ -3119,7 +3119,7 @@ export const getEventControlConfig = ( } } else if ( config.args && - !Object.keys(config.args).length && + Object.keys(config.args).length && config.data === undefined ) { config.__reloadParams = objectToComboArray(config.args);