@worktile/theia 3.0.7 → 3.0.8

package/bundles/worktile-theia.umd.js

@@ -901,11 +901,12 @@
         function TheContextService(ngZone) {
             var _this = this;
             this.ngZone = ngZone;
-            this.fileList = [];
+            this.uploadingFiles = [];
             this.paintFormatStatus = {
                 isActive: false,
                 marks: {}
             };
+            this.uploadingStatus$ = new rxjs.Subject();
             this.ngZone.runOutsideAngular(function () {
                 _this.onMouseUp$ = rxjs.fromEvent(window, "mouseup");
                 _this.onMouseMove$ = rxjs.fromEvent(window, "mousemove");
@@ -940,11 +941,11 @@
             var firstElementChild = this.getFirstElementChild();
             return 0.48 * firstElementChild.clientWidth;
         };
-        TheContextService.prototype.setUploadFileList = function (file) {
-            this.fileList.push(file);
+        TheContextService.prototype.addUploadingFiles = function (file) {
+            this.uploadingFiles.push(file);
         };
         TheContextService.prototype.removeUploadImage = function (file) {
-            this.fileList.splice(this.fileList.findIndex(function (item) { return item.file === file; }), 1);
+            this.uploadingFiles.splice(this.uploadingFiles.findIndex(function (item) { return item.url === file.url; }), 1);
         };
         return TheContextService;
     }());
@@ -3099,6 +3100,7 @@
             var inputFile = document.createElement('input');
             inputFile.setAttribute('type', 'file');
             inputFile.setAttribute('accept', 'image/*');
+            inputFile.setAttribute('multiple', 'true');
             inputFile.onchange = function (event) {
                 ImageEditor.insertImages(editor, event.target.files);
             };
@@ -3115,10 +3117,7 @@
                     var verify = ImageEditor.verifyImage(editor, image);
                     if (verify) {
                         var url = URL.createObjectURL(image);
-                        contextService.setUploadFileList({
-                            url: url,
-                            file: image
-                        });
+                        contextService.addUploadingFiles({ url: url, file: image });
                         imageNodes.push({ type: exports.ElementKinds.image, url: url, children: [text] });
                     }
                 }
@@ -3290,9 +3289,9 @@
             var _this = this;
             var _a;
             this.layoutDefaultWidth = this.theContextService.layoutDefaultWidth();
-            this.file = (_a = this.theContextService.fileList.find(function (item) { return item.url === _this.element.url; })) === null || _a === void 0 ? void 0 : _a.file;
-            if (this.file && this.file instanceof File) {
-                this.uploadImage(this.file);
+            this.fileItem = this.theContextService.uploadingFiles.find(function (item) { return item.url === _this.element.url; });
+            if (((_a = this.fileItem) === null || _a === void 0 ? void 0 : _a.file) && this.fileItem.file instanceof File) {
+                this.uploadImage(this.fileItem.file);
             }
             _super.prototype.ngOnInit.call(this);
         };
@@ -3317,16 +3316,19 @@
             this.mouseUpSubscription = this.theContextService.onMouseUp$.subscribe(function (e) { return _this.endDrag(e); });
             this.uploadingSubscription = this.imageUploaderService
                 .getUploadingItems$()
-                .pipe(operators.map(function (fileUploadingItem) { return _this.file && fileUploadingItem.find(function (item) { return item.file === _this.file; }); }))
+                .pipe(operators.map(function (fileUploadingItem) { var _a; return ((_a = _this.fileItem) === null || _a === void 0 ? void 0 : _a.file) && fileUploadingItem.find(function (item) { var _a; return item.file === ((_a = _this.fileItem) === null || _a === void 0 ? void 0 : _a.file); }); }))
                 .subscribe(function (uploadingItem) {
                 if (!uploadingItem || !uploadingItem.result) {
                     return;
                 }
                 _this.percentage = uploadingItem.result.uploadFile.progress.percentage;
-                var _b = uploadingItem.result, status = _b.status, uploadFile = _b.uploadFile;
-                if (status === uploader.ThyUploadStatus.done && uploadFile.response && uploadFile.responseStatus === 200) {
-                    _this.uploading = false;
+                var status = uploadingItem.result.status;
+                // 成功和失败都要上传结束
+                if (status === uploader.ThyUploadStatus.done) {
                     _this.uploadingSubscription.unsubscribe();
+                    _this.uploading = false;
+                    _this.theContextService.removeUploadImage(_this.fileItem);
+                    _this.theContextService.uploadingStatus$.next(false);
                 }
                 _this.cdr.detectChanges();
             });
@@ -3347,6 +3349,7 @@
                                 thumbUrl: this.sanitizer.bypassSecurityTrustResourceUrl(URL.createObjectURL(file))
                             };
                             this.uploading = true;
