diff --git a/components/contextmenu/ContextMenuSub.vue b/components/contextmenu/ContextMenuSub.vue index fdc6c9961..1b1826e8c 100755 --- a/components/contextmenu/ContextMenuSub.vue +++ b/components/contextmenu/ContextMenuSub.vue @@ -107,8 +107,8 @@ export default { getItemKey(processedItem) { return this.getItemId(processedItem); }, - getItemProp(processedItem, name) { - return processedItem && processedItem.item ? ObjectUtils.getItemValue(processedItem.item[name]) : undefined; + getItemProp(processedItem, name, params) { + return processedItem && processedItem.item ? ObjectUtils.getItemValue(processedItem.item[name], params) : undefined; }, getItemLabel(processedItem) { return this.getItemProp(processedItem, 'label'); @@ -129,9 +129,7 @@ export default { return ObjectUtils.isNotEmpty(processedItem.items); }, onItemClick(event, processedItem) { - const command = this.getItemProp(processedItem, 'command'); - - command && command({ originalEvent: event, item: processedItem.item }); + this.getItemProp(processedItem, 'command', { originalEvent: event, item: processedItem.item }); this.$emit('item-click', { originalEvent: event, processedItem, isFocus: true }); }, onItemMouseEnter(event, processedItem) { diff --git a/components/megamenu/MegaMenuSub.vue b/components/megamenu/MegaMenuSub.vue index c7d741e68..107d3d54c 100644 --- a/components/megamenu/MegaMenuSub.vue +++ b/components/megamenu/MegaMenuSub.vue @@ -118,8 +118,8 @@ export default { getItemKey(processedItem) { return this.getItemId(processedItem); }, - getItemProp(processedItem, name) { - return processedItem && processedItem.item ? ObjectUtils.getItemValue(processedItem.item[name]) : undefined; + getItemProp(processedItem, name, params) { + return processedItem && processedItem.item ? ObjectUtils.getItemValue(processedItem.item[name], params) : undefined; }, getItemLabel(processedItem) { return this.getItemProp(processedItem, 'label'); @@ -140,9 +140,7 @@ export default { return ObjectUtils.isNotEmpty(processedItem.items); }, onItemClick(event, processedItem) { - const command = this.getItemProp(processedItem, 'command'); - - command && command({ originalEvent: event, item: processedItem.item }); + this.getItemProp(processedItem, 'command', { originalEvent: event, item: processedItem.item }); this.$emit('item-click', { originalEvent: event, processedItem, isFocus: true }); }, onItemMouseEnter(event, processedItem) { diff --git a/components/menubar/MenubarSub.vue b/components/menubar/MenubarSub.vue index 3eeef6370..656f3d6d5 100755 --- a/components/menubar/MenubarSub.vue +++ b/components/menubar/MenubarSub.vue @@ -109,8 +109,8 @@ export default { getItemKey(processedItem) { return this.getItemId(processedItem); }, - getItemProp(processedItem, name) { - return processedItem && processedItem.item ? ObjectUtils.getItemValue(processedItem.item[name]) : undefined; + getItemProp(processedItem, name, params) { + return processedItem && processedItem.item ? ObjectUtils.getItemValue(processedItem.item[name], params) : undefined; }, getItemLabel(processedItem) { return this.getItemProp(processedItem, 'label'); @@ -131,9 +131,7 @@ export default { return ObjectUtils.isNotEmpty(processedItem.items); }, onItemClick(event, processedItem) { - const command = this.getItemProp(processedItem, 'command'); - - command && command({ originalEvent: event, item: processedItem.item }); + this.getItemProp(processedItem, 'command', { originalEvent: event, item: processedItem.item }); this.$emit('item-click', { originalEvent: event, processedItem, isFocus: true }); }, onItemMouseEnter(event, processedItem) { diff --git a/components/panelmenu/PanelMenuSub.vue b/components/panelmenu/PanelMenuSub.vue index 7b90ecdcb..9ce8025b8 100755 --- a/components/panelmenu/PanelMenuSub.vue +++ b/components/panelmenu/PanelMenuSub.vue @@ -96,8 +96,8 @@ export default { getItemKey(processedItem) { return this.getItemId(processedItem); }, - getItemProp(processedItem, name) { - return processedItem && processedItem.item ? ObjectUtils.getItemValue(processedItem.item[name]) : undefined; + getItemProp(processedItem, name, params) { + return processedItem && processedItem.item ? ObjectUtils.getItemValue(processedItem.item[name], params) : undefined; }, getItemLabel(processedItem) { return this.getItemProp(processedItem, 'label'); @@ -118,9 +118,7 @@ export default { return ObjectUtils.isNotEmpty(processedItem.items); }, onItemClick(event, processedItem) { - const command = this.getItemProp(processedItem, 'command'); - - command && command({ originalEvent: event, item: processedItem.item }); + this.getItemProp(processedItem, 'command', { originalEvent: event, item: processedItem.item }); this.$emit('item-toggle', { processedItem, expanded: !this.isItemActive(processedItem) }); }, onItemToggle(event) {