From 297cc9379e61ec9e7a947b2c9a8cd81a6fd68211 Mon Sep 17 00:00:00 2001 From: wkj <278599135@qq.com> Date: Wed, 17 Aug 2022 20:47:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4Upload=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/extraFile/gallery/index.ts | 17 +++++++++-------- app/components/extraFile/gallery/index.tsx | 4 +++- app/components/func/debugPanel/index.less | 2 +- src/entities/Area.ts | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/components/extraFile/gallery/index.ts b/app/components/extraFile/gallery/index.ts index eee5a89a4..d8dc3d584 100644 --- a/app/components/extraFile/gallery/index.ts +++ b/app/components/extraFile/gallery/index.ts @@ -107,11 +107,7 @@ export default OakComponent({ return (750 / windowWidth) * px; }, async onPick() { - const { - selectCount, - mediaType, - sourceType, - } = this.props; + const { selectCount, mediaType, sourceType } = this.props; try { const { errMsg, tempFiles } = await wx.chooseMedia({ count: selectCount, @@ -154,9 +150,9 @@ export default OakComponent({ } } }, - async onWebPick(value) { + async onWebPick(uploadFiles) { await Promise.all( - value.map(async (uploadFile) => { + uploadFiles.map(async (uploadFile) => { const { name, type: fileType, size, raw } = uploadFile; this.pushExtraFile({ name, @@ -167,7 +163,12 @@ export default OakComponent({ }) ); }, - async pushExtraFile(options: { name: string, extra1: any, fileType: string, size: number }) { + async pushExtraFile(options: { + name: string; + extra1: any; + fileType: string; + size: number; + }) { const { type, origin, tag1, tag2, entity } = this.props; const { name, extra1, fileType, size } = options; const extension = name.substring(name.lastIndexOf('.') + 1); diff --git a/app/components/extraFile/gallery/index.tsx b/app/components/extraFile/gallery/index.tsx index d1d80812a..b0c6afd04 100644 --- a/app/components/extraFile/gallery/index.tsx +++ b/app/components/extraFile/gallery/index.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Upload, UploadFile } from 'tdesign-mobile-react'; +import { Upload, UploadFile } from 'tdesign-react'; import { composeFileUrl } from '../../../../lib/utils/extraFile'; function extraFileToUploadFile(extraFile, systemConfig) { @@ -23,6 +23,8 @@ export default function render() { autoUpload={false} max={maxNumber} accept={mediaType} + showUploadProgress={false} + theme="image" files={(files || []).map((ele) => extraFileToUploadFile(ele, systemConfig) )} diff --git a/app/components/func/debugPanel/index.less b/app/components/func/debugPanel/index.less index dcb5d482b..bb6cb5b06 100644 --- a/app/components/func/debugPanel/index.less +++ b/app/components/func/debugPanel/index.less @@ -31,5 +31,5 @@ } .btn-item { margin-top: 32rpx; - margin-right: 32rpx; + margin-right: 32rpx !important; } \ No newline at end of file diff --git a/src/entities/Area.ts b/src/entities/Area.ts index e4c6f9ca4..19f5064ad 100644 --- a/src/entities/Area.ts +++ b/src/entities/Area.ts @@ -20,7 +20,7 @@ const locale: LocaleDef