Merge pull request #3 from ant-design/master

merge: ant-design/master

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,20 +21,18 @@ Please makes sure that these form are filled before submitting your pull request
 - [ ] Branch merge
 - [ ] Other (about what?)
 
-### 👻 What's the background?
+### 🔗 Related issue link
 
 <!--
 1. Describe the source of requirement, like related issue link.
-
-2. Describe the problem and the scenario.
 -->
 
-### 💡 Solution
+### 💡 Background and solution
 
 <!--
-1. How to fix the problem, and list final API implementation and usage sample if that is an new feature.
-
+1. Describe the problem and the scenario.
 2. GIF or snapshot should be provided if includes UI/interactive modification.
+3. How to fix the problem, and list final API implementation and usage sample if that is an new feature.
 -->
 
 ### 📝 Changelog

.github/PULL_REQUEST_TEMPLATE/pr_cn.md

@@ -21,20 +21,18 @@
 - [ ] 分支合并
 - [ ] 其他改动（是关于什么的改动？）
 
-### 👻 需求背景
+### 🔗 相关 Issue
 
 <!--
 1. 描述相关需求的来源，如相关的 issue 讨论链接。
-
-2. 要解决的具体问题。
 -->
 
-### 💡 解决方案和最终实现是？
+### 💡 需求背景和解决方案
 
 <!--
-1. 列出最终的 API 实现和用法。
-
-2. 涉及UI/交互变动需要有截图或 GIF。
+1. 要解决的具体问题。
+2. 列出最终的 API 实现和用法。
+3. 涉及UI/交互变动需要有截图或 GIF。
 -->
 
 ### 📝 更新日志怎么写？

components/drawer/index.zh-CN.md

@@ -21,8 +21,8 @@ title: Drawer
 | closable | 是否显示右上角的关闭按钮 | boolean | true | 3.7.0 |
 | destroyOnClose | 关闭时销毁 Drawer 里的子元素 | boolean | false | 3.7.0 |
 | getContainer | 指定 Drawer 挂载的 HTML 节点 | HTMLElement \| `() => HTMLElement` \| Selectors | 'body' | 3.7.0 |
-| maskClosable | 点击蒙层是否允许关闭 | boolean | true | 3.7.0 | 3.7.0 |
-| mask | 是否展示遮罩 | Boolean | true |
+| maskClosable | 点击蒙层是否允许关闭 | boolean | true | 3.7.0 |
+| mask | 是否展示遮罩 | Boolean | true | 3.7.0 |
 | maskStyle | 遮罩样式 | object | {} | 3.7.0 |
 | style | 可用于设置 Drawer 最外层容器的样式 | object | - | 3.7.0 |
 | bodyStyle | 可用于设置 Drawer 的样式，调整浮层位置等 | object | - | 3.12.0 |

components/form/Form.tsx

