Skip to content

Commit bd62d4f

Browse files
committed
Fix shortcut slot not show error (#115)
1 parent d701991 commit bd62d4f

File tree

3 files changed

+60
-3
lines changed

3 files changed

+60
-3
lines changed

examples/views/BasicComponent.vue

+58-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,48 @@
4242
</context-menu-group>
4343
</context-menu-group>
4444
<context-menu-item label="Test dynamic change theme" :clickClose="false" @click="optionsComponent.theme = (optionsComponent.theme === 'dark' ? '' : 'dark')" />
45+
<context-menu-group label="Test Menu item slot" @subMenuOpen="handleSubMenuOpen">
46+
<template #icon>
47+
<i class="iconfont icon-yidong"></i>
48+
</template>
49+
<context-menu-item>
50+
<template #label>
51+
Custom label slot <span class="test-tag">tag name</span>
52+
</template>
53+
</context-menu-item>
54+
<context-menu-item>
55+
<template #label>
56+
Custom shortcut slot
57+
</template>
58+
<template #shortcut>
59+
<span class="test-tag2">#shortcut: my</span>
60+
</template>
61+
</context-menu-item>
62+
<context-menu-item>
63+
<template #label>
64+
Custom icon slot
65+
</template>
66+
<template #icon>
67+
<i class="iconfont icon-terminal"></i>
68+
</template>
69+
</context-menu-item>
70+
<context-menu-item checked>
71+
<template #label>
72+
Custom check slot
73+
</template>
74+
<template #check>
75+
76+
</template>
77+
</context-menu-item>
78+
<context-menu-item showRightArrow>
79+
<template #label>
80+
Custom rightArrow slot
81+
</template>
82+
<template #rightArrow>
83+
>>
84+
</template>
85+
</context-menu-item>
86+
</context-menu-group>
4587
</context-menu>
4688

4789

@@ -146,4 +188,19 @@ function changeLabelText() {
146188
function alertContextMenuItemClicked(name: string) {
147189
alert('You clicked ' + name + ' !');
148190
}
149-
</script>
191+
</script>
192+
193+
<style>
194+
.test-tag {
195+
background-color: #efefef;
196+
padding: 5px;
197+
border-radius: 5px;
198+
margin-left: 10px;
199+
}
200+
.test-tag2 {
201+
background-color: #ff9a9a;
202+
padding: 5px;
203+
border-radius: 25px;
204+
margin-left: 10px;
205+
}
206+
</style>

examples/views/BasicUseage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div @contextmenu="onContextMenu3($event, 'b')">Bottom Center</div>
2020
<div @contextmenu="onContextMenu3($event, 'br')">Bottom Right</div>
2121
</div>
22-
<div class="box2" style="width: 170px; height: 140px" :tabindex="1" @contextmenu="onContextMenu($event)" @keydown="handleKeyPress">
22+
<div class="box2" style="width: 270px; height: 80px; font-style: 15px;" :tabindex="1" @contextmenu="onContextMenu($event)" @keydown="handleKeyPress">
2323
Test keyboard event: Use arrow key to navigate menus.
2424
<br>
2525
Down div event catch: {{ testDownDivKey }}

library/ContextMenuItem.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</slot>
4343
</div>
4444
<div class="mx-item-row">
45-
<slot v-if="shortcut" name="shortcut">
45+
<slot v-if="shortcut || $slots.shortcut" name="shortcut">
4646
<VNodeRender v-if="globalHasSlot('itemShortcutRender')" :vnode="() => globalRenderSlot('itemShortcutRender', getItemDataForChildren())" />
4747
<span class="mx-shortcut">{{ shortcut }}</span>
4848
</slot>

0 commit comments

Comments
 (0)