Merge branch 'next' into doc-demand

2022-05-05 20:45:26 +08:00 · 2022-05-05 20:45:26 +08:00 · ec7af67032
commit ec7af67032
parent 4417797ae1 a71dffb6f5
23 changed files with 274 additions and 170 deletions
--- a/.gitee/ISSUE_TEMPLATE.zh-CN.md
+++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md
@ -1,7 +1,10 @@
 ## 背景

- 描述你希望解决的问题的现状
- 附上相关的 issue 地址
+- 1.描述你希望解决的问题
+
+- 2.陈述问题的现状
+
+- 3.合理的建议

 ## 思路

--- a/.gitignore
+++ b/.gitignore
@ -9,3 +9,7 @@ package-lock.json
 *.ntvs*
 *.njsproj
 *.sln
+
+# yarn
+yarn-lock
+yarn-error.log
--- a/README.en.md
+++ b/README.en.md
@ -1,78 +0,0 @@
-## Introduction
-
-<p>  
-  <a href="https://www.npmjs.com/package/@layui/layui-vue"><img src="https://img.shields.io/npm/v/@layui/layui-vue.svg?sanitize=true" alt="Version"></a>
-  <a href="https://www.npmjs.com/package/@layui/layui-vue"><img src="https://img.shields.io/npm/l/@layui/layui-vue.svg?sanitize=true" alt="License"></a>
-  <a href="https://travis-ci.org/sentsin/layui"><img alt="Build Status" src="https://img.shields.io/travis/sentsin/layui/master.svg"></a>
-  <a href="https://coveralls.io/r/sentsin/layui?branch=master"><img alt="Test Coverage" src="https://img.shields.io/coveralls/sentsin/layui/master.svg"></a>
-</p>  
-
-**[🔶 Explore the docs »](http://www.layui-vue.com)** **[Join us](https://jq.qq.com/?_wv=1027&k=ffiUQgnE)**
-
-An enterprise-class UI components based on Layui and Vue.
-
-**Run with code Sandbox.**
-
-[![Edit layui-vue](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/11mvy)
-
-## Features
-
-A few of the things you can do with layui vue:
-
-* Writing components using setup script
-* Up to 60 high quality components
-* Provide Axure design resources
-* Support theme customization
-* Support internationalization
-
-## Get Started
-
-Use npm to install.
-
-```bash
-npm i @layui/layui-vue
-```
-Before using, you need to mount layui Vue to Vue and introduce index.css style file
-
-```
-import App from './App.vue'
-import { createApp } from 'vue'
-import layui from '@layui/layui-vue'
-import '@layui/layui-vue/lib/index.css'
-
-createApp(App).use(layui).mount('#app')
-```
-
-We have several examples on the [website](http://layui-vue.pearadmin.com). Here is the first one to get you started:
-
-```
-<template>
-  <lay-button-container>
-    <lay-button>Hello Word</lay-button>
-  </lay-button-container>
-</template>
-```
-
-## Feedback
-
-Feel free to send us feedback on [file an issue](https://github.com/layui-vue/layui-vue/issues/new). Feature requests are always welcome. If you wish to contribute, please take a quick look at the [guidelines](./CONTRIBUTING.md)!
-
-If there's anything you'd like to chat about, please feel free to join our [Gitter chat](https://gitter.im/layui-vue/community)!
-
-## Build Process
-
- `build` Packaged component library
-
-Please take a look at the [contributing guidelines](./CONTRIBUTING.md) for a detailed process on how to build your application as well as troubleshooting information.
-
-## Contributors
-
-This project follows the [all-contributors](https://github.com/layui-vue/layui-vue/graphs/contributors) specification and is brought to you by these [awesome contributors](https://github.com/layui-vue/layui-vue/graphs/contributors).
-
-<a href="https://github.com/layui-vue/layui-vue/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=layui-vue/layui-vue" />
-</a>
-
-## Licence
-
-Layui vue is licensed under the [MIT license](https://opensource.org/licenses/MIT).
--- a/README.zh.md
+++ b/README.zh.md
@ -33,7 +33,7 @@ layui - vue（谐音：类 UI) 是 一 套 Vue 3.0 的 桌 面 端 组 件 库.
 ```bash
 npm i @layui/layui-vue
 ```
-使用前需要将layui vue挂载到vue并引入index.css样式文件
+在使用前需要将 layui-vue 挂载到 vue 并引入 index.css 样式

 ```
 import App from './App.vue'
--- a/package/component/package.json
+++ b/package/component/package.json
@ -1,6 +1,6 @@
 {
  "name": "@layui/layui-vue",
-  "version": "1.0.6",
+  "version": "1.0.7-alpha.1",
  "author": "就眠儀式",
  "license": "MIT",
  "description": "a component library for Vue 3 base on layui-vue",
--- a/package/component/src/component/menu/index.less
+++ b/package/component/src/component/menu/index.less
@ -309,3 +309,8 @@
    background-color: transparent;
  }
 }
+
+.layui-nav-child-spacing .layui-nav-item .layui-nav-child {
+  padding-left: 10px;
+  box-sizing: border-box;
+}
--- a/package/component/src/component/menu/index.vue
+++ b/package/component/src/component/menu/index.vue
@ -17,9 +17,15 @@ export interface LayMenuProps {
  level?: boolean | string;
  collapse?: boolean | string;
  collapseTransition?: boolean | string;
+  childSpacing?: boolean;
 }

-const emit = defineEmits(["update:selectedKey", "update:openKeys"]);
+const emit = defineEmits([
+  "update:selectedKey",
+  "update:openKeys",
+  "changeSelectedKey",
+  "changeOpenKeys",
+]);

 const props = withDefaults(defineProps<LayMenuProps>(), {
  selectedKey: "",
@ -30,6 +36,7 @@ const props = withDefaults(defineProps<LayMenuProps>(), {
  level: true,
  collapse: false,
  collapseTransition: true,
+  childSpacing: false,
 });

 const isTree = computed(() => props.tree);
@ -43,6 +50,7 @@ const openKeys = computed({
  },
  set(val) {
    emit("update:openKeys", val);
+    emit("changeOpenKeys", val);
  },
 });

@ -52,6 +60,7 @@ const selectedKey = computed({
  },
  set(val) {
    emit("update:selectedKey", val);
+    emit("changeSelectedKey", val);
  },
 });

@ -59,12 +68,10 @@ watch(
  () => props.collapse,
  () => {
    if (props.collapse) {
-      // 删除所有打开
      oldOpenKeys.value = props.openKeys;
-      emit("update:openKeys", []);
+      openKeys.value = [];
    } else {
-      // 赋值所有打开
-      emit("update:openKeys", oldOpenKeys.value);
+      openKeys.value = oldOpenKeys.value;
    }
  },
  { immediate: true }
@ -86,6 +93,7 @@ provide("isCollapseTransition", isCollapseTransition);
      tree ? 'layui-nav-tree' : '',
      theme === 'dark' ? 'layui-nav-dark' : 'layui-nav-light',
      collapse ? 'layui-nav-collapse' : '',
+      childSpacing ? 'layui-nav-child-spacing' : '',
    ]"
  >
    <slot></slot>
--- a/package/component/src/component/side/index.vue
+++ b/package/component/src/component/side/index.vue
@ -13,12 +13,13 @@ export interface LaySideProps {
 }

 const props = withDefaults(defineProps<LaySideProps>(), {
-  width: "200",
+  width: "200px",
 });

 const styles = computed<CSSProperties>(() => {
  return {
-    width: `${props.width}px`,
+    "flex": `0 0 ${props.width}`,
+    "width": `${props.width}`
  };
 });
 </script>
--- a/package/component/src/component/slider/Standard.vue
+++ b/package/component/src/component/slider/Standard.vue
@ -7,8 +7,9 @@ export default {
 <script setup lang="ts">
 import { Ref, ref } from "vue";
 import { on, off } from "evtd";
-import { throttle, handle_select } from "./utils/index";
+// import { throttle, handle_select } from "./utils/index";
 import LayTooltip from "../tooltip/index.vue";
+import { throttle, handle_select, makeDots } from "./utils/index";

 interface Prop {
  val?: number | Array<number>;
@ -16,6 +17,7 @@ interface Prop {
  step?: number;
  min?: number;
  max?: number;
+  showDots?: boolean;
 }

 const props = withDefaults(defineProps<Prop>(), {
@ -24,6 +26,7 @@ const props = withDefaults(defineProps<Prop>(), {
  step: 0,
  min: 0,
  max: 100,
+  showDots: false,
 });

 const moveAction = throttle(standardMove);
@ -88,6 +91,15 @@ function calcWithStep(
    }
  }
 }
+// 断点
+const dots = makeDots(props);
+const focusDot = (val: number) => {
+  emit("link-val-hook", val);
+};
+// const focusClick = (e: MouseEvent)=>{
+//   console.log(e);
+//   standardMove(e)
+// }
 </script>

 <template>
@ -111,5 +123,13 @@ function calcWithStep(
      :class="[disabled ? 'layui-slider-disabled disable-line' : '']"
    ></div>
    <div class="layui-slider-line-v"></div>
+    <div
+      v-show="showDots"
+      @click="focusDot(item)"
+      class="layui-slider-dots"
+      v-for="(item, index) in dots"
+      :key="index"
+      :style="{ left: item + '%' }"
+    ></div>
  </div>
 </template>
--- a/package/component/src/component/slider/StandardRange.vue
+++ b/package/component/src/component/slider/StandardRange.vue
@ -7,15 +7,16 @@ export default {
 <script setup lang="ts">
 import { ref, toRef, Ref } from "vue";
 import { on, off } from "evtd";
-import { throttle } from "./utils/index";
+// import { throttle } from "./utils/index";
 import LayTooltip from "../tooltip/index.vue";
-
+import { throttle, makeDots } from "./utils/index";
 interface Prop {
  rangeValue: Array<number>;
  disabled?: boolean;
  step?: number;
  min?: number;
  max?: number;
+  showDots?: boolean;
 }

 const props = withDefaults(defineProps<Prop>(), {
@ -23,6 +24,7 @@ const props = withDefaults(defineProps<Prop>(), {
  min: 0,
  max: 100,
  disabled: false,
+  showDots: true,
 });

 let rv = toRef(props, "rangeValue");
@ -129,6 +131,15 @@ function cross(val: any) {
    currbtn = currbtn === 0 ? 1 : 0;
  }
 }
+// 断点
+const dots = makeDots(props);
+console.log(dots);
+
+const focusDot = (item: number) => {
+  let currbtn = moveNeighbors(item, rv);
+  rv.value[currbtn] = item;
+  emit("link-val-hook", rv.value);
+};
 </script>

 <template>
@ -162,5 +173,13 @@ function cross(val: any) {
      class="layui-slider-rate-v"
      :class="[props.disabled ? 'layui-slider-disabled disable-line' : '']"
    ></div>
+    <div
+      v-show="showDots"
+      @click="focusDot(item)"
+      class="layui-slider-dots"
+      v-for="(item, index) in dots"
+      :key="index"
+      :style="{ left: item + '%' }"
+    ></div>
  </div>
 </template>
--- a/package/component/src/component/slider/Vertical.vue
+++ b/package/component/src/component/slider/Vertical.vue
@ -16,6 +16,7 @@ interface Prop {
  step?: number;
  min?: number;
  max?: number;
+  showDots: boolean;
 }

 const props = withDefaults(defineProps<Prop>(), {
@ -24,6 +25,7 @@ const props = withDefaults(defineProps<Prop>(), {
  step: 0,
  min: 0,
  max: 100,
+  showDots: false,
 });

 const moveAction = throttle(verticalMove);
@ -91,6 +93,22 @@ function calcWithStep(
    }
  }
 }
+// 断点
+const makeDots = () => {
+  if (props.step === 0) return [];
+  let val = 0;
+  let dots = [];
+  let count = Math.floor(100 / props.step) - 1;
+  for (let i = 0; i < count; i++) {
+    val += props.step;
+    dots.push(val);
+  }
+  return dots;
+};
+const dots = makeDots();
+const focusDot = (val: number) => {
+  emit("link-val-hook", val);
+};
 </script>

 <template>
@ -115,6 +133,14 @@ function calcWithStep(
        class="layui-slider-vertical-rate"
      ></div>
      <div class="layui-slider-vertical-line"></div>
+      <div
+        v-show="showDots"
+        @click="focusDot(item)"
+        class="layui-slider-vertical-dots"
+        v-for="(item, index) in dots"
+        :key="index"
+        :style="{ bottom: item + '%' }"
+      ></div>
    </div>
  </div>
 </template>
--- a/package/component/src/component/slider/VerticalRange.vue
+++ b/package/component/src/component/slider/VerticalRange.vue
@ -7,15 +7,16 @@ export default {
 <script setup lang="ts">
 import { ref, toRef, Ref } from "vue";
 import { on, off } from "evtd";
-import { throttle } from "./utils/index";
+// import { throttle } from "./utils/index";
 import LayTooltip from "../tooltip/index.vue";
-
+import { throttle, makeDots } from "./utils/index";
 interface Prop {
  rangeValue: Array<number>;
  disabled?: boolean;
  step?: number;
  min?: number;
  max?: number;
+  showDots?: boolean;
 }

 const props = withDefaults(defineProps<Prop>(), {
@ -23,6 +24,7 @@ const props = withDefaults(defineProps<Prop>(), {
  min: 0,
  max: 100,
  disabled: false,
+  showDots: false,
 });

 let rv = toRef(props, "rangeValue");
@ -128,6 +130,15 @@ function cross(val: any) {
    currbtn = currbtn === 0 ? 1 : 0;
  }
 }
+// 断点
+const dots = makeDots(props);
+console.log(dots);
+
+const focusDot = (item: number) => {
+  let currbtn = moveNeighbors(item, rv);
+  rv.value[currbtn] = item;
+  emit("link-val-hook", rv.value);
+};
 </script>

 <template>
@ -163,6 +174,14 @@ function cross(val: any) {
        class="layui-slider-vertical-rate"
        :class="[props.disabled ? 'layui-slider-disabled disable-line' : '']"
      ></div>
+      <div
+        v-show="showDots"
+        @click="focusDot(item)"
+        class="layui-slider-vertical-dots"
+        v-for="(item, index) in dots"
+        :key="index"
+        :style="{ bottom: item + '%' }"
+      ></div>
    </div>
  </div>
 </template>
--- a/package/component/src/component/slider/index.less
+++ b/package/component/src/component/slider/index.less
@ -17,6 +17,7 @@
 .layui-slider-btn-v {
  width: 12px;
  height: 12px;
+  // background-color: @global-back-color;
  background-color: white;
  position: absolute;
  border: 2px solid var(--global-primary-color);
@ -39,7 +40,7 @@
 .layui-slider-line-v {
  width: 100%;
  height: 4px;
-  background-color: #eee;
+  background-color: #cccccc;
  position: absolute;
  top: 6px;
 }
@ -114,3 +115,23 @@
  position: relative;
  cursor: pointer;
 }
+.layui-slider-dots {
+  margin-top: 4px;
+  width: 8px;
+  height: 8px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  position: absolute;
+  top:0;
+  z-index: 1;
+}
+
+.layui-slider-vertical-dots {
+  width: 8px;
+  height: 8px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  position: absolute;
+  z-index: 1;
+  margin-left: 5px;
+}
--- a/package/component/src/component/slider/index.vue
+++ b/package/component/src/component/slider/index.vue
@ -21,6 +21,7 @@ export interface LaySliderProps {
  disabled?: boolean;
  range?: boolean;
  rangeValue?: number[];
+  showDots?: boolean;
 }

 const emit = defineEmits(["update:modelValue"]);
@ -32,6 +33,7 @@ const props = withDefaults(defineProps<LaySliderProps>(), {
  step: 0,
  min: 0,
  max: 100,
+  showDots: false,
 });

 let rangeValues: Ref<number[]> | any = toRef(props, "rangeValue");
@ -53,6 +55,7 @@ function valHook(val: any) {
          :rangeValue="rangeValues"
          :min="min"
          :max="max"
+          :showDots="showDots"
        />
      </div>
      <div v-else>
@ -64,6 +67,7 @@ function valHook(val: any) {
          :val="modelValue"
          :min="min"
          :max="max"
+          :showDots="showDots"
        />
      </div>
    </div>
@ -77,6 +81,7 @@ function valHook(val: any) {
          :rangeValue="rangeValues"
          :min="min"
          :max="max"
+          :showDots="showDots"
        />
      </div>
      <div v-else>
@ -88,6 +93,7 @@ function valHook(val: any) {
          :step="step"
          :min="min"
          :max="max"
+          :showDots="showDots"
        ></StandardVue>
      </div>
    </div>
--- a/package/component/src/component/slider/utils/index.ts
+++ b/package/component/src/component/slider/utils/index.ts
@ -13,3 +13,16 @@ export function throttle(func: Function) {
 export function handle_select(e: Event): void {
  e.preventDefault();
 }
+
+export function makeDots(props: any) {
+  if (props.step === 0) return [];
+  let val = 0;
+  let dots = [0];
+  let count = Math.floor(100 / props.step) - 1;
+  for (let i = 0; i < count; i++) {
+    val += props.step;
+    dots.push(val);
+  }
+  dots.push(100);
+  return dots;
+}
--- a/package/component/src/provider/index.vue
+++ b/package/component/src/provider/index.vue
@ -8,10 +8,10 @@ export default {
 import { watch } from "vue";
 import { useI18n } from "vue-i18n";
 import {
-  enable as enableDarkMode,
-  disable as disableDarkMode,
  Theme,
  DynamicThemeFix,
+  enable as enableDarkMode,
+  disable as disableDarkMode,
 } from "darkreader";

 const { locale, setLocaleMessage, mergeLocaleMessage } = useI18n();
@ -60,9 +60,7 @@ const changeTheme = (theme: string) => {
      "div.layui-color-picker *",
    ],
  };
-
  Object.assign(defaultPartial, props.darkPartial);
-
  if (theme === "dark") {
    enableDarkMode(defaultPartial, defaultFixes);
  } else if (theme === "light") {
--- a/package/document/src/document/zh-CN/components/layout.md
+++ b/package/document/src/document/zh-CN/components/layout.md
@ -188,7 +188,7 @@ export default {
    <lay-header>Header</lay-header>
    <lay-body>
      <lay-layout>
-        <lay-side :width="160">Left</lay-side>
+        <lay-side>Left</lay-side>
        <lay-body>Content</lay-body>
      </lay-layout>
    </lay-body>
@ -200,7 +200,7 @@ export default {
    <lay-body>
      <lay-layout>
        <lay-body>Content</lay-body>
-        <lay-side :width="160">Right</lay-side>
+        <lay-side>Right</lay-side>
      </lay-layout>
    </lay-body>
    <lay-footer>Footer</lay-footer>
--- a/package/document/src/document/zh-CN/components/menu.md
+++ b/package/document/src/document/zh-CN/components/menu.md
@ -487,6 +487,7 @@ export default {
 | level               | 菜单层级       | `true` `false` |
 | collapse            | 折叠状态       | `true` `false` |
 | collapse-transition  | 折叠动画       | `true` `false` |
+| child-spacing       | 子菜单增加间距  | `true` `false` |

 :::

--- a/package/document/src/document/zh-CN/components/slider.md
+++ b/package/document/src/document/zh-CN/components/slider.md
@ -13,7 +13,7 @@
 ::: demo 使用 `lay-slider` 标签, 创建滑块

 <template>
-  <lay-slider :max="88" v-model="value1" :disabled="false"></lay-slider>
+  <lay-slider :showDots="true" :step="10" :max="100" v-model="value1" :disabled="false"></lay-slider>
  <lay-input-number v-model="value1"></lay-input-number>
 </template>

@ -37,7 +37,7 @@ export default {
 ::: demo

 <template>
-  <lay-slider v-model="value2" :vertical="true" :disabled="false"></lay-slider>
+  <lay-slider :showDots="false" :step="10" v-model="value2" :vertical="true" :disabled="false"></lay-slider>
 </template>

 <script>
@ -63,7 +63,7 @@ export default {
 ::: demo

 <template>
-  <lay-slider :disabled="false" :min="10" :max="80" v-model:rangeValue="value3" :range="true"></lay-slider>
+  <lay-slider :disabled="false" :min="0" :max="100" v-model:rangeValue="value3" :range="true"></lay-slider>
 </template>

 <script>
@ -115,6 +115,7 @@ export default {
 | step  |  步长     | `Number`                   |        -       |    -    |
 | min  |  最小值     | `Number`                   |        -       |    -    |
 | max  |  最大值     | `Number`                   |        -       |    -    |
+| showDots  |  是否显示断点     | `Boolean`                   |        -       |    false    |
 :::

 
--- a/package/document/src/document/zh-CN/guide/changelog.md
+++ b/package/document/src/document/zh-CN/guide/changelog.md
@ -11,6 +11,18 @@
 <template>
 <lay-timeline>
  <lay-timeline-item title="1.0.x">
+    <ul> 
+      <a name="1-0-7"></a> 
+      <li> 
+        <h3>1.0.7 <span class="layui-badge-rim">2022-05-03</span></h3> 
+        <ul>
+          <li>[新增] menu 组件 changeOpenKeys 事件。</li>
+          <li>[新增] menu 组件 changeSelectedKey 事件。</li>
+          <li>[新增] slider 组件 showDots 属性, 显示步长断点。</li>
+          <li>[修复] side 组件 width 属性失效, 随内容宽度自适应的问题。</li>
+        </ul> 
+      </li>
+    </ul>
    <ul> 
      <a name="1-0-6"></a> 
      <li> 
--- a/package/document/src/document/zh-CN/guide/locale.md
+++ b/package/document/src/document/zh-CN/guide/locale.md
@ -11,3 +11,28 @@
    </lay-config-provider>
 </template>
 ```
+::: describe layui-vue 内部会维护一个 vue-i18n 实例, 你无需再去创建，直接使用 useI18n() 获取即可
+:::
+
+::: describe 你可以使用 locales 属性来扩展语言包, 用户自定义语言包优先级大于组件库内部维护的语言包, 即你可以扩展亦可以覆盖。
+:::
+
+
+```vue
+<template>
+    <lay-config-provider locale="zh_CN" :locales="locales">
+        <App />
+    </lay-config-provider>
+</template>
+
+<script setup>
+const locales = [
+    'zh_CN': {
+        message: '你好, layui-vue'
+    },
+    'en_US': {
+        message: 'hello, layui-vue'
+    }
+];
+</script>
+```
--- a/package/document/src/document/zh-CN/guide/member.md
+++ b/package/document/src/document/zh-CN/guide/member.md
@ -43,7 +43,7 @@
 <lay-card>
    <lay-row>
        <lay-col md="2">
-            <lay-avatar src="https://portrait.gitee.com/uploads/avatars/user/702/2106738_wanglin300_1639442830.png"></lay-avatar>
+            <lay-avatar src="https://portrait.gitee.com/uploads/avatars/user/702/2106738_wanglin300_1639442830.png!avatar200"></lay-avatar>
        </lay-col>
        <lay-col md="3">
            halo
@ -83,7 +83,7 @@
 <lay-card>
    <lay-row>
        <lay-col md="2">
-            <lay-avatar src="https://portrait.gitee.com/uploads/avatars/user/2469/7407590_wcg666_1640528494.png"></lay-avatar>
+            <lay-avatar src="https://portrait.gitee.com/uploads/avatars/user/2469/7407590_wcg666_1640528494.png!avatar200"></lay-avatar>
        </lay-col>
        <lay-col md="3">
            Sight
@ -103,7 +103,7 @@
 <lay-card>
    <lay-row>
        <lay-col md="2">
-            <lay-avatar src="https://portrait.gitee.com/uploads/avatars/user/2596/7789823_finalsummer_1613993823.png"></lay-avatar>
+            <lay-avatar src="https://portrait.gitee.com/uploads/avatars/user/2596/7789823_finalsummer_1613993823.png!avatar200"></lay-avatar>
        </lay-col>
        <lay-col md="3">
            finalsummer
@ -151,6 +151,8 @@

 ::: describe 

-[![Giteye chart](https://chart.giteye.net/gitee/layui-vue/layui-vue/DBC9Z6HQ.png)](https://giteye.net/chart/DBC9Z6HQ)
+<a href="https://github.com/layui-vue/layui-vue/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=layui-vue/layui-vue" />
+</a>

 :::
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -1,4 +1,4 @@
-lockfileVersion: 5.3
+lockfileVersion: 5.4

 importers:

@ -30,7 +30,7 @@ importers:
    devDependencies:
      '@commitlint/cli': 16.2.3
      '@commitlint/config-conventional': 16.2.1
-      '@typescript-eslint/eslint-plugin': 5.17.0_d811b3e9fac539787959b39b978df707
+      '@typescript-eslint/eslint-plugin': 5.17.0_3ai3h2p2yu4xq6kzwonzpdpxa4
      '@typescript-eslint/parser': 5.17.0_eslint@8.12.0
      commitizen: 4.2.4
      commitlint-config-cz: 0.13.3
@ -38,7 +38,7 @@ importers:
      cz-customizable: 6.3.0
      eslint: 8.12.0
      eslint-config-prettier: 8.5.0_eslint@8.12.0
-      eslint-plugin-prettier: 4.0.0_f2c91d0f54113167d2bd9214a5ab5a36
+      eslint-plugin-prettier: 4.0.0_6ler2d2uceywpuv5sikklk22gy
      eslint-plugin-vue: 8.5.0_eslint@8.12.0
      husky: 7.0.4
      prettier: 2.6.2
@ -72,7 +72,7 @@ importers:
    dependencies:
      '@layui/icons-vue': link:../icons
      '@layui/layer-vue': link:../layer
-      '@vueuse/core': 8.3.1_vue@3.2.33
+      '@vueuse/core': 8.3.1
      animate.css: 4.1.1
      async-validator: 4.0.7
      cropperjs: 1.5.12
@ -80,16 +80,16 @@ importers:
      dayjs: 1.11.0
      evtd: 0.2.3
      uuid: 8.3.2
-      vue-i18n: 9.1.9_vue@3.2.33
+      vue-i18n: 9.1.9
    devDependencies:
      '@babel/core': 7.17.9
      '@babel/preset-env': 7.16.11_@babel+core@7.17.9
      '@babel/preset-typescript': 7.16.7_@babel+core@7.17.9
-      '@rollup/plugin-babel': 5.3.1_@babel+core@7.17.9+rollup@2.70.1
+      '@rollup/plugin-babel': 5.3.1_p6bgnjzmwqvrgilysw56ndqcdu
      '@types/node': 16.11.26
-      '@vitejs/plugin-vue': 2.3.1_vite@2.9.2+vue@3.2.33
+      '@vitejs/plugin-vue': 2.3.1_vite@2.9.2
      '@vue/compiler-sfc': 3.2.33
-      '@vue/server-renderer': 3.2.33_vue@3.2.33
+      '@vue/server-renderer': 3.2.33
      less: 4.1.2
      rimraf: 3.0.2
      rollup: 2.70.1
@ -124,23 +124,23 @@ importers:
      vue-i18n: ^9.2.0-beta.34
      vue-router: ^4.0.12
    dependencies:
-      '@vueuse/core': 8.3.0_vue@3.2.33
-      pinia: 2.0.13_typescript@4.6.3+vue@3.2.33
-      pinia-plugin-persist: 1.0.0_pinia@2.0.13+vue@3.2.33
-      vue-i18n: 9.2.0-beta.34_vue@3.2.33
-      vue-router: 4.0.14_vue@3.2.33
+      '@vueuse/core': 8.3.0
+      pinia: 2.0.13_typescript@4.6.3
+      pinia-plugin-persist: 1.0.0_pinia@2.0.13
+      vue-i18n: 9.2.0-beta.34
+      vue-router: 4.0.14
    devDependencies:
      '@babel/core': 7.17.8
      '@babel/preset-env': 7.16.11_@babel+core@7.17.8
      '@babel/preset-typescript': 7.16.7_@babel+core@7.17.8
-      '@rollup/plugin-babel': 5.3.1_@babel+core@7.17.8+rollup@2.70.1
+      '@rollup/plugin-babel': 5.3.1_b3dmjfji46fxi4pypym34a4m6q
      '@types/markdown-it': 12.2.3
      '@types/markdown-it-container': 2.0.5
      '@types/node': 16.11.26
      '@types/prettier': registry.npmmirror.com/@types/prettier/2.6.0
-      '@vitejs/plugin-vue': 2.3.1_vite@2.9.2+vue@3.2.33
+      '@vitejs/plugin-vue': 2.3.1_vite@2.9.2
      '@vue/compiler-sfc': 3.2.33
-      '@vue/server-renderer': 3.2.33_vue@3.2.33
+      '@vue/server-renderer': 3.2.33
      escape-html: 1.0.3
      less: 4.1.2
      markdown-it-container: 3.0.0
@ -170,11 +170,11 @@ importers:
      '@babel/core': 7.17.8
      '@babel/preset-env': 7.16.11_@babel+core@7.17.8
      '@babel/preset-typescript': 7.16.7_@babel+core@7.17.8
-      '@rollup/plugin-babel': 5.3.1_@babel+core@7.17.8+rollup@2.70.1
+      '@rollup/plugin-babel': 5.3.1_b3dmjfji46fxi4pypym34a4m6q
      '@types/node': 16.11.26
-      '@vitejs/plugin-vue': 2.3.1_vite@2.9.2+vue@3.2.33
+      '@vitejs/plugin-vue': 2.3.1_vite@2.9.2
      '@vue/compiler-sfc': 3.2.33
-      '@vue/server-renderer': 3.2.33_vue@3.2.33
+      '@vue/server-renderer': 3.2.33
      less: 4.1.2
      rimraf: 3.0.2
      rollup: 2.70.1
@ -200,11 +200,11 @@ importers:
      '@babel/core': 7.17.8
      '@babel/preset-env': 7.16.11_@babel+core@7.17.8
      '@babel/preset-typescript': 7.16.7_@babel+core@7.17.8
-      '@rollup/plugin-babel': 5.3.1_@babel+core@7.17.8+rollup@2.70.1
+      '@rollup/plugin-babel': 5.3.1_b3dmjfji46fxi4pypym34a4m6q
      '@types/node': 16.11.26
-      '@vitejs/plugin-vue': 2.3.1_vite@2.9.2+vue@3.2.33
+      '@vitejs/plugin-vue': 2.3.1_vite@2.9.2
      '@vue/compiler-sfc': 3.2.33
-      '@vue/server-renderer': 3.2.33_vue@3.2.33
+      '@vue/server-renderer': 3.2.33
      less: 4.1.2
      rimraf: 3.0.2
      rollup: 2.70.1
@ -2435,7 +2435,7 @@ packages:
      '@types/node': 16.11.26
      chalk: 4.1.2
      cosmiconfig: 7.0.1
-      cosmiconfig-typescript-loader: 1.0.7_ddaac8e123aeb260f586984cee874848
+      cosmiconfig-typescript-loader: 1.0.7_3wvmryjdv2zgb5mgtbgo5b2ija
      lodash: 4.17.21
      resolve-from: 5.0.0
      typescript: 4.6.3
@ -2685,7 +2685,7 @@ packages:
      fastq: 1.13.0
    dev: true

-  /@rollup/plugin-babel/5.3.1_@babel+core@7.17.8+rollup@2.70.1:
+  /@rollup/plugin-babel/5.3.1_b3dmjfji46fxi4pypym34a4m6q:
    resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==}
    engines: {node: '>= 10.0.0'}
    peerDependencies:
@ -2702,7 +2702,7 @@ packages:
      rollup: 2.70.1
    dev: true

-  /@rollup/plugin-babel/5.3.1_@babel+core@7.17.9+rollup@2.70.1:
+  /@rollup/plugin-babel/5.3.1_p6bgnjzmwqvrgilysw56ndqcdu:
    resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==}
    engines: {node: '>= 10.0.0'}
    peerDependencies:
@ -2800,7 +2800,7 @@ packages:
    resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
    dev: true

-  /@typescript-eslint/eslint-plugin/5.17.0_d811b3e9fac539787959b39b978df707:
+  /@typescript-eslint/eslint-plugin/5.17.0_3ai3h2p2yu4xq6kzwonzpdpxa4:
    resolution: {integrity: sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@ -2922,7 +2922,7 @@ packages:
      eslint-visitor-keys: 3.3.0
    dev: true

-  /@vitejs/plugin-vue/2.3.1_vite@2.9.2+vue@3.2.33:
+  /@vitejs/plugin-vue/2.3.1_vite@2.9.2:
    resolution: {integrity: sha512-YNzBt8+jt6bSwpt7LP890U1UcTOIZZxfpE5WOJ638PNxSEKOqAi0+FSKS0nVeukfdZ0Ai/H7AFd6k3hayfGZqQ==}
    engines: {node: '>=12.0.0'}
    peerDependencies:
@ -2930,7 +2930,6 @@ packages:
      vue: ^3.2.25
    dependencies:
      vite: 2.9.2_less@4.1.2
-      vue: 3.2.33
    dev: true

  /@vue/compiler-core/3.2.33:
@ -3014,6 +3013,15 @@ packages:
      csstype: 2.6.20
    dev: false

+  /@vue/server-renderer/3.2.33:
+    resolution: {integrity: sha512-4jpJHRD4ORv8PlbYi+/MfP8ec1okz6rybe36MdpkDrGIdEItHEUyaHSKvz+ptNEyQpALmmVfRteHkU9F8vxOew==}
+    peerDependencies:
+      vue: 3.2.33
+    dependencies:
+      '@vue/compiler-ssr': 3.2.33
+      '@vue/shared': 3.2.33
+    dev: true
+
  /@vue/server-renderer/3.2.33_vue@3.2.33:
    resolution: {integrity: sha512-4jpJHRD4ORv8PlbYi+/MfP8ec1okz6rybe36MdpkDrGIdEItHEUyaHSKvz+ptNEyQpALmmVfRteHkU9F8vxOew==}
    peerDependencies:
@ -3022,6 +3030,7 @@ packages:
      '@vue/compiler-ssr': 3.2.33
      '@vue/shared': 3.2.33
      vue: 3.2.33
+    dev: false

  /@vue/shared/3.2.31:
    resolution: {integrity: sha512-ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ==}
@ -3030,7 +3039,7 @@ packages:
  /@vue/shared/3.2.33:
    resolution: {integrity: sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg==}

-  /@vueuse/core/8.3.0_vue@3.2.33:
+  /@vueuse/core/8.3.0:
    resolution: {integrity: sha512-GDHM0vr/E3mw1fbh3yj4DJCJ/KvTXtOtT0OR2kCKuEUOo0Btk45MDGI6MdIqsHMjI0OXBJl8jH8WFv64KU2mOQ==}
    peerDependencies:
      '@vue/composition-api': ^1.1.0
@ -3042,12 +3051,11 @@ packages:
        optional: true
    dependencies:
      '@vueuse/metadata': 8.3.0
-      '@vueuse/shared': 8.3.0_vue@3.2.33
-      vue: 3.2.33
-      vue-demi: 0.12.5_vue@3.2.33
+      '@vueuse/shared': 8.3.0
+      vue-demi: 0.12.5
    dev: false

-  /@vueuse/core/8.3.1_vue@3.2.33:
+  /@vueuse/core/8.3.1:
    resolution: {integrity: sha512-WiXUgVyPG9elGx3G8UV8g+zqbEJ2hYacrPICogAxDdW6hnxxcUFdF7FtvDroJ/DxWmo2pg8XNNz07ybfnZyJbw==}
    peerDependencies:
      '@vue/composition-api': ^1.1.0
@ -3059,9 +3067,8 @@ packages:
        optional: true
    dependencies:
      '@vueuse/metadata': 8.3.1
-      '@vueuse/shared': 8.3.1_vue@3.2.33
-      vue: 3.2.33
-      vue-demi: 0.12.5_vue@3.2.33
+      '@vueuse/shared': 8.3.1
+      vue-demi: 0.12.5
    dev: false

  /@vueuse/metadata/8.3.0:
@ -3072,7 +3079,7 @@ packages:
    resolution: {integrity: sha512-1aZaFL44HzXXkfN6Q7KMDOXBFKTHDClHlOJBxtN8rTBXIIScoGOrJCpxWiQ4kuVg95MzG/pHrd3P4wd8poL9XQ==}
    dev: false

-  /@vueuse/shared/8.3.0_vue@3.2.33:
+  /@vueuse/shared/8.3.0:
    resolution: {integrity: sha512-xehtLfevPw9nsVIGFe/tWMtFvbvZjeAfXh7DT9Fptt/6/C5rLwpJtxsVguIBtPybjwobO4KCpQYS78aa9fg5Sw==}
    peerDependencies:
      '@vue/composition-api': ^1.1.0
@ -3083,11 +3090,10 @@ packages:
      vue:
        optional: true
    dependencies:
-      vue: 3.2.33
-      vue-demi: 0.12.5_vue@3.2.33
+      vue-demi: 0.12.5
    dev: false

-  /@vueuse/shared/8.3.1_vue@3.2.33:
+  /@vueuse/shared/8.3.1:
    resolution: {integrity: sha512-7HKLCcxp4dtONq6QSSoavblo9riYgqzw7jhqiC0/VUYMXKzqj1G/GznOzTmY8Wi8uKKT197JqjKQ1DKt2j/0+A==}
    peerDependencies:
      '@vue/composition-api': ^1.1.0
@ -3098,8 +3104,7 @@ packages:
      vue:
        optional: true
    dependencies:
-      vue: 3.2.33
-      vue-demi: 0.12.5_vue@3.2.33
+      vue-demi: 0.12.5
    dev: false

  /JSONStream/1.3.5:
@ -3512,7 +3517,7 @@ packages:
      semver: 7.0.0
    dev: true

-  /cosmiconfig-typescript-loader/1.0.7_ddaac8e123aeb260f586984cee874848:
+  /cosmiconfig-typescript-loader/1.0.7_3wvmryjdv2zgb5mgtbgo5b2ija:
    resolution: {integrity: sha512-PxBM//vKuwRmo7xqamKDL+q/FvGig+wKS5pOzaXO/DJbtNzbIYi1bDk251pftEdPRRetEN8RSIyF35n8zLtibA==}
    engines: {node: '>=12', npm: '>=6'}
    peerDependencies:
@ -3521,7 +3526,7 @@ packages:
    dependencies:
      '@types/node': 16.11.26
      cosmiconfig: 7.0.1
-      ts-node: 10.7.0_ddaac8e123aeb260f586984cee874848
+      ts-node: 10.7.0_3wvmryjdv2zgb5mgtbgo5b2ija
      typescript: 4.6.3
    transitivePeerDependencies:
      - '@swc/core'
@ -3969,7 +3974,7 @@ packages:
      eslint: 8.12.0
    dev: true

-  /eslint-plugin-prettier/4.0.0_f2c91d0f54113167d2bd9214a5ab5a36:
+  /eslint-plugin-prettier/4.0.0_6ler2d2uceywpuv5sikklk22gy:
    resolution: {integrity: sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==}
    engines: {node: '>=6.0.0'}
    peerDependencies:
@ -5175,7 +5180,7 @@ packages:
    dev: true
    optional: true

-  /pinia-plugin-persist/1.0.0_pinia@2.0.13+vue@3.2.33:
+  /pinia-plugin-persist/1.0.0_pinia@2.0.13:
    resolution: {integrity: sha512-M4hBBd8fz/GgNmUPaaUsC29y1M09lqbXrMAHcusVoU8xlQi1TqgkWnnhvMikZwr7Le/hVyMx8KUcumGGrR6GVw==}
    peerDependencies:
      '@vue/composition-api': ^1.0.0
@ -5185,12 +5190,11 @@ packages:
      '@vue/composition-api':
        optional: true
    dependencies:
-      pinia: 2.0.13_typescript@4.6.3+vue@3.2.33
-      vue: 3.2.33
-      vue-demi: 0.12.5_vue@3.2.33
+      pinia: 2.0.13_typescript@4.6.3
+      vue-demi: 0.12.5
    dev: false

-  /pinia/2.0.13_typescript@4.6.3+vue@3.2.33:
+  /pinia/2.0.13_typescript@4.6.3:
    resolution: {integrity: sha512-B7rSqm1xNpwcPMnqns8/gVBfbbi7lWTByzS6aPZ4JOXSJD4Y531rZHDCoYWBwLyHY/8hWnXljgiXp6rRyrofcw==}
    peerDependencies:
      '@vue/composition-api': ^1.4.0
@ -5204,8 +5208,7 @@ packages:
    dependencies:
      '@vue/devtools-api': 6.1.4
      typescript: 4.6.3
-      vue: 3.2.33
-      vue-demi: 0.12.5_vue@3.2.33
+      vue-demi: 0.12.5
    dev: false

  /postcss/8.4.12:
@ -5703,7 +5706,7 @@ packages:
    engines: {node: '>=8'}
    dev: true

-  /ts-node/10.7.0_ddaac8e123aeb260f586984cee874848:
+  /ts-node/10.7.0_3wvmryjdv2zgb5mgtbgo5b2ija:
    resolution: {integrity: sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==}
    hasBin: true
    peerDependencies:
@ -5897,7 +5900,7 @@ packages:
      fsevents: 2.3.2
    dev: true

-  /vue-demi/0.12.5_vue@3.2.33:
+  /vue-demi/0.12.5:
    resolution: {integrity: sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==}
    engines: {node: '>=12'}
    hasBin: true
@ -5908,8 +5911,6 @@ packages:
    peerDependenciesMeta:
      '@vue/composition-api':
        optional: true
-    dependencies:
-      vue: 3.2.33
    dev: false

  /vue-eslint-parser/8.3.0_eslint@8.12.0:
@ -5930,7 +5931,7 @@ packages:
      - supports-color
    dev: true

-  /vue-i18n/9.1.9_vue@3.2.33:
+  /vue-i18n/9.1.9:
    resolution: {integrity: sha512-JeRdNVxS2OGp1E+pye5XB6+M6BBkHwAv9C80Q7+kzoMdUDGRna06tjC0vCB/jDX9aWrl5swxOMFcyAr7or8XTA==}
    engines: {node: '>= 10'}
    peerDependencies:
@ -5940,10 +5941,9 @@ packages:
      '@intlify/shared': 9.1.9
      '@intlify/vue-devtools': 9.1.9
      '@vue/devtools-api': 6.1.4
-      vue: 3.2.33
    dev: false

-  /vue-i18n/9.2.0-beta.34_vue@3.2.33:
+  /vue-i18n/9.2.0-beta.34:
    resolution: {integrity: sha512-AKzOMn91OKBKHTPVWrDF+kBSbYYNGfBeeBhuihkxW2ZTXd1l8vp7WBqA6weV9kb9EDv7HO61Qhctqcr79TmHVw==}
    engines: {node: '>= 12'}
    peerDependencies:
@ -5953,16 +5953,14 @@ packages:
      '@intlify/shared': 9.2.0-beta.34
      '@intlify/vue-devtools': 9.2.0-beta.34
      '@vue/devtools-api': 6.1.4
-      vue: 3.2.33
    dev: false

-  /vue-router/4.0.14_vue@3.2.33:
+  /vue-router/4.0.14:
    resolution: {integrity: sha512-wAO6zF9zxA3u+7AkMPqw9LjoUCjSxfFvINQj3E/DceTt6uEz1XZLraDhdg2EYmvVwTBSGlLYsUw8bDmx0754Mw==}
    peerDependencies:
      vue: ^3.2.0
    dependencies:
      '@vue/devtools-api': 6.1.4
-      vue: 3.2.33
    dev: false

  /vue/3.2.33: