mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2024-12-21 04:50:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(menu): submenu title & expand names

Browse Source
This commit is contained in:
07akioni 2020-11-14 15:12:16 +08:00
parent a975316530
commit d5ba53948d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/menu/src/Menu.js
View File

@ -53,7 +53,7 @@ export default {
type: Number,
default: 32
},
defaultExpandedAll: {
defaultExpandAll: {
type: Boolean,
default: false
},
@ -125,7 +125,7 @@ export default {
}
}))
const uncontrolledExpandedKeysRef = ref(
props.defaultExpandedAll
props.defaultExpandAll
? treeMateRef.value.getNonLeafKeys()
: (
props.defaultExpandedNames ||

2
src/menu/src/Submenu.js
View File

@ -67,7 +67,7 @@ export default {
if (this.menuCollapsed) {
return true
}
return this.NMenu.mergedExpandedKeys.includes(this.internalKey)
return !this.NMenu.mergedExpandedKeys.includes(this.internalKey)
},
popoverEnabled () {
return !this.mergedDisabled && (this.horizontal || this.menuCollapsed)

2
src/menu/src/utils.js
View File

@ -26,7 +26,7 @@ export function itemRenderer (tmNode, insidePopover = false) {
)
)
}
return h(NSubmenu, omit(props, ['children', 'name'], { tmNodes: tmNode.children }))
return h(NSubmenu, omit(props, ['children', 'name', 'type', 'titleExtra'], { tmNodes: tmNode.children }))
} else {
return h(NMenuItem, omit(props, ['children', 'name', 'titleExtra']))
}