[修复] 将upload组件添加到公共api里去

rdkmaster · Aug 26, 2018 · cca1da5 · cca1da5
1 parent 2675c0b
commit cca1da5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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";