From 3ed2339a6d75abbd6ccf723b6eaa762f9921409e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=A0=E6=9C=A8?= Date: Sat, 29 May 2021 23:08:10 +0800 Subject: [PATCH] fix(tree): support defaultExpandAll prop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit defaultExpandLevel已去除-1的行为定义,由defaultExpandAll代替。 --- src/components/Tree/src/Tree.vue | 7 +++---- src/components/Tree/src/props.ts | 1 + src/views/demo/tree/index.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Tree/src/Tree.vue b/src/components/Tree/src/Tree.vue index 2bae83ffb..fdacd823c 100644 --- a/src/components/Tree/src/Tree.vue +++ b/src/components/Tree/src/Tree.vue @@ -211,12 +211,11 @@ }); onMounted(() => { - if (props.defaultExpandLevel === '') return; const level = parseInt(props.defaultExpandLevel); - if (level === -1) { - expandAll(true); - } else if (level > 0) { + if (level > 0) { state.expandedKeys = filterByLevel(level); + } else if (props.defaultExpandAll) { + expandAll(true); } }); diff --git a/src/components/Tree/src/props.ts b/src/components/Tree/src/props.ts index 593230676..c399b2c4d 100644 --- a/src/components/Tree/src/props.ts +++ b/src/components/Tree/src/props.ts @@ -27,6 +27,7 @@ export const basicProps = { type: [String, Number] as PropType, default: '', }, + defaultExpandAll: propTypes.bool.def(false), replaceFields: { type: Object as PropType, diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue index 7d3f5aa95..7368c1108 100644 --- a/src/views/demo/tree/index.vue +++ b/src/views/demo/tree/index.vue @@ -13,7 +13,7 @@ title="可勾选,默认全部展开" :checkable="true" class="w-1/3 mx-4" - defaultExpandLevel="-1" + defaultExpandAll @check="handleCheck" />