Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix #2571 #2518 #2645 增加disabled属性及取消上传时cancel请求 #2690

Merged
merged 2 commits into from Aug 14, 2016
Merged

fix #2571 #2518 #2645 增加disabled属性及取消上传时cancel请求 #2690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83c70bd
fix #2571 #2518 use rc-upload@2.x abort
ddcat1115 Aug 11, 2016
a55d686
fix
ddcat1115 Aug 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 13 additions & 7 deletions components/upload/index.jsx
View file
Open in desktop
Expand Up @@ -72,6 +72,7 @@ export default class Upload extends React.Component {
showUploadList: true,
listType: 'text', // or pictrue
className: '',
disabled: false,
}

constructor(props) {
Expand Down Expand Up @@ -197,6 +198,7 @@ export default class Upload extends React.Component {
}

handleManualRemove = (file) => {
this.refs.upload.abort(file);
/*eslint-disable */
file.status = 'removed';
/*eslint-enable */
Expand Down Expand Up @@ -253,18 +255,21 @@ export default class Upload extends React.Component {
);
}
if (type === 'drag') {
let dragUploadingClass = this.state.fileList.some(file => file.status === 'uploading')
? `${prefixCls}-drag-uploading` : '';
let draggingClass = this.state.dragState === 'dragover'
? `${prefixCls}-drag-hover` : '';
const dragCls = classNames({
[prefixCls]: true,
[`${prefixCls}-drag`]: true,
[`${prefixCls}-drag-uploading`]: this.state.fileList.some(file => file.status === 'uploading'),
[`${prefixCls}-drag-hover`]: this.state.dragState === 'dragover',
[`${prefixCls}-disabled`]: this.props.disabled,
});
return (
<span className={this.props.className}>
<div className={`${prefixCls} ${prefixCls}-drag ${dragUploadingClass} ${draggingClass}`}
<div className={dragCls}
onDrop={this.onFileDrop}
onDragOver={this.onFileDrop}
onDragLeave={this.onFileDrop}
>
<RcUpload {...props}>
<RcUpload {...props} ref="upload">
<div className={`${prefixCls}-drag-container`}>
{this.props.children}
</div>
Expand All @@ -279,10 +284,11 @@ export default class Upload extends React.Component {
[prefixCls]: true,
[`${prefixCls}-select`]: true,
[`${prefixCls}-select-${this.props.listType}`]: true,
[`${prefixCls}-disabled`]: this.props.disabled,
});

const uploadButton = this.props.children
? <div className={uploadButtonCls}><RcUpload {...props} /></div>
? <div className={uploadButtonCls}><RcUpload {...props} ref="upload" /></div>
: null;

if (this.props.listType === 'picture-card') {
Expand Down
1 change: 1 addition & 0 deletions components/upload/index.md
View file
Open in desktop
Expand Up @@ -34,6 +34,7 @@ english: Upload
| onPreview | 点击文件链接时的回调 | Function(file) | 无 |
| onRemove | 点击移除文件时的回调 | Function(file) | 无 |
| supportServerRender | 服务端渲染时需要打开这个 | Boolean | false |
| disabled | 是否禁用 | Boolean | false |

### onChange

Expand Down
8 changes: 6 additions & 2 deletions components/upload/style/index.less
View file
Open in desktop
Expand Up @@ -52,10 +52,14 @@
height: 100%;
position: relative;

&.@{upload-prefix-cls}-drag-hover {
&.@{upload-prefix-cls}-drag-hover:not(.@{upload-prefix-cls}-disabled) {
border: 2px dashed tint(@primary-color, 20%);
}

&.@{upload-prefix-cls}-disabled {
cursor: not-allowed;
}

> span {
display: table;
height: 100%;
Expand All @@ -66,7 +70,7 @@
vertical-align: middle;
}

&:hover {
&:not(.@{upload-prefix-cls}-disabled):hover {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

补充上 disabled 的 cursor: not-allowed; 样式。

border-color: tint(@primary-color, 20%);
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -66,7 +66,7 @@
"rc-tooltip": "~3.4.2",
"rc-tree": "~1.3.6",
"rc-tree-select": "~1.8.0",
"rc-upload": "~1.13.3",
"rc-upload": "~2.0.3",
"rc-util": "~3.3.0",
"react-addons-pure-render-mixin": "^15.0.0",
"react-slick": "~0.12.0",
Expand Down