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

Author: Andy

.eslintignore

@@ -7,4 +7,3 @@ es/
 lib/
 _site/
 dist/
-package.json

.github/FUNDING.yml

@@ -9,4 +9,5 @@ custom:
   [
     "https://www.paypal.me/tangjinzhou",
     "https://qn.antdv.com/alipay-and-wechat.png",
+    "https://www.buymeacoffee.com/antdv"
   ]

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,17 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Create new issue
+    url: https://vuecomponent.github.io/issue-helper/
+    about: Please use the following link to create a new issue.
+  - name: Patreon
+    url: https://www.patreon.com/tangjinzhou
+    about: Love Ant Design Vue? Please consider supporting us via Patreon.
+  - name: Open Collective
+    url: https://opencollective.com/ant-design-vue/donate
+    about: Love Ant Design Vue? Please consider supporting us via Open Collective.
+  - name: Paypal
+    url: https://www.paypal.me/tangjinzhou
+    about: Love Ant Design Vue? Please consider supporting us via Paypal.
+  - name: 支付宝/微信 赞助
+    url: https://qn.antdv.com/alipay-and-wechat.png
+    about: Ant Design Vue 的健康持续发展需要您的支持，🙏

.github/ISSUE_TEMPLATE/----please-use-new-issue-ant-design-vue---.md

@@ -50,6 +50,7 @@ jobs:
           repository: tangjinzhou/antdv-demo
           token: ${{ secrets.ACCESS_TOKEN }}
           path: antdv-demo
+          submodules: true
 
       - name: restore cache from package-lock.json
         uses: actions/cache@v1

.github/ISSUE_TEMPLATE/config.yml

@@ -106,6 +106,7 @@ jobs:
           repository: tangjinzhou/antdv-demo
           token: ${{ secrets.ACCESS_TOKEN }}
           path: antdv-demo
+          submodules: true
 
       - name: restore cache from package-lock.json
         uses: actions/cache@v1

.github/workflows/codecov.yml

