Skip to content

Commit 0d3eec1

Browse files
authored
feat(Uploader): add deletable prop (youzan#4925)
1 parent fbb34a0 commit 0d3eec1

4 files changed

Lines changed: 20 additions & 1 deletion

File tree

src/uploader/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ export default {
118118
| preview-full-image | Whethe to show full screen image preview when click image | *boolean* | `true` | - |
119119
| multiple | Whether to enable multiple selection pictures | *boolean* | `false` | - |
120120
| disabled | Whether to disabled the upload | *boolean* | `false` | - |
121+
| deletable | Whether to show delete icon | *boolean* | `true` | 2.2.12 |
121122
| capture | Capture,can be set to `camera` | *string* | - | - |
122123
| after-read | Hook after reading the file | *Function* | - | - |
123124
| before-read | Hook before reading the file, return false to stop reading the file, can return Promise | *Function* | - | - |

src/uploader/README.zh-CN.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ export default {
134134
| preview-full-image | 是否在点击预览图后展示全屏图片预览 | *boolean* | `true` | 2.1.5 |
135135
| multiple | 是否开启图片多选,部分安卓机型不支持 | *boolean* | `false` | - |
136136
| disabled | 是否禁用文件上传 | *boolean* | `false` | - |
137+
| deletable | 是否展示删除按钮 | *boolean* | `true` | 2.2.12 |
137138
| capture | 图片选取模式,可选值为`camera`(直接调起摄像头) | *string* | - | - |
138139
| after-read | 文件读取完成后的回调函数 | *Function* | - | - |
139140
| before-read | 文件读取前的回调函数,返回`false`可终止文件读取,支持返回`Promise` | *Function* | - | - |

src/uploader/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ export default createComponent({
4040
type: Number,
4141
default: Number.MAX_VALUE
4242
},
43+
deletable: {
44+
type: Boolean,
45+
default: true
46+
},
4347
previewImage: {
4448
type: Boolean,
4549
default: true
@@ -214,7 +218,7 @@ export default createComponent({
214218
},
215219

216220
genPreviewItem(item, index) {
217-
const DeleteIcon = (
221+
const DeleteIcon = this.deletable && (
218222
<Icon
219223
name="clear"
220224
class={bem('preview-delete')}

src/uploader/test/index.spec.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,19 @@ it('preview-size prop', async () => {
270270
expect(wrapper).toMatchSnapshot();
271271
});
272272

273+
it('deletable prop', () => {
274+
const wrapper = mount(Uploader, {
275+
propsData: {
276+
fileList: [{ url: IMAGE }]
277+
}
278+
});
279+
280+
expect(wrapper.find('.van-uploader__preview-delete').element).toBeTruthy();
281+
282+
wrapper.setProps({ deletable: false });
283+
expect(wrapper.find('.van-uploader__preview-delete').element).toBeFalsy();
284+
});
285+
273286
it('delete preview image', () => {
274287
const wrapper = mount(Uploader, {
275288
propsData: {

0 commit comments

Comments
 (0)