fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-01 18:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
katherinehhh 2025-01-05 14:28:42 +08:00
commit f9114c3019
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/client/src/schema-component/antd/action/Action.Page.style.ts
View File

@ -29,6 +29,7 @@ export const useActionPageStyle = genStyleHook('nb-action-page', (token) => {
},
'.ant-tabs-content-holder': {
padding: `${token.paddingPageVertical}px`,
paddingBottom: '0px',
},
},
};

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

@ -12,13 +12,17 @@ import { useEventListener } from 'ahooks';
import { theme } from 'antd';
import { debounce } from 'lodash';
import { useCallback, useMemo, useRef, useState } from 'react';
import { useLocation } from 'react-router-dom';
import { useDesignable } from '..';
import { useCollection, useDataBlockRequestData } from '../../';
import { useCollection } from '../../';
import { getPageSchema, useBlockHeightProps } from '../../block-provider/hooks';
import { useTableBlockContext } from '../../block-provider/TableBlockProvider';
import { HeightMode } from '../../schema-settings/SchemaSettingsBlockHeightItem';
const getPageHeaderHeight = (disablePageHeader, enablePageTabs, hidePageTitle, token) => {
const getPageHeaderHeight = (disablePageHeader, enablePageTabs, hidePageTitle, token, pathname) => {
if (pathname.includes('/popups/')) {
return 2 * token.paddingContentVertical + 22 + token.paddingPageVertical;
}
if (disablePageHeader) {
return token.paddingContentHorizontalLG;
} else {
@ -50,12 +54,19 @@ const usePageFullScreenHeight = (props?) => {
const { token } = theme.useToken();
const { designable } = useDesignable();
const { heightProps } = useBlockHeightProps();
const location = useLocation();
const { disablePageHeader, enablePageTabs, hidePageTitle } = props || heightProps || {};
const navHeight = token.sizeXXL - 2;
const addBlockBtnHeight = designable
? token.controlHeight + 2 * token.paddingContentHorizontalLG
: 1 * token.paddingContentHorizontalLG;
const pageHeaderHeight = getPageHeaderHeight(disablePageHeader, enablePageTabs, hidePageTitle, token);
const pageHeaderHeight = getPageHeaderHeight(
disablePageHeader,
enablePageTabs,
hidePageTitle,
token,
location.pathname,
);
return navHeight + pageHeaderHeight + addBlockBtnHeight;
};
@ -92,16 +103,13 @@ const useTableHeight = () => {
const schema = useFieldSchema();
const heightProps = tableHeightProps || blockHeightProps;
const pageFullScreenHeight = useFullScreenHeight(heightProps);
const data = useDataBlockRequestData();
const { name } = useCollection();
const { count, pageSize } = (data as any)?.meta || ({} as any);
const hasPagination = count > pageSize;
const { heightMode, height, title } = heightProps;
if (!heightProps?.heightMode || heightMode === HeightMode.DEFAULT) {
return;
}
const hasTableActions = Object.keys(schema.parent.properties.actions?.properties || {}).length > 0;
const paginationHeight = hasPagination ? token.controlHeight + token.padding + token.marginLG : token.marginLG;
const paginationHeight = token.controlHeight + token.padding + token.marginLG;
const actionBarHeight = hasTableActions || designable ? token.controlHeight + 2 * token.marginLG : token.marginLG;
const tableHeaderHeight =
(designable && !InternalWorkflowCollection.includes(name) ? token.controlHeight : 22) + 2 * token.padding + 1;
@ -189,6 +197,7 @@ export const useTableSize = () => {
);
useEventListener('resize', calcTableSize);
return { height: targetHeight, width, tableSizeRefCallback };
};
@ -196,7 +205,7 @@ const hasActionContainerInParentChain = (schema) => {
if (!schema) return null;
if (schema['x-component'] === 'Action.Container') {
return true;
return schema?.parent['x-component-props']?.['openMode'] !== 'page';
}
return hasActionContainerInParentChain(schema.parent);
};