From 457fb3d479407818f618be4608afa4d8a7f93d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E5=84=80=E5=BC=8F?= <854085467@qq.com>
Date: Sat, 2 Jul 2022 04:04:30 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B:=20=E4=BF=AE=E5=A4=8D=20popup-menu?=
 =?UTF-8?q?=20=E5=9C=A8=E6=8C=89=E9=9C=80=E6=97=B6=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98,=20=E5=BE=85=E8=A7=A3=E5=86=B3=20dr?=
 =?UTF-8?q?opdown=20=E6=97=A0=E6=B3=95=E5=9C=A8=20scroll=20=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package/component/package.json                |  2 +-
 .../component/src/component/menu/index.less   | 36 +++++++++++++++
 .../src/component/menuItem/index.vue          |  1 +
 .../src/component/subMenu/SubMenuPopup.vue    | 45 ++-----------------
 .../component/src/component/subMenu/index.vue |  2 +-
 .../src/document/zh-CN/guide/changelog.md     |  1 +
 6 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/package/component/package.json b/package/component/package.json
index e5ad67df..11700ec9 100644
--- a/package/component/package.json
+++ b/package/component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@layui/layui-vue",
-  "version": "1.2.5",
+  "version": "1.2.6-alpha.4",
   "author": "就眠儀式",
   "license": "MIT",
   "description": "a component library for Vue 3 base on layui-vue",
diff --git a/package/component/src/component/menu/index.less b/package/component/src/component/menu/index.less
index 5e7a1f2a..93250720 100644
--- a/package/component/src/component/menu/index.less
+++ b/package/component/src/component/menu/index.less
@@ -309,4 +309,40 @@
   .layui-nav-child {
     background-color: transparent;
   }
+}
+
+.layui-sub-menu-popup.layui-dropdown > dl {
+  border: unset;
+  border-radius: 2px;
+  background-color: #393d49;
+}
+
+.layui-nav.layui-nav-collapse {
+  .layui-sub-menu-popup dl .layui-nav-item {
+    width: 100%;
+    > a {
+      display: flex;
+      align-items: center;
+      text-overflow: ellipsis;
+      padding: 5px 20px 5px 20px;
+      .layui-sub-menu-icon {
+        margin-right: 8px;
+      }
+    }
+
+    span {
+      display: inline-block;
+      margin-left: 0;
+    }
+
+    .layui-nav-more {
+      position: relative;
+      display: inline-block;
+      font-size: 12.5px !important;
+      margin-top: 0;
+      margin-left: 30px;
+      padding: 0;
+      right: -8px;
+    }
+  }
 }
\ No newline at end of file
diff --git a/package/component/src/component/menuItem/index.vue b/package/component/src/component/menuItem/index.vue
index 8755a193..f31133e7 100644
--- a/package/component/src/component/menuItem/index.vue
+++ b/package/component/src/component/menuItem/index.vue
@@ -7,6 +7,7 @@ export default {
 <script setup lang="ts">
 import { computed, ComputedRef, inject, ref, Ref, useSlots } from "vue";
 import useLevel from "../menu/useLevel";
+import LayTooltip from "../tooltip/index.vue";
 
 export interface LayMenuItemProps {
   id: string;
diff --git a/package/component/src/component/subMenu/SubMenuPopup.vue b/package/component/src/component/subMenu/SubMenuPopup.vue
index 8cd0be79..91587f33 100644
--- a/package/component/src/component/subMenu/SubMenuPopup.vue
+++ b/package/component/src/component/subMenu/SubMenuPopup.vue
@@ -3,9 +3,11 @@ export default {
   name: "SubMenuPopup",
 };
 </script>
+
 <script setup lang="ts">
 import { computed, inject, Ref, useSlots } from "vue";
 import LayDropdown from "../dropdown/index.vue";
+import { LayIcon } from "@layui/icons-vue";
 import useLevel from "../menu/useLevel";
 
 export interface LaySubMenuPopupProps {
@@ -56,45 +58,4 @@ const isOpen = computed(() => {
       <slot></slot>
     </template>
   </lay-dropdown>
-</template>
-<style lang="less">
-// popup-menu 面板样式
-.layui-sub-menu-popup.layui-dropdown > dl {
-  border: unset;
-  border-radius: 2px;
-  background-color: #393d49;
-}
-// popup-menu item样式
-.layui-nav.layui-nav-collapse {
-  .layui-sub-menu-popup dl .layui-nav-item {
-    width: 100%;
-    > a {
-      display: flex;
-      align-items: center;
-      text-overflow: ellipsis;
-      padding: 5px 20px 5px 20px;
-      // height: 35px;
-      // width: 95px;
-
-      .layui-sub-menu-icon {
-        margin-right: 8px;
-      }
-    }
-
-    span {
-      display: inline-block;
-      margin-left: 0;
-    }
-
-    .layui-nav-more {
-      position: relative;
-      display: inline-block;
-      font-size: 12.5px !important;
-      margin-top: 0;
-      margin-left: 30px;
-      padding: 0;
-      right: -8px;
-    }
-  }
-}
-</style>
+</template>
\ No newline at end of file
diff --git a/package/component/src/component/subMenu/index.vue b/package/component/src/component/subMenu/index.vue
index 6c021797..f2c1e1d7 100644
--- a/package/component/src/component/subMenu/index.vue
+++ b/package/component/src/component/subMenu/index.vue
@@ -17,7 +17,7 @@ import {
 } from "vue";
 import { onClickOutside } from "@vueuse/core";
 import LayTransition from "../transition/index.vue";
-import SubMenuPopup from "./subMenuPopup.vue";
+import SubMenuPopup from "./SubMenuPopup.vue";
 import { provideLevel, default as useLevel } from "../menu/useLevel";
 
 export interface LaySubMenuProps {
diff --git a/package/document-component/src/document/zh-CN/guide/changelog.md b/package/document-component/src/document/zh-CN/guide/changelog.md
index 6039da4b..11891939 100644
--- a/package/document-component/src/document/zh-CN/guide/changelog.md
+++ b/package/document-component/src/document/zh-CN/guide/changelog.md
@@ -21,6 +21,7 @@
           <li>[修复] table 组件设置 ellipsisTooltip 属性时 出现...时，tooltip不显示问题。by @dingyongya</li>
           <li>[优化] transfer 组件 selectedKeys 选中效果, 加入 checkbox 半选状态。by @Jmysy</li>
           <li>[优化] page 组件 hover状态下文字颜色跟当前设置的theme主题色保持一致。by @0o张不歪o0</li>
+          <li>[优化] menu 组件 collapse 状态, 提供 popup-menu 悬浮菜单。by @starsatdawn</li>
         </ul>
       </li>
     </ul>