@@ -141,7 +141,7 @@ export type WrappedFormUtils<V = any> = {
   /** 获取一个输入控件的值 */
   getFieldValue(fieldName: string): any;
   /** 设置一组输入控件的值 */
-  setFieldsValue(obj: Object): void;
+  setFieldsValue(obj: Object, callback?: Function): void;
   /** 设置一组输入控件的值 */
   setFields(obj: Object): void;
   /** 校验并获取一组输入域的值与 Error */

components/form/index.en-US.md

@@ -92,7 +92,7 @@ If the form has been decorated by `Form.create` then it has `this.props.form` pr
 | isFieldValidating | Check if the specified field is being validated. | Function(name) |  |
 | resetFields | Reset the specified fields' value(to `initialValue`) and status. If you don't specify a parameter, all the fields will be reset. | Function(\[names: string\[]]) |  |
 | setFields | Set value and error state of fields. [Code Sample](https://github.com/react-component/form/blob/3b9959b57ab30b41d8890ff30c79a7e7c383cad3/examples/server-validate.js#L74-L79) | ({<br />&nbsp;&nbsp;\[fieldName\]: {value: any, errors: \[Error\] }<br />}) => void |  |
-| setFieldsValue | Set the value of a field. (Note: please don't use it in `componentWillReceiveProps`, otherwise, it will cause an endless loop, [reason](https://github.com/ant-design/ant-design/issues/2985)) | ({ \[fieldName\]&#x3A; value }) => void |  |
+| setFieldsValue | Set the value of a field. (Note: please don't use it in `componentWillReceiveProps`, otherwise, it will cause an endless loop, [reason](https://github.com/ant-design/ant-design/issues/2985)) | (<br />&nbsp;&nbsp;{ \[fieldName\]&#x3A; value },<br />&nbsp;&nbsp;callback: Function<br />) => void |  |
 | validateFields | Validate the specified fields and get theirs values and errors. If you don't specify the parameter of fieldNames, you will validate all fields. | (<br />&nbsp;&nbsp;\[fieldNames: string\[]],<br />&nbsp;&nbsp;\[options: object\],<br />&nbsp;&nbsp;callback(errors, values)<br />) => void |  |
 | validateFieldsAndScroll | This function is similar to `validateFields`, but after validation, if the target field is not in visible area of form, form will be automatically scrolled to the target field area. | same as `validateFields` |  |
 

components/form/index.zh-CN.md

@@ -95,7 +95,7 @@ this.form // => The instance of CustomizedForm
 | isFieldValidating | 判断一个输入控件是否在校验状态 | Function(name) |  |
 | resetFields | 重置一组输入控件的值（为 `initialValue`）与状态，如不传入参数，则重置所有组件 | Function(\[names: string\[]]) |  |
 | setFields | 设置一组输入控件的值与错误状态：[代码](https://github.com/react-component/form/blob/3b9959b57ab30b41d8890ff30c79a7e7c383cad3/examples/server-validate.js#L74-L79) | ({<br />&nbsp;&nbsp;\[fieldName\]: {value: any, errors: \[Error\] }<br />}) => void |  |
-| setFieldsValue | 设置一组输入控件的值（注意：不要在 `componentWillReceiveProps` 内使用，否则会导致死循环，[原因](https://github.com/ant-design/ant-design/issues/2985)） | ({ \[fieldName\]&#x3A; value }) => void |  |
+| setFieldsValue | 设置一组输入控件的值（注意：不要在 `componentWillReceiveProps` 内使用，否则会导致死循环，[原因](https://github.com/ant-design/ant-design/issues/2985)） | (<br />&nbsp;&nbsp;{ \[fieldName\]&#x3A; value },<br />&nbsp;&nbsp;callback: Function<br />) => void |  |
 | validateFields | 校验并获取一组输入域的值与 Error，若 fieldNames 参数为空，则校验全部组件 | (<br />&nbsp;&nbsp;\[fieldNames: string\[]],<br />&nbsp;&nbsp;\[options: object\],<br />&nbsp;&nbsp;callback(errors, values)<br />) => void |  |
 | validateFieldsAndScroll | 与 `validateFields` 相似，但校验完后，如果校验不通过的菜单域不在可见范围内，则自动滚动进可见范围 | 参考 `validateFields` |  |
 

components/menu/__tests__/index.test.js

@@ -569,7 +569,6 @@ describe('Menu', () => {
         .instance()
         .getMenuOpenAnimation(''),
     ).toBe('');
-    expect(wrapper.find('InternalMenu').state().switchingModeFromInline).toBe(false);
   });
 
   it('MenuItem should not render Tooltip when inlineCollapsed is false', () => {

components/menu/index.tsx

@@ -276,10 +276,6 @@ class InternalMenu extends React.Component<InternalMenuProps, MenuState> {
         // submenu should hide without animation
         if (this.state.switchingModeFromInline) {
           menuOpenAnimation = '';
-          this.setState({
-            switchingModeFromInline: false,
-          });
-          // this.switchingModeFromInline = false;
         } else {
           menuOpenAnimation = 'zoom-big';
         }

package.json

@@ -75,7 +75,7 @@
     "rc-pagination": "~1.20.1",
     "rc-progress": "~2.5.0",
     "rc-rate": "~2.5.0",
-    "rc-select": "~9.1.4",
+    "rc-select": "~9.2.0",
     "rc-slider": "~8.6.11",
     "rc-steps": "~3.4.1",
     "rc-switch": "~1.9.0",