Skip to content

Commit

Permalink
fix(tree): support defaultExpandAll prop
Browse files Browse the repository at this point in the history
defaultExpandLevel已去除-1的行为定义,由defaultExpandAll代替。
  • Loading branch information
mynetfan committed May 29, 2021
1 parent 6edca1c commit 3ed2339
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
7 changes: 3 additions & 4 deletions src/components/Tree/src/Tree.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

This comment has been minimized.

Copy link
@mynetfan

mynetfan May 29, 2021

Author Collaborator

defaultExpandLevel属性的优先级大于defaultExpandAll。只有在未设置defaultExpandLevel或者defaultExpandLevel值无效的时候,defaultExpandAll才会起作用。

state.expandedKeys = filterByLevel(level);
} else if (props.defaultExpandAll) {
expandAll(true);
}
});
Expand Down
1 change: 1 addition & 0 deletions src/components/Tree/src/props.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const basicProps = {
type: [String, Number] as PropType<string | number>,
default: '',
},
defaultExpandAll: propTypes.bool.def(false),

replaceFields: {
type: Object as PropType<ReplaceFields>,
Expand Down
2 changes: 1 addition & 1 deletion src/views/demo/tree/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
title="可勾选,默认全部展开"
:checkable="true"
class="w-1/3 mx-4"
defaultExpandLevel="-1"
defaultExpandAll
@check="handleCheck"
/>

Expand Down

0 comments on commit 3ed2339

Please sign in to comment.