@gsp-svc/formdoc-upload 0.1.34 → 0.1.36

package/fesm2015/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, Component, NgModule, ViewChild, Input, Injector, ComponentFactoryResolver, defineInjectable } from '@angular/core';
+import { Injectable, Pipe, Inject, LOCALE_ID, Component, ViewChild, Input, NgModule, Injector, ComponentFactoryResolver, 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';
 
 /**
@@ -144,9 +144,11 @@ class ChangeInstanceRequest {
 class UploadService {
     /**
      * @param {?} http
+     * @param {?} httpclient
      */
-    constructor(http) {
+    constructor(http, httpclient) {
         this.http = http;
+        this.httpclient = httpclient;
     }
     /**
      * @param {?} docListInfo
@@ -265,6 +267,26 @@ class UploadService {
             return of(error);
         })));
     }
+    /**
+     * @param {?} formdata
+     * @return {?}
+     */
+    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 {?}
+         */
+        res => { })), catchError((/**
+         * @param {?} error
+         * @return {?}
+         */
+        (error) => {
+            return of(error);
+        })));
+    }
     /**
      * @return {?}
      */
@@ -424,7 +446,8 @@ UploadService.decorators = [
 ];
 /** @nocollapse */
 UploadService.ctorParameters = () => [
-    { type: HttpService }
+    { type: HttpService },
+    { type: HttpClient }
 ];
 
 /**
@@ -804,9 +827,11 @@ class FileUploadComponent {
                 this.nullFileList.push(selectedFile.name);
                 continue;
             }
-            if (selectedFile.size > this.maxFileSize * 1000) {
-                this.beyondFileList.push(selectedFile.name);
-                continue;
+            if (this.maxFileSize != null && this.maxFileSize > 0) {
+                if (selectedFile.size > this.maxFileSize * 1000) {
+                    this.beyondFileList.push(selectedFile.name);
+                    continue;
+                }
             }
             if (!this.sameNameAllowed) {
                 if (this.uploadedFileInfoList.find((/**
@@ -899,12 +924,6 @@ class FileUploadComponent {
                     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.uploadFile(uuid, selectedFile, selectedFile.name);
         }
         // if (this.uploadedNameList.length > 0) {
@@ -1014,49 +1033,52 @@ class FileUploadComponent {
             let nextSize = Math.min((chunkIndex + 1) * this.bufferSize, selectedFile.size);
             /** @type {?} */
             let fileData = selectedFile.slice(chunkIndex * this.bufferSize, nextSize);
-            /** @type {?} */
-            let reader = new FileReader();
-            reader.readAsBinaryString(fileData);
+            // let reader = new FileReader();
+            // reader.readAsBinaryString(fileData);
             /** @type {?} */
             let innerIndex = chunkIndex;
-            reader.onload = (/**
+            // 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);
+            this.uploadService.uploadSliceFile(formData).subscribe((/**
+             * @param {?} res
              * @return {?}
              */
-            () => {
-                docInfo.fileContent = btoa(reader.result.toString());
-                docInfo.index = innerIndex;
-                //chunkIndex++;
-                if (this.haveExtensionProperty)
-                    docInfo.exPropertyName = this.defaultPropertyName;
-                //docInfo.isLast = true;
-                uploadInfo.docInfo = docInfo;
-                /** @type {?} */
-                let info = uploadInfo;
-                // this.requestArray.push(this.uploadService.uploadFile(uploadInfo));
-                this.requestBodyArray.push(info);
-                this.uploadService.uploadFile(info).subscribe((/**
-                 * @param {?} res
-                 * @return {?}
-                 */
-                res => {
-                    if (res != null) {
-                        this.files[this.files.indexOf(fileInfo)].uploadResult = false;
+            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;
         }