From 5931e2914e437fcaf6c66bf619d9959668ce91a5 Mon Sep 17 00:00:00 2001 From: Katherine Date: Fri, 18 Apr 2025 18:00:33 +0800 Subject: [PATCH] fix: after success link (#6707) --- .../action/hooks/useGetAfterSuccessVariablesOptions.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/client/src/schema-component/antd/action/hooks/useGetAfterSuccessVariablesOptions.ts b/packages/core/client/src/schema-component/antd/action/hooks/useGetAfterSuccessVariablesOptions.ts index d89abc64bb..c903752719 100644 --- a/packages/core/client/src/schema-component/antd/action/hooks/useGetAfterSuccessVariablesOptions.ts +++ b/packages/core/client/src/schema-component/antd/action/hooks/useGetAfterSuccessVariablesOptions.ts @@ -12,9 +12,9 @@ import { useCollection_deprecated, useCollectionFilterOptions } from '../../../. import { useCollectionRecordData } from '../../../../data-source'; import { useTranslation } from 'react-i18next'; import { useCompile } from '../../../'; -import { useBlockContext } from '../../../../block-provider/BlockProvider'; import { usePopupVariable } from '../../../../schema-settings/VariableInput/hooks'; import { useCurrentRoleVariable } from '../../../../schema-settings/VariableInput/hooks'; +import { useFormBlockContext } from '../../../../block-provider'; export const useAfterSuccessOptions = () => { const collection = useCollection_deprecated(); @@ -23,7 +23,7 @@ export const useAfterSuccessOptions = () => { const userFieldOptions = useCollectionFilterOptions('users', 'main'); const compile = useCompile(); const recordData = useCollectionRecordData(); - const { name: blockType } = useBlockContext() || {}; + const { form } = useFormBlockContext(); const [fields, userFields] = useMemo(() => { return [compile(fieldsOptions), compile(userFieldOptions)]; }, [fieldsOptions, userFieldOptions]); @@ -32,7 +32,7 @@ export const useAfterSuccessOptions = () => { const record = useCollectionRecordData(); return useMemo(() => { return [ - (record || blockType === 'form') && { + (record || form) && { value: '$record', label: t('Response record', { ns: 'client' }), children: [...fields], @@ -62,5 +62,5 @@ export const useAfterSuccessOptions = () => { children: null, }, ].filter(Boolean); - }, [recordData, t, fields, blockType, userFields]); + }, [recordData, t, fields, form, userFields]); };