From 759ba6de571bb19a8eb1595a42e4f725e9dbceba Mon Sep 17 00:00:00 2001
From: yanmao <55792257+yanmao-cc@users.noreply.github.com>
Date: Fri, 19 Nov 2021 14:10:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(vue):=20=E5=B7=A5=E5=85=B7=E6=A0=8F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E9=94=AE=20#57?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../toolbar-vue/src/components/dropdown-list.vue | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/toolbar-vue/src/components/dropdown-list.vue b/packages/toolbar-vue/src/components/dropdown-list.vue
index 8f5065c8..1c4d1c18 100644
--- a/packages/toolbar-vue/src/components/dropdown-list.vue
+++ b/packages/toolbar-vue/src/components/dropdown-list.vue
@@ -2,12 +2,12 @@
     <div
     :class="['toolbar-dropdown-list',`toolbar-dropdown-${direction || 'vertical'}`,{'toolbar-dropdown-dot': hasDot !== false},className]"
     >
-        <a-tooltip v-for="{ key , placement , title , hotkey , direction , hasDot , content , className , icon, disabled } in items" :key="key" :placement="placement || 'right'" 
-        :overlayStyle="(!!title || !!hotkey) && !isMobile ? {} : {display:'none'}"
+        <a-tooltip v-for="{ key , placement , title , direction , hasDot , content , className , icon, disabled } in items" :key="key" :placement="placement || 'right'" 
+        :overlayStyle="(!!title || !!hotkeys[key]) && !isMobile ? {} : {display:'none'}"
         >
             <template #title>
                 <div v-if="!!title" class="toolbar-tooltip-title">{{title}}</div>
-                <div v-if="!!hotkey" class="toolbar-tooltip-hotkey" v-html="hotkey"></div>
+                <div v-if="!!hotkeys[key]" class="toolbar-tooltip-hotkey" v-html="hotkeys[key]"></div>
             </template>
             <a 
             :class="['toolbar-dropdown-list-item',className, {'toolbar-dropdown-list-item-disabled': disabled}]"
@@ -37,13 +37,15 @@ export default defineComponent({
     props:dropdownListProps,
     setup(props){
         const getHotkey = (item:DropdownListItem) => {
-            const { command } = item
+            const { command, key } = item
             let { hotkey } = item
             //默认获取插件的热键
             if (props.engine && (hotkey === true || hotkey === undefined)) {
+                console.log(item)
                 hotkey = autoGetHotkey(
                     props.engine,
                     command && !Array.isArray(command) ? command.name : props.name,
+                    key
                 );
             }
             if (typeof hotkey === 'string' && hotkey !== '') {
@@ -52,10 +54,10 @@ export default defineComponent({
             return hotkey
         }
 
-        const hotkeys = props.items.map(item => {
-            return {[item.key]:getHotkey(item)}
+        const hotkeys:{[key: string]: any} = {}
+        props.items.forEach(item => {
+            hotkeys[item.key] = getHotkey(item)
         })
-
         return {
             isMobile,
             hotkeys