fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-08 06:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-03-20 15:18:21 +00:00
commit f0e3c46072
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/client/src/schema-component/antd/association-field/Table.tsx
View File

@ -602,12 +602,6 @@ const InternalNocoBaseTable = React.memo(
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.ant-table-expanded-row-fixed {
min-height: ${tableHeight}px;
}
.ant-table-body {
min-height: ${tableHeight}px;
}
.ant-table-cell { .ant-table-cell {
padding: 16px 8px; padding: 16px 8px;
} }

6
packages/core/client/src/schema-component/hooks/useBlockSize.ts
View File

@ -37,7 +37,9 @@ const getPageHeaderHeight = (disablePageHeader, enablePageTabs, hidePageTitle, t
token.paddingContentHorizontalLG token.paddingContentHorizontalLG
); );
} }
return token.controlHeight + token.marginXS + (token.paddingXXS + 2) * 2 + token.paddingContentHorizontalLG; return (
token.controlHeight + token.marginXS + (token.paddingContentVertical + 2) * 2 + token.paddingContentHorizontalLG
);
} else { } else {
if (enablePageTabs) { if (enablePageTabs) {
return ( return (
@ -140,12 +142,12 @@ export const useDataBlockHeight = (options?: UseDataBlockHeightOptions) => {
const { heightMode, height, title, titleHeight } = heightProps || {}; const { heightMode, height, title, titleHeight } = heightProps || {};
const blockHeaderHeight = title ? titleHeight : 0; const blockHeaderHeight = title ? titleHeight : 0;
if (!heightProps?.heightMode || heightMode === HeightMode.DEFAULT) { if (!heightProps?.heightMode || heightMode === HeightMode.DEFAULT) {
return; return;
} }
if (heightMode === HeightMode.FULL_HEIGHT) { if (heightMode === HeightMode.FULL_HEIGHT) {
let res = window.innerHeight - pageFullScreenHeight; let res = window.innerHeight - pageFullScreenHeight;
console.log(res);
if (options?.removeBlockHeaderHeight) { if (options?.removeBlockHeaderHeight) {
res = res - blockHeaderHeight; res = res - blockHeaderHeight;
} }