diff --git a/packages/core/client/src/block-provider/FormBlockProvider.tsx b/packages/core/client/src/block-provider/FormBlockProvider.tsx index fec1e61115..49f8cb5c2d 100644 --- a/packages/core/client/src/block-provider/FormBlockProvider.tsx +++ b/packages/core/client/src/block-provider/FormBlockProvider.tsx @@ -2,6 +2,7 @@ import { createForm } from '@formily/core'; import { useField } from '@formily/react'; import { Spin } from 'antd'; import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react'; +import { RecordProvider } from '../record-provider'; import { BlockProvider, useBlockRequestContext } from './BlockProvider'; export const FormBlockContext = createContext({}); @@ -33,7 +34,13 @@ const InternalFormBlockProvider = (props) => { formBlockRef, }} > -
{props.children}
+ {readPretty ? ( + +
{props.children}
+
+ ) : ( +
{props.children}
+ )} ); }; diff --git a/packages/core/client/src/block-provider/TableSelectorProvider.tsx b/packages/core/client/src/block-provider/TableSelectorProvider.tsx index 3fb2a12849..36a1b98cda 100644 --- a/packages/core/client/src/block-provider/TableSelectorProvider.tsx +++ b/packages/core/client/src/block-provider/TableSelectorProvider.tsx @@ -1,7 +1,7 @@ import { ArrayField } from '@formily/core'; import { Schema, useField, useFieldSchema } from '@formily/react'; import React, { createContext, useContext, useEffect } from 'react'; -import { useCollection, useCollectionManager } from '../collection-manager'; +import { useCollectionManager } from '../collection-manager'; import { useRecord } from '../record-provider'; import { BlockProvider, useBlockRequestContext } from './BlockProvider'; import { useFormBlockContext } from './FormBlockProvider'; @@ -60,7 +60,7 @@ export const TableSelectorProvider = (props) => { if (props.dragSort) { params['sort'] = ['sort']; } - if (appends?.length) { + if (!Object.keys(params).includes('appends')) { params['appends'] = appends; } if (collectionField) { diff --git a/packages/plugins/export/src/client/ExportActionInitializer.tsx b/packages/plugins/export/src/client/ExportActionInitializer.tsx index 6d6ab37ac0..2936c9ee38 100644 --- a/packages/plugins/export/src/client/ExportActionInitializer.tsx +++ b/packages/plugins/export/src/client/ExportActionInitializer.tsx @@ -52,6 +52,7 @@ export const ExportActionInitializer = (props) => { exportSettings: [], }, 'x-designer': 'ExportDesigner', + 'x-decorator': 'ACLActionProvider', 'x-component': 'Action', 'x-component-props': { icon: 'clouddownloadoutlined',