Merge branch 'master' into antd-3.0

3610cn · Nov 13, 2017 · bf36ebd · bf36ebd
2 parents e3da638 + 716c49c
commit bf36ebd
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -23,9 +23,9 @@ If you want to read change logs before `2.0.0`, please visit [GitHub](https://gi
 
 - 📝 Add documentation of [Work with Us](http://ant.design/docs/resource/work-with-us).
 - 📝 Refactor edit row demo of Table. [#8026](https://github.com/ant-design/ant-design/issues/8026)
-- 🌟 Improve code of detecting Layout.Sider, now we can compose and nest the Sider without specify `__ANT_LAYOUT_SIDER` aattribute. [#8077](https://github.com/ant-design/ant-design/pull/8077/) [@yasinuslu](https://github.com/yasinuslu)
+- 🌟 Improve detection of Layout.Sider, now we can compose and nest the Sider without specifying `__ANT_LAYOUT_SIDER` attribute. [#8077](https://github.com/ant-design/ant-design/pull/8077/) [@yasinuslu](https://github.com/yasinuslu)
 - 🐞 Fix align issue of `Input.Group` in Chrome 62. [ant-design/ant-design-pro#139](https://github.com/ant-design/ant-design-pro/issues/139)
-- 🐞 Fix Cascader search not working when option.chidlren is `[]`. [#8130](https://github.com/ant-design/ant-design/issues/8130) [@jdz321](https://github.com/jdz321)
+- 🐞 Fix Cascader search not working when option.children is `[]`. [#8130](https://github.com/ant-design/ant-design/issues/8130) [@jdz321](https://github.com/jdz321)
 - 🐞 Fix broken padding of AutoComponent caused by style order conflict with Input. [#8081](https://github.com/ant-design/ant-design/issues/8081)
 - 🐞 Fix Upload constructor error in IE9. [#7706](https://github.com/ant-design/ant-design/issues/7706)
 - 🐞 Fix Select filterOption's TypeScript definition. [#8128](https://github.com/ant-design/ant-design/issues/8128)

diff --git a/components/_util/__tests__/util.test.js b/components/_util/__tests__/util.test.js
@@ -1,11 +1,14 @@
 import throttleByAnimationFrame from '../throttleByAnimationFrame';
 
-jest.useFakeTimers();
-
 describe('Test utils function', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
   afterAll(() => {
     jest.useRealTimers();
   });
+
   it('throttle function should work', () => {
     const callback = jest.fn();
     const throttled = throttleByAnimationFrame(callback);

diff --git a/components/affix/__tests__/Affix.test.js b/components/affix/__tests__/Affix.test.js
@@ -3,8 +3,6 @@ import { mount } from 'enzyme';
 import Affix from '..';
 import Button from '../../button';
 
-jest.useFakeTimers();
-
 const events = {};
 
 class AffixMounter extends React.Component {
@@ -48,9 +46,14 @@ class AffixMounter extends React.Component {
 }
 
 describe('Affix Render', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
   afterAll(() => {
     jest.useRealTimers();
   });
+
   it('Anchor render perfectly', () => {
     document.body.innerHTML = '<div id="mounter" />';
 

diff --git a/components/form/index.en-US.md b/components/form/index.en-US.md
@@ -58,6 +58,7 @@ The following `options` are available:
 
 | Property | Description | Type |
 | -------- | ----------- | ---- |
+| validateMessages | Default validate message. And its format is similar with [newMessages](https://github.com/yiminghe/async-validator/blob/master/src/messages.js)'s returned value | Object { [nested.path]: String } |
 | mapPropsToFields | Convert props to field value. Usage example: reading the values from Redux store. | Function(props): Object{ fieldName: Object{ value } } |
 | onFieldsChange | Specify a function that will be called when the value a `Form.Item` gets changed. Usage example: saving the field's value to Redux store. | Function(props, fields) |
 | onValuesChange | A handler while value of any field is changed | (props, values) => void |

diff --git a/components/form/index.zh-CN.md b/components/form/index.zh-CN.md
@@ -60,6 +60,7 @@ CustomizedForm = Form.create({})(CustomizedForm);
 
 | 参数 | 说明 | 类型 |
 | --- | --- | --- |
+| validateMessages | 默认校验信息，可用于把默认错误信息改为中文等，格式与 [newMessages](https://github.com/yiminghe/async-validator/blob/master/src/messages.js) 返回值一致 | Object { [nested.path]: String } |
 | mapPropsToFields | 把父组件的属性映射到表单项上（可用于把 Redux store 中的值读出） | Function(props): Object{ fieldName: Object{ value } } |
 | onFieldsChange | 当 `Form.Item` 子节点的值发生改变时触发，可以把对应的值转存到 Redux store | Function(props, fields) |
 | onValuesChange | 任一表单域的值发生改变时的回调 | (props, values) => void |

diff --git a/components/notification/__tests__/index.test.js b/components/notification/__tests__/index.test.js
@@ -1,8 +1,10 @@
 import notification from '..';
 
-jest.useFakeTimers();
-
 describe('notification', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
   afterAll(() => {
     jest.useRealTimers();
   });

diff --git a/docs/resource/work-with-us.md b/docs/resource/work-with-us.md
@@ -5,7 +5,7 @@ title:
   en-US: Work with Us
 ---
 
-我们（蚂蚁金服体验技术部设）是一支兼具设计视角和工程视角的团队，服务蚂蚁金服上百个中后台系统，其中，主打产品 Ant Design 服务全球近 100 万设计师和工程师，是东半球最具影响力的设计语言之一，欢迎来这里和我们一起打造优雅高效的人机设计/研发体系。
+我们（蚂蚁金服体验技术部）是一支兼具设计视角和工程视角的团队，服务蚂蚁金服上百个中后台系统，主打产品 Ant Design 服务全球近 100 万设计师和工程师，是东半球最具影响力的设计语言之一。欢迎来这里和我们一起打造优雅高效的人机设计/研发体系。
 
 ## UI/UE 设计师