diff --git a/components/form/demo/complex-form-control.md b/components/form/demo/complex-form-control.md
new file mode 100644
index 0000000000..0d8e61c73a
--- /dev/null
+++ b/components/form/demo/complex-form-control.md
@@ -0,0 +1,129 @@
+---
+order: 6
+title:
+ zh-CN: 复杂一点的控件
+ en-US: complex form control
+---
+
+## zh-CN
+
+这里演示 `Form.Item` 内有多个元素的使用方式。`` 只会对它的直接子元素绑定表单功能，例如直接包裹了 Input/Select。如果控件前后还有一些文案或样式装点，或者一个表单项内有多个控件，你可以使用内嵌的 `Form.Item` 完成。你可以给 `Form.Item` 自定义 `style` 进行内联布局，或者添加 `noStyle` 作为纯粹的无样式绑定组件（类似 3.x 中的 `getFieldDecorator`）。
+
+```diff
+-
+-
+-
++
++ // 直接包裹才会绑定表单
++ description
++
+```
+
+这里展示了三种典型场景：
+
+- `Username`：输入框后面有描述文案或其他组件，在 `Form.Item` 内使用 `` 去绑定对应子控件。
+- `Address`：有两个控件，在 `Form.Item` 内使用两个 `` 分别绑定对应控件。
+- `BirthDate`：有两个内联控件，错误信息展示各自控件下，使用两个 `` 分别绑定对应控件，并修改 `style` 使其内联布局。
+
+> 注意，在 label 对应的 Form.Item 上不要在指定 `name` 属性，这个 Item 只作为布局作用。
+
+更复杂的封装复用方式可以参考下面的 `自定义表单控件` 演示。
+
+## en-US
+
+This demo show how to use `Form.Item` with multiple controls. `` will only bind control(Input/Select) which is the only children of it. Image this case, you add some text description after Input, then you have to wrap Input by a extra ``. `style` property of `Form.Item` could be useful to modify the nested form item layout, or `` turn it into a pure form bind component(like `getFieldDecorator` in 3.x).
+
+```diff
+-
+-
+-
++
++ // that will bind input
++ description
++
+```
+
+This demo show three typical usages:
+
+- `Username`: extra elements after control, using `` inside `Form.Item` to bind Input.
+- `Address`: two controls in one line, using two `` to bind each control.
+- `BirthDate`：two controls in one line with indeptent error message, using two `` to bind each control, make layout inline by customizing `style` property.
+
+> Note, in this case, no more `name` property should be left in Form.Item with label.
+
+See `Customized Form Controls` demo below for further advanced usage.
+
+```jsx
+import { Form, Input, Select, Tooltip, Button } from 'antd';
+
+const { Option } = Select;
+
+const Demo = () => {
+ const onFinish = values => {
+ console.log('Received values of form: ', values);
+ };
+
+ return (
+
+ );
+};
+
+ReactDOM.render(, mountNode);
+```
diff --git a/components/form/demo/customized-form-controls.md b/components/form/demo/customized-form-controls.md
index 4c85050456..71219c7799 100644
--- a/components/form/demo/customized-form-controls.md
+++ b/components/form/demo/customized-form-controls.md
@@ -1,5 +1,5 @@
---
-order: 6
+order: 6.1
title:
zh-CN: 自定义表单控件
en-US: Customized Form Controls