@gsp-svc/formdoc-upload 0.1.39 → 0.2.0

package/bundles/gsp-svc-formdoc-upload.umd.js

@@ -92,16 +92,6 @@
     DocType[DocType.Image] = 'Image';
     DocType[DocType.Other] = 'Other';
 
-    /**
-     * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
-     */
-    var GspFormDocInfo = /** @class */ (function () {
-        function GspFormDocInfo() {
-        }
-        return GspFormDocInfo;
-    }());
-
     /**
      * @fileoverview added by tsickle
      * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -480,34 +470,13 @@
          * @param {?} rootId
          * @return {?}
          */
-        UploadService.prototype.getRootSetting = /**
+        UploadService.prototype.getUploadInfo = /**
          * @param {?} rootId
          * @return {?}
          */
             function (rootId) {
                 /** @type {?} */
-                var url = "/api/runtime/dfs/v1.0/rootsetting/" + rootId;
-                return this.http.get(url).pipe(operators.tap(( /**
-                 * @param {?} res
-                 * @return {?}
-                 */function (res) { })), operators.catchError(( /**
-                 * @param {?} error
-                 * @return {?}
-                 */function (error) {
-                    return of.of(error);
-                })));
-            };
-        /**
-         * @param {?} id
-         * @return {?}
-         */
-        UploadService.prototype.getValidation = /**
-         * @param {?} id
-         * @return {?}
-         */
-            function (id) {
-                /** @type {?} */
-                var url = "/api/runtime/dfs/v1.0/validation/" + id;
+                var url = "/api/runtime/dfs/v1.0/rootsetting/info?id=" + rootId;
                 return this.http.get(url).pipe(operators.tap(( /**
                  * @param {?} res
                  * @return {?}
@@ -541,16 +510,6 @@
         return UploadFileInfo;
     }());
 
-    /**
-     * @fileoverview added by tsickle
-     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
-     */
-    var GspFormUploadEntity = /** @class */ (function () {
-        function GspFormUploadEntity() {
-        }
-        return GspFormUploadEntity;
-    }());
-
     /**
      * @fileoverview added by tsickle
      * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -605,7 +564,8 @@
             'operation': '操作',
             'size': '大小',
             'close': '关闭',
-            'loading': '拼命加载中'
+            'loading': '拼命加载中',
+            'mismatchChunkSize': '文档分片上传部分丢失，请重新上传，如果多次上传失败，请联系管理员。'
         },
         'en-US': {
             'uploadFile': 'Upload File',
@@ -633,7 +593,8 @@
             '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',
@@ -661,7 +622,8 @@
             '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': '上傳文件',
@@ -689,7 +651,8 @@
             'operation': '操作',
             'size': '大小',
             'close': '關閉',
-            'loading': '拼命加載中'
+            'loading': '拼命加載中',
+            'mismatchChunkSize': '文檔分片上傳部分遺失，請重新上傳，如果多次上傳失敗，請聯系管理員。'
         },
     };
 
@@ -726,6 +689,46 @@
         return LocalLangPipe;
     }());
 
+    /**
+     * @fileoverview added by tsickle
+     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     */
+    var InitMultiUploadRequest = /** @class */ (function () {
+        function InitMultiUploadRequest() {
+        }
+        return InitMultiUploadRequest;
+    }());
+
+    /**
+     * @fileoverview added by tsickle
+     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     */
+    var CompleteMultiUploadRequest = /** @class */ (function () {
+        function CompleteMultiUploadRequest() {
+        }
+        return CompleteMultiUploadRequest;
+    }());
+
+    /**
+     * @fileoverview added by tsickle
+     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     */
+    var GspFormStreamEntity = /** @class */ (function () {
+        function GspFormStreamEntity() {
+        }
+        return GspFormStreamEntity;
+    }());
+
+    /**
+     * @fileoverview added by tsickle
+     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     */
+    var MultiUploadRequest = /** @class */ (function () {
+        function MultiUploadRequest() {
+        }
+        return MultiUploadRequest;
+    }());
+
     /**
      * @fileoverview added by tsickle
      * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -745,7 +748,7 @@
             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';
@@ -753,8 +756,6 @@
             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 = {};
@@ -834,13 +835,14 @@
                         _this.haveExtensionProperty = true;
                     }
                 }));
-                this.uploadService.getRootSetting(this.rootId).subscribe(( /**
+                this.uploadService.getUploadInfo(this.rootId).subscribe(( /**
                  * @param {?} res
                  * @return {?}
                  */function (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
@@ -852,17 +854,9 @@
                                 }
                             }));
                         }
