blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-06 03:58:05 +08:00
Code Issues Projects Releases Wiki Activity

feat(Upload): support mix mediaType #5690

Browse Source
This commit is contained in:
johnsonwong666 2024-01-15 19:53:05 +08:00 committed by GitHub
parent 19083a327c
commit d1f505b8e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/uploader/README.md
View File

@ -244,7 +244,7 @@ uploadFilePromise(fileName, chooseResult) {
| camera | 当 accept 为 `video` \| `media` 时生效，可选值为 `back` `front` | _string_ | - | | camera | 当 accept 为 `video` \| `media` 时生效，可选值为 `back` `front` | _string_ | - |
| compressed | 当 accept 为 `video` 时生效，是否压缩视频，默认为`true` | _boolean_ | - | | compressed | 当 accept 为 `video` 时生效，是否压缩视频，默认为`true` | _boolean_ | - |
| max-duration | 当 accept 为 `video` \| `media` 时生效，拍摄视频最长拍摄时间，单位秒 | _number_ | `60` | | max-duration | 当 accept 为 `video` \| `media` 时生效，拍摄视频最长拍摄时间，单位秒 | _number_ | `60` |
| media-type `v1.10.8` | 当 accept 为 `media` 时生效，选择的文件的文件类型，可选值为 `image` `video` | _string[]_ | `['image', 'video']` | | media-type `v1.10.8` | 当 accept 为 `media` 时生效，选择的文件的文件类型，可选值为 `image` `video` `mix` | _string[]_ | `['image', 'video', 'mix']` |
| extension `v1.10.11` | 当 accept 为 `file` 时生效，根据文件拓展名过滤可选择文件。每一项都不能是空字符串。默认不过滤 | _string[] \| undefined_ | - | | extension `v1.10.11` | 当 accept 为 `file` 时生效，根据文件拓展名过滤可选择文件。每一项都不能是空字符串。默认不过滤 | _string[] \| undefined_ | - |
| showmenu `v1.10.13` | 预览图片时，是否显示长按菜单 | _boolean_ | `true` | | showmenu `v1.10.13` | 预览图片时，是否显示长按菜单 | _boolean_ | `true` |
| upload-icon | 上传区域图标，可选值见 [Icon 组件](#/icon) | _string_ | `plus` | | upload-icon | 上传区域图标，可选值见 [Icon 组件](#/icon) | _string_ | `plus` |

2
packages/uploader/shared.ts
View File

@ -42,7 +42,7 @@ export const mediaProps = {
}, },
mediaType: { mediaType: {
type: Array, type: Array,
value: ['image', 'video'], value: ['image', 'video', 'mix'],
}, },
maxDuration: { maxDuration: {
type: Number, type: Number,

5
packages/uploader/utils.ts
View File

@ -73,9 +73,10 @@ function formatVideo(
function formatMedia(res: WechatMiniprogram.ChooseMediaSuccessCallbackResult) { function formatMedia(res: WechatMiniprogram.ChooseMediaSuccessCallbackResult) {
return res.tempFiles.map((item) => ({ return res.tempFiles.map((item) => ({
...pickExclude(item, ['fileType', 'thumbTempFilePath', 'tempFilePath']), ...pickExclude(item, ['fileType', 'thumbTempFilePath', 'tempFilePath']),
type: res.type, type: item.fileType,
url: item.tempFilePath, url: item.tempFilePath,
thumb: res.type === 'video' ? item.thumbTempFilePath : item.tempFilePath, thumb:
item.fileType === 'video' ? item.thumbTempFilePath : item.tempFilePath,
})); }));
} }