Skip to content

Bump ws from 6.2.1 to 6.2.3 #2282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bump ws from 6.2.1 to 6.2.3 #2282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c2e82e
[故障] 修复upload批量上传uploadProgress和uploadComplete事件不触发的问题，解决了@4181
imbnnn May 8, 2024
b0f2410
[故障] 解决发布脚本未正确设置tag的问题
rdkmaster May 8, 2024
8c3e21c
Bump ws from 6.2.1 to 6.2.3
dependabot[bot] Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions build/tools/gulp/tasks/publish.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 14 additions & 9 deletions src/jigsaw/common/directive/upload/upload.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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';
Expand All @@ -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);
Expand Down Expand Up @@ -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();
Expand Down