From 436fb3f5aa0fb3cc332e6e1d1ecb385579ff97f3 Mon Sep 17 00:00:00 2001 From: roymondchen Date: Mon, 13 Nov 2023 14:34:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(core):=20=E5=B0=86=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E4=B8=AD=E7=9A=84=E5=89=A9=E4=BD=99=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=8F=82=E6=95=B0=E4=BC=A0=E5=85=A5=E5=88=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E4=BB=A3=E7=A0=81=E5=9D=97=E4=B8=8E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=BA=90=E6=96=B9=E6=B3=95=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit re #551 --- packages/core/src/App.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/src/App.ts b/packages/core/src/App.ts index e2235177..bbef6487 100644 --- a/packages/core/src/App.ts +++ b/packages/core/src/App.ts @@ -285,11 +285,11 @@ class App extends EventEmitter implements AppCore { * @param eventConfig 代码动作的配置 * @returns void */ - public async codeActionHandler(eventConfig: CodeItemConfig) { + public async codeActionHandler(eventConfig: CodeItemConfig, args: any[]) { const { codeId = '', params = {} } = eventConfig; if (!codeId || isEmpty(this.codeDsl)) return; if (this.codeDsl![codeId] && typeof this.codeDsl![codeId]?.content === 'function') { - await this.codeDsl![codeId].content({ app: this, params }); + await this.codeDsl![codeId].content({ app: this, params, eventParams: args }); } } @@ -322,7 +322,7 @@ class App extends EventEmitter implements AppCore { } } - public async dataSourceActionHandler(eventConfig: DataSourceItemConfig) { + public async dataSourceActionHandler(eventConfig: DataSourceItemConfig, args: any[]) { const { dataSourceMethod = [], params = {} } = eventConfig; const [id, methodName] = dataSourceMethod; @@ -340,7 +340,7 @@ class App extends EventEmitter implements AppCore { if (!method) return; if (typeof method.content === 'function') { - await method.content({ app: this, params, dataSource }); + await method.content({ app: this, params, dataSource, eventParams: args }); } } @@ -369,9 +369,9 @@ class App extends EventEmitter implements AppCore { await this.compActionHandler(actionItem as CompItemConfig, fromCpt, args); } else if (actionItem.actionType === ActionType.CODE) { // 执行代码块 - await this.codeActionHandler(actionItem as CodeItemConfig); + await this.codeActionHandler(actionItem as CodeItemConfig, args); } else if (actionItem.actionType === ActionType.DATA_SOURCE) { - await this.dataSourceActionHandler(actionItem as DataSourceItemConfig); + await this.dataSourceActionHandler(actionItem as DataSourceItemConfig, args); } } } else {