Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2025-02-18 01:50:00 +00:00
commit 74836f20d7

View File

@ -9,8 +9,14 @@
import React, { useState, useContext } from 'react'; import React, { useState, useContext } from 'react';
import { RecordPickerProvider, RecordPickerContext } from '../../../schema-component/antd/record-picker'; import { RecordPickerProvider, RecordPickerContext } from '../../../schema-component/antd/record-picker';
import { SchemaComponentOptions, useActionContext, useBlockRequestContext, useCollection } from '../../../'; import {
import { useField } from '@formily/react'; SchemaComponentOptions,
useActionContext,
useBlockRequestContext,
useCollection,
ActionContextProvider,
useOpenModeContext,
} from '../../../';
import { import {
TableSelectorParamsProvider, TableSelectorParamsProvider,
useTableSelectorProps as useTsp, useTableSelectorProps as useTsp,
@ -36,7 +42,8 @@ export const AssociateActionProvider = (props) => {
const [selectedRows, setSelectedRows] = useState([]); const [selectedRows, setSelectedRows] = useState([]);
const collection = useCollection(); const collection = useCollection();
const { resource, service, block, __parent } = useBlockRequestContext(); const { resource, service, block, __parent } = useBlockRequestContext();
const actionCtx = useActionContext();
const { isMobile } = useOpenModeContext() || {};
const pickerProps = { const pickerProps = {
size: 'small', size: 'small',
onChange: props?.onChange, onChange: props?.onChange,
@ -73,11 +80,19 @@ export const AssociateActionProvider = (props) => {
} }
return {}; return {};
}; };
return ( return (
<RecordPickerProvider {...pickerProps}> <ActionContextProvider
<SchemaComponentOptions scope={{ useTableSelectorProps, usePickActionProps }}> value={{
<TableSelectorParamsProvider params={{ filter: getFilter() }}>{props.children}</TableSelectorParamsProvider> ...actionCtx,
</SchemaComponentOptions> openMode: isMobile ? 'drawer' : actionCtx.openMode,
</RecordPickerProvider> }}
>
<RecordPickerProvider {...pickerProps}>
<SchemaComponentOptions scope={{ useTableSelectorProps, usePickActionProps }}>
<TableSelectorParamsProvider params={{ filter: getFilter() }}>{props.children}</TableSelectorParamsProvider>
</SchemaComponentOptions>
</RecordPickerProvider>
</ActionContextProvider>
); );
}; };