Skip to content

Commit ba26eff

Browse files
committed
fix: update remove property of upload #259
1 parent 1dbb9c1 commit ba26eff

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

components/upload/Upload.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ export default {
124124
})
125125
},
126126
handleRemove (file) {
127-
Promise.resolve(this.$emit('remove', file)).then(ret => {
127+
const { remove } = getOptionProps(this)
128+
Promise.resolve(typeof remove === 'function' ? remove(file) : remove).then(ret => {
128129
// Prevent removing file
129130
if (ret === false) {
130131
return

components/upload/demo/upload-manually.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Upload files manually after `beforeUpload` returns `false`.
1414
<a-upload
1515
action="//jsonplaceholder.typicode.com/posts/"
1616
:fileList="fileList"
17-
@remove="handleRemove"
17+
:remove="handleRemove"
1818
:beforeUpload="beforeUpload"
1919
>
2020
<a-button>

components/upload/index.en-US.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@
2020
| showUploadList | Whether to show default upload list, could be an object to specify `showPreviewIcon` and `showRemoveIcon` individually | Boolean or { showPreviewIcon?: boolean, showRemoveIcon?: boolean } | true |
2121
| supportServerRender | Need to be turned on while the server side is rendering. | boolean | false |
2222
| withCredentials | ajax upload with cookie sent | boolean | false |
23+
| remove | A callback function, will be executed when removing file button is clicked, remove event will be prevented when return value is `false` or a Promise which resolve(false) or reject. | Function(file): `boolean | Promise` | - |
2324

2425
### events
2526
| Events Name | Description | Arguments |
2627
| --- | --- | --- |
2728
| change | A callback function, can be executed when uploading state is changing. See [change](#change) | Function | - |
2829
| preview | A callback function, will be executed when file link or preview icon is clicked. | Function(file) | - |
29-
| remove | A callback function, will be executed when removing file button is clicked, remove event will be prevented when return value is `false` or a Promise which resolve(false) or reject. | Function(file): `boolean | Promise` | - |
30+
3031

3132
### change
3233

components/upload/index.zh-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
| showUploadList | 是否展示 uploadList, 可设为一个对象,用于单独设定 showPreviewIcon 和 showRemoveIcon | Boolean or { showPreviewIcon?: boolean, showRemoveIcon?: boolean } | true |
2121
| supportServerRender | 服务端渲染时需要打开这个 | boolean | false |
2222
| withCredentials | 上传请求时是否携带 cookie | boolean | false |
23+
| remove   | 点击移除文件时的回调,返回值为 false 时不移除。支持返回一个 Promise 对象,Promise 对象 resolve(false) 或 reject 时不移除。               | Function(file): `boolean | Promise` | 无   |
2324

2425
### 事件
2526
| 事件名称 | 说明 | 回调参数 |
2627
| --- | --- | --- |
2728
| change | 上传文件改变时的状态,详见 [change](#change) | Function ||
2829
| preview | 点击文件链接或预览图标时的回调 | Function(file) ||
29-
| remove   | 点击移除文件时的回调,返回值为 false 时不移除。支持返回一个 Promise 对象,Promise 对象 resolve(false) 或 reject 时不移除。               | Function(file): `boolean | Promise` | 无   |
3030

3131
### change
3232

components/upload/interface.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export const UploadProps = {
6969
listType: PropsTypes.oneOf(['text', 'picture', 'picture-card']),
7070
// className: PropsTypes.string,
7171
// onPreview: PropsTypes.func,
72-
// onRemove: PropsTypes.func,
72+
remove: PropsTypes.func,
7373
supportServerRender: PropsTypes.bool,
7474
// style: PropsTypes.object,
7575
disabled: PropsTypes.bool,

0 commit comments

Comments
 (0)