Commit ca4f1a8faf7d588c0d57d0dc81f4dc04cd757380

Authored by vben
1 parent 025ee927

fix(simple-menu): collapse openmenus error #204

build/vite/plugin/index.ts
@@ -37,7 +37,12 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean, mode: stri @@ -37,7 +37,12 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean, mode: stri
37 37
38 // rollup-plugin-visualizer 38 // rollup-plugin-visualizer
39 if (isReportMode()) { 39 if (isReportMode()) {
40 - vitePlugins.push(visualizer({ filename: './build/.cache/stats.html', open: true }) as Plugin); 40 + vitePlugins.push(
  41 + visualizer({
  42 + filename: './build/.cache/stats.html',
  43 + open: true,
  44 + }) as Plugin
  45 + );
41 } 46 }
42 47
43 return vitePlugins; 48 return vitePlugins;
package.json
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 "path-to-regexp": "^6.2.0", 33 "path-to-regexp": "^6.2.0",
34 "qrcode": "^1.4.4", 34 "qrcode": "^1.4.4",
35 "sortablejs": "^1.13.0", 35 "sortablejs": "^1.13.0",
36 - "vditor": "^3.7.6", 36 + "vditor": "^3.7.7",
37 "vue": "^3.0.5", 37 "vue": "^3.0.5",
38 "vue-i18n": "^9.0.0-rc.2", 38 "vue-i18n": "^9.0.0-rc.2",
39 "vue-router": "^4.0.3", 39 "vue-router": "^4.0.3",
@@ -46,9 +46,9 @@ @@ -46,9 +46,9 @@
46 "devDependencies": { 46 "devDependencies": {
47 "@commitlint/cli": "^11.0.0", 47 "@commitlint/cli": "^11.0.0",
48 "@commitlint/config-conventional": "^11.0.0", 48 "@commitlint/config-conventional": "^11.0.0",
49 - "@iconify/json": "^1.1.287", 49 + "@iconify/json": "^1.1.288",
50 "@ls-lint/ls-lint": "^1.9.2", 50 "@ls-lint/ls-lint": "^1.9.2",
51 - "@purge-icons/generated": "^0.5.1", 51 + "@purge-icons/generated": "^0.5.2",
52 "@types/echarts": "^4.9.3", 52 "@types/echarts": "^4.9.3",
53 "@types/fs-extra": "^9.0.6", 53 "@types/fs-extra": "^9.0.6",
54 "@types/http-proxy": "^1.17.5", 54 "@types/http-proxy": "^1.17.5",
@@ -61,8 +61,8 @@ @@ -61,8 +61,8 @@
61 "@types/sortablejs": "^1.10.6", 61 "@types/sortablejs": "^1.10.6",
62 "@types/yargs": "^15.0.12", 62 "@types/yargs": "^15.0.12",
63 "@types/zxcvbn": "^4.4.0", 63 "@types/zxcvbn": "^4.4.0",
64 - "@typescript-eslint/eslint-plugin": "^4.13.0",  
65 - "@typescript-eslint/parser": "^4.13.0", 64 + "@typescript-eslint/eslint-plugin": "^4.14.0",
  65 + "@typescript-eslint/parser": "^4.14.0",
66 "@vitejs/plugin-legacy": "^1.2.1", 66 "@vitejs/plugin-legacy": "^1.2.1",
67 "@vitejs/plugin-vue": "^1.0.6", 67 "@vitejs/plugin-vue": "^1.0.6",
68 "@vitejs/plugin-vue-jsx": "^1.0.2", 68 "@vitejs/plugin-vue-jsx": "^1.0.2",
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 "cross-env": "^7.0.3", 76 "cross-env": "^7.0.3",
77 "dotenv": "^8.2.0", 77 "dotenv": "^8.2.0",
78 "eslint": "^7.18.0", 78 "eslint": "^7.18.0",
79 - "eslint-config-prettier": "^7.1.0", 79 + "eslint-config-prettier": "^7.2.0",
80 "eslint-plugin-prettier": "^3.3.1", 80 "eslint-plugin-prettier": "^3.3.1",
81 "eslint-plugin-vue": "^7.4.1", 81 "eslint-plugin-vue": "^7.4.1",
82 "esno": "^0.4.0", 82 "esno": "^0.4.0",
@@ -91,17 +91,17 @@ @@ -91,17 +91,17 @@
91 "prettier": "^2.2.1", 91 "prettier": "^2.2.1",
92 "rimraf": "^3.0.2", 92 "rimraf": "^3.0.2",
93 "rollup-plugin-gzip": "^2.5.0", 93 "rollup-plugin-gzip": "^2.5.0",
94 - "rollup-plugin-visualizer": "^4.1.2", 94 + "rollup-plugin-visualizer": "^4.2.0",
95 "stylelint": "^13.8.0", 95 "stylelint": "^13.8.0",
96 "stylelint-config-prettier": "^8.0.2", 96 "stylelint-config-prettier": "^8.0.2",
97 "stylelint-config-standard": "^20.0.0", 97 "stylelint-config-standard": "^20.0.0",
98 "stylelint-order": "^4.1.0", 98 "stylelint-order": "^4.1.0",
99 - "ts-node": "^9.1.0", 99 + "ts-node": "^9.1.1",
100 "typescript": "^4.1.3", 100 "typescript": "^4.1.3",
101 "vite": "^2.0.0-beta.31", 101 "vite": "^2.0.0-beta.31",
102 "vite-plugin-html": "^2.0.0-beta.5", 102 "vite-plugin-html": "^2.0.0-beta.5",
103 "vite-plugin-mock": "^2.0.0-beta.3", 103 "vite-plugin-mock": "^2.0.0-beta.3",
104 - "vite-plugin-purge-icons": "^0.5.1", 104 + "vite-plugin-purge-icons": "^0.5.2",
105 "vite-plugin-pwa": "^0.3.8", 105 "vite-plugin-pwa": "^0.3.8",
106 "vite-plugin-style-import": "^0.4.3", 106 "vite-plugin-style-import": "^0.4.3",
107 "vue-eslint-parser": "^7.3.0", 107 "vue-eslint-parser": "^7.3.0",
src/App.vue
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
21 name: 'App', 21 name: 'App',
22 components: { ConfigProvider, AppProvider }, 22 components: { ConfigProvider, AppProvider },
23 setup() { 23 setup() {
  24 + // support Multi-language
24 const { antConfigLocale, setLocale } = useLocale(); 25 const { antConfigLocale, setLocale } = useLocale();
25 setLocale(); 26 setLocale();
26 27
@@ -30,8 +31,6 @@ @@ -30,8 +31,6 @@
30 // Create a lock screen monitor 31 // Create a lock screen monitor
31 const lockEvent = useLockPage(); 32 const lockEvent = useLockPage();
32 33
33 - // support Multi-language  
34 -  
35 return { 34 return {
36 antConfigLocale, 35 antConfigLocale,
37 lockEvent, 36 lockEvent,
src/components/Form/src/hooks/useFormValues.ts
1 -import { isArray, isFunction, isObject, isString } from '/@/utils/is'; 1 +import { isArray, isFunction, isObject, isString, isNullOrUnDef } from '/@/utils/is';
2 import { dateUtil } from '/@/utils/dateUtil'; 2 import { dateUtil } from '/@/utils/dateUtil';
3 3
4 import { unref, nextTick } from 'vue'; 4 import { unref, nextTick } from 'vue';
@@ -78,9 +78,10 @@ export function useFormValues({ @@ -78,9 +78,10 @@ export function useFormValues({
78 const schemas = unref(getSchema); 78 const schemas = unref(getSchema);
79 const obj: Recordable = {}; 79 const obj: Recordable = {};
80 schemas.forEach((item) => { 80 schemas.forEach((item) => {
81 - if (item.defaultValue) {  
82 - obj[item.field] = item.defaultValue;  
83 - formModel[item.field] = item.defaultValue; 81 + const { defaultValue } = item;
  82 + if (!isNullOrUnDef(defaultValue)) {
  83 + obj[item.field] = defaultValue;
  84 + formModel[item.field] = defaultValue;
84 } 85 }
85 }); 86 });
86 defaultValueRef.value = obj; 87 defaultValueRef.value = obj;
src/components/SimpleMenu/src/SimpleMenu.vue
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 v-bind="getBindValues" 3 v-bind="getBindValues"
4 @select="handleSelect" 4 @select="handleSelect"
5 :activeName="activeName" 5 :activeName="activeName"
6 - :openNames="openNames" 6 + :openNames="getOpenKeys"
7 :class="prefixCls" 7 :class="prefixCls"
8 :activeSubMenuNames="activeSubMenuNames" 8 :activeSubMenuNames="activeSubMenuNames"
9 > 9 >
@@ -67,8 +67,14 @@ @@ -67,8 +67,14 @@
67 67
68 const { currentRoute } = useRouter(); 68 const { currentRoute } = useRouter();
69 const { prefixCls } = useDesign('simple-menu'); 69 const { prefixCls } = useDesign('simple-menu');
70 - const { items, accordion, mixSider } = toRefs(props);  
71 - const { setOpenKeys } = useOpenKeys(menuState, items, accordion, mixSider); 70 + const { items, accordion, mixSider, collapse } = toRefs(props);
  71 + const { setOpenKeys, getOpenKeys } = useOpenKeys(
  72 + menuState,
  73 + items,
  74 + accordion,
  75 + mixSider,
  76 + collapse
  77 + );
72 78
73 const getBindValues = computed(() => ({ ...attrs, ...props })); 79 const getBindValues = computed(() => ({ ...attrs, ...props }));
74 80
@@ -125,6 +131,7 @@ @@ -125,6 +131,7 @@
125 prefixCls, 131 prefixCls,
126 getBindValues, 132 getBindValues,
127 handleSelect, 133 handleSelect,
  134 + getOpenKeys,
128 ...toRefs(menuState), 135 ...toRefs(menuState),
129 }; 136 };
130 }, 137 },
src/components/SimpleMenu/src/useOpenKeys.ts
1 import type { Menu as MenuType } from '/@/router/types'; 1 import type { Menu as MenuType } from '/@/router/types';
2 import type { MenuState } from './types'; 2 import type { MenuState } from './types';
3 3
4 -import { Ref, toRaw } from 'vue'; 4 +import { computed, Ref, toRaw } from 'vue';
5 5
6 import { unref } from 'vue'; 6 import { unref } from 'vue';
7 import { es6Unique } from '/@/utils'; 7 import { es6Unique } from '/@/utils';
@@ -12,7 +12,8 @@ export function useOpenKeys( @@ -12,7 +12,8 @@ export function useOpenKeys(
12 menuState: MenuState, 12 menuState: MenuState,
13 menus: Ref<MenuType[]>, 13 menus: Ref<MenuType[]>,
14 accordion: Ref<boolean>, 14 accordion: Ref<boolean>,
15 - mixSider: Ref<boolean> 15 + mixSider: Ref<boolean>,
  16 + collapse: Ref<boolean>
16 // mode: Ref<MenuModeEnum>, 17 // mode: Ref<MenuModeEnum>,
17 ) { 18 ) {
18 async function setOpenKeys(path: string) { 19 async function setOpenKeys(path: string) {
@@ -41,5 +42,9 @@ export function useOpenKeys( @@ -41,5 +42,9 @@ export function useOpenKeys(
41 ); 42 );
42 } 43 }
43 44
44 - return { setOpenKeys }; 45 + const getOpenKeys = computed(() => {
  46 + return unref(collapse) ? [] : menuState.openNames;
  47 + });
  48 +
  49 + return { setOpenKeys, getOpenKeys };
45 } 50 }
src/locales/lang/zh_CN/sys/api.ts
@@ -5,7 +5,7 @@ export default { @@ -5,7 +5,7 @@ export default {
5 timeoutMessage: '็™ปๅฝ•่ถ…ๆ—ถ,่ฏท้‡ๆ–ฐ็™ปๅฝ•!', 5 timeoutMessage: '็™ปๅฝ•่ถ…ๆ—ถ,่ฏท้‡ๆ–ฐ็™ปๅฝ•!',
6 apiTimeoutMessage: 'ๆŽฅๅฃ่ฏทๆฑ‚่ถ…ๆ—ถ,่ฏทๅˆทๆ–ฐ้กต้ข้‡่ฏ•!', 6 apiTimeoutMessage: 'ๆŽฅๅฃ่ฏทๆฑ‚่ถ…ๆ—ถ,่ฏทๅˆทๆ–ฐ้กต้ข้‡่ฏ•!',
7 networkException: '็ฝ‘็ปœๅผ‚ๅธธ', 7 networkException: '็ฝ‘็ปœๅผ‚ๅธธ',
8 - networkExceptionMsg: '็ฝ‘่ฏทๆฃ€ๆŸฅๆ‚จ็š„็ฝ‘็ปœ่ฟžๆŽฅๆ˜ฏๅฆๆญฃๅธธ!็ปœๅผ‚ๅธธ', 8 + networkExceptionMsg: '่ฏทๆฃ€ๆŸฅๆ‚จ็š„็ฝ‘็ปœ่ฟžๆŽฅๆ˜ฏๅฆๆญฃๅธธ!',
9 9
10 errMsg401: '็”จๆˆทๆฒกๆœ‰ๆƒ้™๏ผˆไปค็‰Œใ€็”จๆˆทๅใ€ๅฏ†็ ้”™่ฏฏ๏ผ‰!', 10 errMsg401: '็”จๆˆทๆฒกๆœ‰ๆƒ้™๏ผˆไปค็‰Œใ€็”จๆˆทๅใ€ๅฏ†็ ้”™่ฏฏ๏ผ‰!',
11 errMsg403: '็”จๆˆทๅพ—ๅˆฐๆŽˆๆƒ๏ผŒไฝ†ๆ˜ฏ่ฎฟ้—ฎๆ˜ฏ่ขซ็ฆๆญข็š„ใ€‚!', 11 errMsg403: '็”จๆˆทๅพ—ๅˆฐๆŽˆๆƒ๏ผŒไฝ†ๆ˜ฏ่ฎฟ้—ฎๆ˜ฏ่ขซ็ฆๆญข็š„ใ€‚!',
src/utils/is.ts
@@ -44,6 +44,10 @@ export function isNullAndUnDef(val: unknown): val is null | undefined { @@ -44,6 +44,10 @@ export function isNullAndUnDef(val: unknown): val is null | undefined {
44 return isUnDef(val) && isNull(val); 44 return isUnDef(val) && isNull(val);
45 } 45 }
46 46
  47 +export function isNullOrUnDef(val: unknown): val is null | undefined {
  48 + return isUnDef(val) || isNull(val);
  49 +}
  50 +
47 export function isNumber(val: unknown): val is number { 51 export function isNumber(val: unknown): val is number {
48 return is(val, 'Number'); 52 return is(val, 'Number');
49 } 53 }
yarn.lock
@@ -1184,10 +1184,10 @@ @@ -1184,10 +1184,10 @@
1184 dependencies: 1184 dependencies:
1185 cross-fetch "^3.0.6" 1185 cross-fetch "^3.0.6"
1186 1186
1187 -"@iconify/json@^1.1.287":  
1188 - version "1.1.287"  
1189 - resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.287.tgz#31fe253ce97fb2bf673a60c2467810a3f48a00c3"  
1190 - integrity sha512-wvmQDpHqzbYZv2mDsdp1eXUN+ff53FjElT19uVxFRPOkY2kaIhs7dMPS/ZeDD38TE2eH1arTzZ2KhtB+Mxe8VQ== 1187 +"@iconify/json@^1.1.288":
  1188 + version "1.1.288"
  1189 + resolved "https://registry.npmjs.org/@iconify/json/-/json-1.1.288.tgz#a9fb51069747177a918b953387b6f89a017db8d3"
  1190 + integrity sha512-m+m89uxYciKcx714zvZ4FUh1kUUVtpNNYr0UoVoYUigSXd2U6A7IaEakqc6gDUkmgUUSDrLB2ajmKHvbJLra1Q==
1191 1191
1192 "@intlify/core-base@9.0.0-beta.16": 1192 "@intlify/core-base@9.0.0-beta.16":
1193 version "9.0.0-beta.16" 1193 version "9.0.0-beta.16"
@@ -1298,10 +1298,10 @@ @@ -1298,10 +1298,10 @@
1298 "@nodelib/fs.scandir" "2.1.3" 1298 "@nodelib/fs.scandir" "2.1.3"
1299 fastq "^1.6.0" 1299 fastq "^1.6.0"
1300 1300
1301 -"@purge-icons/core@^0.5.1":  
1302 - version "0.5.1"  
1303 - resolved "https://registry.npmjs.org/@purge-icons/core/-/core-0.5.1.tgz#d4052b744287e28ec5889cda6620885e68d80f86"  
1304 - integrity sha512-saeIk5KczF5xtJfAy0Mi2TDMMfZPieE7vXw3hUrWTuaOAuYhCx5rtXNuh0ql/Vu0F0IqHJjIIfAyiWmqKmtzow== 1301 +"@purge-icons/core@^0.5.2":
  1302 + version "0.5.2"
  1303 + resolved "https://registry.npmjs.org/@purge-icons/core/-/core-0.5.2.tgz#f308ab31772555babc1c425b9adde7d6a3ec9ab9"
  1304 + integrity sha512-lYPscpk562FvVS6sqSbmLiwjIR5EfOoZD8InJdnm2wi4NUzCL4s+V8MPhN6JjTfUpUfRxPin3KnJbAU4ILutuw==
1305 dependencies: 1305 dependencies:
1306 "@iconify/iconify" "2.0.0-rc.6" 1306 "@iconify/iconify" "2.0.0-rc.6"
1307 axios "^0.21.1" 1307 axios "^0.21.1"
@@ -1309,10 +1309,10 @@ @@ -1309,10 +1309,10 @@
1309 fast-glob "^3.2.4" 1309 fast-glob "^3.2.4"
1310 fs-extra "^9.0.1" 1310 fs-extra "^9.0.1"
1311 1311
1312 -"@purge-icons/generated@^0.5.1":  
1313 - version "0.5.1"  
1314 - resolved "https://registry.npmjs.org/@purge-icons/generated/-/generated-0.5.1.tgz#fbdb984dd72a9a4ab0650ef0153f3e88278cec56"  
1315 - integrity sha512-S6uqlaWoo+L29cxiSNzrw6Lq27IZvESUg/S6MNNiPqY4z+seogzTZgh+KKEY64PqLvm8I4CoRE+fxhWzsj7GRQ== 1312 +"@purge-icons/generated@^0.5.2":
  1313 + version "0.5.2"
  1314 + resolved "https://registry.npmjs.org/@purge-icons/generated/-/generated-0.5.2.tgz#4b4a7aa25211a607595efdb70b6f130818bdbcfc"
  1315 + integrity sha512-dcb4Lu6Ll7Hrnz5yYtTClxDq4FKAxD74B2CxPteACc71kmctsOEQD8z6eLsRhcM9waLdf9oygr+IcRVTIrllcg==
1316 dependencies: 1316 dependencies:
1317 "@iconify/iconify" ">=2.0.0-rc.6" 1317 "@iconify/iconify" ">=2.0.0-rc.6"
1318 1318
@@ -1748,13 +1748,13 @@ @@ -1748,13 +1748,13 @@
1748 resolved "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.0.tgz#fbc1d941cc6d9d37d18405c513ba6b294f89b609" 1748 resolved "https://registry.npmjs.org/@types/zxcvbn/-/zxcvbn-4.4.0.tgz#fbc1d941cc6d9d37d18405c513ba6b294f89b609"
1749 integrity sha512-GQLOT+SN20a+AI51y3fAimhyTF4Y0RG+YP3gf91OibIZ7CJmPFgoZi+ZR5a+vRbS01LbQosITWum4ATmJ1Z6Pg== 1749 integrity sha512-GQLOT+SN20a+AI51y3fAimhyTF4Y0RG+YP3gf91OibIZ7CJmPFgoZi+ZR5a+vRbS01LbQosITWum4ATmJ1Z6Pg==
1750 1750
1751 -"@typescript-eslint/eslint-plugin@^4.13.0":  
1752 - version "4.13.0"  
1753 - resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.13.0.tgz#5f580ea520fa46442deb82c038460c3dd3524bb6"  
1754 - integrity sha512-ygqDUm+BUPvrr0jrXqoteMqmIaZ/bixYOc3A4BRwzEPTZPi6E+n44rzNZWaB0YvtukgP+aoj0i/fyx7FkM2p1w== 1751 +"@typescript-eslint/eslint-plugin@^4.14.0":
  1752 + version "4.14.0"
  1753 + resolved "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.14.0.tgz#92db8e7c357ed7d69632d6843ca70b71be3a721d"
  1754 + integrity sha512-IJ5e2W7uFNfg4qh9eHkHRUCbgZ8VKtGwD07kannJvM5t/GU8P8+24NX8gi3Hf5jST5oWPY8kyV1s/WtfiZ4+Ww==
1755 dependencies: 1755 dependencies:
1756 - "@typescript-eslint/experimental-utils" "4.13.0"  
1757 - "@typescript-eslint/scope-manager" "4.13.0" 1756 + "@typescript-eslint/experimental-utils" "4.14.0"
  1757 + "@typescript-eslint/scope-manager" "4.14.0"
1758 debug "^4.1.1" 1758 debug "^4.1.1"
1759 functional-red-black-tree "^1.0.1" 1759 functional-red-black-tree "^1.0.1"
1760 lodash "^4.17.15" 1760 lodash "^4.17.15"
@@ -1762,48 +1762,48 @@ @@ -1762,48 +1762,48 @@
1762 semver "^7.3.2" 1762 semver "^7.3.2"
1763 tsutils "^3.17.1" 1763 tsutils "^3.17.1"
1764 1764
1765 -"@typescript-eslint/experimental-utils@4.13.0":  
1766 - version "4.13.0"  
1767 - resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.13.0.tgz#9dc9ab375d65603b43d938a0786190a0c72be44e"  
1768 - integrity sha512-/ZsuWmqagOzNkx30VWYV3MNB/Re/CGv/7EzlqZo5RegBN8tMuPaBgNK6vPBCQA8tcYrbsrTdbx3ixMRRKEEGVw== 1765 +"@typescript-eslint/experimental-utils@4.14.0":
  1766 + version "4.14.0"
  1767 + resolved "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.14.0.tgz#5aa7b006736634f588a69ee343ca959cd09988df"
  1768 + integrity sha512-6i6eAoiPlXMKRbXzvoQD5Yn9L7k9ezzGRvzC/x1V3650rUk3c3AOjQyGYyF9BDxQQDK2ElmKOZRD0CbtdkMzQQ==
1769 dependencies: 1769 dependencies:
1770 "@types/json-schema" "^7.0.3" 1770 "@types/json-schema" "^7.0.3"
1771 - "@typescript-eslint/scope-manager" "4.13.0"  
1772 - "@typescript-eslint/types" "4.13.0"  
1773 - "@typescript-eslint/typescript-estree" "4.13.0" 1771 + "@typescript-eslint/scope-manager" "4.14.0"
  1772 + "@typescript-eslint/types" "4.14.0"
  1773 + "@typescript-eslint/typescript-estree" "4.14.0"
1774 eslint-scope "^5.0.0" 1774 eslint-scope "^5.0.0"
1775 eslint-utils "^2.0.0" 1775 eslint-utils "^2.0.0"
1776 1776
1777 -"@typescript-eslint/parser@^4.13.0":  
1778 - version "4.13.0"  
1779 - resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.13.0.tgz#c413d640ea66120cfcc37f891e8cb3fd1c9d247d"  
1780 - integrity sha512-KO0J5SRF08pMXzq9+abyHnaGQgUJZ3Z3ax+pmqz9vl81JxmTTOUfQmq7/4awVfq09b6C4owNlOgOwp61pYRBSg== 1777 +"@typescript-eslint/parser@^4.14.0":
  1778 + version "4.14.0"
  1779 + resolved "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.14.0.tgz#62d4cd2079d5c06683e9bfb200c758f292c4dee7"
  1780 + integrity sha512-sUDeuCjBU+ZF3Lzw0hphTyScmDDJ5QVkyE21pRoBo8iDl7WBtVFS+WDN3blY1CH3SBt7EmYCw6wfmJjF0l/uYg==
1781 dependencies: 1781 dependencies:
1782 - "@typescript-eslint/scope-manager" "4.13.0"  
1783 - "@typescript-eslint/types" "4.13.0"  
1784 - "@typescript-eslint/typescript-estree" "4.13.0" 1782 + "@typescript-eslint/scope-manager" "4.14.0"
  1783 + "@typescript-eslint/types" "4.14.0"
  1784 + "@typescript-eslint/typescript-estree" "4.14.0"
1785 debug "^4.1.1" 1785 debug "^4.1.1"
1786 1786
1787 -"@typescript-eslint/scope-manager@4.13.0":  
1788 - version "4.13.0"  
1789 - resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.13.0.tgz#5b45912a9aa26b29603d8fa28f5e09088b947141"  
1790 - integrity sha512-UpK7YLG2JlTp/9G4CHe7GxOwd93RBf3aHO5L+pfjIrhtBvZjHKbMhBXTIQNkbz7HZ9XOe++yKrXutYm5KmjWgQ== 1787 +"@typescript-eslint/scope-manager@4.14.0":
  1788 + version "4.14.0"
  1789 + resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.14.0.tgz#55a4743095d684e1f7b7180c4bac2a0a3727f517"
  1790 + integrity sha512-/J+LlRMdbPh4RdL4hfP1eCwHN5bAhFAGOTsvE6SxsrM/47XQiPSgF5MDgLyp/i9kbZV9Lx80DW0OpPkzL+uf8Q==
1791 dependencies: 1791 dependencies:
1792 - "@typescript-eslint/types" "4.13.0"  
1793 - "@typescript-eslint/visitor-keys" "4.13.0" 1792 + "@typescript-eslint/types" "4.14.0"
  1793 + "@typescript-eslint/visitor-keys" "4.14.0"
1794 1794
1795 -"@typescript-eslint/types@4.13.0":  
1796 - version "4.13.0"  
1797 - resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.13.0.tgz#6a7c6015a59a08fbd70daa8c83dfff86250502f8"  
1798 - integrity sha512-/+aPaq163oX+ObOG00M0t9tKkOgdv9lq0IQv/y4SqGkAXmhFmCfgsELV7kOCTb2vVU5VOmVwXBXJTDr353C1rQ== 1795 +"@typescript-eslint/types@4.14.0":
  1796 + version "4.14.0"
  1797 + resolved "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.14.0.tgz#d8a8202d9b58831d6fd9cee2ba12f8a5a5dd44b6"
  1798 + integrity sha512-VsQE4VvpldHrTFuVPY1ZnHn/Txw6cZGjL48e+iBxTi2ksa9DmebKjAeFmTVAYoSkTk7gjA7UqJ7pIsyifTsI4A==
1799 1799
1800 -"@typescript-eslint/typescript-estree@4.13.0":  
1801 - version "4.13.0"  
1802 - resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.13.0.tgz#cf6e2207c7d760f5dfd8d18051428fadfc37b45e"  
1803 - integrity sha512-9A0/DFZZLlGXn5XA349dWQFwPZxcyYyCFX5X88nWs2uachRDwGeyPz46oTsm9ZJE66EALvEns1lvBwa4d9QxMg== 1800 +"@typescript-eslint/typescript-estree@4.14.0":
  1801 + version "4.14.0"
  1802 + resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.14.0.tgz#4bcd67486e9acafc3d0c982b23a9ab8ac8911ed7"
  1803 + integrity sha512-wRjZ5qLao+bvS2F7pX4qi2oLcOONIB+ru8RGBieDptq/SudYwshveORwCVU4/yMAd4GK7Fsf8Uq1tjV838erag==
1804 dependencies: 1804 dependencies:
1805 - "@typescript-eslint/types" "4.13.0"  
1806 - "@typescript-eslint/visitor-keys" "4.13.0" 1805 + "@typescript-eslint/types" "4.14.0"
  1806 + "@typescript-eslint/visitor-keys" "4.14.0"
1807 debug "^4.1.1" 1807 debug "^4.1.1"
1808 globby "^11.0.1" 1808 globby "^11.0.1"
1809 is-glob "^4.0.1" 1809 is-glob "^4.0.1"
@@ -1811,12 +1811,12 @@ @@ -1811,12 +1811,12 @@
1811 semver "^7.3.2" 1811 semver "^7.3.2"
1812 tsutils "^3.17.1" 1812 tsutils "^3.17.1"
1813 1813
1814 -"@typescript-eslint/visitor-keys@4.13.0":  
1815 - version "4.13.0"  
1816 - resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.13.0.tgz#9acb1772d3b3183182b6540d3734143dce9476fe"  
1817 - integrity sha512-6RoxWK05PAibukE7jElqAtNMq+RWZyqJ6Q/GdIxaiUj2Ept8jh8+FUVlbq9WxMYxkmEOPvCE5cRSyupMpwW31g== 1814 +"@typescript-eslint/visitor-keys@4.14.0":
  1815 + version "4.14.0"
  1816 + resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.14.0.tgz#b1090d9d2955b044b2ea2904a22496849acbdf54"
  1817 + integrity sha512-MeHHzUyRI50DuiPgV9+LxcM52FCJFYjJiWHtXlbyC27b80mfOwKeiKI+MHOTEpcpfmoPFm/vvQS88bYIx6PZTA==
1818 dependencies: 1818 dependencies:
1819 - "@typescript-eslint/types" "4.13.0" 1819 + "@typescript-eslint/types" "4.14.0"
1820 eslint-visitor-keys "^2.0.0" 1820 eslint-visitor-keys "^2.0.0"
1821 1821
1822 "@vitejs/plugin-legacy@^1.2.1": 1822 "@vitejs/plugin-legacy@^1.2.1":
@@ -3751,10 +3751,10 @@ escape-string-regexp@^1.0.5: @@ -3751,10 +3751,10 @@ escape-string-regexp@^1.0.5:
3751 resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" 3751 resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
3752 integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= 3752 integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
3753 3753
3754 -eslint-config-prettier@^7.1.0:  
3755 - version "7.1.0"  
3756 - resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-7.1.0.tgz#5402eb559aa94b894effd6bddfa0b1ca051c858f"  
3757 - integrity sha512-9sm5/PxaFG7qNJvJzTROMM1Bk1ozXVTKI0buKOyb0Bsr1hrwi0H/TzxF/COtf1uxikIK8SwhX7K6zg78jAzbeA== 3754 +eslint-config-prettier@^7.2.0:
  3755 + version "7.2.0"
  3756 + resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"
  3757 + integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==
3758 3758
3759 eslint-plugin-prettier@^3.3.1: 3759 eslint-plugin-prettier@^3.3.1:
3760 version "3.3.1" 3760 version "3.3.1"
@@ -7043,13 +7043,13 @@ rollup-plugin-gzip@^2.5.0: @@ -7043,13 +7043,13 @@ rollup-plugin-gzip@^2.5.0:
7043 resolved "https://registry.npmjs.org/rollup-plugin-gzip/-/rollup-plugin-gzip-2.5.0.tgz#786650e7bddf86d7f723c205c3e3018ea727388c" 7043 resolved "https://registry.npmjs.org/rollup-plugin-gzip/-/rollup-plugin-gzip-2.5.0.tgz#786650e7bddf86d7f723c205c3e3018ea727388c"
7044 integrity sha512-1N0xtJJ8XfZYklZN1QcMLe+Mos2Vaccy3YUarE/AB1RkH7mkeppkFAz9srh+9KWOC3I2LWJeAYwFabO0rJ4mxg== 7044 integrity sha512-1N0xtJJ8XfZYklZN1QcMLe+Mos2Vaccy3YUarE/AB1RkH7mkeppkFAz9srh+9KWOC3I2LWJeAYwFabO0rJ4mxg==
7045 7045
7046 -rollup-plugin-purge-icons@^0.5.1:  
7047 - version "0.5.1"  
7048 - resolved "https://registry.npmjs.org/rollup-plugin-purge-icons/-/rollup-plugin-purge-icons-0.5.1.tgz#d31c237021cadcaa9afdd585654b1e285ead53c4"  
7049 - integrity sha512-h1yrwiVy2C0SpLl0SglR2ZLOtr0pomg/LLyoViStdTQYKVVznJT/RSs1WZZESsfTLWI1xio0Ou7IMogkIqm0Ow== 7046 +rollup-plugin-purge-icons@^0.5.2:
  7047 + version "0.5.2"
  7048 + resolved "https://registry.npmjs.org/rollup-plugin-purge-icons/-/rollup-plugin-purge-icons-0.5.2.tgz#4f55721fc15c650f82f5aa07900646069663c3ea"
  7049 + integrity sha512-5QPoxSwQyHTq35nFzfH7RrB2ISmXm6YKAWUffYKhyD3gsMNOhJsq0ghrpfxbtP74jVFOmuwyReU/UvMzf09CHw==
7050 dependencies: 7050 dependencies:
7051 - "@purge-icons/core" "^0.5.1"  
7052 - "@purge-icons/generated" "^0.5.1" 7051 + "@purge-icons/core" "^0.5.2"
  7052 + "@purge-icons/generated" "^0.5.2"
7053 7053
7054 rollup-plugin-terser@^7.0.0: 7054 rollup-plugin-terser@^7.0.0:
7055 version "7.0.2" 7055 version "7.0.2"
@@ -7061,7 +7061,7 @@ rollup-plugin-terser@^7.0.0: @@ -7061,7 +7061,7 @@ rollup-plugin-terser@^7.0.0:
7061 serialize-javascript "^4.0.0" 7061 serialize-javascript "^4.0.0"
7062 terser "^5.0.0" 7062 terser "^5.0.0"
7063 7063
7064 -rollup-plugin-visualizer@^4.1.2: 7064 +rollup-plugin-visualizer@^4.2.0:
7065 version "4.2.0" 7065 version "4.2.0"
7066 resolved "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-4.2.0.tgz#2fbdd9d11d22bf231782b6b56a10b5d30a94a01c" 7066 resolved "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-4.2.0.tgz#2fbdd9d11d22bf231782b6b56a10b5d30a94a01c"
7067 integrity sha512-xjfvoK4x0G7lBT3toMx8K/9tkCEWhRehnSJnn+PLY3Hjk8sNvyo407b68Cd3hdV9j42xcb8HXt0ZrmRi5NWeaQ== 7067 integrity sha512-xjfvoK4x0G7lBT3toMx8K/9tkCEWhRehnSJnn+PLY3Hjk8sNvyo407b68Cd3hdV9j42xcb8HXt0ZrmRi5NWeaQ==
@@ -7928,7 +7928,7 @@ trough@^1.0.0: @@ -7928,7 +7928,7 @@ trough@^1.0.0:
7928 resolved "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406" 7928 resolved "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz#b8b639cefad7d0bb2abd37d433ff8293efa5f406"
7929 integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA== 7929 integrity sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==
7930 7930
7931 -ts-node@^9.1.0: 7931 +ts-node@^9.1.1:
7932 version "9.1.1" 7932 version "9.1.1"
7933 resolved "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d" 7933 resolved "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d"
7934 integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== 7934 integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==
@@ -8197,10 +8197,10 @@ vary@^1.1.2: @@ -8197,10 +8197,10 @@ vary@^1.1.2:
8197 resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" 8197 resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
8198 integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= 8198 integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
8199 8199
8200 -vditor@^3.7.6:  
8201 - version "3.7.6"  
8202 - resolved "https://registry.npmjs.org/vditor/-/vditor-3.7.6.tgz#b6d9574a46836cffef05d030154526ee7113925e"  
8203 - integrity sha512-Xs4Au2wQZCf8KI26VNnVfK8HANzaC+oktwrZ639HRkD3NU8NfM3JN4xmvXBikzvwzb1h6smtLC6d3GriU5khrQ== 8200 +vditor@^3.7.7:
  8201 + version "3.7.7"
  8202 + resolved "https://registry.npmjs.org/vditor/-/vditor-3.7.7.tgz#2baf65f3fb3a0743072dc880010cf2fd1a0b864a"
  8203 + integrity sha512-Nk0I8PpGHpQe0Wb7odf63Www9GXC0fCR1Mw8PP1tNIJcv6O9OJ9FE2xIGjAwvOIqUoOtdSprzLS6HuCpgd7n2g==
8204 dependencies: 8204 dependencies:
8205 diff-match-patch "^1.0.5" 8205 diff-match-patch "^1.0.5"
8206 8206
@@ -8247,14 +8247,14 @@ vite-plugin-mock@^2.0.0-beta.3: @@ -8247,14 +8247,14 @@ vite-plugin-mock@^2.0.0-beta.3:
8247 rollup "^2.35.1" 8247 rollup "^2.35.1"
8248 rollup-plugin-esbuild "^2.6.1" 8248 rollup-plugin-esbuild "^2.6.1"
8249 8249
8250 -vite-plugin-purge-icons@^0.5.1:  
8251 - version "0.5.1"  
8252 - resolved "https://registry.npmjs.org/vite-plugin-purge-icons/-/vite-plugin-purge-icons-0.5.1.tgz#3491eaedce061682fe3c2d5928abd781cb6c4f13"  
8253 - integrity sha512-O/gVrdYFGTwfcbTKh0cBFbSEKjX8KlC7WTDOPRay8O9ESJ0S/TggZqfNDisUhR8cGQHNqydX6JRaGzK9CYB0Lw== 8250 +vite-plugin-purge-icons@^0.5.2:
  8251 + version "0.5.2"
  8252 + resolved "https://registry.npmjs.org/vite-plugin-purge-icons/-/vite-plugin-purge-icons-0.5.2.tgz#6d3a3eb7674934db6201b3070d4ccda024307067"
  8253 + integrity sha512-6YsH7FBYmYIOFzmt4TEuAUIypTdLKLqo3BUQt8McR8qKbgWHhkvnXaEHS1rLCowqSYSKKcqhGVuHg5x13VwTpw==
8254 dependencies: 8254 dependencies:
8255 - "@purge-icons/core" "^0.5.1"  
8256 - "@purge-icons/generated" "^0.5.1"  
8257 - rollup-plugin-purge-icons "^0.5.1" 8255 + "@purge-icons/core" "^0.5.2"
  8256 + "@purge-icons/generated" "^0.5.2"
  8257 + rollup-plugin-purge-icons "^0.5.2"
8258 8258
8259 vite-plugin-pwa@^0.3.8: 8259 vite-plugin-pwa@^0.3.8:
8260 version "0.3.8" 8260 version "0.3.8"