🐛: 修复 popup-menu 在按需时使用的问题, 待解决 dropdown 无法在 scroll 正常使用
This commit is contained in:
parent
f00064d509
commit
457fb3d479
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@layui/layui-vue",
|
"name": "@layui/layui-vue",
|
||||||
"version": "1.2.5",
|
"version": "1.2.6-alpha.4",
|
||||||
"author": "就眠儀式",
|
"author": "就眠儀式",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"description": "a component library for Vue 3 base on layui-vue",
|
"description": "a component library for Vue 3 base on layui-vue",
|
||||||
|
@ -309,4 +309,40 @@
|
|||||||
.layui-nav-child {
|
.layui-nav-child {
|
||||||
background-color: transparent;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
@ -7,6 +7,7 @@ export default {
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, ComputedRef, inject, ref, Ref, useSlots } from "vue";
|
import { computed, ComputedRef, inject, ref, Ref, useSlots } from "vue";
|
||||||
import useLevel from "../menu/useLevel";
|
import useLevel from "../menu/useLevel";
|
||||||
|
import LayTooltip from "../tooltip/index.vue";
|
||||||
|
|
||||||
export interface LayMenuItemProps {
|
export interface LayMenuItemProps {
|
||||||
id: string;
|
id: string;
|
||||||
|
@ -3,9 +3,11 @@ export default {
|
|||||||
name: "SubMenuPopup",
|
name: "SubMenuPopup",
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, inject, Ref, useSlots } from "vue";
|
import { computed, inject, Ref, useSlots } from "vue";
|
||||||
import LayDropdown from "../dropdown/index.vue";
|
import LayDropdown from "../dropdown/index.vue";
|
||||||
|
import { LayIcon } from "@layui/icons-vue";
|
||||||
import useLevel from "../menu/useLevel";
|
import useLevel from "../menu/useLevel";
|
||||||
|
|
||||||
export interface LaySubMenuPopupProps {
|
export interface LaySubMenuPopupProps {
|
||||||
@ -56,45 +58,4 @@ const isOpen = computed(() => {
|
|||||||
<slot></slot>
|
<slot></slot>
|
||||||
</template>
|
</template>
|
||||||
</lay-dropdown>
|
</lay-dropdown>
|
||||||
</template>
|
</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>
|
|
@ -17,7 +17,7 @@ import {
|
|||||||
} from "vue";
|
} from "vue";
|
||||||
import { onClickOutside } from "@vueuse/core";
|
import { onClickOutside } from "@vueuse/core";
|
||||||
import LayTransition from "../transition/index.vue";
|
import LayTransition from "../transition/index.vue";
|
||||||
import SubMenuPopup from "./subMenuPopup.vue";
|
import SubMenuPopup from "./SubMenuPopup.vue";
|
||||||
import { provideLevel, default as useLevel } from "../menu/useLevel";
|
import { provideLevel, default as useLevel } from "../menu/useLevel";
|
||||||
|
|
||||||
export interface LaySubMenuProps {
|
export interface LaySubMenuProps {
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
<li>[修复] table 组件设置 ellipsisTooltip 属性时 出现...时,tooltip不显示问题。by @dingyongya</li>
|
<li>[修复] table 组件设置 ellipsisTooltip 属性时 出现...时,tooltip不显示问题。by @dingyongya</li>
|
||||||
<li>[优化] transfer 组件 selectedKeys 选中效果, 加入 checkbox 半选状态。by @Jmysy</li>
|
<li>[优化] transfer 组件 selectedKeys 选中效果, 加入 checkbox 半选状态。by @Jmysy</li>
|
||||||
<li>[优化] page 组件 hover状态下文字颜色跟当前设置的theme主题色保持一致。by @0o张不歪o0</li>
|
<li>[优化] page 组件 hover状态下文字颜色跟当前设置的theme主题色保持一致。by @0o张不歪o0</li>
|
||||||
|
<li>[优化] menu 组件 collapse 状态, 提供 popup-menu 悬浮菜单。by @starsatdawn</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
Loading…
Reference in New Issue
Block a user