+                            this.theContextService.uploadingStatus$.next(true);
                             return [4 /*yield*/, this.imageUploaderService.uploadFileHandle([file]).toPromise()];
                         case 2:
                             _c = __read.apply(void 0, [_d.sent(), 1]), uploadFileEntity = _c[0];
@@ -14004,6 +14007,7 @@
             _this.theOnSave = new i0.EventEmitter();
             _this.theOnDOMEvent = new i0.EventEmitter();
             _this.theEditorCreated = new i0.EventEmitter();
+            _this.theUploadingStatus = new i0.EventEmitter(); // true 上传结束 false 上传中
             _this.autoScrollView = _.debounce(function (editor, scrollContainer) {
                 return autoScrollViewHandle(editor, scrollContainer);
             }, 80);
@@ -14125,7 +14129,18 @@
             configurable: true
         });
         TheEditorComponent.prototype.ngOnInit = function () {
+            var _this = this;
             this.initialize();
+            this.theContextService.uploadingStatus$.subscribe(function (isUploading) {
+                if (isUploading) {
+                    _this.theUploadingStatus.emit(true);
+                }
+                else {
+                    if (_this.theContextService.uploadingFiles.length === 0) {
+                        _this.theUploadingStatus.emit(false);
+                    }
+                }
+            });
             this.onErrorHandler();
         };
         TheEditorComponent.prototype.ngOnChanges = function (changes) {
@@ -14354,7 +14369,7 @@
         return TheEditorComponent;
     }(core.mixinUnsubscribe(core.MixinBase)));
     TheEditorComponent.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.15", ngImport: i0__namespace, type: TheEditorComponent, deps: [{ token: TheContextService }, { token: i0__namespace.ViewContainerRef }, { token: i0__namespace.ElementRef }, { token: i0__namespace.NgZone }, { token: i0__namespace.ChangeDetectorRef }], target: i0__namespace.ɵɵFactoryTarget.Component });
-    TheEditorComponent.ɵcmp = i0__namespace.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.15", type: TheEditorComponent, selector: "the-editor, theEditor", inputs: { theOptions: "theOptions", thePlugins: "thePlugins", theGlobalToolbar: "theGlobalToolbar", theDecorate: "theDecorate", theOnError: "theOnError" }, outputs: { theOnSave: "theOnSave", theOnDOMEvent: "theOnDOMEvent", theEditorCreated: "theEditorCreated" }, host: { properties: { "class.the-editor-readonly": "theOptions?.readonly" }, classAttribute: "the-editor" }, providers: [
+    TheEditorComponent.ɵcmp = i0__namespace.ɵɵngDeclareComponent({ minVersion: "12.0.0", version: "12.2.15", type: TheEditorComponent, selector: "the-editor, theEditor", inputs: { theOptions: "theOptions", thePlugins: "thePlugins", theGlobalToolbar: "theGlobalToolbar", theDecorate: "theDecorate", theOnError: "theOnError" }, outputs: { theOnSave: "theOnSave", theOnDOMEvent: "theOnDOMEvent", theEditorCreated: "theEditorCreated", theUploadingStatus: "theUploadingStatus" }, host: { properties: { "class.the-editor-readonly": "theOptions?.readonly" }, classAttribute: "the-editor" }, providers: [
             TheContextService,
             TheColorSelectService,
             {
@@ -14399,6 +14414,8 @@
                     type: i0.Output
                 }], theEditorCreated: [{
                     type: i0.Output
+                }], theUploadingStatus: [{
+                    type: i0.Output
                 }], templateInstance: [{
                     type: i0.ViewChild,
                     args: ['templateInstance', { static: true }]