From b72e32d48ab8c3db6d613107ee39f280b687f34d Mon Sep 17 00:00:00 2001 From: yinxulai Date: Tue, 22 Oct 2024 11:55:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=82=E5=BD=93=E9=99=8D=E4=BD=8E?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=9A=84=E8=BE=93?= =?UTF-8?q?=E5=87=BA=E9=80=9F=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/common/src/helper/progress/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/common/src/helper/progress/index.ts b/packages/common/src/helper/progress/index.ts index a5409598..a876828e 100644 --- a/packages/common/src/helper/progress/index.ts +++ b/packages/common/src/helper/progress/index.ts @@ -34,7 +34,7 @@ export class MockProgress { let time = 0 this.progress = 0 - const intervalFrequency = 100 + const intervalFrequency = 400 const intervalIds = setInterval(() => { time += intervalFrequency this.setProgress(1 - Math.exp(-1 * time / (this.timeConstant * 1000))) From 0e013dff7ebfe76a272b0d17bc4203c185404819 Mon Sep 17 00:00:00 2001 From: yinxulai Date: Thu, 24 Oct 2024 14:23:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- packages/browser/package.json | 2 +- packages/common/src/upload/common/context/index.ts | 5 +---- packages/common/src/upload/multipartv1/index.ts | 2 +- packages/common/src/upload/multipartv2/index.ts | 2 +- packages/wechat-miniprogram/package.json | 2 +- 6 files changed, 7 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21e2b673..25a79ee5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12124,7 +12124,7 @@ }, "packages/browser": { "name": "qiniu-js", - "version": "4.0.0-beta.4", + "version": "4.0.0-beta.6", "license": "MIT", "devDependencies": { "@rollup/plugin-babel": "^5.3.1", @@ -12207,7 +12207,7 @@ "packages/packages/wechat-miniprogram": {}, "packages/wechat-miniprogram": { "name": "@qiniu/wechat-miniprogram-upload", - "version": "1.0.3", + "version": "1.0.4", "license": "MIT", "devDependencies": { "@rollup/plugin-babel": "^5.3.1", diff --git a/packages/browser/package.json b/packages/browser/package.json index 3146d4b2..81768987 100644 --- a/packages/browser/package.json +++ b/packages/browser/package.json @@ -1,6 +1,6 @@ { "name": "qiniu-js", - "version": "4.0.0-beta.5", + "version": "4.0.0-beta.6", "description": "Qiniu browser upload sdk", "miniprogram": "output", "main": "output/index.js", diff --git a/packages/common/src/upload/common/context/index.ts b/packages/common/src/upload/common/context/index.ts index dc03bb3c..f21cccd0 100644 --- a/packages/common/src/upload/common/context/index.ts +++ b/packages/common/src/upload/common/context/index.ts @@ -33,10 +33,7 @@ export function updateTotalIntoProgress(progress: Progress): Progress { } const newPercent = totalPercent / detailValues.length - - // 在失败重试等场景中，进度回退是正常业务导致的，但是客户要求进度不能回退 - if (newPercent > progress.percent) progress.percent = newPercent // 防止进度倒流 - + progress.percent = newPercent progress.size = totalSize return progress } diff --git a/packages/common/src/upload/multipartv1/index.ts b/packages/common/src/upload/multipartv1/index.ts index 448a4523..1c2f9b15 100644 --- a/packages/common/src/upload/multipartv1/index.ts +++ b/packages/common/src/upload/multipartv1/index.ts @@ -202,7 +202,7 @@ export const createMultipartUploadV1Task = (file: UploadFile, config: UploadConf prefix: 'MultipartUploadChildQueue' }, concurrentLimit: 1, // 此接口只能串行 - // TODO 动态创建任务会导致任务进度倒退 + // FIXME 动态创建任务会导致任务进度倒退 tasksCreator: async () => { const sliceResult = await file.slice(4 * 1024 * 1024) if (isErrorResult(sliceResult)) { diff --git a/packages/common/src/upload/multipartv2/index.ts b/packages/common/src/upload/multipartv2/index.ts index 2593c79a..f33d0de4 100644 --- a/packages/common/src/upload/multipartv2/index.ts +++ b/packages/common/src/upload/multipartv2/index.ts @@ -318,7 +318,7 @@ export const createMultipartUploadV2Task = (file: UploadFile, config: UploadConf }, concurrentLimit: 3, - // TODO 动态创建任务会导致任务进度倒退 + // FIXME: 动态创建任务会导致任务进度倒退 tasksCreator: async () => { const sliceResult = await file.slice(4 * 1024 * 1024) if (isErrorResult(sliceResult)) { diff --git a/packages/wechat-miniprogram/package.json b/packages/wechat-miniprogram/package.json index e1d16430..75668c50 100644 --- a/packages/wechat-miniprogram/package.json +++ b/packages/wechat-miniprogram/package.json @@ -1,6 +1,6 @@ { "name": "@qiniu/wechat-miniprogram-upload", - "version": "1.0.3", + "version": "1.0.4", "description": "Qiniu wechat-miniprogram upload sdk", "miniprogram": "output", "main": "output/index.js",