From d8eebafbdc0c0c490f5d07a4b48d04bbdb8f837e Mon Sep 17 00:00:00 2001 From: baiyaaaaa Date: Wed, 12 Oct 2016 20:27:51 +0800 Subject: [PATCH] dropdown split button prop size --- examples/docs/zh-cn/dropdown.md | 3 ++- packages/dropdown/src/dropdown.vue | 11 +++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/docs/zh-cn/dropdown.md b/examples/docs/zh-cn/dropdown.md index 8a16b219d..1a193360f 100644 --- a/examples/docs/zh-cn/dropdown.md +++ b/examples/docs/zh-cn/dropdown.md @@ -152,7 +152,8 @@ ### Attributes | 参数 | 说明 | 类型 | 可选值 | 默认值 | |------------- |---------------- |---------------- |---------------------- |-------- | -| type | 菜单按钮类型,同 Button 组件 | string | — | — | +| type | 菜单按钮类型,同 Button 组件(只在`split-button`为 true 的情况下有效) | string | — | — | +| size | 菜单按钮尺寸,同 Button 组件(只在`split-button`为 true 的情况下有效) | string | hover, click | hover | | split-button | 下拉触发元素呈现为按钮组 | boolean | — | false | | menu-align | 菜单水平对齐方向 | string | start, end | end | | trigger | 触发下拉的行为 | string | hover, click | hover | diff --git a/packages/dropdown/src/dropdown.vue b/packages/dropdown/src/dropdown.vue index 9cd2eb6df..f0c9ed68e 100644 --- a/packages/dropdown/src/dropdown.vue +++ b/packages/dropdown/src/dropdown.vue @@ -18,9 +18,8 @@ type: String, default: 'end' }, - type: { - type: String - }, + type: String, + size: String, splitButton: Boolean }, @@ -83,7 +82,7 @@ }, render(h) { - let { hide, splitButton, type } = this; + let { hide, splitButton, type, size } = this; var handleClick = _ => { this.$emit('click'); @@ -92,10 +91,10 @@ let triggerElm = !splitButton ? this.$slots.default : ( - + {this.$slots.default} - + );