From cca1da5e997bd1f3fb60c961edc347d0009c996f Mon Sep 17 00:00:00 2001
From: You Haipeng <you.haipeng@zte.com.cn>
Date: Sun, 26 Aug 2018 23:25:49 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B0=86upload=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=88=B0=E5=85=AC=E5=85=B1api?=
 =?UTF-8?q?=E9=87=8C=E5=8E=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/tools/gulp/packaging/rollup-helpers.ts | 2 ++
 src/jigsaw/component/upload/upload.ts        | 4 ++--
 src/jigsaw/module.ts                         | 4 +++-
 src/jigsaw/public_api.ts                     | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/build/tools/gulp/packaging/rollup-helpers.ts b/build/tools/gulp/packaging/rollup-helpers.ts
index 7be9603959..268b812ca6 100644
--- a/build/tools/gulp/packaging/rollup-helpers.ts
+++ b/build/tools/gulp/packaging/rollup-helpers.ts
@@ -15,6 +15,7 @@ const ROLLUP_GLOBALS = {
     '@angular/common': 'ng.common',
     '@angular/forms': 'ng.forms',
     '@angular/http': 'ng.http',
+    '@angular/common/http': 'ng.http',
     '@angular/router': 'ng.router',
     '@angular/platform-browser': 'ng.platformBrowser',
     '@angular/platform-browser-dynamic': 'ng.platformBrowserDynamic',
@@ -69,6 +70,7 @@ const ROLLUP_GLOBALS = {
     'rxjs/operator/switchMap': 'Rx.Observable.prototype',
     'rxjs/operator/takeUntil': 'Rx.Observable.prototype',
     'rxjs/operator/toPromise': 'Rx.Observable.prototype',
+    'rxjs/operator/concatMap': 'Rx.Observable.concatMap',
 
     //@ngx-translate
     '@ngx-translate': 'ngx.translate',
diff --git a/src/jigsaw/component/upload/upload.ts b/src/jigsaw/component/upload/upload.ts
index 59ef9c37a2..e3bb202062 100644
--- a/src/jigsaw/component/upload/upload.ts
+++ b/src/jigsaw/component/upload/upload.ts
@@ -2,7 +2,7 @@ import {Component, ElementRef, EventEmitter, Input, NgModule, Output, Renderer2,
 import {AbstractJigsawComponent} from "../common";
 import {JigsawBoxModule} from "../box/index";
 import {JigsawButtonModule} from "../button/button";
-import {HttpClient} from "@angular/common/http";
+import {HttpClient, HttpClientModule} from "@angular/common/http";
 import {CommonModule} from "@angular/common";
 import {PerfectScrollbarModule} from "ngx-perfect-scrollbar";
 import {JigsawDraggableModule, JigsawDroppableModule} from "../../directive/dragdrop/index";
@@ -123,7 +123,7 @@ export class JigsawUpload extends AbstractJigsawComponent {
 
 @NgModule({
     imports: [JigsawBoxModule, JigsawButtonModule, PerfectScrollbarModule, JigsawDraggableModule,
-        JigsawDroppableModule, CommonModule, FormsModule],
+        JigsawDroppableModule, CommonModule, FormsModule, HttpClientModule],
     declarations: [JigsawUpload],
     exports: [JigsawUpload]
 })
diff --git a/src/jigsaw/module.ts b/src/jigsaw/module.ts
index 176dcba181..1e59654f84 100644
--- a/src/jigsaw/module.ts
+++ b/src/jigsaw/module.ts
@@ -45,6 +45,7 @@ import {JigsawTileLiteModule} from "./component/list-and-tile/tile-lite";
 import {JigsawRadioLiteModule} from "./component/radio/radio-lite";
 import {JigsawButtonBarModule} from "./component/list-and-tile/button-bar";
 import {JigsawIconModule} from "./component/icon/icon";
+import {JigsawUploadModule} from "./component/upload/upload";
 
 const JIGSAW_MODULE = [
     JigsawAlertModule,
@@ -92,7 +93,8 @@ const JIGSAW_MODULE = [
     JigsawTreeExtModule,
     JigsawTrustedHtmlModule,
     JigsawViewportModule,
-    JigsawIconModule
+    JigsawIconModule,
+    JigsawUploadModule
 ];
 
 @NgModule({
diff --git a/src/jigsaw/public_api.ts b/src/jigsaw/public_api.ts
index 3bfee628a9..d38bb77b3f 100644
--- a/src/jigsaw/public_api.ts
+++ b/src/jigsaw/public_api.ts
@@ -53,6 +53,7 @@ export * from "./component/tree/tree-ext";
 export * from "./component/tree/ztree-types";
 export * from "./component/viewport/viewport";
 export * from "./component/icon/icon";
+export * from "./component/upload/upload";
 export * from "./core/data/array-collection";
 export * from "./core/data/component-data";
 export * from "./core/data/echart-types";