From d3d787e2b0e4a55c09a03ba2f8a8295ae382e84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=9F=E7=81=AB=E7=87=8E=E5=8E=9F?= Date: Thu, 24 Sep 2020 13:28:04 +0800 Subject: [PATCH 1/5] fix: a-directory-tree error when use replaceFields (#2869) --- components/tree/DirectoryTree.jsx | 2 +- components/tree/util.js | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/components/tree/DirectoryTree.jsx b/components/tree/DirectoryTree.jsx index deed450a4..34f5c5007 100644 --- a/components/tree/DirectoryTree.jsx +++ b/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); } diff --git a/components/tree/util.js b/components/tree/util.js index 4244d7ae3..fd0a97051 100644 --- a/components/tree/util.js +++ b/components/tree/util.js @@ -88,13 +88,14 @@ 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 => { - keys.push(item.key); - if (item.children) { - keys = [...keys, ...getFullKeyListByTreeData(item.children)]; + keys.push(item[key]); + if (item[children]) { + keys = [...keys, ...getFullKeyListByTreeData(item[children],replaceFields)]; } }); return keys; From b154eeed28d64f0bc17341ce638135c372101c83 Mon Sep 17 00:00:00 2001 From: tanjinzhou <415800467@qq.com> Date: Thu, 24 Sep 2020 13:29:24 +0800 Subject: [PATCH 2/5] style: format code --- components/tree/DirectoryTree.jsx | 2 +- components/tree/util.js | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/components/tree/DirectoryTree.jsx b/components/tree/DirectoryTree.jsx index 34f5c5007..3e6eb7a92 100644 --- a/components/tree/DirectoryTree.jsx +++ b/components/tree/DirectoryTree.jsx @@ -66,7 +66,7 @@ export default { // Expanded keys if (defaultExpandAll) { if (props.treeData) { - state._expandedKeys = getFullKeyListByTreeData(props.treeData,props.replaceFields); + state._expandedKeys = getFullKeyListByTreeData(props.treeData, props.replaceFields); } else { state._expandedKeys = getFullKeyList(children); } diff --git a/components/tree/util.js b/components/tree/util.js index fd0a97051..65a8cd8ce 100644 --- a/components/tree/util.js +++ b/components/tree/util.js @@ -88,14 +88,12 @@ export function convertDirectoryKeysToNodes(rootChildren, keys) { return nodes; } -export function getFullKeyListByTreeData(treeData,replaceFields) { +export function getFullKeyListByTreeData(treeData, replaceFields = {}) { let keys = []; - const {key='key',children='children'} = replaceFields - - (treeData || []).forEach(item => { + const { key = 'key', children = 'children' } = replaceFields(treeData || []).forEach(item => { keys.push(item[key]); if (item[children]) { - keys = [...keys, ...getFullKeyListByTreeData(item[children],replaceFields)]; + keys = [...keys, ...getFullKeyListByTreeData(item[children], replaceFields)]; } }); return keys; From b36043c241158df55340c489cf2e9580d1da6717 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Thu, 24 Sep 2020 21:54:39 +0800 Subject: [PATCH 3/5] bump 2.0.0-beta.10 --- CHANGELOG.en-US.md | 12 ++++++++++++ CHANGELOG.zh-CN.md | 12 ++++++++++++ package.json | 5 +++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 379ef7f0f..b4c43ffaa 100644 --- a/CHANGELOG.en-US.md +++ b/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 diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 3667f7f2c..27f7832d5 100644 --- a/CHANGELOG.zh-CN.md +++ b/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 类型错误 diff --git a/package.json b/package.json index a2881b567..3d03d32d0 100644 --- a/package.json +++ b/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", From 950fd00529eb2be6074870452c378841449bdb70 Mon Sep 17 00:00:00 2001 From: tanjinzhou <415800467@qq.com> Date: Sat, 26 Sep 2020 18:01:37 +0800 Subject: [PATCH 4/5] chore: update qiniu --- antdv-demo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/antdv-demo b/antdv-demo index 05da262e3..b2bd75fda 160000 --- a/antdv-demo +++ b/antdv-demo @@ -1 +1 @@ -Subproject commit 05da262e31f9c6cc524154df13f5e2b05c20c1c8 +Subproject commit b2bd75fdaad216ac1bb4e19a38ab5cf801116baf From ad6b5ae52079e8785d4cedabeff9fa69a5786594 Mon Sep 17 00:00:00 2001 From: John60676 Date: Sun, 27 Sep 2020 11:06:02 +0800 Subject: [PATCH 5/5] fix(types): textarea props types (#2900) --- types/input/textarea.d.ts | 48 ++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/types/input/textarea.d.ts b/types/input/textarea.d.ts index 8a3594e74..a30389a27 100644 --- a/types/input/textarea.d.ts +++ b/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 & { - /** - * Height autosize feature, can be set to true|false or an object { minRows: 2, maxRows: 6 } - * @default false - * @type boolean | object - */ - autoSize?: boolean | { minRows: number; maxRows: number }; + $props: AntdProps & + TextareaHTMLAttributes & { + /** + * Height autosize feature, can be set to true|false or an object { minRows: 2, maxRows: 6 } + * @default false + * @type boolean | object + */ + autoSize?: boolean | { minRows: number; maxRows: number }; - /** - * The initial input content - * @type string | number - */ - defaultValue?: string | number; + /** + * The initial input content + * @type string | number + */ + defaultValue?: string | number; - /** - * The input content value - * @type string | number - */ - value?: string | number; - /** - *allow to remove input content with clear icon (1.5.0) - * @type boolean - */ - allowClear?: boolean; - }; + /** + * The input content value + * @type string | number + */ + value?: string | number; + /** + *allow to remove input content with clear icon (1.5.0) + * @type boolean + */ + allowClear?: boolean; + }; }