Skip to content

Commit 0c0ddf3

Browse files
committed
Merge branch 'master' into feat-3.10.3
# Conflicts: # components/menu/__tests__/__snapshots__/demo.test.js.snap
2 parents aba16db + 7747a3f commit 0c0ddf3

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

components/form/demo/index.vue

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,13 @@ const md = {
5151
5252
这里我们封装了表单域 \`<Form.Item />\`
5353
54-
**注意:** 如果使用 \`Form.create\` 处理表单使其具有自动收集数据并校验的功能,建议使用\`jsx\`
54+
55+
## 注意:
56+
1、如果使用 \`Form.create\` 处理表单使其具有自动收集数据并校验的功能,建议使用\`jsx\`
57+
2、如果不是使用Vue.use(Form)形式注册的\`Form\`组件,你需要自行将\`$form\`挂载到Vue原型上。
58+
\`Vue.prototype.$form = Form\`
59+
60+
5561
## 代码演示
5662
`,
5763
us: `# Form
@@ -70,7 +76,11 @@ You can align the controls of a \`form\` using the \`layout\` prop:
7076
A form consists of one or more form fields whose type includes input, textarea, checkbox, radio, select, tag, and more.
7177
A form field is defined using \`<Form.Item />\`.
7278
73-
**Note:** If you use \`Form.create\` to process forms with automatic data collection and validation, we recommend using \`jsx\`
79+
## Note:
80+
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\`.
81+
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.
82+
\`Vue.prototype.$form = Form\`
83+
7484
## Examples
7585
`,
7686
}

components/menu/demo/SubMenu.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template functional>
2-
<a-sub-menu v-on="listeners" v-bind="data.attrs">
2+
<a-sub-menu v-on="listeners" :key="data.key">
33
<span slot="title"><a-icon type="mail" /><span>{{data.attrs.menuInfo.title}}</span></span>
44
<template v-for="item in data.attrs.menuInfo.children">
55
<a-menu-item v-if="!item.children" :key="item.key">

components/menu/demo/template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The properties of `a-sub-menu` are dynamically changed inside the component. If
1818
</a-button>
1919
<a-menu
2020
:defaultSelectedKeys="['1']"
21-
:defaultOpenKeys="['sub1']"
21+
:defaultOpenKeys="['2']"
2222
mode="inline"
2323
theme="dark"
2424
:inlineCollapsed="collapsed"

0 commit comments

Comments
 (0)