diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 2a113f14e3..f7c3a3ccef 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -17,6 +17,14 @@ If you want to read change logs before `2.0.0`, please visit [GitHub](https://gi
---
+## 2.12.5
+
+`2017-08-07`
+
+- Fix the `SelectPropTypes not found` issue under es mode. [#7123](https://github.com/ant-design/ant-design/issues/7123)
+- Fix Row no wrap issue. [4f73a23](https://github.com/ant-design/ant-design/commit/4f73a23a103733a3c148bb04013493a042f90a8f)
+- Fix broken style of InputNumber and RangePicker. [#7117](https://github.com/ant-design/ant-design/issues/7117) [#7126](https://github.com/ant-design/ant-design/issues/7126)
+
## 2.12.4
`2017-08-06`
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 3a5b5990a0..3e23a3a8b0 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -17,6 +17,14 @@ timeline: true
---
+## 2.12.5
+
+`2017-08-07`
+
+- 修复 ES 模式下报 `SelectPropTypes not found` 的问题。[#7123](https://github.com/ant-design/ant-design/issues/7123)
+- 修复 Row 在 flex 模式下元素不换行的问题。[4f73a23](https://github.com/ant-design/ant-design/commit/4f73a23a103733a3c148bb04013493a042f90a8f)
+- 修复 InputNumber 和 RangePicker 的样式问题。[#7117](https://github.com/ant-design/ant-design/issues/7117) [#7126](https://github.com/ant-design/ant-design/issues/7126)
+
## 2.12.4
`2017-08-06`
diff --git a/components/badge/style/index.less b/components/badge/style/index.less
index 54cc783caa..ad3ea7aa18 100644
--- a/components/badge/style/index.less
+++ b/components/badge/style/index.less
@@ -83,7 +83,7 @@
}
&-text {
color: @text-color;
- font-size: @badge-font-size;
+ font-size: @font-size-base;
margin-left: 8px;
}
}
diff --git a/components/card/__tests__/__snapshots__/demo.test.js.snap b/components/card/__tests__/__snapshots__/demo.test.js.snap
index 0f425d8e69..c9127ec532 100644
--- a/components/card/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/card/__tests__/__snapshots__/demo.test.js.snap
@@ -92,7 +92,7 @@ exports[`renders ./components/card/demo/grid-card.md correctly 1`] = `
- 卡片标题
+ Card Title
- 卡片内容
+ Content
- 卡片内容
+ Content
- 卡片内容
+ Content
- 卡片内容
+ Content
- 卡片内容
+ Content
- 卡片内容
+ Content
- 卡片内容
+ Content
diff --git a/components/card/demo/grid-card.md b/components/card/demo/grid-card.md
index 4f247d74e3..255fc63204 100644
--- a/components/card/demo/grid-card.md
+++ b/components/card/demo/grid-card.md
@@ -22,14 +22,14 @@ const gridStyle = {
};
ReactDOM.render(
-
- 卡片内容
- 卡片内容
- 卡片内容
- 卡片内容
- 卡片内容
- 卡片内容
- 卡片内容
+
+ Content
+ Content
+ Content
+ Content
+ Content
+ Content
+ Content
, mountNode);
````
diff --git a/components/card/style/index.less b/components/card/style/index.less
index 2a2ab520ea..6f3f59a69e 100644
--- a/components/card/style/index.less
+++ b/components/card/style/index.less
@@ -88,14 +88,14 @@
}
&-contain-grid &-body {
- margin: -0.5px;
+ margin: -1px 0 0 -1px;
padding: 0;
}
&-grid {
border-radius: 0;
border: 0;
- box-shadow: 0 0 0 0.5px @border-color-split, 0 0 0 0.5px @border-color-split inset;
+ box-shadow: 1px 0 0 0 @border-color-split, 0 1px 0 0 @border-color-split, 1px 1px 0 0 @border-color-split, 1px 0 0 0 @border-color-split inset, 0 1px 0 0 @border-color-split inset;
width: 33.33%;
float: left;
padding: @card-padding-base;
diff --git a/components/date-picker/style/Picker.less b/components/date-picker/style/Picker.less
index 9b0fb5b916..650525e673 100644
--- a/components/date-picker/style/Picker.less
+++ b/components/date-picker/style/Picker.less
@@ -36,7 +36,7 @@
&-input {
outline: none;
- display: block;
+ vertical-align: top;
}
&:hover &-input:not(.@{ant-prefix}-input-disabled) {
diff --git a/components/date-picker/style/RangePicker.less b/components/date-picker/style/RangePicker.less
index c0817da21f..47621bebf0 100644
--- a/components/date-picker/style/RangePicker.less
+++ b/components/date-picker/style/RangePicker.less
@@ -20,6 +20,8 @@
position: absolute;
top: 50%;
margin-top: -10px;
+ line-height: 20px;
+ height: 20px;
}
.@{calendar-prefix-cls}-range {
diff --git a/components/dropdown/dropdown.tsx b/components/dropdown/dropdown.tsx
index 0d453b2df1..e4aab6d08b 100644
--- a/components/dropdown/dropdown.tsx
+++ b/components/dropdown/dropdown.tsx
@@ -23,7 +23,6 @@ export default class Dropdown extends React.Component {
mouseEnterDelay: 0.15,
mouseLeaveDelay: 0.1,
placement: 'bottomLeft',
- minOverlayWidthMatchTrigger: false,
};
getTransitionName() {
diff --git a/components/form/Form.tsx b/components/form/Form.tsx
index ce187ae054..6379f17302 100755
--- a/components/form/Form.tsx
+++ b/components/form/Form.tsx
@@ -9,10 +9,10 @@ import warning from '../_util/warning';
import FormItem from './FormItem';
import { FIELD_META_PROP } from './constants';
-export interface FormCreateOption {
- onFieldsChange?: (props: any, fields: Array) => void;
- onValuesChange?: (props: any, values: any) => void;
- mapPropsToFields?: (props: any) => void;
+export interface FormCreateOption {
+ onFieldsChange?: (props: T, fields: Array) => void;
+ onValuesChange?: (props: T, values: any) => void;
+ mapPropsToFields?: (props: T) => void;
withRef?: boolean;
}
@@ -139,7 +139,7 @@ export default class Form extends React.Component {
static Item = FormItem;
- static create = function(options?: FormCreateOption): ComponentDecorator {
+ static create = function(options: FormCreateOption = {}): ComponentDecorator {
const formWrapper = createDOMForm({
fieldNameProp: 'id',
...options,
@@ -174,8 +174,10 @@ export default class Form extends React.Component {
this.props.form.getFieldProps = this.deprecatedGetFieldProps;
const withRef: any = {};
- if (options && options.withRef) {
+ if (options.withRef) {
withRef.ref = 'formWrappedComponent';
+ } else if (this.props.wrappedComponentRef) {
+ withRef.ref = this.props.wrappedComponentRef;
}
return ;
},
diff --git a/components/form/index.en-US.md b/components/form/index.en-US.md
index fc56f883f6..92a1a5a482 100644
--- a/components/form/index.en-US.md
+++ b/components/form/index.en-US.md
@@ -107,6 +107,7 @@ After wrapped by `getFieldDecorator`, `value`(or other property defined by `valu
| options.getValueFromEvent | Specify how to get value from event or other onChange arguments | function(..args) | [reference](https://github.com/react-component/form#option-object) |
| options.validateTrigger | When to validate the value of children node. | string\|string[] | 'onChange' |
| options.rules | Includes validation rules. Please refer to "Validation Rules" part for details. | object[] | n/a |
+| options.validateFirst | Whether stop validate on first rule of error for this field. | boolean | false |
| options.exclusive | Whether it is exclusive with other controls, particularly for Radio. | boolean | false |
| options.normalize | Normalize value to form component, [a select-all example](https://codepen.io/afc163/pen/JJVXzG?editors=001) | function(value, prevValue, allValues): any | - |
diff --git a/components/form/index.zh-CN.md b/components/form/index.zh-CN.md
index d6c4367ae8..52b91c3686 100644
--- a/components/form/index.zh-CN.md
+++ b/components/form/index.zh-CN.md
@@ -108,6 +108,7 @@ CustomizedForm = Form.create({})(CustomizedForm);
| options.getValueFromEvent | 可以把 onChange 的参数（如 event）转化为控件的值 | function(..args) | [reference](https://github.com/react-component/form#option-object) |
| options.validateTrigger | 校验子节点值的时机 | string\|string[] | 'onChange' |
| options.rules | 校验规则，参考下方文档 | object[] | |
+| options.validateFirst | 当某一规则校验不通过时，是否停止剩下的规则的校验 | boolean | false |
| options.exclusive | 是否和其他控件互斥，特别用于 Radio 单选控件 | boolean | false |
| options.normalize | 转换默认的 value 给控件，[一个选择全部的例子](https://codepen.io/afc163/pen/JJVXzG?editors=001) | function(value, prevValue, allValues): any | - |
diff --git a/components/grid/style/index.less b/components/grid/style/index.less
index 07d1169183..9671dc96da 100644
--- a/components/grid/style/index.less
+++ b/components/grid/style/index.less
@@ -10,7 +10,7 @@
.@{ant-prefix}-row-flex {
display: flex;
- flex-flow: row nowrap;
+ flex-flow: row wrap;
&:before,
&:after {
diff --git a/components/input-number/style/index.less b/components/input-number/style/index.less
index 7771f47083..c5089ea152 100644
--- a/components/input-number/style/index.less
+++ b/components/input-number/style/index.less
@@ -79,6 +79,7 @@
border: 0;
border-radius: @border-radius-base;
padding: 0 7px;
+ display: block;
.placeholder();
&[disabled] {
diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less
index 301eec8ac7..2452539ba5 100644
--- a/components/input/style/mixin.less
+++ b/components/input/style/mixin.less
@@ -46,6 +46,7 @@
height: @input-height-base;
cursor: text;
font-size: @font-size-base;
+ line-height: @line-height-base;
color: @input-color;
background-color: @input-bg;
background-image: none;
diff --git a/components/layout/style/index.less b/components/layout/style/index.less
index db0c530bcf..ff8ecc1d84 100644
--- a/components/layout/style/index.less
+++ b/components/layout/style/index.less
@@ -11,6 +11,10 @@
&&-has-sider {
flex-direction: row;
+ > .@{layout-prefix-cls},
+ > .@{layout-prefix-cls}-content {
+ overflow-x: hidden;
+ }
}
&-header,
diff --git a/components/select/index.tsx b/components/select/index.tsx
index 07a97a7cb3..8b1b00b23a 100755
--- a/components/select/index.tsx
+++ b/components/select/index.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
-import RcSelect, { Option, OptGroup, SelectPropTypes as RcSelectPropTypes } from 'rc-select';
+import RcSelect, { Option, OptGroup } from 'rc-select';
import classNames from 'classnames';
import warning from '../_util/warning';
@@ -68,7 +68,7 @@ export interface SelectContext {
}
export const SelectPropTypes = {
- ...RcSelectPropTypes,
+ ...RcSelect.propTypes,
prefixCls: PropTypes.string,
className: PropTypes.string,
size: PropTypes.oneOf(['default', 'large', 'small']),
diff --git a/components/steps/style/index.less b/components/steps/style/index.less
index c3a80eedf3..7e72b2712b 100644
--- a/components/steps/style/index.less
+++ b/components/steps/style/index.less
@@ -419,6 +419,7 @@
margin-top: 10px;
.@{steps-prefix-cls}-title {
padding-right: 0;
+ background-color: transparent;
}
}
.@{steps-prefix-cls}-status-process {
diff --git a/components/table/util.tsx b/components/table/util.tsx
index cb97e75195..586560abaf 100644
--- a/components/table/util.tsx
+++ b/components/table/util.tsx
@@ -4,11 +4,15 @@ export function flatArray(data: Object[] = [], childrenName = 'children') {
const result: Object[] = [];
const loop = (array) => {
array.forEach(item => {
- const newItem = { ...item };
- delete newItem[childrenName];
- result.push(newItem);
- if (item[childrenName] && item[childrenName].length > 0) {
- loop(item[childrenName]);
+ if (item[childrenName]) {
+ const newItem = { ...item };
+ delete newItem[childrenName];
+ result.push(newItem);
+ if (item[childrenName].length > 0) {
+ loop(item[childrenName]);
+ }
+ } else {
+ result.push(item);
}
});
};
diff --git a/components/transfer/index.zh-CN.md b/components/transfer/index.zh-CN.md
index 3f6cec6670..afbbe92401 100644
--- a/components/transfer/index.zh-CN.md
+++ b/components/transfer/index.zh-CN.md
@@ -13,7 +13,7 @@ title: Transfer
用直观的方式在两栏中移动元素，完成选择行为。
选择一个或以上的选项后，点击对应的方向键，可以把选中的选项移动到另一栏。
-其中，左边一栏为 `source`，右边一栏为 `target`，API 的设计也反应了这两个概念。
+其中，左边一栏为 `source`，右边一栏为 `target`，API 的设计也反映了这两个概念。
## API
diff --git a/components/upload/UploadList.tsx b/components/upload/UploadList.tsx
index 438ab251c2..341cd7a9aa 100644
--- a/components/upload/UploadList.tsx
+++ b/components/upload/UploadList.tsx
@@ -154,8 +154,12 @@ export default class UploadList extends React.Component {
const actions = (listType === 'picture-card' && file.status !== 'uploading')
? {previewIcon}{removeIcon}
: removeIconCross;
-
- const message = file.response || (file.error && file.error.statusText) || locale.uploadError;
+ let message;
+ if (file.response && typeof file.response === 'string') {
+ message = file.response;
+ } else {
+ message = (file.error && file.error.statusText) || locale.uploadError;
+ }
const iconAndPreview = (file.status === 'error')
? {icon}{preview}
: {icon}{preview};
diff --git a/docs/react/getting-started.en-US.md b/docs/react/getting-started.en-US.md
index 0c1c06fd9d..732d4b16ea 100644
--- a/docs/react/getting-started.en-US.md
+++ b/docs/react/getting-started.en-US.md
@@ -3,7 +3,7 @@ order: 1
title: Getting Started
---
-Ant Design React is dedicated to providing a **good development experience** for programmers and make sure that you had installed [Node.js](https://nodejs.org/)(> v4.x) correctly.
+Ant Design React is dedicated to providing a **good development experience** for programmers and make sure that you had installed [Node.js](https://nodejs.org/)(> v6.5) correctly.
---
diff --git a/docs/react/getting-started.zh-CN.md b/docs/react/getting-started.zh-CN.md
index e7083e5641..d49ab9fb94 100644
--- a/docs/react/getting-started.zh-CN.md
+++ b/docs/react/getting-started.zh-CN.md
@@ -7,7 +7,7 @@ Ant Design React 致力于提供给程序员**愉悦**的开发体验。
---
-在开始之前，推荐先学习 [React](http://facebook.github.io/react/) 和 [ES2015](http://babeljs.io/docs/learn-es2015/)，并正确安装和配置了 [Node.js](https://nodejs.org/) v4.x 或以上。
+在开始之前，推荐先学习 [React](http://facebook.github.io/react/) 和 [ES2015](http://babeljs.io/docs/learn-es2015/)，并正确安装和配置了 [Node.js](https://nodejs.org/) v6.5 或以上。
## 第一个例子
diff --git a/docs/spec/introduce.en-US.md b/docs/spec/introduce.en-US.md
index b786512984..ff5eabc09b 100644
--- a/docs/spec/introduce.en-US.md
+++ b/docs/spec/introduce.en-US.md
@@ -30,6 +30,7 @@ We supply a series of design principles, practical patterns and high quality des
-
-
-
+-
-
## Who's using Ant Design
diff --git a/docs/spec/introduce.zh-CN.md b/docs/spec/introduce.zh-CN.md
index ef190d95f5..fc19bc9ed1 100644
--- a/docs/spec/introduce.zh-CN.md
+++ b/docs/spec/introduce.zh-CN.md
@@ -30,6 +30,7 @@ Ant Design 是一个致力于提升『用户』和『设计者』使用体验的
-
-
-
+-
-
## 谁在使用
diff --git a/package.json b/package.json
index f94b6cd4ce..cf47e6f5f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "antd",
- "version": "2.12.4",
+ "version": "2.12.5",
"title": "Ant Design",
"description": "An enterprise-class UI design language and React-based implementation",
"homepage": "http://ant.design/",
@@ -51,7 +51,7 @@
"rc-checkbox": "~2.0.3",
"rc-collapse": "~1.7.5",
"rc-dialog": "~6.5.10",
- "rc-dropdown": "~1.4.11",
+ "rc-dropdown": "~1.5.0",
"rc-editor-mention": "~0.6.12",
"rc-form": "~1.4.0",
"rc-input-number": "~3.6.0",