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(Upload): fix image upload in wxwork (#5581)

Browse Source
This commit is contained in:
johnsonwong666 2023-11-06 10:08:22 +08:00 committed by GitHub
parent 3e6e157c6a
commit f98cf75027
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/common/utils.ts
View File

@ -115,3 +115,6 @@ export function getCurrentPage<T>() {
} }
export const isPC = ['mac', 'windows'].includes(getSystemInfoSync().platform); export const isPC = ['mac', 'windows'].includes(getSystemInfoSync().platform);
// 是否企业微信
export const isWxWork = getSystemInfoSync().environment === 'wxwork';

11
packages/common/version.ts
View File

@ -1,10 +1,17 @@
let systemInfo: WechatMiniprogram.SystemInfo; interface WxWorkSystemInfo extends WechatMiniprogram.SystemInfo {
environment?: 'wxwork';
}
interface SystemInfo extends WxWorkSystemInfo, WechatMiniprogram.SystemInfo {}
let systemInfo: SystemInfo;
export function getSystemInfoSync() { export function getSystemInfoSync() {
if (systemInfo == null) { if (systemInfo == null) {
systemInfo = wx.getSystemInfoSync(); systemInfo = wx.getSystemInfoSync();
} }
return systemInfo; return systemInfo as SystemInfo;
} }
function compareVersion(v1, v2) { function compareVersion(v1, v2) {

4
packages/uploader/utils.ts
View File

@ -1,4 +1,4 @@
import { pickExclude, isPC } from '../common/utils'; import { pickExclude, isPC, isWxWork } from '../common/utils';
import { isImageUrl, isVideoUrl } from '../common/validator'; import { isImageUrl, isVideoUrl } from '../common/validator';
export interface File { export interface File {
@ -103,7 +103,7 @@ 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) { if (isPC || isWxWork) {
wx.chooseImage({ wx.chooseImage({
count: multiple ? Math.min(maxCount, 9) : 1, count: multiple ? Math.min(maxCount, 9) : 1,
sourceType: capture, sourceType: capture,