From e7b7d5763cdafedeee3256daf64b2eb718406cf5 Mon Sep 17 00:00:00 2001
From: cipchk <cipchk@qq.com>
Date: Fri, 27 Jul 2018 17:04:08 +0800
Subject: [PATCH] releases: 1.2.0

---
 docs/changelog.md           | 13 +++++++++++++
 package.json                |  2 +-
 scaffold                    |  2 +-
 src/app/layout.component.ts |  9 +++++++--
 src/styles.less             |  6 +++---
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/docs/changelog.md b/docs/changelog.md
index e388036a3..fffd48971 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -6,6 +6,19 @@ title:
 type: Other
 ---
 
+### 1.2.0
+
+`2018-7-27`
+
+- 脚手架
+  - 增加 `ng-alain-version` 版本号至 `body` 元素，[3e1966](https://github.com/cipchk/ng-alain/commit/3e1966)
+  - 升级至 Angular 6.1.x 版本号，支持 typescript 2.9.x，[d0adcd](https://github.com/cipchk/ng-alain/commit/d0adcd)
+  - 重构引用 `node_modules/@delon` 开头的样式路径为 `~@delon`，[67c771](https://github.com/cipchk/ng-alain/commit/67c771)
+- @delon/theme
+  - 增加 `VERSION` 版本号
+- Schematics
+  - 修复 `ng add ng-alain` 在 Angular Cli 6.1.x 下无法运行，[#601](https://github.com/cipchk/ng-alain/issues/601)
+
 ### 1.1.5
 
 `2018-7-22`
diff --git a/package.json b/package.json
index 0b929c2d4..36da28937 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "delon",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "typings": "index.d.ts",
   "description": "Delon is a set of essential modules for ng-alain.",
   "repository": {
diff --git a/scaffold b/scaffold
index b977fc025..d9a357a02 160000
--- a/scaffold
+++ b/scaffold
@@ -1 +1 @@
-Subproject commit b977fc0250f38c31a34f3279742eb562d72e27e5
+Subproject commit d9a357a0262422c05e60e7b7394548c792c9b22d
diff --git a/src/app/layout.component.ts b/src/app/layout.component.ts
index 00584f8da..9983b1dd9 100644
--- a/src/app/layout.component.ts
+++ b/src/app/layout.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { MenuService, SettingsService, Menu } from '@delon/theme';
+import { NzMessageService } from 'ng-zorro-antd';
 
 @Component({
   selector: 'app-layout',
@@ -58,7 +59,7 @@ export class LayoutComponent implements OnInit {
           text: 'Dashboard',
           link: '/dashboard',
           icon: 'anticon anticon-appstore-o',
-          badge: 5
+          badge: 5,
         },
         {
           text: 'Level1',
@@ -105,7 +106,11 @@ export class LayoutComponent implements OnInit {
     },
   ];
 
-  constructor(private menuSrv: MenuService, public settings: SettingsService) {}
+  constructor(
+    private menuSrv: MenuService,
+    public settings: SettingsService,
+    public msgSrv: NzMessageService,
+  ) {}
 
   toggleCollapsedSideabar() {
     this.settings.setLayout('collapsed', !this.settings.layout.collapsed);
diff --git a/src/styles.less b/src/styles.less
index 1dc4ca310..33e701906 100644
--- a/src/styles.less
+++ b/src/styles.less
@@ -1,8 +1,8 @@
 // antd
-@import 'node_modules/ng-zorro-antd/src/ng-zorro-antd.less';
+@import '~ng-zorro-antd/src/ng-zorro-antd.less';
 // alain
-@import 'packages/theme/styles/index';
-@import 'packages/abc/index';
+@import '../packages/theme/styles/index';
+@import '../packages/abc/index';
 
 // 例如：内容区域背景色为白色
 // @content-bg:  #fff;