From 1a435c5837073eed2d111dfe1a3909fad0b40bf3 Mon Sep 17 00:00:00 2001
From: rex-zsd <rexkaneki@gmail.com>
Date: Sat, 4 Apr 2020 23:12:04 +0800
Subject: [PATCH] docs(changelog): release 1.2.0

---
 docs/markdown/changelog.md | 20 ++++++++++++++++++++
 package.json               |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/docs/markdown/changelog.md b/docs/markdown/changelog.md
index 6b34ff8a..d39d208e 100644
--- a/docs/markdown/changelog.md
+++ b/docs/markdown/changelog.md
@@ -1,5 +1,25 @@
 # 更新日志
 
+### [v1.2.0](https://github.com/youzan/vant-weapp/tree/v1.2.0)
+`2020-04-04`
+
+**Features**
+
+- TreeSelect: 更新 nav 背景色 [\#2952](https://github.com/youzan/vant-weapp/pull/2952)
+- Sticky: 使用 page scroll 重构组件 [\#2950](https://github.com/youzan/vant-weapp/pull/2950)
+- Field: 新增 auto-focus、disable-default-padding、cursor 属性 [\#2936](https://github.com/youzan/vant-weapp/pull/2936)
+- Field: 新增 linechange、keyboardheightchange 事件 [\#2936](https://github.com/youzan/vant-weapp/pull/2936)
+- Uploader: 支持显示上传状态 [\#2929](https://github.com/youzan/vant-weapp/pull/2929)
+- Image: mode 属性新增 widthFix、heightFix [\#2908](https://github.com/youzan/vant-weapp/pull/2908)
+- Canvas: 新增 type 属性 [\#2906](https://github.com/youzan/vant-weapp/pull/2906)
+- NavBar: 新增 placeholder 属性 [\#2896](https://github.com/youzan/vant-weapp/pull/2896)
+
+**Bug Fixes**
+
+- Field: 修复输入过快时输入框内容不断回退 [\#2936](https://github.com/youzan/vant-weapp/pull/2936)
+- Calendar: 修复 show-confirm 为 true 时组件初始化报错 [\#2951](https://github.com/youzan/vant-weapp/pull/2951)
+- Tab: 修复 type 为 card 时 color 对边框无效 [\#2941](https://github.com/youzan/vant-weapp/pull/2941)
+
 ### [v1.1.0](https://github.com/youzan/vant-weapp/tree/v1.1.0)
 `2020-03-21`
 
diff --git a/package.json b/package.json
index 9c35df19..67317f4b 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "release": "sh build/release.sh",
     "release:site": "sh build/release-site.sh",
     "build:lib": "yarn && npx gulp -f build/compiler.js --series buildEs buildLib",
-    "build:changelog": "vant changelog --tag v1.0.0 ./docs/markdown/changelog.generated.md"
+    "build:changelog": "vant changelog --tag v1.1.0 ./docs/markdown/changelog.generated.md"
   },
   "files": [
     "dist",