@gsp-svc/formdoc-upload 0.1.38 → 0.1.39

package/fesm5/gsp-svc-formdoc-upload.js

@@ -11,7 +11,7 @@ import { ProgressModule } from '@farris/ui-progress';
 import { FormsModule } from '@angular/forms';
 import { ComboListModule } from '@farris/ui-combo-list';
 import { CacheService, HttpService, LanguageService, SessionService } from '@ecp-caf/caf-common';
-import { Injectable, Pipe, Inject, LOCALE_ID, Injector, ComponentFactoryResolver, Component, ViewChild, Input, NgModule, defineInjectable } from '@angular/core';
+import { Injectable, Pipe, Inject, LOCALE_ID, Component, NgModule, Injector, ComponentFactoryResolver, ViewChild, Input, defineInjectable } from '@angular/core';
 import { BsModalService } from '@farris/ui-modal';
 import { of as of$1 } from 'rxjs';
 import { HttpClientModule, HttpClient } from '@angular/common/http';
@@ -441,17 +441,11 @@ var UploadService = /** @class */ (function () {
         request.metadataId = metadataId;
         request.rootId = rootId;
         request.path = path;
-        return this.http.post(url, request).pipe(tap((/**
+        return this.httpclient.post(url, request, { responseType: 'text' }).pipe(tap((/**
          * @param {?} res
          * @return {?}
          */
-        function (res) { })), catchError((/**
-         * @param {?} error
-         * @return {?}
-         */
-        function (error) {
-            return of(error);
-        })));
+        function (res) { })));
     };
     /**
      * @param {?} uploadFileInfoList
@@ -1131,69 +1125,62 @@ var FileUploadComponent = /** @class */ (function () {
      * @return {?}
      */
     function (uuid, selectedFile, fileName) {
-        var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @return {?}
-         */
-        function (resolve) {
-            /** @type {?} */
-            var fileInfo;
-            fileInfo = {
-                id: uuid,
-                name: fileName,
-                type: selectedFile.type,
-                source: "",
-                size: _this.getFileSize(selectedFile.size),
-                fileSize: selectedFile.size,
-                picListDisplayName: _this.getPicListDisplayName(fileName),
-                queueListDisplayName: _this.getQueueDisplayName(fileName),
-                //content: reader.result.toString(),
-                hasUploaded: false,
-                mouseOn: false,
-                selectd: false,
-                isUploading: true,
-                uploadResult: false,
-                uploadProcess: 0,
-                errorMessage: "",
-                extensionDropListId: 0,
-                extensionName: "",
-                securityDropListId: 0,
-                securityInfo: _this.securityInfoList[0]
-            };
-            if (_this.storageExtension != null)
-                fileInfo.extensionName = _this.defaultPropertyName;
-            /** @type {?} */
-            var type = selectedFile.type;
-            if (type.includes("tiff")) {
-                _this.addDocInfo(selectedFile, fileInfo, DocType.Other);
-            }
-            else if (type.includes("image")) {
-                _this.addDocInfo(selectedFile, fileInfo, DocType.Image);
-            }
-            else if (type.includes("word")) {
-                _this.addDocInfo(selectedFile, fileInfo, DocType.Word);
-            }
-            else if (type.includes("pdf")) {
-                _this.addDocInfo(selectedFile, fileInfo, DocType.Pdf);
-            }
-            else if (type.includes("plain")) {
-                _this.addDocInfo(selectedFile, fileInfo, DocType.Txt);
-            }
-            else if (type.includes("sheet") || type.includes("excel")) {
-                _this.addDocInfo(selectedFile, fileInfo, DocType.Excel);
-            }
-            else if (type.includes("powerpoint") || type.includes("presentation")) {
-                _this.addDocInfo(selectedFile, fileInfo, DocType.Powerpoint);
-            }
-            else {
-                _this.addDocInfo(selectedFile, fileInfo, DocType.Other);
-                // let name: string = selectedFile.name;
-                // let errType = name.substring(selectedFile.name.lastIndexOf('.'));
-                // this.errTypeList.push(errType);
-            }
-            resolve(fileInfo);
-        }));
+        /** @type {?} */
+        var fileInfo;
+        fileInfo = {
+            id: uuid,
+            name: fileName,
+            type: selectedFile.type,
+            source: "",
+            size: this.getFileSize(selectedFile.size),
+            fileSize: selectedFile.size,
+            picListDisplayName: this.getPicListDisplayName(fileName),
+            queueListDisplayName: this.getQueueDisplayName(fileName),
+            //content: reader.result.toString(),
+            hasUploaded: false,
+            mouseOn: false,
+            selectd: false,
+            isUploading: true,
+            uploadResult: false,
+            uploadProcess: 0,
+            errorMessage: "",
+            extensionDropListId: 0,
+            extensionName: "",
+            securityDropListId: 0,
+            securityInfo: this.securityInfoList[0]
+        };
+        if (this.storageExtension != null)
+            fileInfo.extensionName = this.defaultPropertyName;
+        /** @type {?} */
+        var type = selectedFile.type;
+        if (type.includes("tiff")) {
+            this.addDocInfo(selectedFile, fileInfo, DocType.Other);
+        }
+        else if (type.includes("image")) {
+            this.addDocInfo(selectedFile, fileInfo, DocType.Image);
+        }
+        else if (type.includes("word")) {
+            this.addDocInfo(selectedFile, fileInfo, DocType.Word);
+        }
+        else if (type.includes("pdf")) {
+            this.addDocInfo(selectedFile, fileInfo, DocType.Pdf);
+        }
+        else if (type.includes("plain")) {
+            this.addDocInfo(selectedFile, fileInfo, DocType.Txt);
+        }
+        else if (type.includes("sheet") || type.includes("excel")) {
+            this.addDocInfo(selectedFile, fileInfo, DocType.Excel);
+        }
+        else if (type.includes("powerpoint") || type.includes("presentation")) {
+            this.addDocInfo(selectedFile, fileInfo, DocType.Powerpoint);
+        }
+        else {
+            this.addDocInfo(selectedFile, fileInfo, DocType.Other);
+            // let name: string = selectedFile.name;
+            // let errType = name.substring(selectedFile.name.lastIndexOf('.'));
+            // this.errTypeList.push(errType);
+        }
+        return fileInfo;
     };
     /**
      * @param {?} uuid
@@ -1212,87 +1199,82 @@ var FileUploadComponent = /** @class */ (function () {
     function (uuid, selectedFile, fileName, state) {
         var _this = this;
         if (state === void 0) { state = FileState.New; }
-        this.handleFileInfo(uuid, selectedFile, fileName).then((/**
-         * @param {?} res
-         * @return {?}
-         */
-        function (res) {
+        /** @type {?} */
+        var fileInfo = this.handleFileInfo(uuid, selectedFile, fileName);
+        /** @type {?} */
+        var chunkTotal = Math.ceil(selectedFile.size / this.bufferSize);
+        /** @type {?} */
+        var chunkIndex = 0;
+        this.fileTotalChunk[uuid] = chunkTotal;
+        /** @type {?} */
+        var uploadFileInfo = new UploadFileInfo();
+        uploadFileInfo.metadataId = uuid;
+        uploadFileInfo.fileName = fileInfo.name;
+        uploadFileInfo.fileSize = fileInfo.size;
+        uploadFileInfo.state = state;
+        uploadFileInfo.securityInfo = this.securityInfoList[0];
+        while (chunkIndex < chunkTotal) {
             /** @type {?} */
-            var fileInfo = res;
+            var uploadInfo = new GspFormUploadEntity;
+            uploadInfo.formId = this.formId;
+            uploadInfo.mode = OperatingModes.Temp;
+            uploadInfo.rootId = this.rootId;
             /** @type {?} */
-            var chunkTotal = Math.ceil(selectedFile.size / _this.bufferSize);
+            var docInfo = new GspFormDocInfo;
+            docInfo.fileName = fileName;
+            docInfo.metadataId = uuid;
+            docInfo.total = chunkTotal;
+            this.uploadedChunk[docInfo.metadataId] = 0;
             /** @type {?} */
-            var chunkIndex = 0;
-            _this.fileTotalChunk[uuid] = chunkTotal;
+            var nextSize = Math.min((chunkIndex + 1) * this.bufferSize, selectedFile.size);
             /** @type {?} */
-            var uploadFileInfo = new UploadFileInfo();
-            uploadFileInfo.metadataId = uuid;
-            uploadFileInfo.fileName = fileInfo.name;
-            uploadFileInfo.fileSize = fileInfo.size;
-            uploadFileInfo.state = state;
-            uploadFileInfo.securityInfo = _this.securityInfoList[0];
-            while (chunkIndex < chunkTotal) {
-                /** @type {?} */
-                var uploadInfo = new GspFormUploadEntity;
-                uploadInfo.formId = _this.formId;
-                uploadInfo.mode = OperatingModes.Temp;
-                uploadInfo.rootId = _this.rootId;
-                /** @type {?} */
-                var docInfo = new GspFormDocInfo;
-                docInfo.fileName = fileName;
-                docInfo.metadataId = uuid;
-                docInfo.total = chunkTotal;
-                _this.uploadedChunk[docInfo.metadataId] = 0;
-                /** @type {?} */
-                var nextSize = Math.min((chunkIndex + 1) * _this.bufferSize, selectedFile.size);
-                /** @type {?} */
-                var fileData = selectedFile.slice(chunkIndex * _this.bufferSize, nextSize);
-                // let reader = new FileReader();
-                // reader.readAsBinaryString(fileData);
-                /** @type {?} */
-                var innerIndex = chunkIndex;
-                // reader.onload = () => {
-                //   docInfo.fileContent = btoa(reader.result.toString());
-                docInfo.size = selectedFile.size;
-                docInfo.index = innerIndex;
-                docInfo.fileContent = "";
-                //chunkIndex++;
-                if (_this.haveExtensionProperty)
-                    docInfo.exPropertyName = _this.defaultPropertyName;
-                //docInfo.isLast = true;
-                uploadInfo.docInfo = docInfo;
-                // let info = uploadInfo;
-                // this.requestArray.push(this.uploadService.uploadFile(uploadInfo));
-                // this.requestBodyArray.push(info);
-                //封装请求formdata
-                /** @type {?} */
-                var formData = new FormData();
-                formData.append('uploadInfo', JSON.stringify(uploadInfo));
-                formData.append('docInfo', JSON.stringify(docInfo));
-                formData.append('file', fileData);
-                // }
-                //console.log(chunkIndex + 1);
-                chunkIndex = chunkIndex + 1;
-            }
+            var fileData = selectedFile.slice(chunkIndex * this.bufferSize, nextSize);
+            // let reader = new FileReader();
+            // reader.readAsBinaryString(fileData);
             /** @type {?} */
-            var index = -1;
-            _this.files.forEach((/**
-             * @param {?} x
-             * @return {?}
-             */
-            function (x) {
-                if (x.name == fileInfo.name) {
-                    if (index == -1)
-                        index = _this.files.indexOf(x);
-                }
-            }));
-            if (index != -1 && index != _this.files.length - 1) {
-                _this.files.splice(index, 1);
-                _this.uploadFileInfoList.splice(index, 1);
-                _this.uploadedFileInfoList.splice(index, 1);
-                _this.uploadedFileTotal--;
+            var innerIndex = chunkIndex;
+            // reader.onload = () => {
+            //   docInfo.fileContent = btoa(reader.result.toString());
+            docInfo.size = selectedFile.size;
+            docInfo.index = innerIndex;
+            docInfo.fileContent = "";
+            //chunkIndex++;
+            if (this.haveExtensionProperty)
+                docInfo.exPropertyName = this.defaultPropertyName;
+            //docInfo.isLast = true;
+            uploadInfo.docInfo = docInfo;
+            // let info = uploadInfo;
+            // this.requestArray.push(this.uploadService.uploadFile(uploadInfo));
+            // this.requestBodyArray.push(info);
+            //封装请求formdata
+            /** @type {?} */
+            var formData = new FormData();
+            formData.append('uploadInfo', JSON.stringify(uploadInfo));
+            formData.append('docInfo', JSON.stringify(docInfo));
+            formData.append('file', fileData);
+            this.sendUploadRequest(formData, fileInfo, docInfo, uploadFileInfo);
+            // }
+            //console.log(chunkIndex + 1);
+            chunkIndex = chunkIndex + 1;
+        }
+        /** @type {?} */
+        var index = -1;
+        this.files.forEach((/**
+         * @param {?} x
+         * @return {?}
+         */
+        function (x) {
+            if (x.name == fileInfo.name) {
+                if (index == -1)
+                    index = _this.files.indexOf(x);
             }
         }));
+        if (index != -1 && index != this.files.length - 1) {
+            this.files.splice(index, 1);
+            this.uploadFileInfoList.splice(index, 1);
+            this.uploadedFileInfoList.splice(index, 1);
+            this.uploadedFileTotal--;
+        }
     };
     /**
      * @param {?} formData
@@ -1546,56 +1528,58 @@ var FileUploadComponent = /** @class */ (function () {
      */
     function (selectdFile, fileInfo, docType) {
         var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @return {?}
-         */
-        function (resolve) {
-            switch (docType) {
-                case DocType.Word: {
-                    fileInfo.source = "/platform/runtime/dfs/images/word.png";
-                    _this.files.push(fileInfo);
-                    break;
-                }
-                case DocType.Pdf: {
-                    fileInfo.source = "/platform/runtime/dfs/images/pdf.png";
-                    _this.files.push(fileInfo);
-                    break;
-                }
-                case DocType.Excel: {
-                    fileInfo.source = "/platform/runtime/dfs/images/excel.png";
-                    _this.files.push(fileInfo);
-                    break;
-                }
-                case DocType.Txt: {
-                    fileInfo.source = "/platform/runtime/dfs/images/txt.png";
-                    _this.files.push(fileInfo);
-                    break;
-                }
-                case DocType.Powerpoint: {
-                    fileInfo.source = "/platform/runtime/dfs/images/ppt.png";
-                    _this.files.push(fileInfo);
-                    break;
-                }
-                case DocType.Other: {
-                    fileInfo.source = "/platform/runtime/dfs/images/file.png";
+        switch (docType) {
+            case DocType.Word: {
+                fileInfo.source = "/platform/runtime/dfs/images/word.png";
+                this.files.push(fileInfo);
+                break;
+            }
+            case DocType.Pdf: {
+                fileInfo.source = "/platform/runtime/dfs/images/pdf.png";
+                this.files.push(fileInfo);
+                break;
+            }
+            case DocType.Excel: {
+                fileInfo.source = "/platform/runtime/dfs/images/excel.png";
+                this.files.push(fileInfo);
+                break;
+            }
+            case DocType.Txt: {
+                fileInfo.source = "/platform/runtime/dfs/images/txt.png";
+                this.files.push(fileInfo);
+                break;
+            }
+            case DocType.Powerpoint: {
+                fileInfo.source = "/platform/runtime/dfs/images/ppt.png";
+                this.files.push(fileInfo);
+                break;
+            }
+            case DocType.Other: {
+                fileInfo.source = "/platform/runtime/dfs/images/file.png";
+                this.files.push(fileInfo);
+                break;
+            }
+            case DocType.Image: {
+                /** @type {?} */
+                var reader_1 = new FileReader();
+                reader_1.readAsDataURL(selectdFile);
+                reader_1.onload = (/**
+                 * @param {?} _event
+                 * @return {?}
+                 */
+                function (_event) {
+                    /** @type {?} */
+                    var imgUrl = reader_1.result;
+                    if (_this.injector != null) {
+                        /** @type {?} */
+                        var sanitizer = _this.injector.get(DomSanitizer);
+                        imgUrl = sanitizer.bypassSecurityTrustResourceUrl(imgUrl);
+                    }
+                    fileInfo.source = imgUrl;
                     _this.files.push(fileInfo);
-                    break;
-                }
-                case DocType.Image: {
-                    _this.getImageUrl(selectdFile).then((/**
-                     * @param {?} res
-                     * @return {?}
-                     */
-                    function (res) {
-                        fileInfo.source = res;
-                        _this.files.push(fileInfo);
-                        resolve(fileInfo);
-                    }));
-                }
+                });
             }
-            resolve(fileInfo);
-        }));
+        }
     };
     /**
      * @param {?} selectdFile
@@ -1606,30 +1590,6 @@ var FileUploadComponent = /** @class */ (function () {
      * @return {?}
      */
     function (selectdFile) {
-        var _this = this;
-        return new Promise((/**
-         * @param {?} resolve
-         * @return {?}
-         */
-        function (resolve) {
-            /** @type {?} */
-            var reader = new FileReader();
-            reader.readAsDataURL(selectdFile);
-            reader.onload = (/**
-             * @param {?} _event
-             * @return {?}
-             */
-            function (_event) {
-                /** @type {?} */
-                var imgUrl = reader.result;
-                if (_this.injector != null) {
-                    /** @type {?} */
-                    var sanitizer = _this.injector.get(DomSanitizer);
-                    imgUrl = sanitizer.bypassSecurityTrustResourceUrl(imgUrl);
-                }
-                resolve(imgUrl);
-            });
-        }));
     };
     /**
      * @param {?} strList