From fdbaf55d23e54ea8c20535de2e21b8cef7deaa4a Mon Sep 17 00:00:00 2001
From: bqy_fe <1743369777@qq.com>
Date: Tue, 5 Apr 2022 16:39:05 +0800
Subject: [PATCH] fix: some ts type issue

---
 package.json                                  |   8 +-
 src/assets/icons/moon.svg                     |   1 +
 src/assets/icons/sun.svg                      |   1 +
 src/components/basic/button/button.vue        |   8 +-
 src/components/basic/svg-icon/svg-icon.vue    |   4 +
 .../src/components/table-action.vue           |   2 +-
 .../table-settings/column-setting.vue         |   9 +-
 src/components/core/schema-form/src/helper.ts |   4 +-
 .../core/schema-form/src/schema-form-item.vue |   8 +-
 .../core/schema-form/src/types/form.ts        |   9 +-
 .../core/schema-form/src/types/formItem.ts    |   7 -
 .../core/schema-form/src/types/index.ts       |   1 -
 src/layout/header/index.vue                   |  10 +-
 src/layout/menu/menu-item.vue                 |  30 ++--
 src/layout/menu/menu.vue                      |  24 ++--
 src/views/demos/tables/search-table/index.vue |   2 +-
 yarn.lock                                     | 132 +++++++++---------
 17 files changed, 137 insertions(+), 123 deletions(-)
 create mode 100644 src/assets/icons/moon.svg
 create mode 100644 src/assets/icons/sun.svg
 delete mode 100644 src/components/core/schema-form/src/types/formItem.ts

diff --git a/package.json b/package.json
index 7657e9747..c4729b607 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@ant-design/icons-vue": "^6.1.0",
-    "@vueuse/core": "^8.2.3",
+    "@vueuse/core": "^8.2.4",
     "ant-design-vue": "3.1.0-rc.6",
     "axios": "^0.26.1",
     "core-js": "^3.21.1",
@@ -56,8 +56,8 @@
     "@types/lodash-es": "^4.17.6",
     "@types/node": "^17.0.23",
     "@types/webpack-env": "^1.16.3",
-    "@typescript-eslint/eslint-plugin": "^5.17.0",
-    "@typescript-eslint/parser": "^5.17.0",
+    "@typescript-eslint/eslint-plugin": "^5.18.0",
+    "@typescript-eslint/parser": "^5.18.0",
     "@vue/cli-plugin-babel": "^5.0.4",
     "@vue/cli-plugin-eslint": "^5.0.4",
     "@vue/cli-plugin-router": "^5.0.4",
@@ -78,7 +78,7 @@
     "lint-staged": "^12.3.7",
     "path-browserify": "^1.0.1",
     "postcss-html": "^1.3.0",
-    "prettier": "^2.6.1",
+    "prettier": "^2.6.2",
     "regenerator-runtime": "^0.13.9",
     "speed-measure-webpack-plugin": "^1.5.0",
     "stylelint": "^14.6.1",
diff --git a/src/assets/icons/moon.svg b/src/assets/icons/moon.svg
new file mode 100644
index 000000000..42ccf14bb
--- /dev/null
+++ b/src/assets/icons/moon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><path fill="currentColor" d="M10 7a7 7 0 0 0 12 4.9v.1c0 5.523-4.477 10-10 10S2 17.523 2 12S6.477 2 12 2h.1A6.979 6.979 0 0 0 10 7zm-6 5a8 8 0 0 0 15.062 3.762A9 9 0 0 1 8.238 4.938A7.999 7.999 0 0 0 4 12z"/></svg>
diff --git a/src/assets/icons/sun.svg b/src/assets/icons/sun.svg
new file mode 100644
index 000000000..b09cb7747
--- /dev/null
+++ b/src/assets/icons/sun.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" role="img" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><path fill="currentColor" d="M12 18a6 6 0 1 1 0-12a6 6 0 0 1 0 12zm0-2a4 4 0 1 0 0-8a4 4 0 0 0 0 8zM11 1h2v3h-2V1zm0 19h2v3h-2v-3zM3.515 4.929l1.414-1.414L7.05 5.636L5.636 7.05L3.515 4.93zM16.95 18.364l1.414-1.414l2.121 2.121l-1.414 1.414l-2.121-2.121zm2.121-14.85l1.414 1.415l-2.121 2.121l-1.414-1.414l2.121-2.121zM5.636 16.95l1.414 1.414l-2.121 2.121l-1.414-1.414l2.121-2.121zM23 11v2h-3v-2h3zM4 11v2H1v-2h3z"/></svg>
diff --git a/src/components/basic/button/button.vue b/src/components/basic/button/button.vue
index c6969896c..b9981bbdc 100644
--- a/src/components/basic/button/button.vue
+++ b/src/components/basic/button/button.vue
@@ -5,15 +5,17 @@
     :type="buttonType"
     :class="[`ant-btn-${type}`]"
   >
