From 5c2e82e94bd2451726fe3eeaf09b814387505f22 Mon Sep 17 00:00:00 2001 From: imbnnn <111834476+imbnnn@users.noreply.github.com> Date: Wed, 8 May 2024 14:10:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E6=95=85=E9=9A=9C]=20=E4=BF=AE=E5=A4=8Dup?= =?UTF-8?q?load=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0uploadProgress=E5=92=8C?= =?UTF-8?q?uploadComplete=E4=BA=8B=E4=BB=B6=E4=B8=8D=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=BA=86?= =?UTF-8?q?@4181?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../directive/upload/upload.directive.ts | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/jigsaw/common/directive/upload/upload.directive.ts b/src/jigsaw/common/directive/upload/upload.directive.ts index 19bb0e42c..0ac41a812 100644 --- a/src/jigsaw/common/directive/upload/upload.directive.ts +++ b/src/jigsaw/common/directive/upload/upload.directive.ts @@ -361,6 +361,8 @@ export class JigsawUploadDirective extends JigsawUploadBase implements IUploader if (fileInfo.files) { // 把多个file凑成一个formData this.files.filter(file => file.url == "").forEach((item: any) => updateState(item)); + fileInfo.name = 'multiple-files-combined'; + fileInfo.state = 'loading'; fileInfo.files.forEach(file => formData.append(this.contentField, file, file.name)); this._appendAdditionalFields(formData, 'multiple-files-combined'); } else { @@ -391,14 +393,14 @@ export class JigsawUploadDirective extends JigsawUploadBase implements IUploader this._statusLog(fileInfo, this._translateService.instant(`upload.done`)); } if (fileInfo.files) { - this.files.forEach(item => { + this.files.filter(file => file.url == "").forEach(item => { update(item); item.progress = 100; }); - } else { - update(fileInfo); - this._afterCurFileUploaded(fileInfo); + fileInfo.name = "multiple-files-combined"; } + update(fileInfo); + this._afterCurFileUploaded(fileInfo); }, (e) => { const update = (fileInfo: UploadFileInfo) => { fileInfo.state = 'error'; @@ -408,7 +410,7 @@ export class JigsawUploadDirective extends JigsawUploadBase implements IUploader const message = this._translateService.instant(`upload.${e.statusText}`) || e.statusText; if (this.batchMode) { this.files.filter(file => file.url == "").forEach((item: any) => update(item)); - return; + fileInfo.name = "multiple-files-combined"; } update(fileInfo); this._afterCurFileUploaded(fileInfo); @@ -449,10 +451,13 @@ export class JigsawUploadDirective extends JigsawUploadBase implements IUploader return; } - const waitingFile = this.files.find(f => f.state == 'pause'); - if (waitingFile) { - this._sequenceUpload(waitingFile) - } else if (this._isAllFilesUploaded()) { + if (!this.batchMode) { + const waitingFile = this.files.find(f => f.state == 'pause'); + if (waitingFile) { + this._sequenceUpload(waitingFile) + } + } + if (this._isAllFilesUploaded()) { this.complete.emit(this.files); } this._cdr.markForCheck(); From b0f2410900f8856e6edbcfd6f3da6267c1f93723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=97=AD?= Date: Wed, 8 May 2024 14:16:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E6=95=85=E9=9A=9C]=20=E8=A7=A3=E5=86=B3?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=84=9A=E6=9C=AC=E6=9C=AA=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E8=AE=BE=E7=BD=AEtag=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/tools/gulp/tasks/publish.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/tools/gulp/tasks/publish.ts b/build/tools/gulp/tasks/publish.ts index f4ac795ec..df8429acf 100644 --- a/build/tools/gulp/tasks/publish.ts +++ b/build/tools/gulp/tasks/publish.ts @@ -74,11 +74,14 @@ async function publishAll() { process.exit(1); } _npmInstall('normal'); + argv.tag = 'latest'; error = await runTasks(['publish:jigsaw', 'publish:formly']); if (error) { process.exit(1); } + argv.nextVersion = argv.nextVersion + '-g1'; + argv.tag = 'governance'; _npmInstall('governance'); error = await runTasks(['publish:governance:jigsaw', 'publish:governance:formly']); if (error) { From 8c3e21c0ef404aedcdbfef38515ca5c2f664eab0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 06:08:21 +0000 Subject: [PATCH 3/3] Bump ws from 6.2.1 to 6.2.3 Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.3. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/6.2.1...6.2.3) --- updated-dependencies: - dependency-name: ws dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 65fa6114b..d0653c042 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19485,9 +19485,9 @@ } }, "ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz", + "integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==", "dev": true, "requires": { "async-limiter": "~1.0.0"