@@ -1,5 +1,4 @@
 **/*.svg
-package.json
 lib/
 es/
 dist/

.github/workflows/test.yml

@@ -29,3 +29,51 @@ v-model -> v-model:visible
 ## Tooltip
 
 v-model -> v-model:visible
+
+## Modal
+
+v-model -> v-model:visible
+
+okButtonProps、cancelButtonProps 扁平化处理
+
+## Mentions
+
+v-model -> v-model:value
+
+## menu
+
+v-model -> v-model:selectedKeys :openKeys.sync -> v-mdoel:openKeys
+
+## dropdown
+
+v-model -> v-model:visible
+
+## Steps
+
+v-model -> v-model:current
+
+## checkbox
+
+v-model -> v-model:checked
+
+checkboxGroup
+
+v-model -> v-model:value
+
+## Switch
+
+v-model -> v-model:checked
+
+## tabs
+
+v-model -> v-model:activeKey
+
+renderTabBar({props, on, style, class}, DefaultTabBar) -> {DefaultTabBar, ...props} 多参数改成单参数并且扁平化处理
+
+## card
+
+tabList[{scopedSlots}] -> tabList[{slots}]
+
+## rate
+
+v-model -> v-model:value

.prettierignore

@@ -1,4 +1,5 @@
 import { getOptionProps } from './props-util';
+import { isOn } from './util';
 
 export default {
   methods: {
@@ -26,7 +27,9 @@ export default {
       const args = [].slice.call(arguments, 0);
       let eventName = args[0];
       // TODO: 后续统一改成onXxxx，不在运行时转，提升性能
-      eventName = `on${eventName[0].toUpperCase()}${eventName.substring(1)}`;
+      eventName = isOn(eventName)
+        ? eventName
+        : `on${eventName[0].toUpperCase()}${eventName.substring(1)}`;
       const event = this.$props[eventName] || this.$attrs[eventName];
       if (args.length && event) {
         if (Array.isArray(event)) {

antdv-demo

@@ -2,7 +2,6 @@ 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 = !(
@@ -142,7 +141,7 @@ export default {
         <Portal
           getContainer={this.getDomContainer}
           children={children(childProps)}
-          {...createRefHooks(this.savePortal)}
+          ref={this.savePortal}
         ></Portal>
       );
     }

breakChange-2.x.md

@@ -54,12 +54,12 @@ function animate(node, show, done) {
 }
 
 const animation = {
-  enter(node, done) {
+  onEnter(node, done) {
     nextTick(() => {
       animate(node, true, done);
     });
   },
-  leave(node, done) {
+  onLeave(node, done) {
     return animate(node, false, done);
   },
 };

components/_util/BaseMixin.js

@@ -69,10 +69,10 @@ const getSlots = ele => {
 };
 const getSlot = (self, name = 'default', options = {}) => {
   let res = self.$slots[name] && self.$slots[name](options);
-  while (res && res.length === 1 && res[0].type === Fragment) {
-    res = res[0].children;
+  while (res && res.length === 1 && (res[0].type === Fragment || Array.isArray(res[0]))) {
+    res = res[0].children || res[0];
   }
-  return res;
+  return res && res.__v_isVNode ? [res] : res;
 };
 
 const getAllChildren = ele => {
@@ -93,6 +93,13 @@ const getSlotOptions = ele => {
   }
   return componentOptions ? componentOptions.Ctor.options || {} : {};
 };
+const findDOMNode = instance => {
+  let node = instance.$el;
+  while (!node.tagName) {
+    node = node.nextSibling;
+  }
+  return node;
+};
 const getOptionProps = instance => {
   const res = {};
   if (instance.$ && instance.$.vnode) {
@@ -105,27 +112,42 @@ const getOptionProps = instance => {
       }
     });
   } else if (isVNode(instance) && typeof instance.type === 'object') {
-    const props = instance.props || {};
+    const originProps = instance.props || {};
+    const props = {};
+    Object.keys(originProps).forEach(key => {
+      props[camelize(key)] = originProps[key];
+    });
     const options = instance.type.props;
     Object.keys(options).forEach(k => {
-      const hyphenateKey = hyphenate(k);
-      const v = resolvePropValue(options, props, k, props[hyphenateKey], hyphenateKey);
-      if (v !== undefined || hyphenateKey in props) {
+      const v = resolvePropValue(options, props, k, props[k]);
+      if (v !== undefined || k in props) {
         res[k] = v;
       }
     });
   }
   return res;
 };
 const getComponent = (instance, prop, options = instance, execute = true) => {
-  const temp = instance[prop];
-  if (temp !== undefined) {
-    return typeof temp === 'function' && execute ? temp(options) : temp;
-  } else {
-    let com = instance.$slots[prop];
-    com = execute && com ? com(options) : com;
-    return Array.isArray(com) && com.length === 1 ? com[0] : com;
+  if (instance.$) {
+    const temp = instance[prop];
+    if (temp !== undefined) {
+      return typeof temp === 'function' && execute ? temp(options) : temp;
+    } else {
+      let com = instance.$slots[prop];
+      com = execute && com ? com(options) : com;
+      return Array.isArray(com) && com.length === 1 ? com[0] : com;
+    }
+  } else if (isVNode(instance)) {
+    const temp = instance.props && instance.props[prop];
+    if (temp !== undefined) {
+      return typeof temp === 'function' && execute ? temp(options) : temp;
+    } else if (instance.children && instance.children[prop]) {
+      let com = instance.children[prop];
+      com = execute && com ? com(options) : com;
+      return Array.isArray(com) && com.length === 1 ? com[0] : com;
+    }
   }
+  return undefined;
 };
 const getComponentFromProp = (instance, prop, options = instance, execute = true) => {
   if (instance.$createElement) {
@@ -169,19 +191,31 @@ const getComponentFromProp = (instance, prop, options = instance, execute = true
 };
 
 const getAllProps = ele => {
-  let data = ele.data || {};
-  let componentOptions = ele.componentOptions || {};
-  if (ele.$vnode) {
-    data = ele.$vnode.data || {};
-    componentOptions = ele.$vnode.componentOptions || {};
+  let props = getOptionProps(ele);
+  if (ele.$) {
+    props = { ...props, ...this.$attrs };
+  } else {
+    props = { ...ele.props, ...props };
   }
-  return { ...data.props, ...data.attrs, ...componentOptions.propsData };
+  return props;
 };
 
-// 使用 getOptionProps 替换 ，待测试
-const getPropsData = ele => {
-  return getOptionProps(ele);
-  //return ele.props || {};
+const getPropsData = vnode => {
+  const res = {};
+  const originProps = vnode.props || {};
+  const props = {};
+  Object.keys(originProps).forEach(key => {
+    props[camelize(key)] = originProps[key];
+  });
+  const options = isPlainObject(vnode.type) ? vnode.type.props : {};
+  Object.keys(options).forEach(k => {
+    const v = resolvePropValue(options, props, k, props[k]);
+    if (k in props) {
+      // 仅包含 props，不包含默认值
+      res[k] = v;
+    }
+  });
+  return { ...props, ...res }; // 合并事件、未声明属性等
 };
 const getValueByProp = (ele, prop) => {
   return getPropsData(ele)[prop];
@@ -203,18 +237,16 @@ const getKey = ele => {
   return key;
 };
 
-export function getEvents(child) {
-  const { $attrs } = child;
-  return splitAttrs($attrs).events;
-
-  // let events = {};
-  // if (child.componentOptions && child.componentOptions.listeners) {
-  //   events = child.componentOptions.listeners;
-  // } else if (child.data && child.data.on) {
-  //   events = child.data.on;
-  // }
-  // return { ...events };
+export function getEvents(ele, on = true) {
+  let props = {};
+  if (ele.$) {
+    props = { ...props, ...ele.$attrs };
+  } else {
+    props = { ...props, ...ele.props };
+  }
+  return splitAttrs(props)[on ? 'onEvents' : 'events'];
 }
+
 export function getEvent(child, event) {
   return child.props && child.props[event];
 }
@@ -270,6 +302,10 @@ export function getComponentName(opts) {
   return opts && (opts.Ctor.options.name || opts.tag);
 }
 
+export function isFragment(c) {
+  return c.length === 1 && c[0].type === Fragment;
+}
+
 export function isEmptyElement(c) {
   return c.type === Comment || (c.type === Text && c.children.trim() === '');
 }
@@ -279,6 +315,9 @@ export function isStringElement(c) {
 }
 
 export function filterEmpty(children = []) {
+  if (isFragment(children)) {
+    return children[0].children.filter(c => !isEmptyElement(c));
+  }
   return children.filter(c => !isEmptyElement(c));
 }
 const initDefaultProps = (propTypes, defaultProps) => {
@@ -332,5 +371,6 @@ export {
   getSlot,
   getAllProps,
   getAllChildren,
+  findDOMNode,
 };
 export default hasProp;