-    <template v-for="(value, key) in $slots" #[key]>
+    <template v-for="(_, key) in $slots" #[key]>
       <slot :name="key"></slot>
     </template>
   </Button>
 </template>
 <script lang="ts" setup>
-  import { computed, type PropType } from 'vue';
+  import { computed } from 'vue';
   import { Button } from 'ant-design-vue';
   import { buttonProps, type ButtonType } from './button';
+  import type { PropType, ComputedRef } from 'vue';
+  import type { ButtonType as AButtonType } from 'ant-design-vue/es/button';
 
   const props = defineProps({
     ...buttonProps(),
@@ -31,7 +33,7 @@
       : ['danger'].includes(type)
       ? 'primary'
       : 'default';
-  });
+  }) as ComputedRef<AButtonType>;
 </script>
 
 <style lang="less" scoped>
diff --git a/src/components/basic/svg-icon/svg-icon.vue b/src/components/basic/svg-icon/svg-icon.vue
index 4df60b8ad..b63b4d710 100644
--- a/src/components/basic/svg-icon/svg-icon.vue
+++ b/src/components/basic/svg-icon/svg-icon.vue
@@ -7,6 +7,10 @@
 <script lang="ts" setup>
   import { computed, type CSSProperties } from 'vue';
 
+  defineOptions({
+    name: 'svg-icon',
+  });
+
   const importAll = (requireContext: __WebpackModuleApi.RequireContext) =>
     requireContext.keys().forEach(requireContext);
   try {
diff --git a/src/components/core/dynamic-table/src/components/table-action.vue b/src/components/core/dynamic-table/src/components/table-action.vue
index 6f7dfa06c..6a26b15eb 100644
--- a/src/components/core/dynamic-table/src/components/table-action.vue
+++ b/src/components/core/dynamic-table/src/components/table-action.vue
@@ -1,5 +1,5 @@
 <template>
-  <template v-for="(actionItem, index) in actionFilters" :key="`${index}-${actionItem.label}`">
+  <template v-for="(actionItem, _index) in actionFilters" :key="`${_index}-${actionItem.label}`">
     <component
       :is="actionItem.popConfirm ? Popconfirm : 'span'"
       :title="actionItem.title"
diff --git a/src/components/core/dynamic-table/src/components/table-settings/column-setting.vue b/src/components/core/dynamic-table/src/components/table-settings/column-setting.vue
index 059c4bc0c..d8ac5cfd6 100644
--- a/src/components/core/dynamic-table/src/components/table-settings/column-setting.vue
+++ b/src/components/core/dynamic-table/src/components/table-settings/column-setting.vue
@@ -83,12 +83,17 @@
   import { useSortable } from '@/hooks/useSortable';
   import { isNullAndUnDef } from '@/utils/is';
 
+  type TableColumnType<T = any> = TableColumn<T> & {
+    /** 目的是解决：类型实例化过深，且可能无限 */
+    formItemProps?: any;
+  };
+
   const table = useTableContext();
   let inited = false;
-  const defaultColumns = cloneDeep(table.columns);
+  const defaultColumns = cloneDeep<TableColumnType[]>(table.columns);
   const defaultShowIndex = !!table.showIndex;
   const defaultBordered = table.bordered;
-  const tableColumns = ref<TableColumn<any>[]>([]);
+  const tableColumns = ref<TableColumnType[]>([]);
 
   const checkAll = computed<boolean>({
     get() {
diff --git a/src/components/core/schema-form/src/helper.ts b/src/components/core/schema-form/src/helper.ts
index c92b67205..b62497d41 100644
--- a/src/components/core/schema-form/src/helper.ts
+++ b/src/components/core/schema-form/src/helper.ts
@@ -1,5 +1,5 @@
 import dayjs from 'dayjs';
-import type { ValidationRule } from 'ant-design-vue/es/form/Form';
+import type { RuleObject } from 'ant-design-vue/es/form/';
 import type { ComponentMapType } from './types/component';
 import { isNumber } from '@/utils/is';
 import { useI18n } from '@/hooks/useI18n';
@@ -34,7 +34,7 @@ function genType() {
 }
 
 export function setComponentRuleType(
-  rule: ValidationRule,
+  rule: RuleObject,
   component: ComponentMapType,
   valueFormat: string,
 ) {
diff --git a/src/components/core/schema-form/src/schema-form-item.vue b/src/components/core/schema-form/src/schema-form-item.vue
index 024cf90fa..62da15772 100644
--- a/src/components/core/schema-form/src/schema-form-item.vue
+++ b/src/components/core/schema-form/src/schema-form-item.vue
@@ -54,7 +54,7 @@
   import type { PropType } from 'vue';
   import type { ComponentMapType } from './componentMap';
   import type { CustomRenderFn, FormSchema, RenderCallbackParams } from './types/form';
-  import type { ValidationRule } from 'ant-design-vue/es/form/Form';
+  import type { RuleObject } from 'ant-design-vue/es/form/';
   import type { TableActionType } from '@/components/core/dynamic-table';
   import { isBoolean, isNull, isObject, isString } from '@/utils/is';
   import BasicHelp from '@/components/basic/basic-help/index.vue';
@@ -275,7 +275,7 @@
   });
 
   function setComponentRuleType(
-    rule: ValidationRule,
+    rule: RuleObject,
     component: ComponentMapType,
     valueFormat: string,
   ) {
@@ -299,10 +299,10 @@
     } = props.schema;
 
     if (isFunction(dynamicRules)) {
-      return dynamicRules(unref(getValues)) as ValidationRule[];
+      return dynamicRules(unref(getValues)) as RuleObject[];
     }
 
-    let rules: ValidationRule[] = cloneDeep(defRules) as ValidationRule[];
+    let rules = cloneDeep<RuleObject[]>(defRules);
     const { rulesMessageJoinLabel: globalRulesMessageJoinLabel } = unref(formPropsRef);
 
     const joinLabel = Reflect.has(unref(formPropsRef), 'rulesMessageJoinLabel')
diff --git a/src/components/core/schema-form/src/types/form.ts b/src/components/core/schema-form/src/types/form.ts
index 8958d986c..164ce41ae 100644
--- a/src/components/core/schema-form/src/types/form.ts
+++ b/src/components/core/schema-form/src/types/form.ts
@@ -1,10 +1,10 @@
+import type { RowProps } from 'ant-design-vue';
 import type { NamePath, RuleObject } from 'ant-design-vue/es/form/interface';
-import type { FormItemProps } from './formItem';
+import type { FormItemProps } from 'ant-design-vue/es/form/FormItem';
 import type { Component, VNode } from 'vue';
 import type { ButtonProps as AntdButtonProps } from '@/components/basic/button';
 import type { ColEx, ComponentMapType, ComponentProps } from './component';
 // import type { TableActionType } from '/@/components/Table/src/types/table'
-import type { RowProps } from 'ant-design-vue';
 import type { SchemaFormInstance } from '../schema-form';
 import type { SchemaFormType } from '../hooks';
 import type { TableActionType } from '@/components/core/dynamic-table';
@@ -16,6 +16,7 @@ export type FieldMapToTime = [string, [string, string], string?][];
 export type Rule = RuleObject & {
   trigger?: 'blur' | 'change' | ['change', 'blur'];
 };
+
 /** 获取所有字段名 */
 export type GetFieldKeys<T> = Exclude<keyof T, symbol | number>;
 
@@ -86,9 +87,9 @@ export interface FormSchema<T = string> {
   labelWidth?: string | number;
   // Disable the adjustment of labelWidth with global settings of formModel, and manually set labelCol and wrapperCol by yourself
   disabledLabelWidth?: boolean;
-  // render component
+  /** 表单项对应的组件，eg: Input */
   component?: ComponentMapType | CustomRenderFn<T> | ((opt: RenderCallbackParams<T>) => Component);
-  // 组件参数
+  /** 表单组件属性 */
   componentProps?:
     | ComponentProps
     | {
diff --git a/src/components/core/schema-form/src/types/formItem.ts b/src/components/core/schema-form/src/types/formItem.ts
deleted file mode 100644
index 7fd91b3c2..000000000
--- a/src/components/core/schema-form/src/types/formItem.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { FormItemProps as AntdFormItemProps } from 'ant-design-vue/es/form/FormItem';
-import type { HTMLAttributes } from 'vue';
-import type { ColProps } from 'ant-design-vue/es/grid/Col';
-
-export interface FormItemProps extends AntdFormItemProps {
-  labelCol?: ColProps & HTMLAttributes;
-}
diff --git a/src/components/core/schema-form/src/types/index.ts b/src/components/core/schema-form/src/types/index.ts
index 18a19df96..f3c2f44d4 100644
--- a/src/components/core/schema-form/src/types/index.ts
+++ b/src/components/core/schema-form/src/types/index.ts
@@ -1,4 +1,3 @@
 export * from './form';
 export * from './component';
 export * from './hooks';
-export * from './formItem';
diff --git a/src/layout/header/index.vue b/src/layout/header/index.vue
index 96f9d4c05..f70d95e04 100644
--- a/src/layout/header/index.vue
+++ b/src/layout/header/index.vue
@@ -9,7 +9,7 @@
           <Breadcrumb.Item>
             <TitleI18n :title="routeItem?.meta?.title" />
             <template v-if="routeItem?.children?.length" #overlay>
-              <Menu :selected-keys="[menus[rotueIndex + 1]?.name]">
+              <Menu :selected-keys="getSelectKeys(rotueIndex)">
                 <template v-for="childItem in routeItem?.children" :key="childItem.name">
                   <Menu.Item
                     v-if="!childItem.meta?.hideInMenu && !childItem.meta?.hideInBreadcrumb"
@@ -31,6 +31,7 @@
         <LockOutlined @click="lockscreenStore.setLock(true)" />
       </Tooltip>
       <FullScreen />
+      <svg-icon :name="isDark ? 'sun' : 'moon'" @click="toggleDark" />
       <LocalePicker />
       <Dropdown placement="bottomRight">
         <Avatar :src="userInfo.headImg" :alt="userInfo.name">{{ userInfo.name }}</Avatar>
@@ -67,6 +68,7 @@
     PoweroffOutlined,
     LockOutlined,
   } from '@ant-design/icons-vue';
+  import { useDark, useToggle } from '@vueuse/core';
   import {
     Layout,
     message,
@@ -96,6 +98,8 @@
 
   const router = useRouter();
   const route = useRoute();
+  const isDark = useDark();
+  const toggleDark = useToggle(isDark);
   const userInfo = computed(() => userStore.userInfo);
 
   const menus = computed(() => {
@@ -120,6 +124,10 @@
     return route.matched;
   });
 
+  const getSelectKeys = (rotueIndex: number) => {
+    return [menus.value[rotueIndex + 1]?.name] as string[];
+  };
+
   const findLastChild = (route?: RouteRecordRaw) => {
     if (typeof route?.redirect === 'object') {
       const redirectValues = Object.values(route.redirect);
diff --git a/src/layout/menu/menu-item.vue b/src/layout/menu/menu-item.vue
index 1b169b9bd..d15270693 100644
--- a/src/layout/menu/menu-item.vue
+++ b/src/layout/menu/menu-item.vue
@@ -1,21 +1,19 @@
 <template>
   <!-- 目录 -->
-  <Menu.SubMenu
-    v-if="props.menuInfo?.meta?.type === 0 || props.menuInfo?.children?.length"
-    :key="props.menuInfo?.name"
-    v-bind="$attrs"
-  >
-    <template #title>
-      <span>
-        <icon-font :type="props.menuInfo.meta?.icon" />
-        <TitleI18n :title="props.menuInfo?.meta?.title" />
-      </span>
-    </template>
-    <template v-for="item in menuChildren" :key="item.name || item.fullPath">
-      <!-- 递归生成菜单 -->
-      <MyMenuItem :menu-info="item" />
-    </template>
-  </Menu.SubMenu>
+  <template v-if="props.menuInfo?.meta?.type === 0 || props.menuInfo?.children?.length">
+    <Menu.SubMenu :key="props.menuInfo?.name" v-bind="$attrs">
+      <template #title>
+        <span>
+          <icon-font :type="props.menuInfo.meta?.icon" />
+          <TitleI18n :title="props.menuInfo?.meta?.title" />
+        </span>
+      </template>
+      <template v-for="item in menuChildren" :key="item.name || item.fullPath">
+        <!-- 递归生成菜单 -->
+        <MyMenuItem :menu-info="item" />
+      </template>
+    </Menu.SubMenu>
+  </template>
   <!-- 菜单 -->
   <template v-else>
     <Menu.Item :key="props.menuInfo?.name">
diff --git a/src/layout/menu/menu.vue b/src/layout/menu/menu.vue
index b805790a3..7903c7f67 100644
--- a/src/layout/menu/menu.vue
+++ b/src/layout/menu/menu.vue
@@ -18,7 +18,7 @@
 
 <script setup lang="ts">
   import { reactive, computed, watch } from 'vue';
-  import { type RouteRecordName, useRoute, useRouter } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
   import { Menu } from 'ant-design-vue';
   import MenuItem from './menu-item.vue';
   import { useUserStore } from '@/store/modules/user';
@@ -35,8 +35,8 @@
   const currentRoute = useRoute();
   const router = useRouter();
   const state = reactive({
-    openKeys: [] as (RouteRecordName | undefined)[],
-    selectedKeys: [currentRoute.name],
+    openKeys: [] as string[],
+    selectedKeys: [currentRoute.name] as string[],
   });
 
   const menus = computed(() => {
@@ -52,24 +52,26 @@
   };
 
   // 获取当前打开的子菜单
-  function getOpenKeys() {
+  const getOpenKeys = () => {
     const meta = currentRoute.meta;
     if (meta?.activeMenu) {
       const targetMenu = getTargetMenuByActiveMenuName(meta.activeMenu);
       return targetMenu?.meta?.namePath ?? [meta?.activeMenu];
     }
 
-    return meta?.hideInMenu
-      ? state?.openKeys || []
-      : currentRoute.meta?.namePath ?? currentRoute.matched.slice(1).map((n) => n.name);
-  }
+    return (
+      meta?.hideInMenu
+        ? state?.openKeys || []
+        : currentRoute.meta?.namePath ?? currentRoute.matched.slice(1).map((n) => n.name)
+    ) as string[];
+  };
 
   // 监听菜单收缩状态
   watch(
     () => props.collapsed,
     (newVal) => {
       state.openKeys = newVal ? [] : getOpenKeys();
-      state.selectedKeys = [currentRoute.name];
+      state.selectedKeys = [currentRoute.name] as string[];
     },
   );
 
@@ -82,9 +84,9 @@
       const meta = currentRoute.meta;
       if (meta?.activeMenu) {
         const targetMenu = getTargetMenuByActiveMenuName(meta.activeMenu);
-        state.selectedKeys = [targetMenu?.name ?? meta?.activeMenu];
+        state.selectedKeys = [targetMenu?.name ?? meta?.activeMenu] as string[];
       } else {
-        state.selectedKeys = [currentRoute.meta?.activeMenu ?? currentRoute.name];
+        state.selectedKeys = [currentRoute.meta?.activeMenu ?? currentRoute.name] as string[];
       }
     },
     {
diff --git a/src/views/demos/tables/search-table/index.vue b/src/views/demos/tables/search-table/index.vue
index d71d55999..cc066b6f3 100644
--- a/src/views/demos/tables/search-table/index.vue
+++ b/src/views/demos/tables/search-table/index.vue
@@ -22,7 +22,7 @@
 
   const [DynamicTable, dynamicTableInstance] = useTable();
 
-  const loadData = async (params) => {
+  const loadData = async (params): Promise<API.TableListResult> => {
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve({
diff --git a/yarn.lock b/yarn.lock
index 7396496bd..343621d07 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1559,14 +1559,14 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/eslint-plugin@^5.17.0":
-  version "5.17.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.17.0.tgz#704eb4e75039000531255672bf1c85ee85cf1d67"
-  integrity sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ==
-  dependencies:
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/type-utils" "5.17.0"
-    "@typescript-eslint/utils" "5.17.0"
+"@typescript-eslint/eslint-plugin@^5.18.0":
+  version "5.18.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.18.0.tgz#950df411cec65f90d75d6320a03b2c98f6c3af7d"
+  integrity sha512-tzrmdGMJI/uii9/V6lurMo4/o+dMTKDH82LkNjhJ3adCW22YQydoRs5MwTiqxGF9CSYxPxQ7EYb4jLNlIs+E+A==
+  dependencies:
+    "@typescript-eslint/scope-manager" "5.18.0"
+    "@typescript-eslint/type-utils" "5.18.0"
+    "@typescript-eslint/utils" "5.18.0"
     debug "^4.3.2"
     functional-red-black-tree "^1.0.1"
     ignore "^5.1.8"
@@ -1584,14 +1584,14 @@
     "@typescript-eslint/typescript-estree" "5.15.0"
     debug "^4.3.2"
 
-"@typescript-eslint/parser@^5.17.0":
-  version "5.17.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.17.0.tgz#7def77d5bcd8458d12d52909118cf3f0a45f89d5"
-  integrity sha512-aRzW9Jg5Rlj2t2/crzhA2f23SIYFlF9mchGudyP0uiD6SenIxzKoLjwzHbafgHn39dNV/TV7xwQkLfFTZlJ4ig==
+"@typescript-eslint/parser@^5.18.0":
+  version "5.18.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.18.0.tgz#2bcd4ff21df33621df33e942ccb21cb897f004c6"
+  integrity sha512-+08nYfurBzSSPndngnHvFw/fniWYJ5ymOrn/63oMIbgomVQOvIDhBoJmYZ9lwQOCnQV9xHGvf88ze3jFGUYooQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/typescript-estree" "5.17.0"
+    "@typescript-eslint/scope-manager" "5.18.0"
+    "@typescript-eslint/types" "5.18.0"
+    "@typescript-eslint/typescript-estree" "5.18.0"
     debug "^4.3.2"
 
 "@typescript-eslint/scope-manager@5.15.0":
@@ -1602,13 +1602,13 @@
     "@typescript-eslint/types" "5.15.0"
     "@typescript-eslint/visitor-keys" "5.15.0"
 
-"@typescript-eslint/scope-manager@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.17.0.tgz#4cea7d0e0bc0e79eb60cad431c89120987c3f952"
-  integrity sha512-062iCYQF/doQ9T2WWfJohQKKN1zmmXVfAcS3xaiialiw8ZUGy05Em6QVNYJGO34/sU1a7a+90U3dUNfqUDHr3w==
+"@typescript-eslint/scope-manager@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.18.0.tgz#a7d7b49b973ba8cebf2a3710eefd457ef2fb5505"
+  integrity sha512-C0CZML6NyRDj+ZbMqh9FnPscg2PrzSaVQg3IpTmpe0NURMVBXlghGZgMYqBw07YW73i0MCqSDqv2SbywnCS8jQ==
   dependencies:
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/visitor-keys" "5.17.0"
+    "@typescript-eslint/types" "5.18.0"
+    "@typescript-eslint/visitor-keys" "5.18.0"
 
 "@typescript-eslint/type-utils@5.15.0":
   version "5.15.0"
@@ -1619,12 +1619,12 @@
     debug "^4.3.2"
     tsutils "^3.21.0"
 
-"@typescript-eslint/type-utils@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.17.0.tgz#1c4549d68c89877662224aabb29fbbebf5fc9672"
-  integrity sha512-3hU0RynUIlEuqMJA7dragb0/75gZmwNwFf/QJokWzPehTZousP/MNifVSgjxNcDCkM5HI2K22TjQWUmmHUINSg==
+"@typescript-eslint/type-utils@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.18.0.tgz#62dbfc8478abf36ba94a90ddf10be3cc8e471c74"
+  integrity sha512-vcn9/6J5D6jtHxpEJrgK8FhaM8r6J1/ZiNu70ZUJN554Y3D9t3iovi6u7JF8l/e7FcBIxeuTEidZDR70UuCIfA==
   dependencies:
-    "@typescript-eslint/utils" "5.17.0"
+    "@typescript-eslint/utils" "5.18.0"
     debug "^4.3.2"
     tsutils "^3.21.0"
 
@@ -1633,10 +1633,10 @@
   resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.15.0.tgz#c7bdd103843b1abae97b5518219d3e2a0d79a501"
   integrity sha512-yEiTN4MDy23vvsIksrShjNwQl2vl6kJeG9YkVJXjXZnkJElzVK8nfPsWKYxcsGWG8GhurYXP4/KGj3aZAxbeOA==
 
-"@typescript-eslint/types@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.17.0.tgz#861ec9e669ffa2aa9b873dd4d28d9b1ce26d216f"
-  integrity sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw==
+"@typescript-eslint/types@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.18.0.tgz#4f0425d85fdb863071680983853c59a62ce9566e"
+  integrity sha512-bhV1+XjM+9bHMTmXi46p1Led5NP6iqQcsOxgx7fvk6gGiV48c6IynY0apQb7693twJDsXiVzNXTflhplmaiJaw==
 
 "@typescript-eslint/typescript-estree@5.15.0":
   version "5.15.0"
@@ -1651,13 +1651,13 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz#a7cba7dfc8f9cc2ac78c18584e684507df4f2488"
-  integrity sha512-X1gtjEcmM7Je+qJRhq7ZAAaNXYhTgqMkR10euC4Si6PIjb+kwEQHSxGazXUQXFyqfEXdkGf6JijUu5R0uceQzg==
+"@typescript-eslint/typescript-estree@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.18.0.tgz#6498e5ee69a32e82b6e18689e2f72e4060986474"
+  integrity sha512-wa+2VAhOPpZs1bVij9e5gyVu60ReMi/KuOx4LKjGx2Y3XTNUDJgQ+5f77D49pHtqef/klglf+mibuHs9TrPxdQ==
   dependencies:
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/visitor-keys" "5.17.0"
+    "@typescript-eslint/types" "5.18.0"
+    "@typescript-eslint/visitor-keys" "5.18.0"
     debug "^4.3.2"
     globby "^11.0.4"
     is-glob "^4.0.3"
@@ -1676,15 +1676,15 @@
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
-"@typescript-eslint/utils@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.17.0.tgz#549a9e1d491c6ccd3624bc3c1b098f5cfb45f306"
-  integrity sha512-DVvndq1QoxQH+hFv+MUQHrrWZ7gQ5KcJzyjhzcqB1Y2Xes1UQQkTRPUfRpqhS8mhTWsSb2+iyvDW1Lef5DD7vA==
+"@typescript-eslint/utils@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.18.0.tgz#27fc84cf95c1a96def0aae31684cb43a37e76855"
+  integrity sha512-+hFGWUMMri7OFY26TsOlGa+zgjEy1ssEipxpLjtl4wSll8zy85x0GrUSju/FHdKfVorZPYJLkF3I4XPtnCTewA==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.17.0"
-    "@typescript-eslint/types" "5.17.0"
-    "@typescript-eslint/typescript-estree" "5.17.0"
+    "@typescript-eslint/scope-manager" "5.18.0"
+    "@typescript-eslint/types" "5.18.0"
+    "@typescript-eslint/typescript-estree" "5.18.0"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
 
@@ -1696,12 +1696,12 @@
     "@typescript-eslint/types" "5.15.0"
     eslint-visitor-keys "^3.0.0"
 
-"@typescript-eslint/visitor-keys@5.17.0":
-  version "5.17.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz#52daae45c61b0211b4c81b53a71841911e479128"
-  integrity sha512-6K/zlc4OfCagUu7Am/BD5k8PSWQOgh34Nrv9Rxe2tBzlJ7uOeJ/h7ugCGDCeEZHT6k2CJBhbk9IsbkPI0uvUkA==
+"@typescript-eslint/visitor-keys@5.18.0":
+  version "5.18.0"
+  resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.18.0.tgz#c7c07709823804171d569017f3b031ced7253e60"
+  integrity sha512-Hf+t+dJsjAKpKSkg3EHvbtEpFFb/1CiOHnvI8bjHgOD4/wAw3gKrA0i94LrbekypiZVanJu3McWJg7rWDMzRTg==
   dependencies:
-    "@typescript-eslint/types" "5.17.0"
+    "@typescript-eslint/types" "5.18.0"
     eslint-visitor-keys "^3.0.0"
 
 "@vue/babel-helper-vue-jsx-merge-props@^1.2.1":
@@ -2102,24 +2102,24 @@
   resolved "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz#b6b40a7625429d2bd7c2281ddba601ed05dc7f1a"
   integrity sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA==
 
-"@vueuse/core@^8.2.3":
-  version "8.2.3"
-  resolved "https://registry.npmmirror.com/@vueuse/core/-/core-8.2.3.tgz#cc87e3b14867619fd475868a97ffd0366b0a9b77"
-  integrity sha512-bz6XroFRFOIGzhAHcnTfjtAQNkNcSELKPoSSUGROwYfOgTnaVyq7iKhgwdeRNom3y9q+a60RlhD35oJaGsXDHA==
+"@vueuse/core@^8.2.4":
+  version "8.2.4"
+  resolved "https://registry.npmmirror.com/@vueuse/core/-/core-8.2.4.tgz#04159d28267e56fd27488de116e465d0b12b48ac"
+  integrity sha512-K8DbVLErlHMnEOqy67BrRbDmWCd4Z9X0a1dL6fQdhABLXBydy69Tm7uF5ZUotAqib9sskItYFsAnLhvGSue6bg==
   dependencies:
-    "@vueuse/metadata" "8.2.3"
-    "@vueuse/shared" "8.2.3"
+    "@vueuse/metadata" "8.2.4"
+    "@vueuse/shared" "8.2.4"
     vue-demi "*"
 
-"@vueuse/metadata@8.2.3":
-  version "8.2.3"
-  resolved "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.2.3.tgz#2b0afe38a37cf3d5277c624502ebc5f86eec6d90"
-  integrity sha512-xH5256Bn6hBYvQWoaCBagpeCrzJmeEeWnyDDkwVFhx7+pLOe4I6gsMHie3yJoowK9AN/D7JLTtEBbWvvBi5TOA==
+"@vueuse/metadata@8.2.4":
+  version "8.2.4"
+  resolved "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-8.2.4.tgz#a880aa1ba1e30850983a85de8e1a6295d798250e"
+  integrity sha512-mn4FLULZAHd6r6vo5hLz+99xzwlVDP9qeVtZGV2Ik40m0zETe2okUr3O1Yoz6FReUoc7KAPrf0/GFpWEXVDAnQ==
 
-"@vueuse/shared@8.2.3":
-  version "8.2.3"
-  resolved "https://registry.npmmirror.com/@vueuse/shared/-/shared-8.2.3.tgz#c8281ceb0e2e73bac329a0af506d0c883353be34"
-  integrity sha512-4Cd3s+x8ZwzzAf7o8jS7mEj9pQ1Zsf9aiNBAFg4rHcWeDY0S3XMgvN4ae2hBul7jmi+Ab4REAqiqYWyYqU86qg==
+"@vueuse/shared@8.2.4":
+  version "8.2.4"
+  resolved "https://registry.npmmirror.com/@vueuse/shared/-/shared-8.2.4.tgz#a5b3bb53596c802df2181a3a0095e9782383be32"
+  integrity sha512-sLkuZMEumsmEDYie3m6/nrk7SrLGlyUgtVn/0EJZ8Chaj1YfSmBQuLxNE0ruQ/6VZlqkx44jEZxcgbU7qPyAiw==
   dependencies:
     vue-demi "*"
 
@@ -7508,10 +7508,10 @@ prettier-linter-helpers@^1.0.0:
   resolved "https://registry.npmmirror.com/prettier/-/prettier-2.6.0.tgz#12f8f504c4d8ddb76475f441337542fa799207d4"
   integrity sha512-m2FgJibYrBGGgQXNzfd0PuDGShJgRavjUoRCw1mZERIWVSXF0iLzLm+aOqTAbLnC3n6JzUhAA8uZnFVghHJ86A==
 
-prettier@^2.6.1:
-  version "2.6.1"
-  resolved "https://registry.npmmirror.com/prettier/-/prettier-2.6.1.tgz#d472797e0d7461605c1609808e27b80c0f9cfe17"
-  integrity sha512-8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A==
+prettier@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.npmmirror.com/prettier/-/prettier-2.6.2.tgz#e26d71a18a74c3d0f0597f55f01fb6c06c206032"
+  integrity sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
 
 pretty-error@^4.0.0:
   version "4.0.0"