-                        _this.uploadService.getValidation(_this.validationId).subscribe(( /**
-                         * @param {?} res
-                         * @return {?}
-                         */function (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 {?}
@@ -886,12 +880,7 @@
          * @return {?}
          */
             function ($event) {
-                // const loading = this.loadService.show({
-                //   message: this.localepipe.transform('uploading')
-                // });
                 var _this = this;
-                // this.totalLoad.close();
-                // this.totalLoad = null;
                 this.hasSelectedFile = true;
                 this.selectedFiles = document.querySelector('#file');
                 if (this.fileCount > 0) {
@@ -923,11 +912,6 @@
                          * @param {?} x
                          * @return {?}
                          */function (x) { return 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 {?} */
                             var msg_1 = this_1.msgService.show('warning', this_1.localepipe.transform('haveSameName') + selectedFile.name, {
                                 initialState: {
@@ -1008,11 +992,6 @@
                 for (var i = 0; i < this.selectedFiles.files.length; i++) {
                     _loop_1(i);
                 }
-                // if (this.uploadedNameList.length > 0) {
-                //   let name: string = this.listToString(this.uploadedNameList);
-                //   this.msgService.warning('之前已上传过同名文件: ' + name + '请重新选择上传文件。');
-                //   this.uploadedNameList = [];
-                // }
                 if (this.errFileList.length > 0) {
                     /** @type {?} */
                     var name_1 = this.listToString(this.errFileList);
@@ -1033,11 +1012,6 @@
                     this.msgService.warning(name_3 + 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 = '';
@@ -1146,60 +1120,141 @@
                 /** @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.fileSize = fileInfo.fileSize;
                 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;
+                //判断是否支持分片上传
+                if (this.allowedMultiUpload) {
+                    //支持分片上传
                     /** @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);
+                    var 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 {?}
+                     */function (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 {?} */
+                            var uploadId_1 = res.uploadId;
+                            /** @type {?} */
+                            var chunkTotal = Math.ceil(selectedFile.size / _this.bufferSize);
+                            /** @type {?} */
+                            var chunkIndex = 0;
+                            /** @type {?} */
+                            var multiResultList_1 = [];
+                            _this.fileTotalChunk[uuid] = chunkTotal;
+                            _this.uploadedChunk[uuid] = 0;
+                            while (chunkIndex < chunkTotal) {
+                                /** @type {?} */
+                                var nextSize = Math.min((chunkIndex + 1) * _this.bufferSize, selectedFile.size);
+                                /** @type {?} */
+                                var fileData = selectedFile.slice(chunkIndex * _this.bufferSize, nextSize);
+                                /** @type {?} */
+                                var multiRequest = new MultiUploadRequest;
+                                multiRequest.metadataId = uuid;
+                                multiRequest.rootId = _this.rootId;
+                                multiRequest.uploadId = uploadId_1;
+                                multiRequest.index = chunkIndex;
+                                multiRequest.total = chunkTotal;
+                                multiRequest.size = fileData.size;
+                                /** @type {?} */
+                                var formData = new FormData();
+                                formData.append('multiRequest', JSON.stringify(multiRequest));
+                                formData.append('file', fileData);
+                                _this.multiUpload(formData).subscribe(( /**
+                                 * @param {?} res
+                                 * @return {?}
+                                 */function (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_1.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_1.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 {?} */
+                                                var completeMultiUploadRequest = new CompleteMultiUploadRequest;
+                                                completeMultiUploadRequest.metadataId = uuid;
+                                                completeMultiUploadRequest.partList = multiResultList_1;
+                                                completeMultiUploadRequest.rootId = _this.rootId;
+                                                completeMultiUploadRequest.uploadId = uploadId_1;
+                                                completeMultiUploadRequest.size = fileInfo.fileSize;
+                                                if (_this.haveExtensionProperty)
+                                                    completeMultiUploadRequest.exPropertyName = _this.defaultPropertyName;
+                                                _this.completeMultiUpload(completeMultiUploadRequest).subscribe(( /**
+                                                 * @param {?} res
+                                                 * @return {?}
+                                                 */function (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 {?} */
-                    var innerIndex = chunkIndex;
-                    // reader.onload = () => {
-                    //   docInfo.fileContent = btoa(reader.result.toString());
-                    docInfo.size = selectedFile.size;
-                    docInfo.index = innerIndex;
-                    docInfo.fileContent = "";
-                    //chunkIndex++;
+                    var 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)
-                        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
+                        entity.exPropertyName = this.defaultPropertyName;
                     /** @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;
+                    formData.append('uploadEntity', JSON.stringify(entity));
+                    formData.append('file', selectedFile);
+                    this.uploadSingleFile(formData).subscribe(( /**
+                     * @param {?} res
+                     * @return {?}
+                     */function (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++;
+                        }
+                    }));
                 }
                 /** @type {?} */
                 var index = -1;
@@ -1216,46 +1271,29 @@
                     this.files.splice(index, 1);
                     this.uploadFileInfoList.splice(index, 1);
                     this.uploadedFileInfoList.splice(index, 1);
-                    this.uploadedFileTotal--;
+                    //this.uploadedFileTotal--;
                 }
             };
         /**
-         * @param {?} formData
-         * @param {?} fileInfo
-         * @param {?} docInfo
-         * @param {?} uploadFileInfo
+         * @param {?} formdata
          * @return {?}
          */
-        FileUploadComponent.prototype.sendUploadRequest = /**
-         * @param {?} formData
-         * @param {?} fileInfo
-         * @param {?} docInfo
-         * @param {?} uploadFileInfo
+        FileUploadComponent.prototype.uploadSingleFile = /**
+         * @param {?} formdata
          * @return {?}
          */
-            function (formData, fileInfo, docInfo, uploadFileInfo) {
-                var _this = this;
-                this.uploadSliceFile(formData).subscribe(( /**
+            function (formdata) {
+                /** @type {?} */
+                var url = "/api/runtime/dfs/v1.0/formdoc/single";
+                return this.httpclient.post(url, formdata).pipe(operators.tap(( /**
                  * @param {?} res
                  * @return {?}
-                 */function (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++;
-                        }
-                    }
-                }));
+                 */function (res) { })), operators.catchError(( /**
+                 * @param {?} error
+                 * @return {?}
+                 */function (error) {
+                    return rxjs.of(error);
+                })));
             };
         /**
          * @param {?} formdata
@@ -1268,7 +1306,6 @@
             function (formdata) {
                 /** @type {?} */
                 var url = "/api/runtime/dfs/v1.0/formdoc/slice";
-                //url = "/api/runtime/dfs/v1.0/formdoc/list";
                 return this.httpclient.post(url, formdata).pipe(operators.tap(( /**
                  * @param {?} res
                  * @return {?}
@@ -1279,6 +1316,69 @@
                     return rxjs.of(error);
                 })));
             };
+        /**
+         * @param {?} request
+         * @return {?}
+         */
+        FileUploadComponent.prototype.initMultiUpload = /**
+         * @param {?} request
+         * @return {?}
+         */
+            function (request) {
+                /** @type {?} */
+                var url = "/api/runtime/dfs/v1.0/formdoc/multi/init";
+                return this.httpclient.post(url, request).pipe(operators.tap(( /**
+                 * @param {?} res
+                 * @return {?}
+                 */function (res) { })), operators.catchError(( /**
+                 * @param {?} error
+                 * @return {?}
+                 */function (error) {
+                    return rxjs.of(error);
+                })));
+            };
+        /**
+         * @param {?} formdata
+         * @return {?}
+         */
+        FileUploadComponent.prototype.multiUpload = /**
+         * @param {?} formdata
+         * @return {?}
+         */
+            function (formdata) {
+                /** @type {?} */
+                var url = "/api/runtime/dfs/v1.0/formdoc/multi/upload";
+                return this.httpclient.post(url, formdata).pipe(operators.tap(( /**
+                 * @param {?} res
+                 * @return {?}
+                 */function (res) { })), operators.catchError(( /**
+                 * @param {?} error
+                 * @return {?}
+                 */function (error) {
+                    return rxjs.of(error);
+                })));
+            };
+        /**
+         * @param {?} request
+         * @return {?}
+         */
+        FileUploadComponent.prototype.completeMultiUpload = /**
+         * @param {?} request
+         * @return {?}
+         */
+            function (request) {
+                /** @type {?} */
+                var url = "/api/runtime/dfs/v1.0/formdoc/multi/complete";
+                return this.httpclient.post(url, request).pipe(operators.tap(( /**
+                 * @param {?} res
+                 * @return {?}
+                 */function (res) { })), operators.catchError(( /**
+                 * @param {?} error
+                 * @return {?}
+                 */function (error) {
+                    return rxjs.of(error);
+                })));
+            };
         /**
          * @return {?}
          */
@@ -1291,8 +1391,6 @@
                      * @param {?} element
                      * @return {?}
                      */function (element) {
-                        // let obj: any = document.getElementById(element.name);
-                        // obj.checked = true;
                         element.selectd = true;
                     }));
                     this.fileAllSelected = true;
@@ -1303,8 +1401,6 @@
                      * @param {?} element
                      * @return {?}
                      */function (element) {
-                        // let obj: any = document.getElementById(element.name);
-                        // obj.checked = false;
                         element.selectd = false;
                     }));
                     this.fileAllSelected = false;
@@ -1394,9 +1490,6 @@
                     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 {?}
@@ -1508,20 +1601,27 @@
                             }
                             fileInfo.source = imgUrl;
                             _this.files.push(fileInfo);
+                            //因为异步处理的差异，补偿一次删除
+                            /** @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);
+                            }
                         });
                     }
                 }
             };
-        /**
-         * @param {?} selectdFile
-         * @return {?}
-         */
-        FileUploadComponent.prototype.getImageUrl = /**
-         * @param {?} selectdFile
-         * @return {?}
-         */
-            function (selectdFile) {
-            };
         /**
          * @param {?} strList
          * @return {?}
@@ -1611,9 +1711,6 @@
                  * @param {?} x
                  * @return {?}
                  */function (x) { return x.isUploading || x.uploadResult; })).length) {
-                    // this.notifyService.success(<NotifyOptions>{
-                    //   msg: '保存成功！', timeout: 3000
-                    // });
                     this.msgService.warning(this.localepipe.transform('wait'));
                     return rxjs.of(false);
                 }
@@ -1690,9 +1787,6 @@
                      * @return {?}
                      */function (x) { return x.metadataId == file.id; })), 1);
                 }
-                // var obj:any = document.querySelector('#file');
-                // obj.files.remove();
-                //obj.value='';
             };
         /**
          * @param {?} size
@@ -1807,6 +1901,19 @@
             function (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 {?}
+         */
+        DownloadService.prototype.getStreamDownloadUrl = /**
+         * @param {?} metadataId
+         * @param {?} rootId
+         * @return {?}
+         */
+            function (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
@@ -2296,6 +2403,16 @@
         return GspFormUploadListEntity;
     }());
 
+    /**
+     * @fileoverview added by tsickle
+     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     */
+    var GspFormDocInfo = /** @class */ (function () {
+        function GspFormDocInfo() {
+        }
+        return GspFormDocInfo;
+    }());
+
     /**
      * @fileoverview added by tsickle
      * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
@@ -2306,6 +2423,16 @@
         return GspDocMetaProperty;
     }());
 
+    /**
+     * @fileoverview added by tsickle
+     * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
+     */
+    var GspFormUploadEntity = /** @class */ (function () {
+        function GspFormUploadEntity() {
+        }
+        return GspFormUploadEntity;
+    }());
+
     /**
      * @fileoverview added by tsickle
      * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc