Merge branch 'master' into antd-3.0

CHANGELOG.en-US.md

@@ -17,15 +17,28 @@ If you want to read change logs before `2.0.0`, please visit [GitHub](https://gi
 
 ---
 
+## 2.13.10
+
+`2017-11-12`
+
+- 📝 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)
+- 🐞 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 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)
+
 ## 2.13.9
 
 `2017-11-06`
 
-- Published [Ant Design Pro](https://pro.ant.design/).
-- Fix that `Cascader[popupVisible]` doesn't work. [#8088](https://github.com/ant-design/ant-design/issues/8088)
-- Fix that native `input[type=checkbox|radio]` invisible issue. [7c3a483](https://github.com/ant-design/ant-design/commit/7c3a48319074a800c89935e728904933d503ee86)
-- Fix that `Input.Search[suffix]` doesn't work. [#7970](https://github.com/ant-design/ant-design/issues/7970)
-- Fix TypeScript definitions of Slider. [#8102](https://github.com/ant-design/ant-design/pull/8102) [@davschne](https://github.com/davschne)
+- 🌟 Published [Ant Design Pro](https://pro.ant.design/).
+- 🐞 Fix that `Cascader[popupVisible]` doesn't work. [#8088](https://github.com/ant-design/ant-design/issues/8088)
+- 🐞 Fix that native `input[type=checkbox|radio]` invisible issue. [7c3a483](https://github.com/ant-design/ant-design/commit/7c3a48319074a800c89935e728904933d503ee86)
+- 🐞 Fix that `Input.Search[suffix]` doesn't work. [#7970](https://github.com/ant-design/ant-design/issues/7970)
+- 🐞 Fix TypeScript definitions of Slider. [#8102](https://github.com/ant-design/ant-design/pull/8102) [@davschne](https://github.com/davschne)
 
 ## 2.13.8
 

CHANGELOG.zh-CN.md

@@ -15,9 +15,7 @@ timeline: true
 
 如果需要查看 `2.0.0` 之前的更新日志，请移步 [GitHub](https://github.com/ant-design/ant-design/blob/1.x-stable/CHANGELOG.md)。
 
----
-
-## 3.0.0
+---## 3.0.0
 
 - Select
   - 单选和多选模式 Option 支持 number。
@@ -26,15 +24,28 @@ timeline: true
   - 新增 `onMouseEnter` 和 `onMouseLeave`。
   - 新增 `focus()`、`blur()` 和 `autoFocus`。
 
+## 2.13.10
+
+`2017-11-12`
+
+- 📝 添加 [招聘](http://ant.design/docs/resource/work-with-us-cn) 页面。
+- 📝 重构了可编辑表格的演示代码。[#8026](https://github.com/ant-design/ant-design/issues/8026)
+- 🌟 优化了 Layout.Sider 的探测方式，现在支持 Sider 随意内嵌和组合（不再需要指定 `__ANT_LAYOUT_SIDER` 属性）。[#8077](https://github.com/ant-design/ant-design/pull/8077/) [@yasinuslu](https://github.com/yasinuslu)
+- 🐞 修复 Chrome 62 下 Input.Group 内 Select 和 Input 的对齐问题。[ant-design/ant-design-pro#139](https://github.com/ant-design/ant-design-pro/issues/139)
+- 🐞 修复 Cascader 搜索在 options 内 children 为空数组时工作不正常的问题。[#8130](https://github.com/ant-design/ant-design/issues/8130) [@jdz321](https://github.com/jdz321)
+- 🐞 修复一个 AutoComponent 和 Input 样式优先级导致错位的问题。[#8081](https://github.com/ant-design/ant-design/issues/8081)
+- 🐞 修复 IE9 下 Upload 初始化时报错的问题。[#7706](https://github.com/ant-design/ant-design/issues/7706)
+- 🐞 修复 Select 的 filterOption 参数的 TypeScript 定义。[#8128](https://github.com/ant-design/ant-design/issues/8128)
+
 ## 2.13.9
 
 `2017-11-06`
 
-- 发布 [Ant Design Pro](https://pro.ant.design/)。
-- 修复 `Cascader[popupVisible]` 失效问题。[#8088](https://github.com/ant-design/ant-design/issues/8088)
-- 修复原生 `input[type=checkbox|radio]` 看不到的问题。[7c3a483](https://github.com/ant-design/ant-design/commit/7c3a48319074a800c89935e728904933d503ee86)
-- 修复 `Input.Search[suffix]` 失效的问题。[#7970](https://github.com/ant-design/ant-design/issues/7970)
-- 修复 Slider TypeScript 定义问题。[#8102](https://github.com/ant-design/ant-design/pull/8102) [@davschne](https://github.com/davschne)
+- 🌟 发布 [Ant Design Pro](https://pro.ant.design/)。
+- 🐞 修复 `Cascader[popupVisible]` 失效问题。[#8088](https://github.com/ant-design/ant-design/issues/8088)
+- 🐞 修复原生 `input[type=checkbox|radio]` 看不到的问题。[7c3a483](https://github.com/ant-design/ant-design/commit/7c3a48319074a800c89935e728904933d503ee86)
+- 🐞 修复 `Input.Search[suffix]` 失效的问题。[#7970](https://github.com/ant-design/ant-design/issues/7970)
+- 🐞 修复 Slider TypeScript 定义问题。[#8102](https://github.com/ant-design/ant-design/pull/8102) [@davschne](https://github.com/davschne)
 
 ## 2.13.8
 

components/layout/index.en-US.md

@@ -109,12 +109,3 @@ The sidebar.
   xl: '1600px',
 }
 ```
-
-> Note: If you want to wrap the `Sider`, do not forget to add this setting to the customized component: `__ANT_LAYOUT_SIDER = true`. e.g.
-
-```jsx
-const CustomizedSider = (props) => <Sider {...props} />
-CustomizedSider.__ANT_LAYOUT_SIDER = true;
-...
-<CustomizedSider>Sider Content</CustomizedSider>
-```

components/layout/index.zh-CN.md

@@ -110,12 +110,3 @@ title: Layout
   xl: '1600px',
 }
 ```
-
-> 注意：如果你想在 `Sider` 基础上进行包装，需要给自定义组件加上 `__ANT_LAYOUT_SIDER = true` 设置，例如：
-
-```jsx
-const CustomizedSider = (props) => <Sider {...props} />
-CustomizedSider.__ANT_LAYOUT_SIDER = true;
-...
-<CustomizedSider>Sider Content</CustomizedSider>
-```

components/upload/Upload.tsx

@@ -35,8 +35,9 @@ export default class Upload extends React.Component<UploadProps, any> {
 
   constructor(props) {
     super(props);
+
     this.state = {
-      fileList: this.props.fileList || this.props.defaultFileList || [],
+      fileList: props.fileList || props.defaultFileList || [],
       dragState: 'drop',
     };
   }

docs/pattern/form.en-US.md

@@ -102,7 +102,7 @@ Password input box provides real time feedback on password strength and validity
 <img class="preview-img inline" align="right" description="Validation in real time" src="https://os.alipayobjects.com/rmsportal/urCdIJFuNYCenqH.png">
 <img class="preview-img inline" align="right" description="Validation after losing focus" src="https://os.alipayobjects.com/rmsportal/KkcSBkbTJirIxCw.png">
 
-<img class="preview-img" align="right" description="When a "submit" button is clicked, the system will deal with user inputs and display feedback (the number of errors and the types of errors) on the page." src="https://zos.alipayobjects.com/rmsportal/xTtVSREbASRMstTggVGD.png">
+<img class="preview-img" align="right" description="When a 'submit' button is clicked, the system will deal with user inputs and display feedback (the number of errors and the types of errors) on the page." src="https://zos.alipayobjects.com/rmsportal/xTtVSREbASRMstTggVGD.png">
 
 Use different validation rules and a variety of feedback to help users correct errors before they click on a "submit" button.
 
@@ -145,8 +145,6 @@ Right alignment (recommended)
 
 <br>
 
-<!-- https://www.expedia.co.uk/FlightCheckout?tripid=89e54540-dcf4-4c27-be3f-c9efaae6dac2&c=69c4491d-2d30-406a-9b2c-6ec50a932b48 -->
-
 <img class="preview-img" align="right" alt="Top alignment" src="https://os.alipayobjects.com/rmsportal/AsyyNKormNdEMLi.png">
 
 Top alignment