@gsp-svc/formdoc-upload 0.1.34 → 0.1.36

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

@@ -11,10 +11,10 @@ import { ProgressModule } from '@farris/ui-progress';
 import { FormsModule } from '@angular/forms';
 import { ComboListModule } from '@farris/ui-combo-list';
 import { LanguageService, HttpService } from '@ecp-caf/caf-common';
-import { Injectable, Pipe, Inject, LOCALE_ID, NgModule, Component, ViewChild, Input, Injector, ComponentFactoryResolver, defineInjectable } from '@angular/core';
+import { Injectable, Pipe, Inject, LOCALE_ID, NgModule, Component, Injector, ComponentFactoryResolver, ViewChild, Input, defineInjectable } from '@angular/core';
 import { BsModalService } from '@farris/ui-modal';
 import { of as of$1 } from 'rxjs';
-import { HttpClientModule } from '@angular/common/http';
+import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { NotifyModule } from '@farris/ui-notify';
 
 /**
@@ -160,8 +160,9 @@ var ChangeInstanceRequest = /** @class */ (function () {
  * @suppress {checkTypes,extraRequire,missingOverride,missingReturn,unusedPrivateMembers,uselessCode} checked by tsc
  */
 var UploadService = /** @class */ (function () {
-    function UploadService(http) {
+    function UploadService(http, httpclient) {
         this.http = http;
+        this.httpclient = httpclient;
     }
     /**
      * @param {?} docListInfo
@@ -309,6 +310,30 @@ var UploadService = /** @class */ (function () {
             return of(error);
         })));
     };
+    /**
+     * @param {?} formdata
+     * @return {?}
+     */
+    UploadService.prototype.uploadSliceFile = /**
+     * @param {?} formdata
+     * @return {?}
+     */
+    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(tap((/**
+         * @param {?} res
+         * @return {?}
+         */
+        function (res) { })), catchError((/**
+         * @param {?} error
+         * @return {?}
+         */
+        function (error) {
+            return of(error);
+        })));
+    };
     /**
      * @return {?}
      */
@@ -497,7 +522,8 @@ var UploadService = /** @class */ (function () {
     ];
     /** @nocollapse */
     UploadService.ctorParameters = function () { return [
-        { type: HttpService }
+        { type: HttpService },
+        { type: HttpClient }
     ]; };
     return UploadService;
 }());
@@ -897,9 +923,11 @@ var FileUploadComponent = /** @class */ (function () {
                 this_1.nullFileList.push(selectedFile.name);
                 return "continue";
             }
-            if (selectedFile.size > this_1.maxFileSize * 1000) {
-                this_1.beyondFileList.push(selectedFile.name);
-                return "continue";
+            if (this_1.maxFileSize != null && this_1.maxFileSize > 0) {
+                if (selectedFile.size > this_1.maxFileSize * 1000) {
+                    this_1.beyondFileList.push(selectedFile.name);
+                    return "continue";
+                }
             }
             if (!this_1.sameNameAllowed) {
                 if (this_1.uploadedFileInfoList.find((/**
@@ -992,12 +1020,6 @@ var FileUploadComponent = /** @class */ (function () {
                     return "continue";
                 }
             }
-            // if (this.files.find(x => x.name == selectedFile.name) != null) {
-            //   this.errFileList.push(selectedFile.name);
-            //   continue;
-            // }
-            //this.flag += Math.ceil(selectedFile.size / this.bufferSize);
-            //let reader = new FileReader();
             this_1.uploadFile(uuid, selectedFile, selectedFile.name);
         };
         var this_1 = this;
@@ -1125,49 +1147,52 @@ var FileUploadComponent = /** @class */ (function () {
             var nextSize = Math.min((chunkIndex + 1) * this_2.bufferSize, selectedFile.size);
             /** @type {?} */
             var fileData = selectedFile.slice(chunkIndex * this_2.bufferSize, nextSize);
-            /** @type {?} */
-            var reader = new FileReader();
-            reader.readAsBinaryString(fileData);
+            // let reader = new FileReader();
+            // reader.readAsBinaryString(fileData);
             /** @type {?} */
             var innerIndex = chunkIndex;
-            reader.onload = (/**
+            // reader.onload = () => {
+            //   docInfo.fileContent = btoa(reader.result.toString());
+            docInfo.size = selectedFile.size;
+            docInfo.index = innerIndex;
+            docInfo.fileContent = "";
+            //chunkIndex++;
+            if (this_2.haveExtensionProperty)
+                docInfo.exPropertyName = this_2.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_2.uploadService.uploadSliceFile(formData).subscribe((/**
+             * @param {?} res
              * @return {?}
              */
-            function () {
-                docInfo.fileContent = btoa(reader.result.toString());
-                docInfo.index = innerIndex;
-                //chunkIndex++;
-                if (_this.haveExtensionProperty)
-                    docInfo.exPropertyName = _this.defaultPropertyName;
-                //docInfo.isLast = true;
-                uploadInfo.docInfo = docInfo;
-                /** @type {?} */
-                var info = uploadInfo;
-                // this.requestArray.push(this.uploadService.uploadFile(uploadInfo));
-                _this.requestBodyArray.push(info);
-                _this.uploadService.uploadFile(info).subscribe((/**
-                 * @param {?} res
-                 * @return {?}
-                 */
-                function (res) {
-                    if (res != null) {
-                        _this.files[_this.files.indexOf(fileInfo)].uploadResult = false;
+            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.files[_this.files.indexOf(fileInfo)].errorMessage = res.error.Message;
+                        _this.uploadFileInfoList = _this.uploadFileInfoList.concat(uploadFileInfo);
+                        _this.uploadedFileInfoList = _this.uploadedFileInfoList.concat(uploadFileInfo);
+                        _this.uploadedFileTotal++;
                     }
-                    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++;
-                        }
-                    }
-                }));
-            });
+                }
+            }));
+            // }
             //console.log(chunkIndex + 1);
             chunkIndex = chunkIndex + 1;
         };