From 2ab338f21bad28afc40cf54c0bddc4643433eaba Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <1171051090@qq.com>
Date: Fri, 25 Dec 2020 10:12:15 +0800
Subject: [PATCH] update

---
 .../Contextmenu/ContextmenuContent.vue        | 40 ++++---------------
 src/components/Contextmenu/index.vue          |  7 +---
 src/plugins/contextmenu.ts                    |  2 -
 3 files changed, 8 insertions(+), 41 deletions(-)

diff --git a/src/components/Contextmenu/ContextmenuContent.vue b/src/components/Contextmenu/ContextmenuContent.vue
index fc3240a..35642d1 100644
--- a/src/components/Contextmenu/ContextmenuContent.vue
+++ b/src/components/Contextmenu/ContextmenuContent.vue
@@ -1,5 +1,5 @@
 <template>
-  <ul :class="['contextmenu-content', { 'dark': isDark }]">
+  <ul class="contextmenu-content">
     <template v-for="(menu, index) in menus">
       <li
         v-if="!menu.hide"
@@ -47,10 +47,6 @@ export default {
       type: Array as PropType<ContextmenuItem[]>,
       required: true,
     },
-    isDark: {
-      type: Boolean,
-      default: false,
-    },
     subMenuPosition: {
       type: String,
       default: 'left',
@@ -72,42 +68,20 @@ $subMenuWidth: 120px;
   width: $menuWidth;
   padding: 5px 0;
   background: #fff;
-  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.1);
+  border: 1px solid #ccc;
+  box-shadow: 3px 3px 3px rgba(#000, 0.3);
   border-radius: 2px;
   list-style: none;
   margin: 0;
-
-  &.dark {
-    background-color: #393939;
-    box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.25);
-    .contextmenu-content {
-      background-color: #393939;
-      box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.25);
-    }
-    .contextmenu-item {
-      color: #f1f1f1;
-      background-color: #393939;
-      &:hover:not(.disable) {
-        background-color: #555;
-      }
-      &.divider {
-        background-color: #999;
-      }
-      &.disable {
-        color: #999;
-      }
-    }
-  }
 }
 .contextmenu-item {
   padding: 0 20px;
   color: #555;
   font-size: 12px;
-  transition: all 0.3s;
+  transition: all 0.2s;
   white-space: nowrap;
   height: $menuHeight;
   line-height: $menuHeight;
-  border-radius: 4px;
   background-color: #fff;
   cursor: pointer;
 
@@ -116,13 +90,13 @@ $subMenuWidth: 120px;
   }
 
   &:hover:not(.disable) {
-    background-color: #f7f7f7;
+    background-color: #e1e1e1;
   }
 
   &.divider {
     height: 1px;
     overflow: hidden;
-    margin: 5px 15px;
+    margin: 5px;
     background-color: #e5e5e5;
     line-height: 0;
     padding: 0;
@@ -145,7 +119,7 @@ $subMenuWidth: 120px;
     width: 0;
     height: 0;
     border-top: 4px solid transparent;
-    border-left: 4px solid #676b6f;
+    border-left: 6px solid rgba($color: $themeColor, $alpha: .8);
     border-bottom: 4px solid transparent;
     position: absolute;
     right: 0;
diff --git a/src/components/Contextmenu/index.vue b/src/components/Contextmenu/index.vue
index 9c8c3e6..d04e47d 100644
--- a/src/components/Contextmenu/index.vue
+++ b/src/components/Contextmenu/index.vue
@@ -14,8 +14,7 @@
     @contextmenu.prevent
   >
     <ContextmenuContent 
-      :menus="menus" 
-      :isDark="isDark"
+      :menus="menus"
       :subMenuPosition="style.subMenuPosition" 
       :handleClickMenuItem="handleClickMenuItem" 
     />
@@ -51,10 +50,6 @@ export default defineComponent({
       type: Array as PropType<ContextmenuItem[]>,
       required: true,
     },
-    isDark: {
-      type: Boolean,
-      default: false,
-    },
     removeContextMenu: {
       type: Function,
       required: true,
diff --git a/src/plugins/contextmenu.ts b/src/plugins/contextmenu.ts
index a9a2121..e302f70 100644
--- a/src/plugins/contextmenu.ts
+++ b/src/plugins/contextmenu.ts
@@ -9,7 +9,6 @@ const contextmenuListener = (el: HTMLElement, event: MouseEvent, binding: Direct
 
   const menus = binding.value(el)
   if(!menus) return
-  const isDark = binding.modifiers.dark
 
   let container: HTMLDivElement | null = null
 
@@ -27,7 +26,6 @@ const contextmenuListener = (el: HTMLElement, event: MouseEvent, binding: Direct
     axis: { x: event.x, y: event.y },
     el,
     menus,
-    isDark,
     removeContextMenu,
   }
   container = document.createElement('div')