Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-08-22 18:11:26 +08:00
11 changed files with 41 additions and 9 deletions

View File

@@ -324,7 +324,10 @@ export default createComponent({
const PreviewCover = this.$slots['preview-cover'] && (
<div class={bem('preview-cover')}>
{this.$slots['preview-cover'](item)}
{this.$slots['preview-cover']({
index,
...item,
})}
</div>
);

View File

@@ -76,7 +76,7 @@ exports[`preview-cover slot 1`] = `
<div class="van-image van-uploader__preview-image"><img src="https://img.yzcdn.cn/vant/cat.jpeg" class="van-image__img" style="object-fit: cover;">
<div class="van-image__loading"><i class="van-icon van-icon-photo van-image__loading-icon">
<!----></i></div>
<div class="van-uploader__preview-cover">https://img.yzcdn.cn/vant/cat.jpeg</div>
<div class="van-uploader__preview-cover">url: https://img.yzcdn.cn/vant/cat.jpeg, index: 0</div>
</div>
<div class="van-uploader__preview-delete"><i class="van-icon van-icon-cross van-uploader__preview-delete-icon">
<!----></i></div>
@@ -85,7 +85,7 @@ exports[`preview-cover slot 1`] = `
<div class="van-image van-uploader__preview-image"><img src="https://img.yzcdn.cn/vant/cat.jpeg" class="van-image__img" style="object-fit: cover;">
<div class="van-image__loading"><i class="van-icon van-icon-photo van-image__loading-icon">
<!----></i></div>
<div class="van-uploader__preview-cover">https://img.yzcdn.cn/vant/cat.jpeg</div>
<div class="van-uploader__preview-cover">url: https://img.yzcdn.cn/vant/cat.jpeg, index: 1</div>
</div>
<div class="van-uploader__preview-delete"><i class="van-icon van-icon-cross van-uploader__preview-delete-icon">
<!----></i></div>

View File

@@ -531,7 +531,7 @@ test('preview-cover slot', () => {
fileList: [{ url: IMAGE }, { url: IMAGE }],
},
scopedSlots: {
'preview-cover': (item) => item.url,
'preview-cover': (item) => `url: ${item.url}, index: ${item.index}`,
},
});