mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-01-06 02:38:00 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ant-design/ant-design

Browse Source
This commit is contained in:
偏右 2016-04-11 15:27:28 +08:00
commit 7fc830394d
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/breadcrumb/index.jsx
View File

@ -52,6 +52,7 @@ const Breadcrumb = React.createClass({
if (routes && routes.length > 0) { if (routes && routes.length > 0) {
const paths = []; const paths = [];
crumbs = routes.map((route, i) => { crumbs = routes.map((route, i) => {
route.path = route.path || '';
let path = route.path.replace(/^\//, ''); let path = route.path.replace(/^\//, '');
Object.keys(params).forEach(key => { Object.keys(params).forEach(key => {
path = path.replace(`:${key}`, params[key]); path = path.replace(`:${key}`, params[key]);

2
components/menu/index.md
View File

@ -38,7 +38,7 @@
| defaultOpenKeys | 初始展开的菜单项 key 数组 | | | | defaultOpenKeys | 初始展开的菜单项 key 数组 | | |
| onSelect | 被选中时调用，参数 {item, key, selectedKeys} 对象 | function | 无 | | onSelect | 被选中时调用，参数 {item, key, selectedKeys} 对象 | function | 无 |
| onDeselect | 取消选中时调用，参数 {item, key, selectedKeys} 对象，仅在 multiple 生效 | function | 无 | | onDeselect | 取消选中时调用，参数 {item, key, selectedKeys} 对象，仅在 multiple 生效 | function | 无 |
| onClick | 点击 menuitem 调用此函数，参数为 {item, key} | function | 无 | | onClick | 点击 menuitem 调用此函数，参数为 {item, key, keyPath} | function | 无 |
| style | 根节点样式 | object | | | | style | 根节点样式 | object | | |
### Menu.Item props ### Menu.Item props

3
components/upload/demo/basic.md
View File

@ -12,6 +12,9 @@ import { Upload, message, Button, Icon } from 'antd';
const props = { const props = {
name: 'file', name: 'file',
action: '/upload.do', action: '/upload.do',
headers: {
authorization: 'authorization-text',
},
onChange(info) { onChange(info) {
if (info.file.status !== 'uploading') { if (info.file.status !== 'uploading') {
console.log(info.file, info.fileList); console.log(info.file, info.fileList);

2
style/components/menu.less
View File

@ -307,6 +307,8 @@
&-dark&-horizontal > &-item, &-dark&-horizontal > &-item,
&-dark&-horizontal > &-submenu { &-dark&-horizontal > &-submenu {
border-color: #404040; border-color: #404040;
border-bottom: 0;
top: 0;
} }
&-dark&-horizontal > &-item-active, &-dark&-horizontal > &-item-active,

2
style/components/pagination.less
View File

@ -1,7 +1,6 @@
@pagination-prefix-cls: ant-pagination; @pagination-prefix-cls: ant-pagination;
.@{pagination-prefix-cls} { .@{pagination-prefix-cls} {
user-select: none;
font-size: @font-size-base; font-size: @font-size-base;
&:after { &:after {
@ -23,6 +22,7 @@
&-item { &-item {
cursor: pointer; cursor: pointer;
border-radius: @border-radius-base; border-radius: @border-radius-base;
user-select: none;
min-width: 28px; min-width: 28px;
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;