Browse Source

fix button list rule

pull/39/merge
ddcat1115 9 years ago
parent
commit
9b55900dc4
  1. 12
      src/components/PageHeader/demo/standard.md
  2. 6
      src/components/PageHeader/index.less
  3. 15
      src/routes/Profile/AdvancedProfile.js

12
src/components/PageHeader/demo/standard.md

@ -8,9 +8,10 @@ title: Standard
````jsx ````jsx
import PageHeader from 'ant-design-pro/lib/PageHeader'; import PageHeader from 'ant-design-pro/lib/PageHeader';
import DescriptionList from 'ant-design-pro/lib/DescriptionList'; import DescriptionList from 'ant-design-pro/lib/DescriptionList';
import { Button, Menu, Icon, Row, Col } from 'antd'; import { Button, Menu, Dropdown, Icon, Row, Col } from 'antd';
const { Description } = DescriptionList; const { Description } = DescriptionList;
const ButtonGroup = Button.Group;
const description = ( const description = (
<DescriptionList col="2"> <DescriptionList col="2">
@ -31,8 +32,13 @@ const menu = (
const action = ( const action = (
<div> <div>
<Button>操作</Button> <ButtonGroup>
<Button>操作</Button> <Button>操作</Button>
<Button>操作</Button>
<Dropdown overlay={menu} placement="bottomRight">
<Button><Icon type="ellipsis" /></Button>
</Dropdown>
</ButtonGroup>
<Button type="primary">主操作</Button> <Button type="primary">主操作</Button>
</div> </div>
); );

6
src/components/PageHeader/index.less

@ -118,10 +118,14 @@
.pageHeader { .pageHeader {
.action { .action {
:global { :global {
.ant-btn-group, :not(.ant-btn-group) .ant-btn { .ant-btn-group, .ant-btn {
display: block; display: block;
margin-bottom: 8px; margin-bottom: 8px;
} }
.ant-btn-group > .ant-btn {
display: inline-block;
margin-bottom: 0;
}
} }
} }
} }

15
src/routes/Profile/AdvancedProfile.js

@ -10,6 +10,7 @@ import styles from './AdvancedProfile.less';
const { Step } = Steps; const { Step } = Steps;
const { Description } = DescriptionList; const { Description } = DescriptionList;
const ButtonGroup = Button.Group;
const getWindowWidth = () => (window.innerWidth || document.documentElement.clientWidth); const getWindowWidth = () => (window.innerWidth || document.documentElement.clientWidth);
@ -23,13 +24,13 @@ const menu = (
const action = ( const action = (
<div> <div>
<Button>操作</Button> <ButtonGroup>
<Button>操作</Button> <Button>操作</Button>
<Dropdown overlay={menu}> <Button>操作</Button>
<Button> <Dropdown overlay={menu} placement="bottomRight">
更多 <Icon type="down" /> <Button><Icon type="ellipsis" /></Button>
</Button> </Dropdown>
</Dropdown> </ButtonGroup>
<Button type="primary">主操作</Button> <Button type="primary">主操作</Button>
</div> </div>
); );

Loading…
Cancel
Save