diff --git a/packages/core/client/src/schema-component/antd/list/List.Decorator.tsx b/packages/core/client/src/schema-component/antd/list/List.Decorator.tsx index ed412aa82..adbb182fb 100644 --- a/packages/core/client/src/schema-component/antd/list/List.Decorator.tsx +++ b/packages/core/client/src/schema-component/antd/list/List.Decorator.tsx @@ -40,7 +40,7 @@ const InternalListBlockProvider = (props) => { line-height: 34px; } .ant-formily-item-feedback-layout-loose { - margin-bottom: 12px; + margin-bottom: 0; } `)} > diff --git a/packages/core/client/src/schema-component/antd/list/List.Item.tsx b/packages/core/client/src/schema-component/antd/list/List.Item.tsx index b36bed717..de640b6f1 100644 --- a/packages/core/client/src/schema-component/antd/list/List.Item.tsx +++ b/packages/core/client/src/schema-component/antd/list/List.Item.tsx @@ -1,12 +1,14 @@ +import React from 'react'; import { ObjectField } from '@formily/core'; import { useField } from '@formily/react'; -import React from 'react'; +import classnames from 'classnames'; + import { RecordProvider } from '../../../record-provider'; export const ListItem = (props) => { const field = useField(); return ( -
+
{props.children}
); diff --git a/packages/core/client/src/schema-component/antd/list/List.style.ts b/packages/core/client/src/schema-component/antd/list/List.style.ts index 25eee9a65..18e85fcc0 100644 --- a/packages/core/client/src/schema-component/antd/list/List.style.ts +++ b/packages/core/client/src/schema-component/antd/list/List.style.ts @@ -7,7 +7,7 @@ const useStyles = genStyleHook('nb-list', (token) => { [componentCls]: { width: '100%', marginBottom: token.marginLG, - '.nb-action-bar': { marginTop: token.marginXS }, + '.nb-action-bar:not(:empty)': { marginTop: token.marginXS }, '&:hover': { '> .general-schema-designer': { display: 'block' } }, '> .general-schema-designer': { position: 'absolute', @@ -40,8 +40,15 @@ const useStyles = genStyleHook('nb-list', (token) => { display: 'flex', width: '100%', flexDirection: 'column', - padding: '4px 5px 0', - borderBottom: `1px solid ${token.colorBorderSecondary}`, + + '&:not(:first-child)': { + paddingTop: token.paddingContentVertical, + }, + + '&:not(:last-child)': { + paddingBottom: token.paddingContentVertical, + borderBottom: `1px solid ${token.colorBorderSecondary}`, + }, }, }, }; diff --git a/packages/plugins/@nocobase/plugin-import/src/client/ImportModal.tsx b/packages/plugins/@nocobase/plugin-import/src/client/ImportModal.tsx index a3b5017b9..f579d9e28 100644 --- a/packages/plugins/@nocobase/plugin-import/src/client/ImportModal.tsx +++ b/packages/plugins/@nocobase/plugin-import/src/client/ImportModal.tsx @@ -28,7 +28,7 @@ export const ImportModal = (props: any) => {