From 2ac824c85a79fb8db84be7d27e4502a09d7373da Mon Sep 17 00:00:00 2001 From: gchust Date: Sun, 20 Apr 2025 10:17:14 +0800 Subject: [PATCH] chore: api update --- .../demos/events/basic-eventflow.tsx | 29 +++++-------------- .../demos/events/conditional-eventflow.tsx | 25 +++++++--------- .../demos/events/conditional-flow-trigger.tsx | 23 ++++++--------- .../demos/events/configurable-action.tsx | 11 ++----- .../demos/events/data-passing-eventflow.tsx | 21 +++++--------- .../demos/events/multi-button-eventflow.tsx | 11 ++----- .../client/src/eventflow/eventflow-manager.ts | 4 +-- packages/core/client/src/eventflow/types.ts | 10 ++----- 8 files changed, 45 insertions(+), 89 deletions(-) diff --git a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/basic-eventflow.tsx b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/basic-eventflow.tsx index d9f6f2881d..1ed44d8d72 100644 --- a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/basic-eventflow.tsx +++ b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/basic-eventflow.tsx @@ -79,28 +79,15 @@ const BasicEventFlow = () => { time: new Date().toLocaleString(), }, meta: { - actionParams: [ - { - flow: 'demo-button-click-flow', - params: { - steps: { - step1: { - title: '第一步：简单对话框', - width: 600, - }, - step2: { - title: '第二步：通知', - description: '这是事件流的第二步，显示通知消息', - duration: 3, - }, - step3: { - title: '第三步：表单对话框', - width: 500, - }, - }, - }, + stepParams: { + step1: { + title: '第一步：简单对话框', + width: 600, }, - ], + step2: { + title: '第二步：通知', + }, + }, }, }; diff --git a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/conditional-eventflow.tsx b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/conditional-eventflow.tsx index 00e06ecd32..b1e887e774 100644 --- a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/conditional-eventflow.tsx +++ b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/conditional-eventflow.tsx @@ -68,22 +68,17 @@ const ConditionalEventFlow = () => { option: selectedOption, }, meta: { - actionParams: [ - { - flow: 'conditional-flow-demo', - params: { - step1: { - title: '第一步：简单对话框', - width: 600, - }, - step2: { - title: '选项B的通知', - description: '您选择了选项B', - duration: 3, - }, - }, + stepParams: { + step1: { + title: '第一步：简单对话框', + width: 600, }, - ], + step2: { + title: '选项B的通知', + description: '您选择了选项B', + duration: 3, + }, + }, }, }; diff --git a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/conditional-flow-trigger.tsx b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/conditional-flow-trigger.tsx index ba7524ecf6..e834439670 100644 --- a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/conditional-flow-trigger.tsx +++ b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/conditional-flow-trigger.tsx @@ -77,21 +77,16 @@ const ConditionalFlowTrigger = () => { time: new Date().toLocaleString(), }, meta: { - actionParams: [ - { - flow: 'conditional-trigger-flow', - params: { - step1: { - title: '阈值警告', - width: 500, - }, - step2: { - title: '阈值超限警告', - duration: 5, - }, - }, + stepParams: { + step1: { + title: '阈值警告', + width: 500, }, - ], + step2: { + title: '阈值超限警告', + duration: 5, + }, + }, }, }; diff --git a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/configurable-action.tsx b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/configurable-action.tsx index ee26a8bbeb..b541e3fcfd 100644 --- a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/configurable-action.tsx +++ b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/configurable-action.tsx @@ -167,14 +167,9 @@ const ConfigurableActionDemo = () => { const ctx = { payload: {}, meta: { - actionParams: [ - { - flow: 'message-flow', - params: { - 'message-step': currentParams, - }, - }, - ], + stepParams: { + 'message-step': currentParams, + }, }, }; eventBus.dispatchEvent('button:click', ctx); diff --git a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/data-passing-eventflow.tsx b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/data-passing-eventflow.tsx index 01e297012b..4281527ae1 100644 --- a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/data-passing-eventflow.tsx +++ b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/data-passing-eventflow.tsx @@ -99,20 +99,15 @@ const DataPassingEventFlow = () => { time: new Date().toLocaleString(), }, meta: { - actionParams: [ - { - flow: 'data-passing-flow', - params: { - step1: { - prefix: '已处理: ', - }, - step2: { - title: '数据处理结果', - duration: 5, - }, - }, + stepParams: { + step1: { + prefix: '已处理: ', }, - ], + step2: { + title: '数据处理结果', + duration: 5, + }, + }, }, }; diff --git a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/multi-button-eventflow.tsx b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/multi-button-eventflow.tsx index f3ded54acc..1c9d587039 100644 --- a/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/multi-button-eventflow.tsx +++ b/packages/core/client/docs/zh-CN/core/event-and-filter/demos/events/multi-button-eventflow.tsx @@ -145,14 +145,9 @@ const MultiButtonEventFlow = () => { time: new Date().toLocaleString(), }, meta: { - actionParams: [ - { - flow: `button${buttonNum}-flow`, - params: { - step1: stepParams, - }, - }, - ], + stepParams: { + step1: stepParams, + }, }, }; diff --git a/packages/core/client/src/eventflow/eventflow-manager.ts b/packages/core/client/src/eventflow/eventflow-manager.ts index 26286a7b20..79e6790061 100644 --- a/packages/core/client/src/eventflow/eventflow-manager.ts +++ b/packages/core/client/src/eventflow/eventflow-manager.ts @@ -210,7 +210,7 @@ export class EventFlow { return; } // 触发器执行函数 - const eventParams = context?.meta?.eventParams?.find((item) => item.flow === this.key)?.params; + const eventParams = context?.meta?.eventParams?.[this.key]; await this.executeHandler(event.handler, eventParams, context); if (!this.hasSteps()) { @@ -248,7 +248,7 @@ export class EventFlow { const action = this.eventFlowManager.getAction(step.action); if (action) { if (this.checkCondition(step.condition, context)) { - const stepParams = context?.meta?.actionParams?.find((item) => item.flow === this.key)?.params?.[step.key]; + const stepParams = context?.meta?.stepParams?.[step.key]; if (step.isAwait !== false) { await this.executeHandler(action.handler, stepParams, context); } else { diff --git a/packages/core/client/src/eventflow/types.ts b/packages/core/client/src/eventflow/types.ts index 14cf9956c4..aac76cdb96 100644 --- a/packages/core/client/src/eventflow/types.ts +++ b/packages/core/client/src/eventflow/types.ts @@ -26,14 +26,8 @@ export interface EventContext { userId?: string; event?: string | string[]; // 事件名称， 一个事件是可以触发多个eventflow的，与filterflow不同 [key: string]: any; - eventParams?: { - flow?: string; - params?: Record>; - }[]; - actionParams?: { - flow?: string; - params?: Record>; - }[]; + eventParams?: Record>; + stepParams?: Record>; }; payload?: T; results?: Record;