fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-07 22:49:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-01-13 07:12:40 +00:00
commit fd73f852ec
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/core/client/src/schema-component/common/withPopupWrapper/index.tsx
View File

@ -14,9 +14,9 @@ import { ActionContextProvider, SchemaComponentOptions, useActionContext, useDes
import { PopupVisibleProvider } from '../../antd/page/PagePopups'; import { PopupVisibleProvider } from '../../antd/page/PagePopups';
import { usePopupUtils } from '../../antd/page/pagePopupUtils'; import { usePopupUtils } from '../../antd/page/pagePopupUtils';
import { popupSchema } from './schema'; import { popupSchema } from './schema';
import { CollectionProvider, useCollection } from '../../../data-source'; import { CollectionProvider, useCollection } from '../../../data-source';
import { NocoBaseRecursionField } from '../../../formily/NocoBaseRecursionField'; import { NocoBaseRecursionField } from '../../../formily/NocoBaseRecursionField';
import { VariablePopupRecordProvider } from '../../../modules/variable/variablesProvider/VariablePopupRecordProvider';
const useInsertSchema = () => { const useInsertSchema = () => {
const fieldSchema = useFieldSchema(); const fieldSchema = useFieldSchema();
@ -109,12 +109,14 @@ function withPopupWrapper<T>(WrappedComponent: React.ComponentType<T>) {
> >
<CollectionProvider name={collection.name}> <CollectionProvider name={collection.name}>
<SchemaComponentOptions> <SchemaComponentOptions>
<NocoBaseRecursionField <VariablePopupRecordProvider>
onlyRenderProperties <NocoBaseRecursionField
basePath={field?.address} onlyRenderProperties
schema={fieldSchema} basePath={field?.address}
filterProperties={filterProperties} schema={fieldSchema}
/> filterProperties={filterProperties}
/>
</VariablePopupRecordProvider>
</SchemaComponentOptions> </SchemaComponentOptions>
</CollectionProvider> </CollectionProvider>
<a onClick={handleClick}> <a onClick={handleClick}>