From b6de2765bfe584a63740df5b6517cd6f21e515a1 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 29 Mar 2016 18:02:01 +0800 Subject: [PATCH 1/4] Add some api in docs --- components/dropdown/index.md | 2 +- components/popover/index.md | 1 + components/select/index.md | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/dropdown/index.md b/components/dropdown/index.md index 13db8872b8..fdcd7c71af 100644 --- a/components/dropdown/index.md +++ b/components/dropdown/index.md @@ -20,7 +20,7 @@ |-------------|------------------|--------------------|--------------| | trigger | 触发下拉的行为 | ['click'] or ['hover'] | ['hover'] | | overlay | 菜单节点 | [Menu](/components/menu) | 无 | - +| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试改为滚动的区域 | Function | () => document.body | 菜单可由 `antd.Menu` 取得，可设置 `onSelect` 回调，菜单还包括菜单项 `antd.Menu.Item`，分割线 `antd.Menu.Divider`。 diff --git a/components/popover/index.md b/components/popover/index.md index c64b6532ad..a71710eee7 100644 --- a/components/popover/index.md +++ b/components/popover/index.md @@ -26,3 +26,4 @@ | prefixCls | 浮层的类名 | string | ant-popover | | visible | 用于手动控制浮层显隐 | boolean | false | | onVisibleChange | 显示隐藏改变的回调 | function | 无 | +| getTooltipContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到浮层滚动定位问题，试试改为滚动的区域 | Function | () => document.body | diff --git a/components/select/index.md b/components/select/index.md index 0375e3f7cd..8d8274b4d2 100644 --- a/components/select/index.md +++ b/components/select/index.md @@ -43,6 +43,7 @@ | size | 选择框大小，可选 `large` `small` | String | default | | showSearch | 在下拉中显示搜索框 | boolean | false | | disabled | 是否禁用 | boolean | false | +| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试改为滚动的区域 | Function | () => document.body | ### Option props From 376d1efc04a952ae26e943f39040628c454c5296 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 29 Mar 2016 18:05:08 +0800 Subject: [PATCH 2/4] Add some api in docs --- components/dropdown/index.md | 2 +- components/popover/index.md | 2 +- components/select/index.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/dropdown/index.md b/components/dropdown/index.md index fdcd7c71af..cabdd87559 100644 --- a/components/dropdown/index.md +++ b/components/dropdown/index.md @@ -20,7 +20,7 @@ |-------------|------------------|--------------------|--------------| | trigger | 触发下拉的行为 | ['click'] or ['hover'] | ['hover'] | | overlay | 菜单节点 | [Menu](/components/menu) | 无 | -| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试改为滚动的区域 | Function | () => document.body | +| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试改为滚动的区域 | Function(triggerNode) | () => document.body | 菜单可由 `antd.Menu` 取得，可设置 `onSelect` 回调，菜单还包括菜单项 `antd.Menu.Item`，分割线 `antd.Menu.Divider`。 diff --git a/components/popover/index.md b/components/popover/index.md index a71710eee7..b06792c412 100644 --- a/components/popover/index.md +++ b/components/popover/index.md @@ -26,4 +26,4 @@ | prefixCls | 浮层的类名 | string | ant-popover | | visible | 用于手动控制浮层显隐 | boolean | false | | onVisibleChange | 显示隐藏改变的回调 | function | 无 | -| getTooltipContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到浮层滚动定位问题，试试改为滚动的区域 | Function | () => document.body | +| getTooltipContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到浮层滚动定位问题，试试改为滚动的区域 | Function(triggerNode) | () => document.body | diff --git a/components/select/index.md b/components/select/index.md index 8d8274b4d2..83dd13fca9 100644 --- a/components/select/index.md +++ b/components/select/index.md @@ -43,7 +43,7 @@ | size | 选择框大小，可选 `large` `small` | String | default | | showSearch | 在下拉中显示搜索框 | boolean | false | | disabled | 是否禁用 | boolean | false | -| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试改为滚动的区域 | Function | () => document.body | +| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试改为滚动的区域 | Function(triggerNode) | () => document.body | ### Option props From 3c351bee098c2caf942fea97b1dc68dbf9812974 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 29 Mar 2016 18:07:56 +0800 Subject: [PATCH 3/4] remove unused button style, fix #1293 --- style/mixins/button.less | 4 ---- 1 file changed, 4 deletions(-) diff --git a/style/mixins/button.less b/style/mixins/button.less index cc9b90c035..bc6e481fc5 100644 --- a/style/mixins/button.less +++ b/style/mixins/button.less @@ -83,10 +83,6 @@ .button-size(@btn-padding-base; @font-size-base; @border-radius-base); .user-select(none); .transition(all .3s @ease-in-out); - transform: translate3d(0, 0, 0); - // Fix for ie8 border-radius - // http://css3pie.com/documentation/known-issues/#z-index - position: relative\0; > .@{iconfont-css-prefix} { line-height: 1; From 74f462e8a896b5f0b9777b014e1040d9ef7bdbc6 Mon Sep 17 00:00:00 2001 From: afc163 Date: Tue, 29 Mar 2016 18:21:57 +0800 Subject: [PATCH 4/4] update docs --- components/dropdown/index.md | 2 +- components/popover/index.md | 2 +- components/select/index.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/dropdown/index.md b/components/dropdown/index.md index cabdd87559..933a5d36c8 100644 --- a/components/dropdown/index.md +++ b/components/dropdown/index.md @@ -20,7 +20,7 @@ |-------------|------------------|--------------------|--------------| | trigger | 触发下拉的行为 | ['click'] or ['hover'] | ['hover'] | | overlay | 菜单节点 | [Menu](/components/menu) | 无 | -| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试改为滚动的区域 | Function(triggerNode) | () => document.body | +| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位。[示例](http://codepen.io/anon/pen/ONjyba?editors=001) | Function(triggerNode) | () => document.body | 菜单可由 `antd.Menu` 取得，可设置 `onSelect` 回调，菜单还包括菜单项 `antd.Menu.Item`，分割线 `antd.Menu.Divider`。 diff --git a/components/popover/index.md b/components/popover/index.md index b06792c412..def27a85f5 100644 --- a/components/popover/index.md +++ b/components/popover/index.md @@ -26,4 +26,4 @@ | prefixCls | 浮层的类名 | string | ant-popover | | visible | 用于手动控制浮层显隐 | boolean | false | | onVisibleChange | 显示隐藏改变的回调 | function | 无 | -| getTooltipContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到浮层滚动定位问题，试试改为滚动的区域 | Function(triggerNode) | () => document.body | +| getTooltipContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位。[示例](http://codepen.io/anon/pen/ONjyba?editors=001) | Function(triggerNode) | () => document.body | diff --git a/components/select/index.md b/components/select/index.md index 83dd13fca9..e5af9007e9 100644 --- a/components/select/index.md +++ b/components/select/index.md @@ -43,7 +43,7 @@ | size | 选择框大小，可选 `large` `small` | String | default | | showSearch | 在下拉中显示搜索框 | boolean | false | | disabled | 是否禁用 | boolean | false | -| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试改为滚动的区域 | Function(triggerNode) | () => document.body | +| getPopupContainer | 菜单渲染父节点。默认渲染到 body 上，如果你遇到菜单滚动定位问题，试试修改为滚动的区域，并相对其定位。[示例](http://codepen.io/anon/pen/ONjyba?editors=001) | Function(triggerNode) | () => document.body | ### Option props