From 39226565660f723470b9190b804252f7daba37bc Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 17 Aug 2015 16:54:42 +0800 Subject: [PATCH 1/3] RadioGroup defaultValue --- components/radio/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/components/radio/index.md b/components/radio/index.md index 2d8f9498cc..6094c20d1f 100644 --- a/components/radio/index.md +++ b/components/radio/index.md @@ -32,3 +32,4 @@ |----------------|----------------------------------|-------------------|--------|--------| | onChange | 选项变化时的回调函数 | Function(e:Event) | 无 | 无 | | value | 用于设置当前选中的值 | String | 无 | 无 | +| defaultValue | 默认选中的值 | String | 无 | 无 | From fab3280ed211b311ba75bab19c4cc9e9ec97cfe3 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 17 Aug 2015 17:03:16 +0800 Subject: [PATCH 2/3] code style update --- components/radio/demo/radiogroup.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/radio/demo/radiogroup.md b/components/radio/demo/radiogroup.md index 1ce350d199..f124fac2a1 100644 --- a/components/radio/demo/radiogroup.md +++ b/components/radio/demo/radiogroup.md @@ -23,7 +23,7 @@ var App = React.createClass({ }); }, render() { - return
+ return
A B @@ -31,7 +31,7 @@ var App = React.createClass({ D
你选中的: {this.state.value}
-
+
; } }); React.render(, document.getElementById('components-radio-demo-radiogroup')); From 662f8889bf89ae5e3f4b31113c421e04c261938b Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 17 Aug 2015 17:28:48 +0800 Subject: [PATCH 3/3] fix menu-item link, #139 --- components/menu/demo/horizontal.md | 5 ++++- style/components/menu.less | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/components/menu/demo/horizontal.md b/components/menu/demo/horizontal.md index 9ef8bf9484..11022bf478 100644 --- a/components/menu/demo/horizontal.md +++ b/components/menu/demo/horizontal.md @@ -30,12 +30,15 @@ var App = React.createClass({ 导航二 - 导航三(子菜单)}> + 导航 - 子菜单}> 选项1 选项2 选项3 选项4 + + 导航四 - 链接 + } }); diff --git a/style/components/menu.less b/style/components/menu.less index 0e0776f2d1..ad10a9e6bf 100644 --- a/style/components/menu.less +++ b/style/components/menu.less @@ -156,9 +156,23 @@ & > .@{menuPrefixCls}-item, & > .@{menuPrefixCls}-submenu > .@{menuPrefixCls}-submenu-title { - padding: 15px 20px; + padding: 0 20px; + line-height: 50px; position: relative; top: 1px; + > a { + display: block; + &:before, &:after { + position: absolute; + background-color: rgba(255,255,255,0.001); + width: 20px; + height: 50px; + content: ''; + } + &:before { + left: 0; + } + } } & > .@{menuPrefixCls}-submenu, & > .@{menuPrefixCls}-item {