Merge branch 'main' into next

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 = {

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),