mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-05 13:39:24 +08:00
Merge branch 'next' into develop
This commit is contained in:
commit
f009420588
@ -70,6 +70,15 @@ const subTableContainer = css`
|
|||||||
.ant-table-thead .ant-table-cell {
|
.ant-table-thead .ant-table-cell {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
}
|
}
|
||||||
|
.ant-pagination {
|
||||||
|
position: absolute;
|
||||||
|
right: 0px;
|
||||||
|
bottom: 0px;
|
||||||
|
}
|
||||||
|
.ant-table-footer {
|
||||||
|
margin-top: 10px;
|
||||||
|
background: inherit;
|
||||||
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
const tableClassName = css`
|
const tableClassName = css`
|
||||||
@ -252,12 +261,11 @@ export const SubTable: any = observer(
|
|||||||
emptyText: <span> {field.editable ? t('Please add or select record') : t('No data')}</span>,
|
emptyText: <span> {field.editable ? t('Please add or select record') : t('No data')}</span>,
|
||||||
}}
|
}}
|
||||||
enableIndexÏColumn={enableIndexÏColumn !== false}
|
enableIndexÏColumn={enableIndexÏColumn !== false}
|
||||||
/>
|
footer={() => (
|
||||||
|
<div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
|
||||||
{field.editable && (
|
{field.editable && (
|
||||||
<Space
|
<Space
|
||||||
style={{
|
style={{
|
||||||
position: 'relative',
|
|
||||||
bottom: '0',
|
|
||||||
gap: 15,
|
gap: 15,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
@ -283,6 +291,9 @@ export const SubTable: any = observer(
|
|||||||
)}
|
)}
|
||||||
</Space>
|
</Space>
|
||||||
)}
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
</SubFormProvider>
|
</SubFormProvider>
|
||||||
</FormActiveFieldsProvider>
|
</FormActiveFieldsProvider>
|
||||||
</CollectionRecordProvider>
|
</CollectionRecordProvider>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user