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

example/docs/zh-CN/components/menu.md

@@ -106,7 +106,7 @@ export default {
 ::: demo
 
 <template>
-  <lay-menu level="true" v-model:selectedKey="selectedKey" inverted="true" v-model:openKeys="openKeys3" :tree="true">
+  <lay-menu :level="isLevel" v-model:selectedKey="selectedKey" inverted="true" v-model:openKeys="openKeys3" :tree="true">
     <lay-menu-item id="1">首页</lay-menu-item>
     <lay-menu-item id="2">首页</lay-menu-item>
     <lay-menu-item id="3">首页</lay-menu-item> 
@@ -134,10 +134,12 @@ import { ref } from 'vue'
 export default {
   setup() {
 
-    const openKeys3 = ref(["7"])
+    const isLevel = ref(false);
-    const selectedKey = ref("5")
+    const openKeys3 = ref(["7"]);
+    const selectedKey = ref("5");
 
     return {
+      isLevel,
       openKeys3,
       selectedKey
     }

example/docs/zh-CN/components/transition.md

@@ -42,7 +42,7 @@ export default {
 
 :::
 
-::: title 基础使用
+::: title 淡入淡出
 :::
 
 ::: demo 使用 `lay-transition` 标签, 为元素提供过渡动画
@@ -76,3 +76,26 @@ export default {
 </script>
 
 :::
+
+::: title Transition 属性
+:::
+
+::: table
+
+| 属性         | 描述               | 类型                     |默认值    | 可选值   |
+| ------------ | ---------------- | ------------- | ---- | ----   |
+| enable       | 启用               | `boolean`   | `true` | `true` `false`   |
+| type         | 类型               | `string`   |  `collapse` | --   |
+
+:::
+
+::: title Transition 属性值
+:::
+
+::: table
+
+| 属性值         | 描述               | 
+| ------------ | ---------------- | 
+| collapse       | 折叠动画               |
+| fade           | 淡入淡出               |
+:::

example/docs/zh-CN/guide/changelog.md

@@ -11,6 +11,17 @@
 <template>
 <lay-timeline>
   <lay-timeline-item title="0.4.0">
+    <ul> 
+      <a name="0-4-3"> </a> 
+      <li> 
+        <h3>0.4.3 <span class="layui-badge-rim">2022-03-27</span></h3> 
+        <ul>
+          <li>[修复] menu 组件 level 属性的语义与实际功能相悖。</li>
+          <li>[修复] input 组件 height 高度固定 38 px。</li>
+          <li>[修复] step 组件 line 样式。</li>
+        </ul> 
+      </li>
+    </ul>
     <ul> 
       <a name="0-4-2"> </a> 
       <li> 

example/src/layouts/Layout.vue

@@ -308,7 +308,7 @@ export default {
 
 <style>
 .layui-layout-document > .layui-header {
-  z-index: 9999;
+  z-index: 99;
   width: 100%;
   position: fixed;
   background: #393d49;
@@ -319,6 +319,7 @@ export default {
   overflow-x: hidden;
   position: fixed;
   margin-top: 60px;
+  z-index: 99;
   height: calc(100% - 60px);
   box-shadow: 2px 0 8px 0 rgb(29 35 41 / 5%);
 }

src/component/datePicker/day.ts

@@ -0,0 +1,43 @@
+/**
+ * 获取年份列表
+ */
+const getYears = () => {
+  let years = [];
+  for (let i = 1970; i < getYear() + 100; i++) {
+    years.push(i);
+  }
+  return years;
+};
+
+/**
+ * 获取当前日期
+ */
+const getDate = () => {
+  return new Date();
+};
+
+/**
+ * 获取当前年份
+ */
+const getYear = () => {
+  return getDate().getFullYear();
+};
+
+/**
+ * 获取当前月份
+ */
+const getMonth = () => {
+  return getDate().getMonth();
+};
+
+/**
+ * 获取月份天数
+ *
+ * @param year
+ * @param month
+ */
+const getDayLength = (year: number, month: number): number => {
+  return new Date(year, month + 1, 0).getDate();
+};
+
+export { getDayLength, getYears, getDate, getMonth, getYear };

src/component/datePicker/index.vue

@@ -17,8 +17,10 @@
                 ></i
               >
               <div class="laydate-set-ym">
-                <span @click="showYearPanel">{{ curYear }} 年</span
+                <span @click="showYearPanel">{{ currentYear }} 年</span
-                ><span @click="showPanel = 'month'">{{ curMonth + 1 }} 月</span>
+                ><span @click="showPanel = 'month'"
+                  >{{ currentMonth + 1 }} 月</span
+                >
               </div>
               <i
                 class="layui-icon laydate-icon laydate-next-m"
@@ -100,9 +102,9 @@
                 <li
                   v-for="item of yearList"
                   :key="item"
-                  :class="[{ 'layui-this': curYear === item }]"
+                  :class="[{ 'layui-this': currentYear === item }]"
                   @click="
-                    curYear = item;
+                    currentYear = item;
                     showPanel = 'date';
                   "
                 >
@@ -136,8 +138,10 @@
                 ></i
               >
               <div class="laydate-set-ym">
-                <span @click="showYearPanel">{{ curYear }} 年</span
+                <span @click="showYearPanel">{{ currentYear }} 年</span
-                ><span @click="showPanel = 'month'">{{ curMonth + 1 }} 月</span>
+                ><span @click="showPanel = 'month'"
+                  >{{ currentMonth + 1 }} 月</span
+                >
               </div>
               <i
                 class="layui-icon laydate-icon laydate-next-y"
@@ -151,10 +155,10 @@
                   v-for="item of MONTH_NAME"
                   :key="item"
                   :class="[
-                    { 'layui-this': MONTH_NAME.indexOf(item) === curMonth },
+                    { 'layui-this': MONTH_NAME.indexOf(item) === currentMonth },
                   ]"
                   @click="
-                    curMonth = MONTH_NAME.indexOf(item);
+                    currentMonth = MONTH_NAME.indexOf(item);
                     showPanel = 'date';
                   "
                 >
@@ -178,7 +182,7 @@
           </div>
         </div>
 
-        <!-- 事件选择器 -->
+        <!-- 时间选择器 -->
         <div class="layui-laydate" v-if="showPanel == 'time'">
           <div class="layui-laydate-main laydate-main-list-0 laydate-time-show">
             <div class="layui-laydate-header">
@@ -188,12 +192,8 @@
             </div>
             <div class="layui-laydate-content" style="height: 210px">
               <ul class="layui-laydate-list laydate-time-list">
-                <li
+                <li class="num-list" v-for="item in els" :key="item.type">
-                  class="num-list"
+                  <ol class="scroll" @click="choseTime">
-                  v-for="item in hms.insertEls"
-                  :key="item.type"
-                >
-                  <ol class="scroll" @click="chooseTime">
                     <li
                       v-for="(it, index) in item.count"
                       :id="item.type + index.toString()"
@@ -231,28 +231,20 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, nextTick, ref, watch, defineProps, defineEmits } from "vue";
+import {
+  computed,
+  nextTick,
+  ref,
+  watch,
+  defineProps,
+  defineEmits,
+  onMounted,
+} from "vue";
 import LayInput from "../input/index.vue";
 import LayDropdown from "../dropdown/index.vue";
-
+import { getDayLength, getYears, getDate, getMonth, getYear } from "./day";
-export interface LayDatePickerProps {
-  modelValue?: string;
-  type: "date" | "datetime" | "year" | "time" | "month";
-}
-
-const props = withDefaults(defineProps<LayDatePickerProps>(), {
-  modelValue: "",
-  type: "date",
-});
 
 const $emits = defineEmits(["update:modelValue"]);
-const currentDate = new Date();
-const yearList = ref<number[]>([]);
-const dateList = ref<any[]>([]);
-const curYear = ref(currentDate.getFullYear());
-const curMonth = ref(currentDate.getMonth());
-const showPanel = ref("date");
-const selectedDay = ref<number>();
 
 const WEEK_NAME = ["日", "一", "二", "三", "四", "五", "六"];
 const MONTH_NAME = [
@@ -270,26 +262,33 @@ const MONTH_NAME = [
   "12月",
 ];
 
-const hms = ref({
+const hms = ref({ hh: "00", mm: "00", ss: "00" });
-  hh: "00",
+const els = [
-  mm: "00",
+  { count: 24, type: "hh" },
-  ss: "00",
+  { count: 60, type: "mm" },
-  insertEls: [
+  { count: 60, type: "ss" },
-    {
+];
-      count: 24,
+
-      type: "hh",
+export interface LayDatePickerProps {
-    },
+  modelValue?: string;
-    {
+  type: "date" | "datetime" | "year" | "time" | "month";
-      count: 60,
+}
-      type: "mm",
+
-    },
+const props = withDefaults(defineProps<LayDatePickerProps>(), {
-    {
+  modelValue: "",
-      count: 60,
+  type: "date",
-      type: "ss",
-    },
-  ],
 });
 
+const currentDate = getDate();
+const currentYear = ref(getYear());
+const currentMonth = ref(getMonth());
+
+const yearList = ref<number[]>(getYears());
+const dateList = ref<any[]>([]);
+const showPanel = ref("date");
+const selectedDay = ref<number>();
+
+// 最终结果
 const dateValue = computed<string>(() => {
   if (!selectedDay.value) return "";
   const d = new Date(selectedDay.value);
@@ -301,18 +300,6 @@ const dateValue = computed<string>(() => {
   return currentValue;
 });
 
-// 生成近100年的年份列表
-(() => {
-  for (let i = 1970; i < curYear.value + 100; i++) {
-    yearList.value.push(i);
-  }
-})();
-
-// 获取传入的月份有多少天
-const getDayLength = (year: number, month: number): number => {
-  return new Date(year, month + 1, 0).getDate();
-};
-
 // 设置日期列表
 const setDateList = (year: number, month: number) => {
   const curDays = getDayLength(year, month); // 当月天数
@@ -355,10 +342,11 @@ const setDateList = (year: number, month: number) => {
   dateList.value = list;
 };
 
+// 监听年月, 刷新日期
 watch(
-  [curYear, curMonth],
+  [currentYear, currentMonth],
   () => {
-    setDateList(curYear.value, curMonth.value);
+    setDateList(currentYear.value, currentMonth.value);
   },
   { immediate: true }
 );
@@ -367,8 +355,8 @@ watch(
 const handleDayClick = (item: any) => {
   selectedDay.value = item.value;
   if (item.type !== "current") {
-    curMonth.value =
+    currentMonth.value =
-      item.type === "prev" ? curMonth.value - 1 : curMonth.value + 1;
+      item.type === "prev" ? currentMonth.value - 1 : currentMonth.value + 1;
   }
 };
 
@@ -378,18 +366,17 @@ const ok = () => {};
 // 切换年月
 const changeYearOrMonth = (type: "year" | "month", num: number) => {
   if (type === "year") {
-    curYear.value += num;
+    currentYear.value += num;
   } else {
-    let month = curMonth.value + num;
+    let month = currentMonth.value + num;
-
     if (month > 11) {
       month = 0;
-      curYear.value++;
+      currentYear.value++;
     } else if (month < 0) {
       month = 11;
-      curYear.value--;
+      currentYear.value--;
     }
-    curMonth.value = month;
+    currentMonth.value = month;
   }
 };
 
@@ -403,23 +390,8 @@ const showYearPanel = () => {
   });
 };
 
-const showHmPanel = ref(false);
+// 点击时间 - hms
-
+const choseTime = (e: any) => {
-const openHmPanel = () => {
-  let activeEl = document.querySelectorAll(".hms-change .isactive") as any;
-  let count = 0;
-  const initScrollIntoView = () => {
-    if (count > activeEl.length) return;
-    activeEl[count].scrollIntoView({ behavior: "smooth" });
-    count++;
-    setTimeout(initScrollIntoView, Number(activeEl[count].dataset.value) * 16);
-  };
-
-  initScrollIntoView();
-  showHmPanel.value = !showHmPanel.value;
-};
-
-const chooseTime = (e: any) => {
   if (e.target.nodeName == "LI") {
     let { value, type } = e.target.dataset;
     hms.value[type as keyof typeof hms.value] = value;

src/component/input/index.less

@@ -21,6 +21,8 @@
 
 .layui-input-wrapper {
   width: 100%;
+  height: 38px;
+  line-height: 38px;
   border-width: 1px;
   border-style: solid;
   display: inline-flex;

src/component/menu/index.less

@@ -327,8 +327,8 @@
   padding: 5px 17px 5px 17px;
 }
 
-.layui-nav-tree.level {
+.layui-nav-tree.not-level {
-  .layui-nav-itemed > .layui-nav-child {
+  .layui-nav-child {
     background-color: transparent;
   }
 }

src/component/menu/index.vue

@@ -27,7 +27,7 @@ const props = withDefaults(defineProps<LayMenuProps>(), {
   tree: false,
   theme: "dark",
   inverted: false,
-  level: false,
+  level: true,
   collapse: false,
   collapseTransition: true,
 });
@@ -82,7 +82,7 @@ provide("isCollapseTransition", isCollapseTransition);
   <ul
     class="layui-nav"
     :class="[
-      level ? 'level' : '',
+      level ? '' : 'not-level',
       inverted ? 'inverted' : '',
       tree ? 'layui-nav-tree' : '',
       theme === 'dark' ? 'layui-nav-dark' : 'layui-nav-light',