Merge branch 'develop' of https://gitee.com/dingyongya/layui-vue into setup

 Conflicts:

	example/src/router/zh-CN.ts

	src/index.ts

src/css/layui.css

@@ -2844,6 +2844,25 @@ body .layui-table-tips .layui-layer-content {
   color: #5fb878;
 }
 
+.layui-nav .layui-show.layui-anim-upbit .layui-show.layui-anim-upbit {
+  top: 0px;
+  left: 106px;
+}
+
+.layui-nav .layui-show.layui-anim-upbit .layui-nav-item {
+  display: block;
+  height: 40px;
+  line-height: 40px;
+}
+
+.layui-nav .layui-show.layui-anim-upbit .layui-nav-item.layui-this {
+  background-color: whitesmoke;
+}
+
+.layui-nav .layui-show.layui-anim-upbit .layui-nav-item.layui-this:after {
+  display: none;
+}
+
 .layui-nav {
   position: relative;
   padding: 0 20px;
@@ -2868,7 +2887,7 @@ body .layui-table-tips .layui-layer-content {
 
 .layui-nav .layui-nav-item a {
   display: block;
-  padding: 0 20px;
+  padding: 0 30px;
   color: #fff;
   color: rgba(255, 255, 255, 0.7);
   -webkit-transition: all 0.3s;
@@ -2881,7 +2900,7 @@ body .layui-table-tips .layui-layer-content {
   left: 0;
   top: 0;
   width: 0;
-  height: 5px;
+  height: 3px;
   background-color: #5fb878;
   transition: all 0.2s;
   -webkit-transition: all 0.2s;
@@ -2917,7 +2936,7 @@ body .layui-table-tips .layui-layer-content {
 .layui-nav .layui-nav-more {
   position: absolute;
   top: 0;
-  right: 3px;
+  right: 8px;
   left: auto !important;
   margin-top: 0;
   font-size: 12.5px !important;
@@ -2988,13 +3007,13 @@ body .layui-table-tips .layui-layer-content {
 .layui-nav-tree .layui-nav-item {
   display: block;
   width: 100%;
-  line-height: 40px;
+  line-height: 42px;
 }
 
 .layui-nav-tree .layui-nav-item a {
   position: relative;
-  height: 46px;
-  line-height: 46px;
+  height: 42px;
+  line-height: 42px;
   text-overflow: ellipsis;
   overflow: hidden;
   white-space: nowrap;

src/index.ts

@@ -6,7 +6,7 @@ import "@layui/layer-vue/lib/index.css";
 import "@layui/icons-vue/lib/index.css";
 import { layer } from "@layui/layer-vue";
 
-import LayModal from "./module/layer/modal/index";
+import LayLayer from "./module/layer/index";
 import LayBacktop from "./module/backTop/index";
 import LayAvatar from "./module/avatar/index";
 import LayRadio from "./module/radio/index";
@@ -40,7 +40,6 @@ import LayContainer from "./module/container/index";
 import LayCountUp from "./module/countUp/index";
 import LayMenu from "./module/menu/index";
 import LayMenuItem from "./module/menuItem/index";
-import LayMenuChildItem from "./module/menuChildItem/index";
 import LayCheckbox from "./module/checkbox/index";
 import LayCheckboxGroup from "./module/checkboxGroup/index";
 import LayForm from "./module/form/index";
@@ -103,7 +102,6 @@ const components: Record<string, IDefineComponent> = {
   LayContainer,
   LayMenu,
   LayMenuItem,
-  LayMenuChildItem,
   LayCheckbox,
   LayForm,
   LayBreadcrumb,
@@ -130,7 +128,7 @@ const components: Record<string, IDefineComponent> = {
   LayCarousel,
   LayCarouselItem,
   LayColorPicker,
-  LayModal,
+  LayLayer,
   LayTooltip,
   LayInputNumber,
   LaySkeleton,
@@ -184,7 +182,6 @@ export {
   LayContainer,
   LayMenu,
   LayMenuItem,
-  LayMenuChildItem,
   LayCheckbox,
   LayForm,
   LayBreadcrumb,
@@ -211,7 +208,7 @@ export {
   LayCarousel,
   LayCarouselItem,
   LayColorPicker,
-  LayModal,
+  LayLayer
 };
 
 export { layer };

src/module/layer/index.ts

@@ -0,0 +1,9 @@
+import type { App } from "vue";
+import { LayLayer } from "@layui/layer-vue";
+import type { IDefineComponent } from "../type/index";
+
+LayLayer.install = (app: App) => {
+  app.component(LayLayer.name || "LayLayer", LayLayer);
+};
+
+export default LayLayer as IDefineComponent;

src/module/layer/modal/index.ts

@@ -1,9 +0,0 @@
-import type { App } from "vue";
-import { LayModal } from "@layui/layer-vue";
-import type { IDefineComponent } from "../../type/index";
-
-LayModal.install = (app: App) => {
-  app.component(LayModal.name || "LayModal", LayModal);
-};
-
-export default LayModal as IDefineComponent;

src/module/menuChildItem/index.ts

@@ -1,9 +0,0 @@
-import type { App } from "vue";
-import Component from "./index.vue";
-import type { IDefineComponent } from "../type/index";
-
-Component.install = (app: App) => {
-  app.component(Component.name || "LayMenuChildItem", Component);
-};
-
-export default Component as IDefineComponent;

src/module/menuChildItem/index.vue

@@ -1,25 +0,0 @@
-<template>
-  <dd :class="[selectedKey === id ? 'layui-this' : '']" @click="selectHandle()">
-    <slot v-if="slots.title" name="title"></slot>
-    <a v-else href="javascript:void(0)">
-      {{ title }}
-    </a>
-  </dd>
-</template>
-
-<script setup name="LayMenuChildItem" lang="ts">
-import { defineProps, inject, Ref, useSlots } from "vue";
-
-const slots = useSlots();
-
-const props = defineProps<{
-  id: string;
-  title: string;
-}>();
-
-const selectedKey: Ref<string> = inject("selectedKey") as Ref<string>;
-
-const selectHandle = function () {
-  selectedKey.value = props.id;
-};
-</script>