From fee7a26cfc82fd76a3548b987448ed583643024b Mon Sep 17 00:00:00 2001 From: afc163 Date: Sun, 10 Apr 2016 16:01:03 +0800 Subject: [PATCH 1/6] fix menu style --- style/components/menu.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/style/components/menu.less b/style/components/menu.less index 9c1abdd067..20fa4b3b49 100644 --- a/style/components/menu.less +++ b/style/components/menu.less @@ -307,6 +307,8 @@ &-dark&-horizontal > &-item, &-dark&-horizontal > &-submenu { border-color: #404040; + border-bottom: 0; + top: 0; } &-dark&-horizontal > &-item-active, From e3834829e4a8f4909ae1f7c9cf82ac7fbb92a113 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 11 Apr 2016 10:57:58 +0800 Subject: [PATCH 2/6] update menu doc --- components/menu/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/menu/index.md b/components/menu/index.md index 5f6e8ea9c0..ab108f256a 100644 --- a/components/menu/index.md +++ b/components/menu/index.md @@ -38,7 +38,7 @@ | defaultOpenKeys | 初始展开的菜单项 key 数组 | | | | onSelect | 被选中时调用,参数 {item, key, selectedKeys} 对象 | function | 无 | | onDeselect | 取消选中时调用,参数 {item, key, selectedKeys} 对象,仅在 multiple 生效 | function | 无 | -| onClick | 点击 menuitem 调用此函数,参数为 {item, key} | function | 无 | +| onClick | 点击 menuitem 调用此函数,参数为 {item, key, keyPath} | function | 无 | | style | 根节点样式 | object | | | ### Menu.Item props From 76f14b4bd26d2ee0b93a3066e171c8bbce9e5b9f Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 11 Apr 2016 11:16:31 +0800 Subject: [PATCH 3/6] Fix BreadCrumb IndexRoute support, close #1375 & #571 --- components/breadcrumb/index.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/breadcrumb/index.jsx b/components/breadcrumb/index.jsx index 593d8f3769..83dd1309f8 100644 --- a/components/breadcrumb/index.jsx +++ b/components/breadcrumb/index.jsx @@ -52,6 +52,7 @@ const Breadcrumb = React.createClass({ if (routes && routes.length > 0) { const paths = []; crumbs = routes.map((route, i) => { + route.path = route.path || ''; let path = route.path.replace(/^\//, ''); Object.keys(params).forEach(key => { path = path.replace(`:${key}`, params[key]); From 95fabf0c005f1d23a77fc4533fa413d3e1344596 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 11 Apr 2016 14:03:31 +0800 Subject: [PATCH 4/6] update demo --- components/form/demo/search-input.md | 12 ++++++------ components/upload/demo/basic.md | 12 +++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/components/form/demo/search-input.md b/components/form/demo/search-input.md index 8935567d3a..37ac572f86 100644 --- a/components/form/demo/search-input.md +++ b/components/form/demo/search-input.md @@ -47,12 +47,12 @@ const SearchInput = React.createClass({ -
- -
-
+
+ +
+ ); } }); diff --git a/components/upload/demo/basic.md b/components/upload/demo/basic.md index ab4dfbbd1d..905d0e1ebe 100644 --- a/components/upload/demo/basic.md +++ b/components/upload/demo/basic.md @@ -1,17 +1,19 @@ -# 点击上传 - -- order: 0 +--- +order: 0 +title: 点击上传 +--- 经典款式,用户点击按钮弹出文件选择框。 ---- - ````jsx import { Upload, message, Button, Icon } from 'antd'; const props = { name: 'file', action: '/upload.do', + headers: { + authorization: 'authorization-text', + }, onChange(info) { if (info.file.status !== 'uploading') { console.log(info.file, info.fileList); From d4cfd369b784657542513251cde8c80302fbcee5 Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 11 Apr 2016 14:20:05 +0800 Subject: [PATCH 5/6] update demo --- components/upload/demo/basic.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/components/upload/demo/basic.md b/components/upload/demo/basic.md index 905d0e1ebe..e9b8309058 100644 --- a/components/upload/demo/basic.md +++ b/components/upload/demo/basic.md @@ -1,10 +1,11 @@ ---- -order: 0 -title: 点击上传 ---- +# 点击上传 + +- order: 0 经典款式,用户点击按钮弹出文件选择框。 +--- + ````jsx import { Upload, message, Button, Icon } from 'antd'; From 8b98ce682d45f5e3acc0cea3b53a3827f65c262d Mon Sep 17 00:00:00 2001 From: afc163 Date: Mon, 11 Apr 2016 14:31:59 +0800 Subject: [PATCH 6/6] Fix Pagination text should not be selectable --- style/components/pagination.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style/components/pagination.less b/style/components/pagination.less index b9fe5a1936..583624049c 100644 --- a/style/components/pagination.less +++ b/style/components/pagination.less @@ -1,7 +1,6 @@ @pagination-prefix-cls: ant-pagination; .@{pagination-prefix-cls} { - user-select: none; font-size: @font-size-base; &:after { @@ -23,6 +22,7 @@ &-item { cursor: pointer; border-radius: @border-radius-base; + user-select: none; min-width: 28px; height: 28px; line-height: 28px;