Merge branch 'main' into next

fix: update collection name handling in useCurrentFormVariable (#7125 )
2025-07-01 18:52:20 +08:00 · 2025-07-01 02:02:12 +00:00 · 2025-07-01 10:01:50 +08:00
1 changed files with 3 additions and 2 deletions
--- a/packages/core/client/src/schema-settings/VariableInput/hooks/useFormVariable.ts
+++ b/packages/core/client/src/schema-settings/VariableInput/hooks/useFormVariable.ts
@ -13,7 +13,7 @@ import { useTranslation } from 'react-i18next';
 import { useBlockContext } from '../../../block-provider';
 import { useFormBlockContext } from '../../../block-provider/FormBlockProvider';
 import { CollectionFieldOptions_deprecated } from '../../../collection-manager';
-import { useDataBlockRequestData, useDataSource } from '../../../data-source';
+import { useCollection, useDataSource } from '../../../data-source';
 import { useFlag } from '../../../flag-provider/hooks/useFlag';
 import { useBaseVariable } from './useBaseVariable';

@ -100,6 +100,7 @@ export const useCurrentFormVariable = ({
  const { currentFormCtx, shouldDisplayCurrentForm } = useCurrentFormContext({ form: _form });
  const { t } = useTranslation();
  const { collectionName } = useFormBlockContext();
+  const collection = useCollection();
  const dataSource = useDataSource();
  const currentFormSettings = useBaseVariable({
    collectionField,
@ -108,7 +109,7 @@ export const useCurrentFormVariable = ({
    maxDepth: 4,
    name: '$nForm',
    title: t('Current form'),
-    collectionName: collectionName,
+    collectionName: collectionName || collection?.name,
    noDisabled,
    dataSource: dataSource?.key,
    returnFields: (fields, option) => {
Author	SHA1	Message	Date
nocobase[bot]	05b40e18b3	Merge branch 'main' into next	2025-07-01 02:02:12 +00:00
Zeke Zhang	22cd39552f	fix: update collection name handling in useCurrentFormVariable (#7125 )	2025-07-01 10:01:50 +08:00