Skip to content

Commit 7ff240b

Browse files
committed
refactor: 移除更多已废弃的 API,包括 TabPane、rightContentRender、StatisticsCardProps 等
1 parent a18de31 commit 7ff240b

File tree

7 files changed

+12
-94
lines changed

7 files changed

+12
-94
lines changed

src/card/ProCard.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ export type ProCardProps = CardProps;
99
export type ProCardType = CardType & {
1010
isProCard: boolean;
1111
Divider: typeof Divider;
12-
TabPane: () => null;
1312
Group: typeof Group;
1413
};
1514

@@ -22,8 +21,7 @@ const ProCard = Card as ProCardType;
2221

2322
ProCard.isProCard = true;
2423
ProCard.Divider = Divider;
25-
// @deprecated TabPane 已废弃,请使用 tabs.items 属性
26-
ProCard.TabPane = () => null;
24+
2725
ProCard.Group = Group;
2826

2927
export default ProCard;

src/card/components/Card/index.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { LabelIconTip } from '../../../utils';
99
import type { Breakpoint, CardProps, Gutter } from '../../typing';
1010
import Actions from '../Actions';
1111
import Loading from '../Loading';
12-
import { useLegacyItems } from '../TabPane';
12+
1313
import useStyle from './style';
1414

1515
type ProCardChildType = React.ReactElement<CardProps, any>;
@@ -68,9 +68,8 @@ const Card = React.forwardRef((props: CardProps, ref: any) => {
6868

6969
// 顺序决定如何进行响应式取值,按最大响应值依次取值,请勿修改。
7070
const responsiveArray: Breakpoint[] = ['xxl', 'xl', 'lg', 'md', 'sm', 'xs'];
71-
// 修改组合传给antd tabs的参数
72-
// @ts-ignore
73-
const ModifyTabItemsContent = useLegacyItems(tabs?.items, children, tabs);
71+
// 直接使用 tabs.items,不再支持旧的 TabPane 写法
72+
const ModifyTabItemsContent = tabs?.items;
7473

7574
/**
7675
* 根据响应式获取 gutter, 参考 antd 实现

src/card/components/StatisticCard/index.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ export type StatisticCardProps = {
2020
footer?: React.ReactNode;
2121
} & CardProps;
2222

23-
/** @deprecated */
24-
export type StatisticsCardProps = StatisticCardProps;
25-
2623
const StatisticCard: React.FC<StatisticCardProps> & {
2724
Statistic: typeof Statistic;
2825
Divider: typeof Divider;

src/card/components/TabPane/index.tsx

Lines changed: 0 additions & 62 deletions
This file was deleted.

src/layout/components/GlobalHeader/ActionsContent.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import { useStyle } from './rightContentStyle';
1111
* @param param0
1212
*/
1313
export const ActionsContent: React.FC<GlobalHeaderProps> = ({
14-
rightContentRender,
1514
avatarProps,
1615
actionsRender,
1716
headerContentRender,
@@ -106,7 +105,7 @@ export const ActionsContent: React.FC<GlobalHeaderProps> = ({
106105
setRightSize(width);
107106
}, 160);
108107

109-
const contentRender = rightActionsRender || rightContentRender;
108+
const contentRender = rightActionsRender;
110109
return (
111110
<div
112111
className={`${prefixCls}-right-content ${hashId}`.trim()}

src/layout/components/GlobalHeader/index.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ export type GlobalHeaderProps = {
3333
menuRender?: WithFalse<
3434
(props: HeaderViewProps, defaultDom: React.ReactNode) => React.ReactNode
3535
>;
36-
/**
37-
* @deprecated
38-
* 使用 actionsRender 和 avatarProps 代替
39-
*/
40-
rightContentRender?: WithFalse<(props: HeaderViewProps) => React.ReactNode>;
36+
4137
className?: string;
4238
prefixCls?: string;
4339
/** 相关品牌的列表 */
@@ -103,7 +99,6 @@ const GlobalHeader: React.FC<GlobalHeaderProps & PrivateSiderMenuProps> = (
10399
logo,
104100
collapsed,
105101
onCollapse,
106-
rightContentRender,
107102
menuHeaderRender,
108103
onMenuHeaderClick,
109104
className: propClassName,
@@ -174,8 +169,8 @@ const GlobalHeader: React.FC<GlobalHeaderProps & PrivateSiderMenuProps> = (
174169
</>
175170
)}
176171
<div style={{ flex: 1 }}>{children}</div>
177-
{(rightContentRender || props.actionsRender || props.avatarProps) && (
178-
<ActionsContent rightContentRender={rightContentRender} {...props} />
172+
{(props.actionsRender || props.avatarProps) && (
173+
<ActionsContent {...props} />
179174
)}
180175
</div>,
181176
);

src/provider/typing/layoutToken.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,7 @@ export type BaseLayoutDesignToken = {
7474
* pageContainer 的背景颜色
7575
*/
7676
colorBgPageContainer: string;
77-
/**
78-
* pageContainer 自带的 margin inline
79-
* @deprecated 请使用 paddingInlinePageContainerContent
80-
*/
81-
marginInlinePageContainerContent: number;
82-
/**
83-
* pageContainer 自带的 margin block
84-
* @deprecated 请使用 paddingBlockPageContainerContent
85-
*/
86-
marginBlockPageContainerContent: number;
77+
8778
/**
8879
* pageContainer 自带的 padding inline
8980
*/
@@ -164,9 +155,10 @@ export const getLayoutDesignToken: (
164155
pageContainer: {
165156
colorBgPageContainer: 'transparent',
166157
paddingInlinePageContainerContent:
167-
finalDesignTokens.pageContainer?.marginInlinePageContainerContent || 40,
158+
finalDesignTokens.pageContainer?.paddingInlinePageContainerContent ||
159+
40,
168160
paddingBlockPageContainerContent:
169-
finalDesignTokens.pageContainer?.marginBlockPageContainerContent || 32,
161+
finalDesignTokens.pageContainer?.paddingBlockPageContainerContent || 32,
170162
colorBgPageContainerFixed: antdToken.colorBgElevated,
171163
...finalDesignTokens.pageContainer,
172164
},

0 commit comments

Comments
 (0)