Merge branch 'master' into feat-3.10.3

# Conflicts:
#	components/menu/__tests__/__snapshots__/demo.test.js.snap
pull/309/head
tangjinzhou 2018-12-13 10:06:41 +08:00
commit 0c0ddf3e17
3 changed files with 14 additions and 4 deletions

View File

@ -51,7 +51,13 @@ const md = {
这里我们封装了表单域 \`<Form.Item />\`
**注意** 如果使用 \`Form.create\` 处理表单使其具有自动收集数据并校验的功能,建议使用\`jsx\`
## 注意
1如果使用 \`Form.create\` 处理表单使其具有自动收集数据并校验的功能,建议使用\`jsx\`
2如果不是使用Vue.use(Form)形式注册的\`Form\`组件,你需要自行将\`$form\`挂载到Vue原型上。
\`Vue.prototype.$form = Form\`
## 代码演示
`,
us: `# Form
@ -70,7 +76,11 @@ You can align the controls of a \`form\` using the \`layout\` prop
A form consists of one or more form fields whose type includes input, textarea, checkbox, radio, select, tag, and more.
A form field is defined using \`<Form.Item />\`.
**Note:** If you use \`Form.create\` to process forms with automatic data collection and validation, we recommend using \`jsx\`
## Note:
1. If you use \`Form.create\` to process the form to have the ability to automatically collect data and verify it, it is recommended to use \`jsx\`.
2. If you are not using the \`Form\` component registered in Vue.use(Form) form, you need to mount \`$form\` to the Vue prototype yourself.
\`Vue.prototype.$form = Form\`
## Examples
`,
}

View File

@ -1,5 +1,5 @@
<template functional>
<a-sub-menu v-on="listeners" v-bind="data.attrs">
<a-sub-menu v-on="listeners" :key="data.key">
<span slot="title"><a-icon type="mail" /><span>{{data.attrs.menuInfo.title}}</span></span>
<template v-for="item in data.attrs.menuInfo.children">
<a-menu-item v-if="!item.children" :key="item.key">

View File

@ -18,7 +18,7 @@ The properties of `a-sub-menu` are dynamically changed inside the component. If
</a-button>
<a-menu
:defaultSelectedKeys="['1']"
:defaultOpenKeys="['sub1']"
:defaultOpenKeys="['2']"
mode="inline"
theme="dark"
:inlineCollapsed="collapsed"