mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-01-18 06:03:38 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Merge branch "1.x-stable"

Browse Source
This commit is contained in:
afc163 2016-09-08 15:17:39 +08:00
commit bab669d17d
15 changed files with 46 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/CONTRIBUTING.md vendored
View File

@ -13,7 +13,7 @@ The following guidelines are about *How to avoid Homework Questions*.
### 1. Read the documentation.
It sad but true that someone just glance(not read) [Ant Design's documentation](http://ant.design/). Please read the documentation closely. What's more, you can modify and run our demo with [CodePen](http://codepen.io/anon/pen/wGOWGW?editors=001). It's helpful to understand our documentation.
It sad but true that someone just glance(not read) [Ant Design's documentation](http://ant.design/). Please read the documentation closely. What's more, you can modify and run our demo with [CodePen](http://codepen.io/benjycui/pen/KgPZrE?editors=001). It's helpful to understand our documentation.
Tips: choose the corresponding documentation with versions selector which in the bottom-right corner.
@ -36,7 +36,7 @@ It is a good habit which will save maintainers' time. Thank you!
## Providing a demo while reporting a bug
It would be helpful to provide a demo which can re-produce the bug 100%. Please fork this [CodePen](http://codepen.io/anon/pen/wGOWGW?editors=001) and re-produce the bug you met. Then, create an issue. The most important thing is: double check before claiming that you have found a bug.
It would be helpful to provide a demo which can re-produce the bug 100%. Please fork this [CodePen](http://codepen.io/benjycui/pen/KgPZrE?editors=001) and re-produce the bug you met. Then, create an issue. The most important thing is: double check before claiming that you have found a bug.
## Tips about Feature Request

2
.github/ISSUE_TEMPLATE.md vendored
View File

@ -24,4 +24,4 @@
#### 可重现的在线演示
<!-- 请修改并 Fork http://codepen.io/anon/pen/wGOWGW?editors=001 -->
<!-- 请修改并 Fork http://codepen.io/benjycui/pen/KgPZrE?editors=001 -->

15
CHANGELOG.md
View File

@ -9,6 +9,21 @@ timeline: true
---
## 1.11.0
`2016-09-01`
- `Tooltip` `Popover` `Popconfirm` 修正默认对齐方式为边缘对齐，增加 arrowPointAtCenter 属性用于箭头指向中心的行为。[commit 977e2e3](https://github.com/ant-design/ant-design/commit/977e2e32fc40968846c8201ed72bdc3818375d2f)
- `Table`
- 移除数据中添加的 `indexForSort`。[#2501](https://github.com/ant-design/ant-design/issues/2501)
- 修复 `pagination` 属性中 `defaultPageSize` 不生效的问题。[#2874](https://github.com/ant-design/ant-design/issues/2874)
- 修复数据为空时固定列出现重复提示的问题。[#2812](https://github.com/ant-design/ant-design/issues/2812)
- 给树形子数据增加排序功能。[#2839](https://github.com/ant-design/ant-design/issues/2839)
- `InputNumber` 样式问题修复。[#2876](https://github.com/ant-design/ant-design/issues/2876)
- 修复手动导入 less 文件时 input error 样式被 focus 样式覆盖的问题。[#2916](https://github.com/ant-design/ant-design/issues/2916)
- index.d.ts 中补充了一些缺失的声明，修复 `Form` 中 typescript 语法检查报错的问题。[#2885](https://github.com/ant-design/ant-design/issues/2885)
- 升级 react-slick 依赖到 `0.13`。
## 1.10.0
`2016-08-20`

2
README-zh_CN.md
View File

@ -64,7 +64,7 @@ import 'antd/dist/antd.css'; // or 'antd/dist/antd.less'
- [版本发布手册](https://github.com/ant-design/ant-design/wiki/%E8%BD%AE%E5%80%BC%E8%A7%84%E5%88%99%E5%92%8C%E7%89%88%E6%9C%AC%E5%8F%91%E5%B8%83%E6%B5%81%E7%A8%8B)
- [社区贡献脚手架和范例](https://github.com/ant-design/ant-design/issues/129)
- [常见问题](https://github.com/ant-design/ant-design/wiki/FAQ)
- [CodePen 模板](http://codepen.io/anon/pen/wGOWGW?editors=001)
- [CodePen 模板](http://codepen.io/benjycui/pen/KgPZrE?editors=001)
- [Awesome Ant Design](https://github.com/websemantics/awesome-ant-design)

2
README.md
View File

@ -98,7 +98,7 @@ tsconfig.json
- [Versioning Release Note](https://github.com/ant-design/ant-design/wiki/%E8%BD%AE%E5%80%BC%E8%A7%84%E5%88%99%E5%92%8C%E7%89%88%E6%9C%AC%E5%8F%91%E5%B8%83%E6%B5%81%E7%A8%8B)
- [Boilerplates](https://github.com/ant-design/ant-design/issues/129)
- [FAQ](https://github.com/ant-design/ant-design/wiki/FAQ)
- [CodePen boilerplate](http://codepen.io/anon/pen/wGOWGW?editors=001) for bug reports
- [CodePen boilerplate](http://codepen.io/benjycui/pen/KgPZrE?editors=001) for bug reports
- [Awesome Ant Design](https://github.com/websemantics/awesome-ant-design)
## Contributing

6
components/date-picker/demo/start-end.md
View File

@ -1,6 +1,6 @@
---
order: 7
title:
title:
zh-CN: 日期范围一
en-US: Date range, case 1
---
@ -61,8 +61,6 @@ const DateRange = React.createClass({
<div>
<DatePicker
disabledDate={this.disabledStartDate}
showTime
format="yyyy-MM-dd HH:mm:ss"
value={this.state.startValue}
placeholder="开始日期"
onChange={this.onStartChange}
@ -70,8 +68,6 @@ const DateRange = React.createClass({
/>
<DatePicker
disabledDate={this.disabledEndDate}
showTime
format="yyyy-MM-dd HH:mm:ss"
value={this.state.endValue}
placeholder="结束日期"
onChange={this.onEndChange}

3
components/date-picker/index.en-US.md
View File

@ -31,7 +31,8 @@ By clicking the input box, you can select a date from a popup calendar.
| size | determine the size of the input box, the height of `large` and `small`, are 32px and 22px respectively, while default size is 28px | String | - |
| locale | localization configuration | Object | [default](https://github.com/ant-design/ant-design/issues/424) |
| onOk | a callback function, can be executed when OK-button is clicked | function(Date value) | - |
| toggleOpen | a callback function, can be executed whether the popup calendar is popped up or closed | function(status) | - |
| open | open state of picker | bool | - |
| toggleOpen | a callback function, can be executed whether the popup calendar is popped up or closed | function(open) | - |
| getCalendarContainer | to set the container of the floating layer, while the default is to create a `div` element in `body` | function(trigger) | - |
| showTime | to provide an additional time selection | Object/Boolean | [TimePicker Options](http://ant.design/components/time-picker/#api) |

3
components/date-picker/index.zh-CN.md
View File

@ -31,7 +31,8 @@ english: DatePicker
| popupStyle | 格外的弹出日历样式 | object | {} |
| size | 输入框大小，`large` 高度为 32px，`small` 为 22px，默认是 28px | string | 无 |
| locale | 国际化配置 | object | [默认配置](https://github.com/ant-design/ant-design/issues/424) |
| toggleOpen | 弹出日历和关闭日历的回调 | function(status) | 无 |
| open | 控制弹层是否展开 | bool | - |
| toggleOpen | 弹出日历和关闭日历的回调 | function(open) | 无 |
| getCalendarContainer | 定义浮层的容器，默认为 body 上新建 div | function(trigger) | 无 |
| showTime | 增加时间选择功能 | Object or Boolean | [TimePicker Options](http://ant.design/components/time-picker/#api) |

8
components/form/style/mixin.less
View File

@ -7,8 +7,12 @@
}
// 输入框的不同校验状态
.ant-input {
border-color: @border-color;
.active(@border-color);
&,
&:hover,
&:focus {
border-color: @border-color;
.active(@border-color);
}
&:not([disabled]):hover {
border-color: @border-color;

3
components/upload/index.zh-CN.md
View File

@ -60,8 +60,7 @@ english: Upload
response: '{"status": "success"}', // 服务端响应内容
}
```
如果上传控件是 multiple 时，此参数将为一个对象数组 `[file, ...]`。
> `antd@1.9.0` 之前，multiple 模式下，此参数为一个对象数组 `[file, ...]`，`antd@1.9.0` 开始无论是否多选，均为一个对象。
2. `fileList` 当前的文件列表。
3. `event` 上传中的服务端响应内容，包含了上传进度等信息，高级浏览器支持。

2
docs/react/getting-started.zh-CN.md
View File

@ -13,7 +13,7 @@ Ant Design React 致力于提供给程序员**愉悦**的开发体验。
最简单的使用方式参照以下 CodePen 演示，也推荐 Fork 本例来进行 `Bug Report`，注意不要在实际项目中这样使用。
- [antd CodePen](http://codepen.io/anon/pen/wGOWGW?editors=001)
- [antd CodePen](http://codepen.io/benjycui/pen/KgPZrE?editors=001)
## 标准开发

18
docs/react/install.zh-CN.md
View File

@ -32,23 +32,23 @@ $ npm install antd@beta --save
## 浏览器引入
我们在 npm 发布包内的 `antd/dist` 目录下提供了 `antd.js` `antd.css` 以及 `antd.min.js` `antd.min.css` 用于一次性引入所有的 antd 组件，也可以通过 [npmcdn](https://npmcdn.com/) 进行下载。
我们在 npm 发布包内的 `antd/dist` 目录下提供了 `antd.js` `antd.css` 以及 `antd.min.js` `antd.min.css` 用于一次性引入所有的 antd 组件，也可以通过 [UNPKG](https://unpkg.com/) 进行下载。
> 不推荐使用构建文件，因为难以获得底层依赖模块的 bug 快速修复支持。
#### stable
- https://npmcdn.com/antd/dist/antd.js
- https://npmcdn.com/antd/dist/antd.css
- https://npmcdn.com/antd/dist/antd.min.js
- https://npmcdn.com/antd/dist/antd.min.css
- https://unpkg.com/antd/dist/antd.js
- https://unpkg.com/antd/dist/antd.css
- https://unpkg.com/antd/dist/antd.min.js
- https://unpkg.com/antd/dist/antd.min.css
#### beta
- https://npmcdn.com/antd@beta/dist/antd.js
- https://npmcdn.com/antd@beta/dist/antd.css
- https://npmcdn.com/antd@beta/dist/antd.min.js
- https://npmcdn.com/antd@beta/dist/antd.min.css
- https://unpkg.com/antd@beta/dist/antd.js
- https://unpkg.com/antd@beta/dist/antd.css
- https://unpkg.com/antd@beta/dist/antd.min.js
- https://unpkg.com/antd@beta/dist/antd.min.css
> 对于 1.0 之前的版本，这里有一个 [自行构建的例子](https://github.com/ant-design/antd-init/tree/master/examples/build-antd-standalone) 以供参考。

2
docs/react/introduce.zh-CN.md
View File

@ -81,7 +81,7 @@ import 'antd/dist/antd.css'; // or 'antd/dist/antd.less'
- [设计规范速查手册](https://os.alipayobjects.com/rmsportal/HTXUgPGkyyxEivE.png)
- [社区贡献脚手架和范例](https://github.com/ant-design/ant-design/issues/129)
- [常见问题](https://github.com/ant-design/ant-design/wiki/FAQ)
- [CodePen 模板](http://codepen.io/anon/pen/wGOWGW?editors=001)
- [CodePen 模板](http://codepen.io/benjycui/pen/KgPZrE?editors=001)
- [Awesome Ant Design](https://github.com/websemantics/awesome-ant-design)
## 谁在使用

2
docs/resource/download.zh-CN.md
View File

@ -7,7 +7,7 @@ english: Download
这里提供 Ant Design 相关设计资源和设计工具的下载，更多设计资源正在整理和完善中。
<div class="resource-cards">
<a target="_blank" href="https://github.com/ant-design/ant-design/releases/download/resource/AntD_Library_V2.01.rplib" class="resource-card">
<a target="_blank" href="http://library.ant.design" class="resource-card">
<img src="https://os.alipayobjects.com/rmsportal/cnmjGfbBWUZPFiO.png">
<span class="resource-card-content">
<span class="resource-card-title">Ant Design Library v2.0.1</span>

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "antd",
"version": "1.10.0",
"version": "1.11.0",
"title": "Ant Design",
"description": "An enterprise-class UI design language and React-based implementation",
"homepage": "http://ant.design/",
@ -71,7 +71,7 @@
"rc-upload": "~2.0.3",
"rc-util": "~3.3.0",
"react-addons-pure-render-mixin": "^15.0.0",
"react-slick": "~0.12.0",
"react-slick": "~0.13.3",
"shallowequal": "^0.2.2",
"warning": "~3.0.0"
},