Merge branch 'feat-vue3' into next

CHANGELOG.en-US.md

@@ -10,6 +10,18 @@
 
 ---
 
+## 2.0.0-beta.10
+
+`2020-09-24`
+
+- 🌟 Update Vue dependency to release version
+- 🐞 Fix the problem that Menu does not collapse in Layout [#2819](https://github.com/vueComponent/ant-design-vue/issues/2819)
+- 🐞 Fix a warning issue when switching Tabs [#2865](https://github.com/vueComponent/ant-design-vue/issues/2865)
+- 🐞 Fix the problem that the input box does not trigger the change event when compositionend
+- 🐞 Fix the problem that the Upload button does not disappear [#2884](https://github.com/vueComponent/ant-design-vue/issues/2884)
+- 🐞 Fix upload custom method not working issue [#2837](https://github.com/vueComponent/ant-design-vue/issues/2837)
+- 🐞 Fix some ts type errors
+
 ## 2.0.0-beta.8
 
 - 🐞 Fix ts types error

CHANGELOG.zh-CN.md

@@ -10,6 +10,18 @@
 
 ---
 
+## 2.0.0-beta.10
+
+`2020-09-24`
+
+- 🌟 更新 Vue 依赖到 release 版本
+- 🐞 修复 Menu 在 Layout 中不折叠问题 [#2819](https://github.com/vueComponent/ant-design-vue/issues/2819)
+- 🐞 修复 Tabs 切换时出现 warning 问题 [#2865](https://github.com/vueComponent/ant-design-vue/issues/2865)
+- 🐞 修复输入框在 compositionend 时不触发 change 事件问题
+- 🐞 修复 Upload 上传按钮不消失问题 [#2884](https://github.com/vueComponent/ant-design-vue/issues/2884)
+- 🐞 修复 Upload 自定义 method 不生效问题 [#2837](https://github.com/vueComponent/ant-design-vue/issues/2837)
+- 🐞 修复若干 ts 类型错误
+
 ## 2.0.0-beta.8
 
 - 🐞 修复 ts 类型错误

antdv-demo

@@ -1 +1 @@
-Subproject commit 05da262e31f9c6cc524154df13f5e2b05c20c1c8
+Subproject commit b2bd75fdaad216ac1bb4e19a38ab5cf801116baf

components/tree/DirectoryTree.jsx

@@ -66,7 +66,7 @@ export default {
     // Expanded keys
     if (defaultExpandAll) {
       if (props.treeData) {
-        state._expandedKeys = getFullKeyListByTreeData(props.treeData);
+        state._expandedKeys = getFullKeyListByTreeData(props.treeData, props.replaceFields);
       } else {
         state._expandedKeys = getFullKeyList(children);
       }

components/tree/util.js

@@ -88,13 +88,12 @@ export function convertDirectoryKeysToNodes(rootChildren, keys) {
   return nodes;
 }
 
-export function getFullKeyListByTreeData(treeData) {
+export function getFullKeyListByTreeData(treeData, replaceFields = {}) {
   let keys = [];
-
+  const { key = 'key', children = 'children' } = replaceFields(treeData || []).forEach(item => {
-  (treeData || []).forEach(item => {
+    keys.push(item[key]);
-    keys.push(item.key);
+    if (item[children]) {
-    if (item.children) {
+      keys = [...keys, ...getFullKeyListByTreeData(item[children], replaceFields)];
-      keys = [...keys, ...getFullKeyListByTreeData(item.children)];
     }
   });
   return keys;

package.json

@@ -1,13 +1,14 @@
 {
   "name": "ant-design-vue",
-  "version": "2.0.0-beta.9",
+  "version": "2.0.0-beta.10",
   "title": "Ant Design Vue",
   "description": "An enterprise-class UI design language and Vue-based implementation",
   "keywords": [
+    "vue",
+    "vue3",
     "ant",
     "design",
     "antd",
-    "vue",
     "vueComponent",
     "component",
     "components",

types/input/textarea.d.ts

@@ -3,31 +3,33 @@
 // Definitions: https://github.com/vueComponent/ant-design-vue/types
 
 import { AntdComponent, AntdProps } from '../component';
+import { TextareaHTMLAttributes } from 'vue';
 
 export declare class TextArea extends AntdComponent {
-  $props: AntdProps & {
+  $props: AntdProps &
-    /**
+    TextareaHTMLAttributes & {
-     * Height autosize feature, can be set to true|false or an object { minRows: 2, maxRows: 6 }
+      /**
-     * @default false
+       * Height autosize feature, can be set to true|false or an object { minRows: 2, maxRows: 6 }
-     * @type boolean | object
+       * @default false
-     */
+       * @type boolean | object
-    autoSize?: boolean | { minRows: number; maxRows: number };
+       */
+      autoSize?: boolean | { minRows: number; maxRows: number };
 
-    /**
+      /**
-     * The initial input content
+       * The initial input content
-     * @type string | number
+       * @type string | number
-     */
+       */
-    defaultValue?: string | number;
+      defaultValue?: string | number;
 
-    /**
+      /**
-     * The input content value
+       * The input content value
-     * @type string | number
+       * @type string | number
-     */
+       */
-    value?: string | number;
+      value?: string | number;
-    /**
+      /**
-     *allow to remove input content with clear icon (1.5.0)
+       *allow to remove input content with clear icon (1.5.0)
-     * @type boolean
+       * @type boolean
-     */
+       */
-    allowClear?: boolean;
+      allowClear?: boolean;
-  };
+    };
 }