From 310cdfa86021a3b3bdf6cc2697b018ead2a39f8f Mon Sep 17 00:00:00 2001 From: Junyi Date: Sun, 24 Aug 2025 19:55:48 +0800 Subject: [PATCH] refactor(plugin-workflow): adjust variable api (#7439) --- .../plugin-notification-manager/src/server/manager.ts | 1 - .../@nocobase/plugin-workflow/src/client/variable.tsx | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/plugins/@nocobase/plugin-notification-manager/src/server/manager.ts b/packages/plugins/@nocobase/plugin-notification-manager/src/server/manager.ts index ccd538a78da..9bc0c25af50 100644 --- a/packages/plugins/@nocobase/plugin-notification-manager/src/server/manager.ts +++ b/packages/plugins/@nocobase/plugin-notification-manager/src/server/manager.ts @@ -49,7 +49,6 @@ export class NotificationManager implements NotificationManager { async send(params: SendOptions) { this.plugin.logger.info('receive sending message request', params); - console.log('receive sending message request', params); const message = compile(params.message ?? {}, params.data ?? {}); const messageData = { ...(params.receivers ? { receivers: params.receivers } : {}), ...message }; const logData: any = { diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/variable.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/variable.tsx index 847fcefbd34..29ea71eca9f 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/variable.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/variable.tsx @@ -240,10 +240,14 @@ function useOptions(scope, opts) { }; } -export function useWorkflowVariableOptions(options: UseVariableOptions = {}) { +export function useWorkflowVariableOptions( + options: UseVariableOptions = {}, + preset: VariableOption[] = [], +): VariableOption[] { const fieldNames = Object.assign({}, defaultFieldNames, options.fieldNames ?? {}); const opts = Object.assign(options, { fieldNames }); const result = [ + ...preset, useOptions(scopeOptions, opts), useOptions(nodesOptions, opts), useOptions(triggerOptions, opts),