Merge remote-tracking branch 'origin/master' into feat-vue3

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`

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`

components/input/Password.jsx

@@ -58,6 +58,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',

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')

components/vc-drawer/src/Drawer.js

@@ -483,6 +483,7 @@ const Drawer = {
         >
           {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}

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": [
@@ -148,7 +148,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": "^3.0.0-beta.14",