Merge branch 'master' into feat-1.3.0

pull/398/head
tangjinzhou 2019-01-10 20:47:35 +08:00
commit dcefca22a4
11 changed files with 37 additions and 12 deletions

View File

@ -69,6 +69,20 @@ $ yarn add ant-design-vue
- [Vue官方文档](https://cn.vuejs.org/)
- [Antd React](http://ant.design/)
## 生态
| Project | Description |
|----------|-------------|
| [vue-ref](https://github.com/vueComponent/vue-ref) | 您可以使用回调来获取组件的引用类似react |
| [ant-design-vue-helper](https://marketplace.visualstudio.com/items?itemName=ant-design-vue.vscode-ant-design-vue-helper) | ant-design-vue的vscode扩展 |
| [vue-cli-plugin-ant-design](https://github.com/vueComponent/vue-cli-plugin-ant-design) | 使用vue-cli3快速使用ant-design-vue组件库 |
| [vue-dash-event](https://github.com/vueComponent/vue-dash-event) | 在DOM模板中您可以使用ant-design-vue组件的自定义事件camelCase |
## 问答
> 强烈推荐阅读 [《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way)、[《如何向开源社区提问题》](https://github.com/seajs/seajs/issues/545) 和 [《如何有效地报告 Bug》](http://www.chiark.greenend.org.uk/%7Esgtatham/bugs-cn.html)、[《如何向开源项目提交无法解答的问题》](https://zhuanlan.zhihu.com/p/25795393),更好的问题更容易获得帮助。
[![Let's fund issues in this repository](https://issuehunt.io/static/embed/issuehunt-button-v1.svg)](https://issuehunt.io/repos/104172832)
## 赞助
ant-design-vue是MIT协议的开源项目。为了项目能够更好的持续的发展我们期望获得更多的[支持者](https://github.com/vueComponent/ant-design-vue/blob/master/BACKERS.md),你可以通过如下任何一种方式支持我们:

View File

@ -69,6 +69,15 @@ If you are in a bad network environmentyou can try other registries and tools
- [Vue](https://vuejs.org/)
- [Ant Design React](http://ant.design/)
## Ecosystem
| Project | Description |
|----------|-------------|
| [vue-ref](https://github.com/vueComponent/vue-ref) | You can use the callback to get a reference like react |
| [ant-design-vue-helper](https://marketplace.visualstudio.com/items?itemName=ant-design-vue.vscode-ant-design-vue-helper) | A vscode extension for ant-design-vue |
| [vue-cli-plugin-ant-design](https://github.com/vueComponent/vue-cli-plugin-ant-design) | Vue-cli 3 plugin to add ant-design-vue |
| [vue-dash-event](https://github.com/vueComponent/vue-dash-event) | The library function, implemented in the DOM template, can use the custom event of the ant-design-vue component (camelCase) |
## Donation
ant-design-vue is an MIT-licensed open source project. In order to achieve better and sustainable development of the project, we expect to gain more [backers](https://github.com/vueComponent/ant-design-vue/blob/master/BACKERS.md). You can support us in any of the following ways:
@ -112,3 +121,4 @@ Become a sponsor and get your logo on our README on Github with a link to your s
<a href="https://opencollective.com/ant-design-vue/sponsor/10/website" target="_blank"><img src="https://opencollective.com/ant-design-vue/sponsor/10/avatar.svg"></a>
[![Let's fund issues in this repository](https://issuehunt.io/static/embed/issuehunt-button-v1.svg)](https://issuehunt.io/repos/104172832)

View File

@ -26,8 +26,7 @@ customize the progress dot by setting a scoped slot
| defaultValue | The date selected by default | [moment](http://momentjs.com/) | default date |
| disabledDate | Function that specifies the dates that cannot be selected | (currentDate: moment) => boolean | - |
| fullscreen | Whether to display in full-screen | boolean | `true` |
| locale | The calendar's locale | object | [default]
(https://github.com/vueComponent/ant-design-vue/blob/master/components/date-picker/locale/example.json) |
| locale | The calendar's locale | object | [default](https://github.com/vueComponent/ant-design-vue/blob/master/components/date-picker/locale/example.json) |
| mode | The display mode of the calendar | `month` \| `year` | `month` |
| monthCellRender | Customize the display of the month cell by setting a scoped slot, the returned content will be appended to the cell | function(date: moment) | - |
| monthFullCellRender | Customize the display of the month cell by setting a scoped slot, the returned content will override the cell | function(date: moment) | - |

View File

@ -24,7 +24,7 @@ const md = {
`,
us: `# Card
Simple rectangular container.
##When To Use
## When To Use
A card can be used to display content related to a single subject. The content can consist of multiple elements of varying types and sizes.
## Examples
`,

View File

@ -19,11 +19,13 @@ const md = {
- '手风琴' 是一种特殊的折叠面板只允许单个内容区域展开
## 代码演示`,
us: `# When To Use
us: `# Collapse
A content area which can be collapsed and expanded.
## When To Use
- Can be used to group or hide complex regions to keep the page clean.
- 'Accordion' is a special kind of 'Collapse', which allows only one panel to be expanded at a time.
## Examples
## Examples
`,
}
export default {

View File

@ -2,7 +2,6 @@
| Property | Description | Type | Default |
| -------- | ----------- | ---- | ------- |
| --- | --- | --- | --- |
| closable | Whether a close (x) button is visible on top right of the Drawer dialog or not. | boolean | true |
| destroyOnClose | Whether to unmount child components on closing drawer or not. | boolean | false |
| getContainer | Return the mounted node for Drawer. | HTMLElement \| `() => HTMLElement` \| Selectors | 'body' |

View File

@ -4,7 +4,7 @@
| Param | Description | Type | Default value |
| ----- | ----------- | ---- | ------------- |
| content | Content of the card | string\|slot\|vNode | - |
| title | Title of the card | string\|slot\VNode | - |
| title | Title of the card | string\|slot\|VNode | - |
Consult [Tooltip's documentation](/ant-design-vue/components/tooltip/#API) to find more APIs.

View File

@ -22,6 +22,8 @@ const md = {
- 当需要显示一个操作完成的百分比时
## 代码演示`,
us: `# Progress
Display the current progress of an operation flow.
## When To Use
If it will take a long time to complete an operation, you can use \`Progress\` to show the current progress and status.
- When an operation will interrupt the current interface, or it needs to run in the background for more than 2 seconds.

View File

@ -17,7 +17,7 @@ const md = {
- 当有一系列信息需按时间排列时可正序和倒序
- 需要有一条时间轴进行视觉上的串联时
## 代码演示`,
us: `# Data Display
us: `# Timeline
Vertical display timeline.
## When To Use
- When a series of information needs to be ordered by time (ascend or descend).

View File

@ -81,7 +81,7 @@ export default {
display: 'inline-block', // default inline-block is important
...picked,
cursor: 'not-allowed',
width: isAntBtn && ele.componentOptions.propsData.disabled ? '100%' : null,
width: isAntBtn && ele.componentOptions.propsData.block ? '100%' : null,
}
const buttonStyle = {
...omitted,

View File

@ -7,9 +7,8 @@
&-notice {
padding: 7px 20px 7px 10px;
border-radius: 3px 3px;
border: 1px solid #999;;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
border: 0px solid rgba(0, 0, 0, 0);;
border: 0px solid rgba(0, 0, 0, 0);
background: #fff;
display: block;
width: auto;
@ -93,4 +92,4 @@
opacity: 0;
}
}
}
}