Merge branch 'next' into develop

packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsTableField.tsx

@@ -22,7 +22,7 @@ const CollectionsTable = observer((tableProps: any) => {
   const [selectAllForCurrentView, setSelectAllForCurrentView] = useState(false);
   const searchTimeoutRef = useRef<NodeJS.Timeout>();
 
-  const MAX_SELECTION_LIMIT = 100;
+  const MAX_SELECTION_LIMIT = 500;
 
   const { NAMESPACE, t } = tableProps;
   const defaultAddAllCollections =

packages/plugins/@nocobase/plugin-data-source-manager/src/server/constants.ts

@@ -1 +1,10 @@
-export const ALLOW_MAX_COLLECTIONS_COUNT = 100;
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+export const ALLOW_MAX_COLLECTIONS_COUNT = 500;

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