mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-08-06 16:06:28 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Merge pull request #24018 from ant-design/master

Browse Source 
chore: Feature merge master
This commit is contained in:
二货机器人 2020-05-10 18:42:00 +08:00 committed by GitHub
commit 1cf1a15d50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 300 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

450
components/drawer/__tests__/__snapshots__/demo.test.js.snap
View File

@ -1,172 +1,164 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP // Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`renders ./components/drawer/demo/basic-right.md correctly 1`] = ` exports[`renders ./components/drawer/demo/basic-right.md correctly 1`] = `
<div> <button
<button class="ant-btn ant-btn-primary"
class="ant-btn ant-btn-primary" type="button"
type="button" >
> <span>
<span> Open
Open </span>
</span> </button>
</button>
</div>
`; `;
exports[`renders ./components/drawer/demo/form-in-drawer.md correctly 1`] = ` exports[`renders ./components/drawer/demo/form-in-drawer.md correctly 1`] = `
<div> <button
<button class="ant-btn ant-btn-primary"
class="ant-btn ant-btn-primary" type="button"
type="button" >
<span
aria-label="plus"
class="anticon anticon-plus"
role="img"
> >
<span <svg
aria-label="plus" aria-hidden="true"
class="anticon anticon-plus" class=""
role="img" data-icon="plus"
fill="currentColor"
focusable="false"
height="1em"
viewBox="64 64 896 896"
width="1em"
> >
<svg <defs />
aria-hidden="true" <path
class="" d="M482 152h60q8 0 8 8v704q0 8-8 8h-60q-8 0-8-8V160q0-8 8-8z"
data-icon="plus" />
fill="currentColor" <path
focusable="false" d="M176 474h672q8 0 8 8v60q0 8-8 8H176q-8 0-8-8v-60q0-8 8-8z"
height="1em" />
viewBox="64 64 896 896" </svg>
width="1em" </span>
> <span>
<defs /> New account
<path </span>
d="M482 152h60q8 0 8 8v704q0 8-8 8h-60q-8 0-8-8V160q0-8 8-8z" </button>
/>
<path
d="M176 474h672q8 0 8 8v60q0 8-8 8H176q-8 0-8-8v-60q0-8 8-8z"
/>
</svg>
</span>
<span>
New account
</span>
</button>
</div>
`; `;
exports[`renders ./components/drawer/demo/multi-level-drawer.md correctly 1`] = ` exports[`renders ./components/drawer/demo/multi-level-drawer.md correctly 1`] = `
<div> <button
<button class="ant-btn ant-btn-primary"
class="ant-btn ant-btn-primary" type="button"
type="button" >
> <span>
<span> Open drawer
Open drawer </span>
</span> </button>
</button>
</div>
`; `;
exports[`renders ./components/drawer/demo/placement.md correctly 1`] = ` exports[`renders ./components/drawer/demo/placement.md correctly 1`] = `
<div> <div
class="ant-space ant-space-horizontal ant-space-align-center"
>
<div <div
class="ant-space ant-space-horizontal ant-space-align-center" class="ant-space-item"
style="margin-right:8px"
> >
<div <div
class="ant-space-item" class="ant-radio-group ant-radio-group-outline"
style="margin-right:8px"
> >
<div <label
class="ant-radio-group ant-radio-group-outline" class="ant-radio-wrapper"
> >
<label <span
class="ant-radio-wrapper" class="ant-radio"
> >
<input
class="ant-radio-input"
type="radio"
value="top"
/>
<span <span
class="ant-radio" class="ant-radio-inner"
> />
<input
class="ant-radio-input"
type="radio"
value="top"
/>
<span
class="ant-radio-inner"
/>
</span>
<span>
top
</span>
</label>
<label
class="ant-radio-wrapper"
>
<span
class="ant-radio"
>
<input
class="ant-radio-input"
type="radio"
value="right"
/>
<span
class="ant-radio-inner"
/>
</span>
<span>
right
</span>
</label>
<label
class="ant-radio-wrapper"
>
<span
class="ant-radio"
>
<input
class="ant-radio-input"
type="radio"
value="bottom"
/>
<span
class="ant-radio-inner"
/>
</span>
<span>
bottom
</span>
</label>
<label
class="ant-radio-wrapper ant-radio-wrapper-checked"
>
<span
class="ant-radio ant-radio-checked"
>
<input
checked=""
class="ant-radio-input"
type="radio"
value="left"
/>
<span
class="ant-radio-inner"
/>
</span>
<span>
left
</span>
</label>
</div>
</div>
<div
class="ant-space-item"
>
<button
class="ant-btn ant-btn-primary"
type="button"
>
<span>
Open
</span> </span>
</button> <span>
top
</span>
</label>
<label
class="ant-radio-wrapper"
>
<span
class="ant-radio"
>
<input
class="ant-radio-input"
type="radio"
value="right"
/>
<span
class="ant-radio-inner"
/>
</span>
<span>
right
</span>
</label>
<label
class="ant-radio-wrapper"
>
<span
class="ant-radio"
>
<input
class="ant-radio-input"
type="radio"
value="bottom"
/>
<span
class="ant-radio-inner"
/>
</span>
<span>
bottom
</span>
</label>
<label
class="ant-radio-wrapper ant-radio-wrapper-checked"
>
<span
class="ant-radio ant-radio-checked"
>
<input
checked=""
class="ant-radio-input"
type="radio"
value="left"
/>
<span
class="ant-radio-inner"
/>
</span>
<span>
left
</span>
</label>
</div> </div>
</div> </div>
<div
class="ant-space-item"
>
<button
class="ant-btn ant-btn-primary"
type="button"
>
<span>
Open
</span>
</button>
</div>
</div> </div>
`; `;
@ -233,113 +225,111 @@ exports[`renders ./components/drawer/demo/render-in-current.md correctly 1`] = `
`; `;
exports[`renders ./components/drawer/demo/user-profile.md correctly 1`] = ` exports[`renders ./components/drawer/demo/user-profile.md correctly 1`] = `
<div> <div
class="ant-list ant-list-split ant-list-bordered"
>
<div <div
class="ant-list ant-list-split ant-list-bordered" class="ant-spin-nested-loading"
> >
<div <div
class="ant-spin-nested-loading" class="ant-spin-container"
> >
<div <ul
class="ant-spin-container" class="ant-list-items"
> >
<ul <li
class="ant-list-items" class="ant-list-item"
> >
<li <div
class="ant-list-item" class="ant-list-item-meta"
> >
<div <div
class="ant-list-item-meta" class="ant-list-item-meta-avatar"
> >
<div <span
class="ant-list-item-meta-avatar" class="ant-avatar ant-avatar-circle ant-avatar-image"
> >
<span <img
class="ant-avatar ant-avatar-circle ant-avatar-image" src="https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png"
> />
<img </span>
src="https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png" </div>
/> <div
</span> class="ant-list-item-meta-content"
</div> >
<div <h4
class="ant-list-item-meta-content" class="ant-list-item-meta-title"
> >
<h4 <a
class="ant-list-item-meta-title" href="https://ant.design/index-cn"
> >
<a Lily
href="https://ant.design/index-cn" </a>
> </h4>
Lily <div
</a> class="ant-list-item-meta-description"
</h4> >
<div Progresser XTech
class="ant-list-item-meta-description"
>
Progresser XTech
</div>
</div> </div>
</div> </div>
<ul </div>
class="ant-list-item-action" <ul
> class="ant-list-item-action"
<li> >
<a> <li>
View Profile <a>
</a> View Profile
</li> </a>
</ul> </li>
</li> </ul>
<li </li>
class="ant-list-item" <li
class="ant-list-item"
>
<div
class="ant-list-item-meta"
> >
<div <div
class="ant-list-item-meta" class="ant-list-item-meta-avatar"
> >
<div <span
class="ant-list-item-meta-avatar" class="ant-avatar ant-avatar-circle ant-avatar-image"
> >
<span <img
class="ant-avatar ant-avatar-circle ant-avatar-image" src="https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png"
> />
<img </span>
src="https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png" </div>
/> <div
</span> class="ant-list-item-meta-content"
</div> >
<div <h4
class="ant-list-item-meta-content" class="ant-list-item-meta-title"
> >
<h4 <a
class="ant-list-item-meta-title" href="https://ant.design/index-cn"
> >
<a Lily
href="https://ant.design/index-cn" </a>
> </h4>
Lily <div
</a> class="ant-list-item-meta-description"
</h4> >
<div Progresser XTech
class="ant-list-item-meta-description"
>
Progresser XTech
</div>
</div> </div>
</div> </div>
<ul </div>
class="ant-list-item-action" <ul
> class="ant-list-item-action"
<li> >
<a> <li>
View Profile <a>
</a> View Profile
</li> </a>
</ul> </li>
</li> </ul>
</ul> </li>
</div> </ul>
</div> </div>
</div> </div>
</div> </div>

4
components/drawer/demo/basic-right.md
View File

@ -33,7 +33,7 @@ class App extends React.Component {
render() { render() {
return ( return (
<div> <>
<Button type="primary" onClick={this.showDrawer}> <Button type="primary" onClick={this.showDrawer}>
Open Open
</Button> </Button>
@ -48,7 +48,7 @@ class App extends React.Component {
<p>Some contents...</p> <p>Some contents...</p>
<p>Some contents...</p> <p>Some contents...</p>
</Drawer> </Drawer>
</div> </>
); );
} }
} }

9
components/drawer/demo/form-in-drawer.md
View File

@ -36,7 +36,7 @@ class DrawerForm extends React.Component {
render() { render() {
return ( return (
<div> <>
<Button type="primary" onClick={this.showDrawer}> <Button type="primary" onClick={this.showDrawer}>
<PlusOutlined /> New account <PlusOutlined /> New account
</Button> </Button>
@ -52,10 +52,7 @@ class DrawerForm extends React.Component {
textAlign: 'right', textAlign: 'right',
}} }}
> >
<Button <Button onClick={this.onClose} style={{ marginRight: 8 }}>
onClick={this.onClose}
style={{ marginRight: 8 }}
>
Cancel Cancel
</Button> </Button>
<Button onClick={this.onClose} type="primary"> <Button onClick={this.onClose} type="primary">
@ -160,7 +157,7 @@ class DrawerForm extends React.Component {
</Row> </Row>
</Form> </Form>
</Drawer> </Drawer>
</div> </>
); );
} }
} }

4
components/drawer/demo/multi-level-drawer.md
View File

@ -45,7 +45,7 @@ class App extends React.Component {
render() { render() {
return ( return (
<div> <>
<Button type="primary" onClick={this.showDrawer}> <Button type="primary" onClick={this.showDrawer}>
Open drawer Open drawer
</Button> </Button>
@ -69,7 +69,7 @@ class App extends React.Component {
This is two-level drawer This is two-level drawer
</Drawer> </Drawer>
</Drawer> </Drawer>
</div> </>
); );
} }
} }

12
components/drawer/demo/placement.md
View File

@ -40,10 +40,11 @@ class App extends React.Component {
}; };
render() { render() {
const { placement, visible } = this.state;
return ( return (
<div> <>
<Space> <Space>
<RadioGroup defaultValue={this.state.placement} onChange={this.onChange}> <RadioGroup defaultValue={placement} onChange={this.onChange}>
<Radio value="top">top</Radio> <Radio value="top">top</Radio>
<Radio value="right">right</Radio> <Radio value="right">right</Radio>
<Radio value="bottom">bottom</Radio> <Radio value="bottom">bottom</Radio>
@ -55,16 +56,17 @@ class App extends React.Component {
</Space> </Space>
<Drawer <Drawer
title="Basic Drawer" title="Basic Drawer"
placement={this.state.placement} placement={placement}
closable={false} closable={false}
onClose={this.onClose} onClose={this.onClose}
visible={this.state.visible} visible={visible}
key={placement}
> >
<p>Some contents...</p> <p>Some contents...</p>
<p>Some contents...</p> <p>Some contents...</p>
<p>Some contents...</p> <p>Some contents...</p>
</Drawer> </Drawer>
</div> </>
); );
} }
} }

8
components/drawer/demo/render-in-current.md
View File

@ -61,14 +61,14 @@ ReactDOM.render(<App />, mountNode);
```css ```css
.site-drawer-render-in-current-wrapper { .site-drawer-render-in-current-wrapper {
height: 200px;
overflow: hidden;
position: relative; position: relative;
border: 1px solid #ebedf0; height: 200px;
border-radius: 2px;
padding: 48px; padding: 48px;
overflow: hidden;
text-align: center; text-align: center;
background: #fafafa; background: #fafafa;
border: 1px solid #ebedf0;
border-radius: 2px;
} }
``` ```

12
components/drawer/demo/user-profile.md
View File

@ -40,7 +40,7 @@ class App extends React.Component {
render() { render() {
return ( return (
<div> <>
<List <List
dataSource={[ dataSource={[
{ {
@ -162,7 +162,7 @@ class App extends React.Component {
</Col> </Col>
</Row> </Row>
</Drawer> </Drawer>
</div> </>
); );
} }
} }
@ -172,10 +172,10 @@ ReactDOM.render(<App />, mountNode);
```css ```css
.site-description-item-profile-wrapper { .site-description-item-profile-wrapper {
margin-bottom: 7px;
color: rgba(0, 0, 0, 0.65); color: rgba(0, 0, 0, 0.65);
font-size: 14px; font-size: 14px;
line-height: 1.5715; line-height: 1.5715;
margin-bottom: 7px;
} }
[data-theme='compact'] .site-description-item-profile-wrapper { [data-theme='compact'] .site-description-item-profile-wrapper {
@ -184,11 +184,11 @@ ReactDOM.render(<App />, mountNode);
} }
.ant-drawer-body p.site-description-item-profile-p { .ant-drawer-body p.site-description-item-profile-p {
display: block;
margin-bottom: 16px;
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
font-size: 16px; font-size: 16px;
line-height: 1.5715; line-height: 1.5715;
display: block;
margin-bottom: 16px;
} }
[data-theme='compact'] .ant-drawer-body p.site-description-item-profile-p { [data-theme='compact'] .ant-drawer-body p.site-description-item-profile-p {
@ -197,8 +197,8 @@ ReactDOM.render(<App />, mountNode);
} }
.site-description-item-profile-p-label { .site-description-item-profile-p-label {
margin-right: 8px;
display: inline-block; display: inline-block;
margin-right: 8px;
color: rgba(0, 0, 0, 0.85); color: rgba(0, 0, 0, 0.85);
} }
``` ```

2
components/table/demo/drag-sorting.md
View File

@ -19,7 +19,7 @@ import { DndProvider, useDrag, useDrop } from 'react-dnd';
import HTML5Backend from 'react-dnd-html5-backend'; import HTML5Backend from 'react-dnd-html5-backend';
import update from 'immutability-helper'; import update from 'immutability-helper';
const type = 'DragbleBodyRow'; const type = 'DragableBodyRow';
const DragableBodyRow = ({ index, moveRow, className, style, ...restProps }) => { const DragableBodyRow = ({ index, moveRow, className, style, ...restProps }) => {
const ref = React.useRef(); const ref = React.useRef();

108
docs/react/i18n.en-US.md
View File

@ -26,60 +26,60 @@ Note: `fr_FR` is the filename, follow below.
Supported languages: Supported languages:
| Language | Filename | | Language | Filename |
| --------------------- | -------- | | ------------------------ | -------- |
| Arabic | ar_EG | | Arabic | ar_EG |
| Azerbaijani | az_AZ | | Azerbaijani | az_AZ |
| Bulgarian | bg_BG | | Bulgarian | bg_BG |
| Catalan | ca_ES | | Catalan | ca_ES |
| Czech | cs_CZ | | Czech | cs_CZ |
| Danish | da_DK | | Danish | da_DK |
| German | de_DE | | German | de_DE |
| Greek | el_GR | | Greek | el_GR |
| English (Global) | en_GB | | English (United Kingdom) | en_GB |
| English | en_US | | English | en_US |
| Spanish | es_ES | | Spanish | es_ES |
| Estonian | et_EE | | Estonian | et_EE |
| Persian | fa_IR | | Persian | fa_IR |
| Finnish | fi_FI | | Finnish | fi_FI |
| French (Belgium) | fr_BE | | French (Belgium) | fr_BE |
| French (France) | fr_FR | | French (France) | fr_FR |
| Hebrew | he_IL | | Hebrew | he_IL |
| Hindi | hi_IN | | Hindi | hi_IN |
| Croatian | hr_HR | | Croatian | hr_HR |
| Hungarian | hu_HU | | Hungarian | hu_HU |
| Armenian | hy_AM | | Armenian | hy_AM |
| Indonesian | id_ID | | Indonesian | id_ID |
| Italian | it_IT | | Italian | it_IT |
| Icelandic | is_IS | | Icelandic | is_IS |
| Japanese | ja_JP | | Japanese | ja_JP |
| Kurdish (Iraq) | ku_IQ | | Kurdish (Iraq) | ku_IQ |
| Kannada | kn_IN | | Kannada | kn_IN |
| Korean | ko_KR | | Korean | ko_KR |
| Latvian | lv_LV | | Latvian | lv_LV |
| Macedonian | mk_MK | | Macedonian | mk_MK |
| Mongolian | mn_MN | | Mongolian | mn_MN |
| Malay (Malaysia) | ms_MY | | Malay (Malaysia) | ms_MY |
| Norwegian | nb_NO | | Norwegian | nb_NO |
| Nepal | ne_NP | | Nepal | ne_NP |
| Dutch (Belgium) | nl_BE | | Dutch (Belgium) | nl_BE |
| Dutch | nl_NL | | Dutch | nl_NL |
| Polish | pl_PL | | Polish | pl_PL |
| Portuguese (Brazil) | pt_BR | | Portuguese (Brazil) | pt_BR |
| Portuguese | pt_PT | | Portuguese | pt_PT |
| Romanian | ro_RO | | Romanian | ro_RO |
| Russian | ru_RU | | Russian | ru_RU |
| Slovak | sk_SK | | Slovak | sk_SK |
| Serbian | sr_RS | | Serbian | sr_RS |
| Slovenian | sl_SI | | Slovenian | sl_SI |
| Swedish | sv_SE | | Swedish | sv_SE |
| Tamil | ta_IN | | Tamil | ta_IN |
| Thai | th_TH | | Thai | th_TH |
| Turkish | tr_TR | | Turkish | tr_TR |
| Ukrainian | uk_UA | | Ukrainian | uk_UA |
| Vietnamese | vi_VN | | Vietnamese | vi_VN |
| Chinese (Simplified) | zh_CN | | Chinese (Simplified) | zh_CN |
| Chinese (Traditional) | zh_TW | | Chinese (Traditional) | zh_TW |
See usage and ways to contribute a new locale package at [ConfigProvider](/components/config-provider). See usage and ways to contribute a new locale package at [ConfigProvider](/components/config-provider).

2
docs/react/use-with-create-react-app.zh-CN.md
View File

@ -60,7 +60,7 @@ $ yarn add antd
```jsx ```jsx
import React from 'react'; import React from 'react';
import { Button } from 'antd'; import Button from 'antd/es/button';
import './App.css'; import './App.css';
const App = () => ( const App = () => (