From 717f9e16c558973fc534bbb7333ff7ca7ffed7fb Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sun, 31 May 2020 15:10:27 +0800
Subject: [PATCH 1/5] fix: rangeCalendar  panel error #2318

---
 components/vc-calendar/src/RangeCalendar.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/vc-calendar/src/RangeCalendar.jsx b/components/vc-calendar/src/RangeCalendar.jsx
index 05e3cce20..fbd28ddf9 100644
--- a/components/vc-calendar/src/RangeCalendar.jsx
+++ b/components/vc-calendar/src/RangeCalendar.jsx
@@ -494,7 +494,7 @@ const RangeCalendar = {
       // Adjust month if date not align
       if (
         !showTimePicker &&
-        panelTriggerSource === 'start' &&
+        panelTriggerSource !== 'end' &&
         mode[0] === 'date' &&
         mode[1] === 'date' &&
         endValue.isSame(value[0], 'month')

From 5108f67c11edbc3ae3e26091d7b9eaabf82d0516 Mon Sep 17 00:00:00 2001
From: tanjinzhou <415800467@qq.com>
Date: Tue, 2 Jun 2020 13:48:05 +0800
Subject: [PATCH 2/5] release 1.6.2

---
 CHANGELOG.en-US.md | 7 +++++++
 CHANGELOG.zh-CN.md | 7 +++++++
 package.json       | 2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index 831613349..761f22cbf 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -10,6 +10,13 @@
 
 ---
 
+## 1.6.2
+
+`2020-06-02`
+
+- 🐞 Fix dialogClass type error [#2298](https://github.com/vueComponent/ant-design-vue/issues/2298)
+- 🐞 Fix RangePicker panel display error [#2318](https://github.com/vueComponent/ant-design-vue/issues/2318)
+
 ## 1.6.1
 
 `2020-05-25`
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index d3ab13506..79ea5fa70 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -10,6 +10,13 @@
 
 ---
 
+## 1.6.2
+
+`2020-06-02`
+
+- 🐞 修复弹窗 dialogClass 类型错误 [#2298](https://github.com/vueComponent/ant-design-vue/issues/2298)
+- 🐞 修复 RangePicker 面板展示错误 [#2318](https://github.com/vueComponent/ant-design-vue/issues/2318)
+
 ## 1.6.1
 
 `2020-05-25`
diff --git a/package.json b/package.json
index 260d1e39d..64e334c70 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "ant-design-vue",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "title": "Ant Design Vue",
     "description": "An enterprise-class UI design language and Vue-based implementation",
     "keywords": [

From 413793234b5bd6764c324ae739d62c5a339f9486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E8=BF=90=E5=A4=A9?= <ununian@outlook.com>
Date: Fri, 12 Jun 2020 22:02:11 +0800
Subject: [PATCH 3/5] fix: input-password prevent  caret position (#2420)

---
 components/input/Password.jsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/input/Password.jsx b/components/input/Password.jsx
index 93517c04a..3625c115a 100644
--- a/components/input/Password.jsx
+++ b/components/input/Password.jsx
@@ -60,6 +60,11 @@ export default {
             // https://github.com/ant-design/ant-design/issues/15173
             e.preventDefault();
           },
+          mouseup: e => {
+            // Prevent focused state lost
+            // https://github.com/ant-design/ant-design/pull/23633/files
+            e.preventDefault();
+          },
         },
         class: `${prefixCls}-icon`,
         key: 'passwordIcon',

From 65ea66da367b96a97b7079f40fdda2087ae08602 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sat, 13 Jun 2020 14:35:47 +0800
Subject: [PATCH 4/5] fix: drawer maskstyle not work #2407

---
 components/vc-drawer/src/Drawer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/vc-drawer/src/Drawer.js b/components/vc-drawer/src/Drawer.js
index 934f6e161..1a54d7ac7 100644
--- a/components/vc-drawer/src/Drawer.js
+++ b/components/vc-drawer/src/Drawer.js
@@ -474,6 +474,7 @@ const Drawer = {
         <div {...domContProps} tabIndex={-1}>
           {showMask && (
             <div
+              key={open} // 第二次渲染时虚拟DOM没有改变，没有出发dom更新，使用key强制更新 https://github.com/vueComponent/ant-design-vue/issues/2407
               class={`${prefixCls}-mask`}
               onClick={maskClosable ? this.onMaskTouchEnd : noop}
               style={maskStyle}

From 6c71de6e70201a828f5395c72368ec59eef5bbab Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sat, 13 Jun 2020 16:46:05 +0800
Subject: [PATCH 5/5] chore: update package.json

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 64e334c70..cbeafca5d 100644
--- a/package.json
+++ b/package.json
@@ -147,7 +147,7 @@
         "stylelint": "^13.0.0",
         "stylelint-config-prettier": "^8.0.0",
         "stylelint-config-standard": "^19.0.0",
-        "terser-webpack-plugin": "^2.3.1",
+        "terser-webpack-plugin": "^3.0.3",
         "through2": "^3.0.0",
         "url-loader": "^3.0.0",
         "vue": "^2.6.11",