Merge branch 'feat-vue3' of https://github.com/vueComponent/ant-design-vue into feat-vue3

Author: Andy

.babelrc

@@ -1,13 +1,17 @@
 {
   "env": {
     "test": {
-      "presets": [["env", { "targets": { "node": "current" } }]],
+      "presets": [["@babel/preset-env", { "targets": { "node": "current" } }]],
       "plugins": [
-        "transform-vue-jsx",
-        "transform-object-assign",
-        "transform-object-rest-spread",
-        "transform-class-properties",
-        "transform-runtime"
+        "@ant-design-vue/babel-plugin-jsx",
+        "babel-plugin-inline-import-data-uri",
+        "@babel/plugin-transform-member-expression-literals",
+        "@babel/plugin-transform-property-literals",
+        "@babel/plugin-proposal-export-default-from",
+        "@babel/plugin-transform-object-assign",
+        "@babel/plugin-transform-template-literals",
+        "@babel/plugin-proposal-object-rest-spread",
+        "@babel/plugin-proposal-class-properties"
       ]
     }
   }

.jest.js

@@ -21,7 +21,7 @@ module.exports = {
     '^@/(.*)$': '<rootDir>/$1',
     'ant-design-vue$': '<rootDir>/components/index.js',
     'ant-design-vue/es': '<rootDir>/components',
-    '^vue$': 'vue/dist/vue.common.js',
+    // '^vue$': 'vue/dist/vue.global.js',
   },
   snapshotSerializers: ['<rootDir>/node_modules/jest-serializer-vue'],
   collectCoverage: process.env.COVERAGE === 'true',

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`

breakChange-2.x.md

@@ -0,0 +1,31 @@
+# break change
+
+## Tag
+
+### CheckableTag
+
+v-model -> v-model:checked
+
+### Tag
+
+v-model -> v-model:visible
+
+移除 afterClose 属性
+
+## Radio
+
+radioGroup radio v-model -> v-model:value
+
+## popconfirm
+
+okButtonProps、cancelButtonProps 扁平化处理
+
+v-model -> v-model:visible
+
+## popover
+
+v-model -> v-model:visible
+
+## Tooltip
+
+v-model -> v-model:visible

components/_util/BaseMixin.js

@@ -24,8 +24,10 @@ export default {
     __emit() {
       // 直接调用listeners，底层组件不需要vueTool记录events
       const args = [].slice.call(arguments, 0);
-      const eventName = args[0];
-      const event = this[eventName];
+      let eventName = args[0];
+      // TODO: 后续统一改成onXxxx，不在运行时转，提升性能
+      eventName = `on${eventName[0].toUpperCase()}${eventName.substring(1)}`;
+      const event = this.$props[eventName] || this.$attrs[eventName];
       if (args.length && event) {
         if (Array.isArray(event)) {
           for (let i = 0, l = event.length; i < l; i++) {

components/_util/ContainerRender.jsx

@@ -24,7 +24,7 @@ export default {
     }
   },
 
-  beforeDestroy() {
+  beforeUnmount() {
     if (this.autoDestroy) {
       this.removeContainer();
     }

components/_util/Portal.js

@@ -1,5 +1,5 @@
 import PropTypes from './vue-types';
-import { cloneElement } from './vnode';
+import { Teleport } from 'vue';
 
 export default {
   name: 'Portal',
@@ -8,6 +8,10 @@ export default {
     children: PropTypes.any.isRequired,
     didUpdate: PropTypes.func,
   },
+  data() {
+    this._container = null;
+    return {};
+  },
   mounted() {
     this.createContainer();
   },
@@ -20,7 +24,7 @@ export default {
     }
   },
 
-  beforeDestroy() {
+  beforeUnmount() {
     this.removeContainer();
   },
   methods: {
@@ -37,14 +41,7 @@ export default {
 
   render() {
     if (this._container) {
-      return cloneElement(this.$props.children, {
-        directives: [
-          {
-            name: 'ant-portal',
-            value: this._container,
-          },
-        ],
-      });
+      return <Teleport to={this._container}>{this.$props.children}</Teleport>;
     }
     return null;
   },

components/_util/PortalWrapper.js

@@ -2,6 +2,7 @@ import PropTypes from './vue-types';
 import switchScrollingEffect from './switchScrollingEffect';
 import setStyle from './setStyle';
 import Portal from './Portal';
+import createRefHooks from './createRefHooks';
 
 let openCount = 0;
 const windowIsUndefined = !(
@@ -23,6 +24,7 @@ export default {
     visible: PropTypes.bool,
   },
   data() {
+    this._component = null;
     const { visible } = this.$props;
     openCount = visible ? openCount + 1 : openCount;
     return {};
@@ -46,7 +48,7 @@ export default {
       }
     },
   },
-  beforeDestroy() {
+  beforeUnmount() {
     const { visible } = this.$props;
     // 离开时不会 render， 导到离开时数值不变，改用 func 。。
     openCount = visible && openCount ? openCount - 1 : openCount;
@@ -140,14 +142,7 @@ export default {
         <Portal
           getContainer={this.getDomContainer}
           children={children(childProps)}
-          {...{
-            directives: [
-              {
-                name: 'ant-ref',
-                value: this.savePortal,
-              },
-            ],
-          }}
+          {...createRefHooks(this.savePortal)}
         ></Portal>
       );
     }

components/_util/createRefHooks.js

@@ -0,0 +1,14 @@
+const createRef = fn => {
+  return {
+    onVnodeBeforeMount: vnode => {
+      fn(vnode.component || vnode.el, vnode.key);
+    },
+    onVnodeUpdated: vnode => {
+      fn(vnode.component || vnode.el, vnode.key);
+    },
+    onVnodeUnmounted: vnode => {
+      fn(null, vnode.key);
+    },
+  };
+};
+export default createRef;

components/_util/getTransitionProps.js

@@ -1,33 +1,16 @@
 import animate from './css-animation';
-const noop = () => {};
 const getTransitionProps = (transitionName, opt = {}) => {
-  const { beforeEnter, enter, afterEnter, leave, afterLeave, appear = true, tag, nativeOn } = opt;
   const transitionProps = {
-    props: {
-      appear,
-      css: false,
+    appear: true,
+    css: false,
+    onEnter: (el, done) => {
+      animate(el, `${transitionName}-enter`, done);
     },
-    on: {
-      beforeEnter: beforeEnter || noop,
-      enter:
-        enter ||
-        ((el, done) => {
-          animate(el, `${transitionName}-enter`, done);
-        }),
-      afterEnter: afterEnter || noop,
-      leave:
-        leave ||
-        ((el, done) => {
-          animate(el, `${transitionName}-leave`, done);
-        }),
-      afterLeave: afterLeave || noop,
+    onLeave: (el, done) => {
+      animate(el, `${transitionName}-leave`, done);
     },
-    nativeOn,
+    ...opt,
   };
-  // transition-group
-  if (tag) {
-    transitionProps.tag = tag;
-  }
   return transitionProps;
 };
 

components/_util/openAnimation.js

@@ -1,6 +1,6 @@
 import cssAnimation from './css-animation';
 import raf from 'raf';
-import Vue from 'vue';
+import { nextTick } from 'vue';
 
 function animate(node, show, done) {
   let height;
@@ -55,7 +55,7 @@ function animate(node, show, done) {
 
 const animation = {
   enter(node, done) {
-    Vue.nextTick(() => {
+    nextTick(() => {
       animate(node, true, done);
     });
   },