From e02fbe5b3077e049e9699765eea72448ae183ae9 Mon Sep 17 00:00:00 2001 From: ajie Date: Sun, 24 Aug 2025 15:45:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(data-source-manager):=20increase=20lim?= =?UTF-8?q?it=20for=20manual=20table=20selection=20=E2=80=A6=20(#7380)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/client/component/CollectionsTableField.tsx | 2 +- .../src/server/constants.ts | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsTableField.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsTableField.tsx index 5a8584a4c72..66049d3e6a8 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsTableField.tsx +++ b/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(); - const MAX_SELECTION_LIMIT = 100; + const MAX_SELECTION_LIMIT = 500; const { NAMESPACE, t } = tableProps; const defaultAddAllCollections = diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/constants.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/constants.ts index 62f8725bfc2..571eda70c41 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/constants.ts +++ b/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; From 310cdfa86021a3b3bdf6cc2697b018ead2a39f8f Mon Sep 17 00:00:00 2001 From: Junyi Date: Sun, 24 Aug 2025 19:55:48 +0800 Subject: [PATCH 2/2] 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),