From 6099f73d5265360ce5a676f0c874257af05eef73 Mon Sep 17 00:00:00 2001
From: Melon <guang.xing@liulishuo.com>
Date: Mon, 15 Oct 2018 23:50:07 +0800
Subject: [PATCH] 1.18.0

---
 CHANGELOG.md      | 13 +++++++++++++
 CHANGELOG_CN.md   | 13 +++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22a51df..8051be7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+<a name="1.18.0"></a>
+# [1.18.0](https://github.com/ElemeFE/v-charts/compare/v1.17.10...v1.18.0) (2018-10-15)
+
+
+### Features
+
+* **core:** add log prop to comp ([7abca27](https://github.com/ElemeFE/v-charts/commit/7abca27))
+* 完善水球图的配置settings中关于seriesMap和wave的配置项 ([3e82c6f](https://github.com/ElemeFE/v-charts/commit/3e82c6f))
+* 增加词云图的封装 ([30ddf30](https://github.com/ElemeFE/v-charts/commit/30ddf30))
+* 增加水球图 ([391d62d](https://github.com/ElemeFE/v-charts/commit/391d62d))
+
+
+
 <a name="1.17.10"></a>
 ## [1.17.10](https://github.com/ElemeFE/v-charts/compare/v1.17.9...v1.17.10) (2018-08-10)
 
diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
index db6948c..0aec08c 100644
--- a/CHANGELOG_CN.md
+++ b/CHANGELOG_CN.md
@@ -1,3 +1,16 @@
+<a name="1.18.0"></a>
+# [1.18.0](https://github.com/ElemeFE/v-charts/compare/v1.17.10...v1.18.0) (2018-10-15)
+
+
+### Features
+
+* **core:** add log prop to comp ([7abca27](https://github.com/ElemeFE/v-charts/commit/7abca27))
+* 完善水球图的配置settings中关于seriesMap和wave的配置项 ([3e82c6f](https://github.com/ElemeFE/v-charts/commit/3e82c6f))
+* 增加词云图的封装 ([30ddf30](https://github.com/ElemeFE/v-charts/commit/30ddf30))
+* 增加水球图 ([391d62d](https://github.com/ElemeFE/v-charts/commit/391d62d))
+
+
+
 <a name="1.17.10"></a>
 ## [1.17.10](https://github.com/ElemeFE/v-charts/compare/v1.17.9...v1.17.10) (2018-08-10)
 
diff --git a/package-lock.json b/package-lock.json
index 5e82d9f..2e9c2be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "v-charts",
-  "version": "1.17.10",
+  "version": "1.18.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 7d7dbcb..b904669 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "v-charts",
-  "version": "1.17.10",
+  "version": "1.18.0",
   "description": "Vue Echarts Components",
   "main": "lib/index.js",
   "scripts": {