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

fix(uploader): fix chooseImage error in PC (#5477)

Browse Source
This commit is contained in:
johnsonwong666 2023-07-10 19:17:54 +08:00 committed by GitHub
parent f197c5f3c3
commit 7498ed12c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/common/utils.ts
View File

@ -1,5 +1,9 @@
import { isDef, isNumber, isPlainObject, isPromise } from './validator'; import { isDef, isNumber, isPlainObject, isPromise } from './validator';
import { canIUseGroupSetData, canIUseNextTick } from './version'; import {
canIUseGroupSetData,
canIUseNextTick,
getSystemInfoSync,
} from './version';
export { isDef } from './validator'; export { isDef } from './validator';
export { getSystemInfoSync } from './version'; export { getSystemInfoSync } from './version';
@ -109,3 +113,5 @@ export function getCurrentPage<T>() {
const pages = getCurrentPages(); const pages = getCurrentPages();
return pages[pages.length - 1] as T & WechatMiniprogram.Page.TrivialInstance; return pages[pages.length - 1] as T & WechatMiniprogram.Page.TrivialInstance;
} }
export const isPC = ['mac', 'windows'].includes(getSystemInfoSync().platform);

20
packages/uploader/utils.ts
View File

@ -1,4 +1,4 @@
import { pickExclude } from '../common/utils'; import { pickExclude, isPC } from '../common/utils';
import { isImageUrl, isVideoUrl } from '../common/validator'; import { isImageUrl, isVideoUrl } from '../common/validator';
export interface File { export interface File {
@ -45,13 +45,15 @@ export function isVideoFile(item: File): boolean {
} }
function formatImage( function formatImage(
res: WechatMiniprogram.ChooseMediaSuccessCallbackResult res:
| WechatMiniprogram.ChooseMediaSuccessCallbackResult
| WechatMiniprogram.ChooseImageSuccessCallbackResult
): File[] { ): File[] {
return res.tempFiles.map((item) => ({ return res.tempFiles.map((item) => ({
...pickExclude(item, ['path']), ...pickExclude(item, ['path']),
type: 'image', type: 'image',
url: item.tempFilePath, url: item.tempFilePath || item.path,
thumb: item.tempFilePath, thumb: item.tempFilePath || item.path,
})); }));
} }
@ -101,6 +103,15 @@ export function chooseFile({
return new Promise<File | File[]>((resolve, reject) => { return new Promise<File | File[]>((resolve, reject) => {
switch (accept) { switch (accept) {
case 'image': case 'image':
if (isPC) {
wx.chooseImage({
count: multiple ? Math.min(maxCount, 9) : 1,
sourceType: capture,
sizeType,
success: (res) => resolve(formatImage(res)),
fail: reject,
});
} else {
wx.chooseMedia({ wx.chooseMedia({
count: multiple ? Math.min(maxCount, 9) : 1, count: multiple ? Math.min(maxCount, 9) : 1,
mediaType: ['image'], mediaType: ['image'],
@ -111,6 +122,7 @@ export function chooseFile({
success: (res) => resolve(formatImage(res)), success: (res) => resolve(formatImage(res)),
fail: reject, fail: reject,
}); });
}
break; break;
case 'media': case 'media':
wx.chooseMedia({ wx.chooseMedia({