@gsp-svc/formdoc-upload 0.1.38 → 0.2.0

package/fesm2015/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, Component, ViewChild, Input, NgModule, Injector, ComponentFactoryResolver, 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';
@@ -99,13 +99,6 @@ DocType[DocType.Txt] = 'Txt';
 DocType[DocType.Image] = 'Image';
 DocType[DocType.Other] = 'Other';
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-class GspFormDocInfo {
-}
-
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -373,17 +366,11 @@ class UploadService {
         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 {?}
          */
-        res => { })), catchError((/**
-         * @param {?} error
-         * @return {?}
-         */
-        (error) => {
-            return of(error);
-        })));
+        res => { })));
     }
     /**
      * @param {?} uploadFileInfoList
@@ -441,28 +428,9 @@ class UploadService {
      * @param {?} rootId
      * @return {?}
      */
-    getRootSetting(rootId) {
+    getUploadInfo(rootId) {
         /** @type {?} */
-        let url = "/api/runtime/dfs/v1.0/rootsetting/" + rootId;
-        return this.http.get(url).pipe(tap((/**
-         * @param {?} res
-         * @return {?}
-         */
-        res => { })), catchError((/**
-         * @param {?} error
-         * @return {?}
-         */
-        (error) => {
-            return of(error);
-        })));
-    }
-    /**
-     * @param {?} id
-     * @return {?}
-     */
-    getValidation(id) {
-        /** @type {?} */
-        let url = "/api/runtime/dfs/v1.0/validation/" + id;
+        let url = "/api/runtime/dfs/v1.0/rootsetting/info?id=" + rootId;
         return this.http.get(url).pipe(tap((/**
          * @param {?} res
          * @return {?}
@@ -492,13 +460,6 @@ UploadService.ctorParameters = () => [
 class UploadFileInfo {
 }
 
-/**
- * @fileoverview added by tsickle
- * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
- */
-class GspFormUploadEntity {
-}
-
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -550,7 +511,8 @@ const LANG_RESOURCES = {
         'operation': '操作',
         'size': '大小',
         'close': '关闭',
-        'loading': '拼命加载中'
+        'loading': '拼命加载中',
+        'mismatchChunkSize': '文档分片上传部分丢失，请重新上传，如果多次上传失败，请联系管理员。'
     },
     'en-US': {
         'uploadFile': 'Upload File',
@@ -578,7 +540,8 @@ const LANG_RESOURCES = {
         'operation': 'Operation',
         'size': 'Size',
         'close': 'Close',
-        'loading': 'Loading'
+        'loading': 'Loading',
+        'mismatchChunkSize': 'The partial upload of document shards is missing. Please upload again. If multiple uploads fail, please contact the administrator.'
     },
     'en': {
         'uploadFile': 'Upload File',
@@ -606,7 +569,8 @@ const LANG_RESOURCES = {
         'operation': 'Operation',
         'size': 'Size',
         'close': 'Close',
-        'loading': 'Loading'
+        'loading': 'Loading',
+        'mismatchChunkSize': 'The partial upload of document shards is missing. Please upload again. If multiple uploads fail, please contact the administrator.'
     },
     'zh-CHT': {
         'uploadFile': '上傳文件',
@@ -634,7 +598,8 @@ const LANG_RESOURCES = {
         'operation': '操作',
         'size': '大小',
         'close': '關閉',
-        'loading': '拼命加載中'
+        'loading': '拼命加載中',
+        'mismatchChunkSize': '文檔分片上傳部分遺失，請重新上傳，如果多次上傳失敗，請聯系管理員。'
     },
 };
 
@@ -674,6 +639,34 @@ LocalLangPipe.ctorParameters = () => [
 class GspDocSecurityBaseInfo {
 }
 
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+class InitMultiUploadRequest {
+}
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+class CompleteMultiUploadRequest {
+}
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+class GspFormStreamEntity {
+}
+
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+class MultiUploadRequest {
+}
+
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -699,7 +692,7 @@ class FileUploadComponent {
         this.beyondFileList = [];
         this.showType = 0;
         this.mouseOn = false;
-        this.bufferSize = 10 * 1024 * 1024;
+        this.bufferSize = 5 * 1024 * 1024;
         this.selectedFileCount = 0;
         this.uploadIconAddress = '/platform/runtime/dfs/images/upload.svg';
         this.uploadLittleIconAddress = '/platform/runtime/dfs/images/uploadIcon.svg';
@@ -707,8 +700,6 @@ class FileUploadComponent {
         this.fileAllSelected = false;
         this.uploadProcess = { width: '0%' };
         this.fileTotalChunk = {};
-        //fileUploadState: { [key: string]: boolean } = {};
-        //flag: number = 0;
         this.requestArray = new Array;
         this.requestBodyArray = new Array;
         this.uploadedChunk = {};
@@ -789,14 +780,15 @@ class FileUploadComponent {
                 this.haveExtensionProperty = true;
             }
         }));
-        this.uploadService.getRootSetting(this.rootId).subscribe((/**
+        this.uploadService.getUploadInfo(this.rootId).subscribe((/**
          * @param {?} res
          * @return {?}
          */
         res => {
             if (res != null && res.error == null) {
                 this.sameNameAllowed = res.sameNameAllowed;
-                this.validationId = res.validationId;
+                this.maxFileSize = parseInt(JSON.parse(res.validateConfiguration).maxFileSize);
+                this.allowedMultiUpload = res.allowedMultiUpload;
                 if (!this.sameNameAllowed) {
                     this.uploadService.getUploadedFileInfoList(this.formId, this.rootId).subscribe((/**
                      * @param {?} res
@@ -809,18 +801,9 @@ class FileUploadComponent {
                         }
                     }));
                 }
-                this.uploadService.getValidation(this.validationId).subscribe((/**
-                 * @param {?} res
-                 * @return {?}
-                 */
-                res => {
-                    this.maxFileSize = parseInt(JSON.parse(res.configuration).maxFileSize);
-                }));
             }
         }));
-        if (this.oldIdList != null && this.oldIdList.length > 0) {
-            this.uploadService.cancel(this.oldIdList, this.rootId).subscribe();
-        }
+        if (this.oldIdList != null && this.oldIdList.length > 0) ;
     }
     /**
      * @return {?}
@@ -837,11 +820,6 @@ class FileUploadComponent {
      * @return {?}
      */
     fileSelected($event) {
-        // const loading = this.loadService.show({
-        //   message: this.localepipe.transform('uploading')
-        // });
-        // this.totalLoad.close();
-        // this.totalLoad = null;
         this.hasSelectedFile = true;
         this.selectedFiles = document.querySelector('#file');
         if (this.fileCount > 0) {
@@ -875,11 +853,6 @@ class FileUploadComponent {
                  * @return {?}
                  */
                 x => x.fileName == selectedFile.name)) != null) {
-                    // this.uploadedNameList.push(selectedFile.name);
-                    // this.msgService.question('之前已上传过同名文件: ' + selectedFile.name + '，需要替换么？', () => {
-                    //   uuid = this.uploadedFileInfoList.find(x => x.fileName == selectedFile.name).metadataId;
-                    //   this.uploadFile(uuid, selectedFile);
-                    // })
                     /** @type {?} */
                     const msg = this.msgService.show('warning', this.localepipe.transform('haveSameName') + selectedFile.name, {
                         initialState: {
@@ -962,11 +935,6 @@ class FileUploadComponent {
             }
             this.uploadFile(uuid, selectedFile, selectedFile.name);
         }
-        // if (this.uploadedNameList.length > 0) {
-        //   let name: string = this.listToString(this.uploadedNameList);
-        //   this.msgService.warning('之前已上传过同名文件: ' + name + '请重新选择上传文件。');
-        //   this.uploadedNameList = [];
-        // }
         if (this.errFileList.length > 0) {
             /** @type {?} */
             let name = this.listToString(this.errFileList);
@@ -987,11 +955,6 @@ class FileUploadComponent {
             this.msgService.warning(name + this.localepipe.transform('sizeMax') + this.maxFileSize + "KB" + this.localepipe.transform('rechooseFile'));
             this.beyondFileList = [];
         }
-        // if (this.errTypeList.length > 0) {
-        //   let type: string = this.listToString(this.errTypeList);
-        //   this.msgService.warning('不支持上传类型为 ' + type + '的文件请重新选择上传文件。');
-        //   this.errTypeList = [];
-        // }
         this.files = this.files.slice();
         this.fileAllSelected = false;
         $event.target.value = '';
@@ -1011,68 +974,62 @@ class FileUploadComponent {
      * @return {?}
      */
     handleFileInfo(uuid, selectedFile, fileName) {
-        return new Promise((/**
-         * @param {?} resolve
-         * @return {?}
-         */
-        resolve => {
-            /** @type {?} */
-            let 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 {?} */
-            let 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 {?} */
+        let 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 {?} */
+        let 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
@@ -1082,118 +1039,186 @@ class FileUploadComponent {
      * @return {?}
      */
     uploadFile(uuid, selectedFile, fileName, state = FileState.New) {
-        this.handleFileInfo(uuid, selectedFile, fileName).then((/**
-         * @param {?} res
-         * @return {?}
-         */
-        res => {
-            /** @type {?} */
-            let fileInfo = res;
-            /** @type {?} */
-            let chunkTotal = Math.ceil(selectedFile.size / this.bufferSize);
+        /** @type {?} */
+        let fileInfo = this.handleFileInfo(uuid, selectedFile, fileName);
+        /** @type {?} */
+        let uploadFileInfo = new UploadFileInfo();
+        uploadFileInfo.metadataId = uuid;
+        uploadFileInfo.fileName = fileInfo.name;
+        uploadFileInfo.fileSize = fileInfo.fileSize;
+        uploadFileInfo.state = state;
+        uploadFileInfo.securityInfo = this.securityInfoList[0];
+        //判断是否支持分片上传
+        if (this.allowedMultiUpload) {
+            //支持分片上传
             /** @type {?} */
-            let chunkIndex = 0;
-            this.fileTotalChunk[uuid] = chunkTotal;
+            let initRequest = new InitMultiUploadRequest;
+            initRequest.path = this.formId;
+            initRequest.metadataId = uuid;
+            initRequest.rootId = this.rootId;
+            initRequest.size = fileInfo.fileSize;
+            initRequest.fileName = fileName;
+            //初始化分片
+            this.initMultiUpload(initRequest).subscribe((/**
+             * @param {?} res
+             * @return {?}
+             */
+            res => {
+                if (res.error != null) {
+                    this.files[this.files.indexOf(fileInfo)].uploadResult = false;
+                    this.files[this.files.indexOf(fileInfo)].isUploading = false;
+                    this.files[this.files.indexOf(fileInfo)].errorMessage = res.error.Message;
+                }
+                else {
+                    /** @type {?} */
+                    let uploadId = res.uploadId;
+                    /** @type {?} */
+                    let chunkTotal = Math.ceil(selectedFile.size / this.bufferSize);
+                    /** @type {?} */
+                    let chunkIndex = 0;
+                    /** @type {?} */
+                    let multiResultList = [];
+                    this.fileTotalChunk[uuid] = chunkTotal;
+                    this.uploadedChunk[uuid] = 0;
+                    while (chunkIndex < chunkTotal) {
+                        /** @type {?} */
+                        let nextSize = Math.min((chunkIndex + 1) * this.bufferSize, selectedFile.size);
+                        /** @type {?} */
+                        let fileData = selectedFile.slice(chunkIndex * this.bufferSize, nextSize);
+                        /** @type {?} */
+                        let multiRequest = new MultiUploadRequest;
+                        multiRequest.metadataId = uuid;
+                        multiRequest.rootId = this.rootId;
+                        multiRequest.uploadId = uploadId;
+                        multiRequest.index = chunkIndex;
+                        multiRequest.total = chunkTotal;
+                        multiRequest.size = fileData.size;
+                        /** @type {?} */
+                        let formData = new FormData();
+                        formData.append('multiRequest', JSON.stringify(multiRequest));
+                        formData.append('file', fileData);
+                        this.multiUpload(formData).subscribe((/**
+                         * @param {?} res
+                         * @return {?}
+                         */
+                        res => {
+                            if (res.error != null) {
+                                this.files[this.files.indexOf(fileInfo)].uploadResult = false;
+                                this.files[this.files.indexOf(fileInfo)].isUploading = false;
+                                this.files[this.files.indexOf(fileInfo)].errorMessage = res.error.Message;
+                            }
+                            else {
+                                multiResultList.push(res.result);
+                                this.uploadedChunk[uuid]++;
+                                this.files[this.files.indexOf(fileInfo)].uploadProcess = Number.parseInt((this.uploadedChunk[uuid] / this.fileTotalChunk[uuid] * 100).toFixed(0));
+                                if (this.uploadedChunk[uuid] == this.fileTotalChunk[uuid]) {
+                                    if (multiResultList.length == this.fileTotalChunk[uuid]) {
+                                        this.files[this.files.indexOf(fileInfo)].uploadResult = true;
+                                        this.files[this.files.indexOf(fileInfo)].isUploading = false;
+                                        this.uploadFileInfoList = this.uploadFileInfoList.concat(uploadFileInfo);
+                                        this.uploadedFileInfoList = this.uploadedFileInfoList.concat(uploadFileInfo);
+                                        this.uploadedFileTotal++;
+                                        /** @type {?} */
+                                        let completeMultiUploadRequest = new CompleteMultiUploadRequest;
+                                        completeMultiUploadRequest.metadataId = uuid;
+                                        completeMultiUploadRequest.partList = multiResultList;
+                                        completeMultiUploadRequest.rootId = this.rootId;
+                                        completeMultiUploadRequest.uploadId = uploadId;
+                                        completeMultiUploadRequest.size = fileInfo.fileSize;
+                                        if (this.haveExtensionProperty)
+                                            completeMultiUploadRequest.exPropertyName = this.defaultPropertyName;
+                                        this.completeMultiUpload(completeMultiUploadRequest).subscribe((/**
+                                         * @param {?} res
+                                         * @return {?}
+                                         */
+                                        res => {
+                                        }));
+                                        //后台异步拼接文档
+                                    }
+                                    else {
+                                        this.files[this.files.indexOf(fileInfo)].uploadResult = false;
+                                        this.files[this.files.indexOf(fileInfo)].isUploading = false;
+                                        this.files[this.files.indexOf(fileInfo)].errorMessage = this.localepipe.transform('mismatchChunkSize');
+                                    }
+                                }
+                            }
+                        }));
+                        chunkIndex = chunkIndex + 1;
+                    }
+                }
+            }));
+        }
+        else {
             /** @type {?} */
-            let 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 {?} */
-                let uploadInfo = new GspFormUploadEntity;
-                uploadInfo.formId = this.formId;
-                uploadInfo.mode = OperatingModes.Temp;
-                uploadInfo.rootId = this.rootId;
-                /** @type {?} */
-                let docInfo = new GspFormDocInfo;
-                docInfo.fileName = fileName;
-                docInfo.metadataId = uuid;
-                docInfo.total = chunkTotal;
-                this.uploadedChunk[docInfo.metadataId] = 0;
-                /** @type {?} */
-                let nextSize = Math.min((chunkIndex + 1) * this.bufferSize, selectedFile.size);
-                /** @type {?} */
-                let fileData = selectedFile.slice(chunkIndex * this.bufferSize, nextSize);
-                // let reader = new FileReader();
-                // reader.readAsBinaryString(fileData);
-                /** @type {?} */
-                let 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 {?} */
-                let 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;
-            }
+            let entity = new GspFormStreamEntity;
+            entity.formId = this.formId;
+            entity.metadataId = uuid;
+            entity.mode = OperatingModes.Temp;
+            entity.rootId = this.rootId;
+            entity.size = selectedFile.size;
+            entity.fileName = fileName;
+            if (this.haveExtensionProperty)
+                entity.exPropertyName = this.defaultPropertyName;
             /** @type {?} */
-            let index = -1;
-            this.files.forEach((/**
-             * @param {?} x
+            let formData = new FormData();
+            formData.append('uploadEntity', JSON.stringify(entity));
+            formData.append('file', selectedFile);
+            this.uploadSingleFile(formData).subscribe((/**
+             * @param {?} res
              * @return {?}
              */
-            x => {
-                if (x.name == fileInfo.name) {
-                    if (index == -1)
-                        index = this.files.indexOf(x);
+            res => {
+                if (res != null) {
+                    this.files[this.files.indexOf(fileInfo)].uploadResult = false;
+                    this.files[this.files.indexOf(fileInfo)].isUploading = false;
+                    this.files[this.files.indexOf(fileInfo)].errorMessage = res.error.Message;
+                }
+                else {
+                    this.files[this.files.indexOf(fileInfo)].uploadResult = true;
+                    this.files[this.files.indexOf(fileInfo)].isUploading = false;
+                    this.uploadFileInfoList = this.uploadFileInfoList.concat(uploadFileInfo);
+                    this.uploadedFileInfoList = this.uploadedFileInfoList.concat(uploadFileInfo);
+                    this.uploadedFileTotal++;
                 }
             }));
-            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--;
+        }
+        /** @type {?} */
+        let index = -1;
+        this.files.forEach((/**
+         * @param {?} x
+         * @return {?}
+         */
+        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
-     * @param {?} fileInfo
-     * @param {?} docInfo
-     * @param {?} uploadFileInfo
+     * @param {?} formdata
      * @return {?}
      */
-    sendUploadRequest(formData, fileInfo, docInfo, uploadFileInfo) {
-        this.uploadSliceFile(formData).subscribe((/**
+    uploadSingleFile(formdata) {
+        /** @type {?} */
+        let url = "/api/runtime/dfs/v1.0/formdoc/single";
+        return this.httpclient.post(url, formdata).pipe(tap((/**
          * @param {?} res
          * @return {?}
          */
-        res => {
-            if (res != null) {
-                this.files[this.files.indexOf(fileInfo)].uploadResult = false;
-                this.files[this.files.indexOf(fileInfo)].isUploading = false;
-                this.files[this.files.indexOf(fileInfo)].errorMessage = res.error.Message;
-            }
-            else {
-                this.uploadedChunk[docInfo.metadataId]++;
-                this.files[this.files.indexOf(fileInfo)].uploadProcess = Number.parseInt((this.uploadedChunk[docInfo.metadataId] / this.fileTotalChunk[docInfo.metadataId] * 100).toFixed(0));
-                if (this.uploadedChunk[docInfo.metadataId] == this.fileTotalChunk[docInfo.metadataId]) {
-                    this.files[this.files.indexOf(fileInfo)].uploadResult = true;
-                    this.files[this.files.indexOf(fileInfo)].isUploading = false;
-                    this.uploadFileInfoList = this.uploadFileInfoList.concat(uploadFileInfo);
-                    this.uploadedFileInfoList = this.uploadedFileInfoList.concat(uploadFileInfo);
-                    this.uploadedFileTotal++;
-                }
-            }
-        }));
+        res => { })), catchError((/**
+         * @param {?} error
+         * @return {?}
+         */
+        (error) => {
+            return of$1(error);
+        })));
     }
     /**
      * @param {?} formdata
@@ -1202,7 +1227,6 @@ class FileUploadComponent {
     uploadSliceFile(formdata) {
         /** @type {?} */
         let url = "/api/runtime/dfs/v1.0/formdoc/slice";
-        //url = "/api/runtime/dfs/v1.0/formdoc/list";
         return this.httpclient.post(url, formdata).pipe(tap((/**
          * @param {?} res
          * @return {?}
@@ -1215,6 +1239,63 @@ class FileUploadComponent {
             return of$1(error);
         })));
     }
+    /**
+     * @param {?} request
+     * @return {?}
+     */
+    initMultiUpload(request) {
+        /** @type {?} */
+        let url = "/api/runtime/dfs/v1.0/formdoc/multi/init";
+        return this.httpclient.post(url, request).pipe(tap((/**
+         * @param {?} res
+         * @return {?}
+         */
+        res => { })), catchError((/**
+         * @param {?} error
+         * @return {?}
+         */
+        (error) => {
+            return of$1(error);
+        })));
+    }
+    /**
+     * @param {?} formdata
+     * @return {?}
+     */
+    multiUpload(formdata) {
+        /** @type {?} */
+        let url = "/api/runtime/dfs/v1.0/formdoc/multi/upload";
+        return this.httpclient.post(url, formdata).pipe(tap((/**
+         * @param {?} res
+         * @return {?}
+         */
+        res => { })), catchError((/**
+         * @param {?} error
+         * @return {?}
+         */
+        (error) => {
+            return of$1(error);
+        })));
+    }
+    /**
+     * @param {?} request
+     * @return {?}
+     */
+    completeMultiUpload(request) {
+        /** @type {?} */
+        let url = "/api/runtime/dfs/v1.0/formdoc/multi/complete";
+        return this.httpclient.post(url, request).pipe(tap((/**
+         * @param {?} res
+         * @return {?}
+         */
+        res => { })), catchError((/**
+         * @param {?} error
+         * @return {?}
+         */
+        (error) => {
+            return of$1(error);
+        })));
+    }
     /**
      * @return {?}
      */
@@ -1225,8 +1306,6 @@ class FileUploadComponent {
              * @return {?}
              */
             element => {
-                // let obj: any = document.getElementById(element.name);
-                // obj.checked = true;
                 element.selectd = true;
             }));
             this.fileAllSelected = true;
@@ -1238,8 +1317,6 @@ class FileUploadComponent {
              * @return {?}
              */
             element => {
-                // let obj: any = document.getElementById(element.name);
-                // obj.checked = false;
                 element.selectd = false;
             }));
             this.fileAllSelected = false;
@@ -1321,9 +1398,6 @@ class FileUploadComponent {
             metadataList.push(element.id);
             this.files.splice(this.files.indexOf(element), 1);
             if (element.uploadResult) {
-                // let idList: string[] = [];
-                // idList.push(fileInfo.id);
-                // this.uploadService.cancel(idList, this.rootId).subscribe();
                 this.uploadFileInfoList.splice(this.uploadFileInfoList.indexOf(this.uploadFileInfoList.filter((/**
                  * @param {?} x
                  * @return {?}
@@ -1374,85 +1448,76 @@ class FileUploadComponent {
      * @return {?}
      */
     addDocInfo(selectdFile, fileInfo, docType) {
-        return new Promise((/**
-         * @param {?} resolve
-         * @return {?}
-         */
-        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 {?} */
+                let reader = new FileReader();
+                reader.readAsDataURL(selectdFile);
+                reader.onload = (/**
+                 * @param {?} _event
+                 * @return {?}
+                 */
+                (_event) => {
+                    /** @type {?} */
+                    let imgUrl = reader.result;
+                    if (this.injector != null) {
+                        /** @type {?} */
+                        let 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
+                    //因为异步处理的差异，补偿一次删除
+                    /** @type {?} */
+                    let index = -1;
+                    this.files.forEach((/**
+                     * @param {?} x
                      * @return {?}
                      */
-                    res => {
-                        fileInfo.source = res;
-                        this.files.push(fileInfo);
-                        resolve(fileInfo);
+                    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);
+                    }
+                });
             }
-            resolve(fileInfo);
-        }));
-    }
-    /**
-     * @param {?} selectdFile
-     * @return {?}
-     */
-    getImageUrl(selectdFile) {
-        return new Promise((/**
-         * @param {?} resolve
-         * @return {?}
-         */
-        resolve => {
-            /** @type {?} */
-            let reader = new FileReader();
-            reader.readAsDataURL(selectdFile);
-            reader.onload = (/**
-             * @param {?} _event
-             * @return {?}
-             */
-            (_event) => {
-                /** @type {?} */
-                let imgUrl = reader.result;
-                if (this.injector != null) {
-                    /** @type {?} */
-                    let sanitizer = this.injector.get(DomSanitizer);
-                    imgUrl = sanitizer.bypassSecurityTrustResourceUrl(imgUrl);
-                }
-                resolve(imgUrl);
-            });
-        }));
+        }
     }
     /**
      * @param {?} strList
@@ -1531,9 +1596,6 @@ class FileUploadComponent {
          * @return {?}
          */
         x => x.isUploading || x.uploadResult)).length) {
-            // this.notifyService.success(<NotifyOptions>{
-            //   msg: '保存成功！', timeout: 3000
-            // });
             this.msgService.warning(this.localepipe.transform('wait'));
             return of$1(false);
         }
@@ -1603,9 +1665,6 @@ class FileUploadComponent {
              */
             x => x.metadataId == file.id)), 1);
         }
-        // var obj:any = document.querySelector('#file');
-        // obj.files.remove();
-        //obj.value='';
     }
     /**
      * @param {?} size
@@ -1693,6 +1752,14 @@ class DownloadService {
     getDownloadUrl(metadataId, rootId) {
         return "/api/runtime/dfs/v1.0/doc/filecontent?metadataid=" + metadataId + "&rootid=" + rootId + "&token=" + this.getToken(this.mergeString(metadataId, rootId));
     }
+    /**
+     * @param {?} metadataId
+     * @param {?} rootId
+     * @return {?}
+     */
+    getStreamDownloadUrl(metadataId, rootId) {
+        return "/api/runtime/dfs/v1.0/formdoc/stream?metadataid=" + metadataId + "&rootid=" + rootId + "&token=" + this.getToken(this.mergeString(metadataId, rootId));
+    }
     /**
      * @param {?} metadataIdList
      * @param {?} rootId
@@ -2116,6 +2183,13 @@ class UploadLimit {
 class GspFormUploadListEntity {
 }
 
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+class GspFormDocInfo {
+}
+
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -2123,6 +2197,13 @@ class GspFormUploadListEntity {
 class GspDocMetaProperty {
 }
 
+/**
+ * @fileoverview added by tsickle
+ * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+ */
+class GspFormUploadEntity {
+}
+
 /**
  * @fileoverview added by tsickle
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc