diff --git a/packages/ui/src/PageContainer/demo/basic.tsx b/packages/ui/src/PageContainer/demo/basic.tsx index b4bbc932c..b1b046000 100644 --- a/packages/ui/src/PageContainer/demo/basic.tsx +++ b/packages/ui/src/PageContainer/demo/basic.tsx @@ -1,17 +1,37 @@ /** * iframe: 600 */ -import React from 'react'; +import React, { useState } from 'react'; import { EllipsisOutlined } from '@oceanbase/icons'; -import { Button, Descriptions, Dropdown, Radio } from '@oceanbase/design'; +import { Button, Descriptions, Dropdown, Radio, message } from '@oceanbase/design'; import { PageContainer } from '@oceanbase/ui'; export default () => { + const [loading, setLoading] = useState(false); + + const mockRequest = () => { + const promise = new Promise(resolve => { + setTimeout(() => { + resolve(); + }, 1000); + }); + setLoading(true); + promise.then(() => { + setLoading(false); + message.success('刷新成功'); + }); + }; return ( { + mockRequest(); + }, + }, breadcrumb: { items: [ { diff --git a/packages/ui/src/PageContainer/demo/header-less.tsx b/packages/ui/src/PageContainer/demo/header-less.tsx index e18d5a68e..3563a36a6 100644 --- a/packages/ui/src/PageContainer/demo/header-less.tsx +++ b/packages/ui/src/PageContainer/demo/header-less.tsx @@ -84,7 +84,7 @@ export default () => { }, ]; return ( - + {reload && ( diff --git a/packages/ui/src/PageContainer/style/index.ts b/packages/ui/src/PageContainer/style/index.ts index 4140831b5..8e03cf5cb 100644 --- a/packages/ui/src/PageContainer/style/index.ts +++ b/packages/ui/src/PageContainer/style/index.ts @@ -31,7 +31,8 @@ export const genPageContainerStyle: GenerateStyle = ( }, [`${antCls}-page-header`]: { [`${antCls}-page-header-breadcrumb`]: { - marginBottom: 6, + // overwritten pro-components style + paddingBlockStart: 0, }, [`${antCls}-page-header-heading-title`]: { fontSize: fontSizeHeading3, @@ -62,8 +63,10 @@ export const genPageContainerStyle: GenerateStyle = ( }, // 减小内容区左右两侧间距 [`${componentCls}-warp-page-header`]: { - paddingInline: `${paddingLG}px !important`, - paddingBlock: `${padding}px !important`, + paddingInlineStart: paddingLG, + paddingInlineEnd: paddingLG, + paddingBlockStart: padding, + paddingBlockEnd: padding, }, [`${componentCls}-children-container`]: { paddingInline: paddingLG,