From dc6561958fe095cb7d557b6f501fa23276cf086d Mon Sep 17 00:00:00 2001
From: purocean <purocean@gmail.com>
Date: Wed, 29 Dec 2021 11:34:27 +0800
Subject: [PATCH] fix: fix lint

---
 src/renderer/components/StatusBarMenu.vue | 4 ++--
 src/renderer/plugins/markdown-macro.ts    | 2 +-
 src/renderer/services/status-bar.ts       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/StatusBarMenu.vue b/src/renderer/components/StatusBarMenu.vue
index ade00cd8..c4501a72 100644
--- a/src/renderer/components/StatusBarMenu.vue
+++ b/src/renderer/components/StatusBarMenu.vue
@@ -10,9 +10,9 @@
         <svg-icon v-if="menu.icon" :name="menu.icon" class="title-icon" />
         <div v-if="menu.title" class="title-text">{{menu.title}}</div>
       </div>
-      <ul v-if="showList && menu.list && menu.list.length" :class="{list: true, 'has-checked': menu.list.some(x => x.checked)}">
+      <ul v-if="showList && menu.list && menu.list.length" :class="{list: true, 'has-checked': menu.list.some(x => x.type === 'normal' && x.checked)}">
         <template v-for="item in menu.list" :key="item.id">
-          <li v-if="item.type === 'separator'" v-show="!item.hidden" :key="i" :class="item.type"></li>
+          <li v-if="item.type === 'separator'" v-show="!item.hidden" :class="item.type"></li>
           <li
             v-else
             :class="{[item.type]: true, disabled: item.disabled, hidden: item.hidden}"
diff --git a/src/renderer/plugins/markdown-macro.ts b/src/renderer/plugins/markdown-macro.ts
index 380c6ae7..7a6a6689 100644
--- a/src/renderer/plugins/markdown-macro.ts
+++ b/src/renderer/plugins/markdown-macro.ts
@@ -365,7 +365,7 @@ export default {
           }
         }
 
-        const item = list.find(x => x.id === id)
+        const item = list.find(x => x.type === 'normal' && x.id === id)
         if (item) {
           Object.assign(item, menu)
         } else {
diff --git a/src/renderer/services/status-bar.ts b/src/renderer/services/status-bar.ts
index 4b6d9a4d..9d5b44b8 100644
--- a/src/renderer/services/status-bar.ts
+++ b/src/renderer/services/status-bar.ts
@@ -12,7 +12,7 @@ export type MenuItem = {
   hidden?: boolean;
   checked?: boolean;
   onClick?: (item: MenuItem) => void;
-} | { type: 'separator' }
+} | { type: 'separator', hidden?: boolean }
 
 export interface Menu {
   id: string;