diff --git a/packages/core/client/src/schema-component/antd/block-item/BlockItem.tsx b/packages/core/client/src/schema-component/antd/block-item/BlockItem.tsx index 5f88e50ecd..2b9a4c0724 100644 --- a/packages/core/client/src/schema-component/antd/block-item/BlockItem.tsx +++ b/packages/core/client/src/schema-component/antd/block-item/BlockItem.tsx @@ -9,6 +9,8 @@ import { useFieldSchema } from '@formily/react'; import cls from 'classnames'; +import { css } from '@emotion/css'; +import { theme } from 'antd'; import React, { useMemo } from 'react'; import { withDynamicSchemaProps } from '../../../hoc/withDynamicSchemaProps'; import { CustomCreateStylesUtils, createStyles } from '../../../style'; @@ -18,6 +20,7 @@ import { useGetAriaLabelOfBlockItem } from './hooks/useGetAriaLabelOfBlockItem'; import { ErrorBoundary } from 'react-error-boundary'; import { ErrorFallback } from '../error-fallback'; import { useSchemaToolbarRender } from '../../../application'; +import { useDesignable } from '../../'; const useStyles = createStyles(({ css, token }: CustomCreateStylesUtils) => { return css` @@ -81,15 +84,29 @@ export const BlockItem: React.FC = withDynamicSchemaProps( // 新版 UISchema(1.0 之后)中已经废弃了 useProps,这里之所以继续保留是为了兼容旧版的 UISchema const { className, children } = useProps(props); const { styles: blockItemCss } = useStyles(); - const fieldSchema = useFieldSchema(); const { render } = useSchemaToolbarRender(fieldSchema); const { getAriaLabel } = useGetAriaLabelOfBlockItem(props.name); - + const { token } = theme.useToken(); + const { designable } = useDesignable(); const label = useMemo(() => getAriaLabel(), [getAriaLabel]); return ( - + {render()} console.log(err)}> {children} diff --git a/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx b/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx index ace2b5b6d3..80924672d6 100644 --- a/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx +++ b/packages/core/client/src/schema-component/antd/collection-select/__tests__/collection-select.test.tsx @@ -50,7 +50,7 @@ describe('CollectionSelect', () => { >
{ >
{ }, '.nb-page-wrapper': { - padding: `${token.paddingPageVertical}px ${token.paddingPageHorizontal}px 0px ${token.paddingPageHorizontal}px`, + padding: `${token.paddingPageVertical}px`, flex: 1, }, }, diff --git a/packages/core/client/src/schema-component/hooks/useBlockSize.ts b/packages/core/client/src/schema-component/hooks/useBlockSize.ts index 45c0caad38..f8ef157b38 100644 --- a/packages/core/client/src/schema-component/hooks/useBlockSize.ts +++ b/packages/core/client/src/schema-component/hooks/useBlockSize.ts @@ -34,6 +34,11 @@ const getPageHeaderHeight = (disablePageHeader, enablePageTabs, hidePageTitle, t } return token.controlHeight + token.marginXS + (token.paddingXXS + 2) * 2 + token.paddingContentHorizontalLG; } else { + if (enablePageTabs) { + return ( + token.controlPaddingHorizontal + 3 * token.controlPaddingHorizontalSM + 22 + token.paddingContentHorizontalLG + ); + } return token.paddingContentHorizontalLG + 12; } }