更新版本 icon st 等等，解决缺包问题

Author: DesignHhuang

README.md

@@ -1,7 +1,8 @@
 # flowchart-angular6
 一个基于jsplumb的使用angular6写的一个可拖拽的流程图实例(目前已更新到Angular 7版本)
 
-### 更新：解决ng-zorro版本更新带来的图标加载问题
+### 更新：解决ng-zorro版本更新带来的图标加载问题(由于集成了两种icon加载方式，弹出框的icon会出现两个，之后有时间再修改)
+
 
 * 网上找了很久都没有找到用angular实现的可拖拽式的流程图组件，于是就基于jsplumb自己写了一个，实现了一些基本的功能，后续可能会再添加点。
 

src/app/core/core.module.ts

@@ -1,9 +1,8 @@
 import { NgModule, Optional, SkipSelf } from '@angular/core';
 import { throwIfAlreadyLoaded } from '@core/module-import-guard';
-import { I18NService } from '@core/i18n/i18n.service';
 
 @NgModule({
-    providers: [I18NService],
+    providers: [],
 })
 export class CoreModule {
     constructor(

src/app/core/index.ts

@@ -0,0 +1,4 @@
+export * from './i18n/i18n.service';
+export * from './module-import-guard';
+export * from './net/default.interceptor';
+export * from './startup/startup.service';

src/app/core/startup/startup.service.ts

@@ -6,14 +6,10 @@ import { MenuService, SettingsService, TitleService, ALAIN_I18N_TOKEN } from '@d
 import { ACLService } from '@delon/acl';
 import { TranslateService } from '@ngx-translate/core';
 import { I18NService } from '@core/i18n/i18n.service';
-import { NzIconService } from 'ng-zorro-antd';
-import { ICONS_AUTO } from '../../../style-icons-auto';
-import { ICONS } from '../../../style-icons';
 
 @Injectable()
 export class StartupService {
     constructor(
-        iconSrv: NzIconService,
         private menuService: MenuService,
         private translate: TranslateService,
         @Inject(ALAIN_I18N_TOKEN) private i18n: I18NService,
@@ -22,7 +18,7 @@ export class StartupService {
         private titleService: TitleService,
         private httpClient: HttpClient,
         private injector: Injector,
-    ) { iconSrv.addIcon(...ICONS_AUTO, ...ICONS); }
+    ) { }
 
     load(): Promise<any> {
         return new Promise((resolve, reject) => {

src/app/delon.module.ts

@@ -1,44 +1,44 @@
 import { NgModule, Optional, SkipSelf, ModuleWithProviders } from '@angular/core';
-import { throwIfAlreadyLoaded } from '@core/module-import-guard';
+import { throwIfAlreadyLoaded } from '@core';
 import { AlainThemeModule } from '@delon/theme';
 import { DelonMockModule } from '@delon/mock';
 import * as MOCKDATA from '../../_mock';
 import { environment } from '@env/environment';
 const MOCK_MODULES = !environment.production ? [DelonMockModule.forRoot({ data: MOCKDATA })] : [];
 import { PageHeaderConfig } from '@delon/abc';
 export function fnPageHeaderConfig(): PageHeaderConfig {
-  return {
-    ...new PageHeaderConfig(),
-    ...({ homeI18n: 'home' } as PageHeaderConfig),
-  };
+    return {
+        ...new PageHeaderConfig(),
+        ...({ homeI18n: 'home' } as PageHeaderConfig),
+    };
 }
 import { STConfig } from '@delon/abc';
 export function fnSTConfig(): STConfig {
-  return {
-    ...new STConfig(),
-    ...({
-      modal: { size: 'lg' },
-    } as STConfig),
-  };
+    return {
+        ...new STConfig(),
+        ...({
+            modal: { size: 'lg' },
+        } as STConfig),
+    };
 }
 
 const GLOBAL_CONFIG_PROVIDES = [
-  { provide: STConfig, useFactory: fnSTConfig },
-  { provide: PageHeaderConfig, useFactory: fnPageHeaderConfig },
+    { provide: STConfig, useFactory: fnSTConfig },
+    { provide: PageHeaderConfig, useFactory: fnPageHeaderConfig },
 ];
 
 @NgModule({
-  imports: [AlainThemeModule.forRoot(), ...MOCK_MODULES],
+    imports: [AlainThemeModule.forRoot(), ...MOCK_MODULES],
 })
 export class DelonModule {
-  constructor(@Optional() @SkipSelf() parentModule: DelonModule) {
-    throwIfAlreadyLoaded(parentModule, 'DelonModule');
-  }
+    constructor(@Optional() @SkipSelf() parentModule: DelonModule) {
+        throwIfAlreadyLoaded(parentModule, 'DelonModule');
+    }
 
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: DelonModule,
-      providers: [ ...GLOBAL_CONFIG_PROVIDES],
-    };
-  }
+    static forRoot(): ModuleWithProviders {
+        return {
+            ngModule: DelonModule,
+            providers: [...GLOBAL_CONFIG_PROVIDES],
+        };
+    }
 }

src/app/routes/default/default.component.ts

@@ -163,7 +163,8 @@ export class LayoutDefaultComponent implements OnInit {
     }
 
     createSettingModal(toolId): void {
-        this.modalService.create({
+        console.log(toolId)
+        /* this.modalService.create({
             nzTitle: '参数设置',
             nzContent: NodeParamsetComponent,
             nzComponentParams: {
@@ -172,7 +173,20 @@ export class LayoutDefaultComponent implements OnInit {
             },
             nzMaskClosable: false,
             nzFooter: null,
+        }); */
+        const modal = this.modalService.create({
+            nzTitle: '参数设置',
+            nzContent: NodeParamsetComponent,
+            nzComponentParams: {
+                projectId: 'ceshicanshu1',
+                toolId: toolId
+            }
         });
+
+        modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!'));
+
+        // Return a result when closed
+        modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result));
     }
 
     addPorts(instance, node, ports) {

src/style-icons-auto.ts

@@ -7,9 +7,7 @@
 @font-face {
     font-family: 'anticon';
     src: url('./assets/fonts/iconfont.eot');
-    src: url('./assets/fonts/iconfont.woff') format('woff'), 
-    url('./assets/fonts/iconfont.ttf') format('truetype'), 
-    url('./assets/fonts/iconfont.svg') format('svg');
+    src: url('./assets/fonts/iconfont.woff') format('woff'), url('./assets/fonts/iconfont.ttf') format('truetype'), url('./assets/fonts/iconfont.svg') format('svg');
 }
 
 .anticon {