diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 97b17c768..f09977b13 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,5 +1,15 @@
## Changelog
+### 1.2.2
+
+*2017-02-28*
+
+- Fixed compatibility issues with Vue 2.2, #3002 #3067 #3097
+- Fixed Cascader's dropdown hiding behind Dialog when nested in a Dialog, #3035
+- Fixed incorrect parameter of `change` event of Cascader, #3014
+- Add `change` event for ColorPicker, #3049 (by @nicoeg)
+- Fixed `setCheckedKeys` method of Tree not working on non-leaf nodes, #2967 (by @rainyLeo)
+
### 1.2.1
*2017-02-23*
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index 09193001e..c0aa20a78 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,5 +1,14 @@
## 更新日志
+### 1.2.2
+*2017-02-28*
+
+- 修复若干组件与 Vue 2.2 不兼容的问题,#3002 #3067 #3097
+- 修复嵌套在 Dialog 内的 Cascader 下拉框有时出现在 Dialog 之后的问题,#3035
+- 修复 Cascader 的 `change` 事件参数在某些情况下不正确的问题,#3014
+- 新增 ColorPicker 的 `change` 事件,#3049(by @nicoeg)
+- 修复 Tree 的 `setCheckedKeys` 方法对非叶子节点无效的问题,#2967(by @rainyLeo)
+
### 1.2.1
*2017-02-23*
diff --git a/build/deploy-ci.sh b/build/deploy-ci.sh
index 41a28be93..6d91bf0d6 100644
--- a/build/deploy-ci.sh
+++ b/build/deploy-ci.sh
@@ -42,7 +42,7 @@ if [ "$TRAVIS_TAG" ]; then
export SUB_FOLDER=$(echo "$TRAVIS_TAG" | grep -o -E "\d+\.\d+")
echo $SUB_FOLDER
- SUB_FOLDER='1.1'
+ SUB_FOLDER='1.2'
mkdir $SUB_FOLDER
rm -rf *.js *.css *.map static
rm -rf $SUB_FOLDER/**
diff --git a/examples/docs/en-US/tree.md b/examples/docs/en-US/tree.md
index 52fc9ad17..9bca8fdff 100644
--- a/examples/docs/en-US/tree.md
+++ b/examples/docs/en-US/tree.md
@@ -153,7 +153,7 @@
]);
},
setCheckedKeys() {
- this.$refs.tree.setCheckedKeys([8]);
+ this.$refs.tree.setCheckedKeys([3]);
},
resetChecked() {
this.$refs.tree.setCheckedKeys([]);
@@ -446,7 +446,7 @@ Tree nodes can be initially expanded or checked
}]);
},
setCheckedKeys() {
- this.$refs.tree.setCheckedKeys([8]);
+ this.$refs.tree.setCheckedKeys([3]);
},
resetChecked() {
this.$refs.tree.setCheckedKeys([]);
diff --git a/examples/docs/zh-CN/color-picker.md b/examples/docs/zh-CN/color-picker.md
index 5b34412bc..32025816e 100644
--- a/examples/docs/zh-CN/color-picker.md
+++ b/examples/docs/zh-CN/color-picker.md
@@ -88,4 +88,9 @@
| 参数 | 说明 | 类型 | 可选值 | 默认值 |
|---------- |-------- |---------- |------------- |-------- |
| show-alpha | 是否支持透明度选择 | boolean | — | false |
-| color-format | 写入 v-model 的颜色的格式 | string | hsl / hsv / hex / rgb | hex(show-alpha 为 false)/ rgb(show-alpha 为 true) |
\ No newline at end of file
+| color-format | 写入 v-model 的颜色的格式 | string | hsl / hsv / hex / rgb | hex(show-alpha 为 false)/ rgb(show-alpha 为 true) |
+
+### Events
+| 事件名称 | 说明 | 回调参数 |
+|---------- |-------- |---------- |
+| change | 当绑定值变化时触发 | 当前值 |
\ No newline at end of file
diff --git a/examples/docs/zh-CN/custom-theme.md b/examples/docs/zh-CN/custom-theme.md
index 200197f1c..84a0e6244 100644
--- a/examples/docs/zh-CN/custom-theme.md
+++ b/examples/docs/zh-CN/custom-theme.md
@@ -95,4 +95,4 @@ Vue.use(ElementUI)
}
```
-如果不清楚 `babel-plugin-component` 是什么,请阅读 快读上手 一节。更多 `element-theme` 用法请参考[项目仓库](https://github.com/ElementUI/element-theme)。
+如果不清楚 `babel-plugin-component` 是什么,请阅读 快速上手 一节。更多 `element-theme` 用法请参考[项目仓库](https://github.com/ElementUI/element-theme)。
diff --git a/examples/docs/zh-CN/tree.md b/examples/docs/zh-CN/tree.md
index bf1635e30..97e3c957a 100644
--- a/examples/docs/zh-CN/tree.md
+++ b/examples/docs/zh-CN/tree.md
@@ -175,7 +175,7 @@
]);
},
setCheckedKeys() {
- this.$refs.tree.setCheckedKeys([8]);
+ this.$refs.tree.setCheckedKeys([3]);
},
resetChecked() {
this.$refs.tree.setCheckedKeys([]);
@@ -468,7 +468,7 @@
}]);
},
setCheckedKeys() {
- this.$refs.tree.setCheckedKeys([8]);
+ this.$refs.tree.setCheckedKeys([3]);
},
resetChecked() {
this.$refs.tree.setCheckedKeys([]);