From 726f6b4b2da48775ede1d71e51511e76919ef550 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sun, 9 May 2021 21:24:59 +0800
Subject: [PATCH] release 2.1.4

---
 CHANGELOG.en-US.md                       | 10 ++++++++++
 CHANGELOG.zh-CN.md                       | 10 ++++++++++
 components/vc-tree-select/src/Select.jsx | 16 ++++++++++------
 package.json                             |  2 +-
 v2-doc                                   |  2 +-
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 2b9fe433c..df7b8b026 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -10,6 +10,16 @@
 
 ---
 
+## 2.1.4
+
+`2021-05-09`
+
+- 🐞 Fix `Table` scrolling misalignment issue [#4045](https://github.com/vueComponent/ant-design-vue/issues/4045)
+- 🐞 Fix `Typography` editable mode triggering link jump issue [#4105](https://github.com/vueComponent/ant-design-vue/issues/4105)
+- 🐞 Fix the issue that `Carousel` variableWidth does not take effect [#3977](https://github.com/vueComponent/ant-design-vue/issues/3977)
+- 🐞 Fix the problem that `TreeSelect` cannot delete parent and child nodes at the same time through the keyboard [#3508](https://github.com/vueComponent/ant-design-vue/issues/3508)
+- 🐞 Fix some types of errors
+
 ## 2.1.3
 
 `2021-04-25`
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index ec3891d99..c3ddae7bf 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -10,6 +10,16 @@
 
 ---
 
+## 2.1.4
+
+`2021-05-09`
+
+- 🐞 修复 `Table` 滚动错位问题 [#4045](https://github.com/vueComponent/ant-design-vue/issues/4045)
+- 🐞 修复 `Typography` editable 模式触发链接跳转问题 [#4105](https://github.com/vueComponent/ant-design-vue/issues/4105)
+- 🐞 修复 `Carousel` variableWidth 不生效问题 [#3977](https://github.com/vueComponent/ant-design-vue/issues/3977)
+- 🐞 修复 `TreeSelect` 无法通过键盘同时删除父子节点问题 [#3508](https://github.com/vueComponent/ant-design-vue/issues/3508)
+- 🐞 修复若干类型错误问题
+
 ## 2.1.3
 
 `2021-04-25`
diff --git a/components/vc-tree-select/src/Select.jsx b/components/vc-tree-select/src/Select.jsx
index e243dd59b..df766976c 100644
--- a/components/vc-tree-select/src/Select.jsx
+++ b/components/vc-tree-select/src/Select.jsx
@@ -874,21 +874,25 @@ const Select = defineComponent({
     },
 
     onSearchInputKeyDown(event) {
-      const { _searchValue: searchValue, _valueList: valueList, _valueEntities: valueEntities } = this.$data;
+      const {
+        _searchValue: searchValue,
+        _valueList: valueList,
+        _valueEntities: valueEntities,
+      } = this.$data;
 
       const { keyCode } = event;
 
       if (KeyCode.BACKSPACE === keyCode && this.isMultiple() && !searchValue && valueList.length) {
         let lastValue = valueList[valueList.length - 1].value;
         const { treeCheckStrictly } = this.$props;
-        if(!treeCheckStrictly) {
+        if (!treeCheckStrictly) {
           let cur = valueEntities[lastValue];
-          while(cur) {
-            if(valueList.some(j => j.value === cur.value)) {
+          while (cur) {
+            if (valueList.some(j => j.value === cur.value)) {
               lastValue = cur.value;
               cur = cur.parent;
-            }else{
-              cur = null
+            } else {
+              cur = null;
             }
           }
         }
diff --git a/package.json b/package.json
index b780da634..7df3bb417 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ant-design-vue",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "title": "Ant Design Vue",
   "description": "An enterprise-class UI design language and Vue-based implementation",
   "keywords": [
diff --git a/v2-doc b/v2-doc
index a7013ae87..4da56dac8 160000
--- a/v2-doc
+++ b/v2-doc
@@ -1 +1 @@
-Subproject commit a7013ae87f69dcbcf547f4b023255b8a7a775557
+Subproject commit 4da56dac85f43ad7a288951cbf09d860ecf93bb4