Merge branch 'develop-0.11.0' of github.com:ant-design/ant-design into develop-0.11.0

components/form/Form.jsx

@@ -3,15 +3,15 @@ import classNames from 'classnames';
 
 class Form extends React.Component {
   render() {
-    const prefixCls = this.props.prefixCls;
+    const { prefixCls, className } = this.props;
-    const formClassName = {
+    const formClassName = classNames({
+      [className]: !!className,
       [`${prefixCls}-horizontal`]: this.props.horizontal,
       [`${prefixCls}-inline`]: this.props.inline,
-    };
+    });
-    const classes = classNames(formClassName);
 
     return (
-      <form {...this.props} className={classes}>
+      <form {...this.props} className={formClassName}>
         {this.props.children}
       </form>
     );