From 2214ce7911e3e0b064ef8a382df5279a35c2a76f Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Sat, 14 May 2022 09:56:07 +0800 Subject: [PATCH] fix: update --- package.json | 4 +- pnpm-lock.yaml | 388 +++++++++++------------- src/layout/components/setting/index.vue | 12 +- src/layout/components/tag/index.vue | 13 +- src/store/modules/multiTags.ts | 12 +- src/store/modules/user.ts | 12 +- src/utils/storage/responsive.ts | 12 +- 7 files changed, 186 insertions(+), 267 deletions(-) diff --git a/package.json b/package.json index 71b184eba..998de6afa 100644 --- a/package.json +++ b/package.json @@ -131,8 +131,8 @@ "stylelint-config-standard": "^24.0.0", "stylelint-order": "^5.0.0", "typescript": "^4.6.3", - "unocss": "^0.33.2", - "vite": "^2.9.6", + "unocss": "^0.33.4", + "vite": "^2.9.9", "vite-plugin-mock": "^2.9.6", "vite-plugin-remove-console": "^0.0.7", "vite-svg-loader": "^3.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 94d7a65ec..3d7f34c42 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -92,9 +92,9 @@ specifiers: stylelint-order: ^5.0.0 swiper: ^8.1.4 typescript: ^4.6.3 - unocss: ^0.33.2 + unocss: ^0.33.4 v-contextmenu: 3.0.0 - vite: ^2.9.6 + vite: ^2.9.9 vite-plugin-mock: ^2.9.6 vite-plugin-remove-console: ^0.0.7 vite-svg-loader: ^3.3.0 @@ -171,7 +171,7 @@ devDependencies: "@iconify-icons/ri": 1.2.1 "@iconify-icons/uil": 1.2.1 "@iconify/vue": 3.2.1_vue@3.2.33 - "@intlify/vite-plugin-vue-i18n": 3.4.0_527a5feddd721fab25fea36326f6d01f + "@intlify/vite-plugin-vue-i18n": 3.4.0_2953886ef562a41127ff9a4083619d3a "@pureadmin/theme": 1.1.0 "@types/element-resize-detector": 1.1.3 "@types/js-cookie": 3.0.2 @@ -184,8 +184,8 @@ devDependencies: "@types/qs": 6.9.7 "@typescript-eslint/eslint-plugin": 5.23.0_17b6d2ce7129f0b36f2c30ae592c16e7 "@typescript-eslint/parser": 5.23.0_eslint@8.15.0+typescript@4.6.4 - "@vitejs/plugin-legacy": 1.8.2_vite@2.9.8 - "@vitejs/plugin-vue": 2.3.2_vite@2.9.8+vue@3.2.33 + "@vitejs/plugin-legacy": 1.8.2_vite@2.9.9 + "@vitejs/plugin-vue": 2.3.2_vite@2.9.9+vue@3.2.33 "@vitejs/plugin-vue-jsx": 1.3.10 "@vue/eslint-config-prettier": 7.0.0_eslint@8.15.0+prettier@2.6.2 "@vue/eslint-config-typescript": 10.0.0_7f105dc3ebd31cec885fdbbd30d5cc4c @@ -215,9 +215,9 @@ devDependencies: stylelint-config-standard: 24.0.0_stylelint@14.8.2 stylelint-order: 5.0.0_stylelint@14.8.2 typescript: 4.6.4 - unocss: 0.33.2_vite@2.9.8 - vite: 2.9.8_sass@1.51.0 - vite-plugin-mock: 2.9.6_b36be780fcabf2452078cfac5d8ea549 + unocss: 0.33.4_vite@2.9.9 + vite: 2.9.9_sass@1.51.0 + vite-plugin-mock: 2.9.6_95c4cc53f4075e6399c4c5caf758f11f vite-plugin-remove-console: 0.0.7 vite-svg-loader: 3.3.0 vue-eslint-parser: 8.3.0_eslint@8.15.0 @@ -1174,7 +1174,7 @@ packages: engines: { node: ">= 12" } dev: false - /@intlify/vite-plugin-vue-i18n/3.4.0_527a5feddd721fab25fea36326f6d01f: + /@intlify/vite-plugin-vue-i18n/3.4.0_2953886ef562a41127ff9a4083619d3a: resolution: { integrity: sha512-XXcZBgwJ+3FRu11c4ARoY9N00kElPii0/jNZ49qR045Ka7/YGCwb1Ku14BBlMSEHiHDSjLQknLwrJKSQGVZLyA== @@ -1196,7 +1196,7 @@ packages: debug: 4.3.4 fast-glob: 3.2.11 source-map: 0.6.1 - vite: 2.9.8_sass@1.51.0 + vite: 2.9.9_sass@1.51.0 vue-i18n: 9.2.0-beta.35_vue@3.2.33 transitivePeerDependencies: - supports-color @@ -1703,17 +1703,17 @@ packages: eslint-visitor-keys: 3.3.0 dev: true - /@unocss/cli/0.33.2: + /@unocss/cli/0.33.4: resolution: { - integrity: sha512-X64DpwvPnHHjTROm+6fZb/HoMl4SYzaVjNg/XxmGxrbBbh18tbY6rAcjQF6O7TGPVn07ZuSTEGUsH4PsCaOxXg== + integrity: sha512-r3nNWfSLyr5JeL+X/jRJRHFQtcJJLtpXtfHT/IgnPrrFjig7xZs+aLJEhQUgL4kvIdjX1kmPRCtu/N9xNsM8bA== } engines: { node: ">=14" } hasBin: true dependencies: - "@unocss/config": 0.33.2 - "@unocss/core": 0.33.2 - "@unocss/preset-uno": 0.33.2 + "@unocss/config": 0.33.4 + "@unocss/core": 0.33.4 + "@unocss/preset-uno": 0.33.4 cac: 6.7.12 chokidar: 3.5.3 colorette: 2.0.16 @@ -1723,162 +1723,162 @@ packages: perfect-debounce: 0.1.3 dev: true - /@unocss/config/0.33.2: + /@unocss/config/0.33.4: resolution: { - integrity: sha512-0IntORr7pTYVngdHUS1RUtRFKBJ/wuOy/i9/s2gGYA+Dmh9odZHzB1ExpMckrnGZEjzq6VYX69bDtwSgvl4cyQ== + integrity: sha512-mFwNwKycvDk9Pa1BhwEhRGG7rV2sWP8UuubnDQqBFCfx+pe6MAbULbImU+QOUNE6WMqhcA7Ny2L+MMF7CVx9kA== } engines: { node: ">=14" } dependencies: - "@unocss/core": 0.33.2 + "@unocss/core": 0.33.4 unconfig: 0.3.4 dev: true - /@unocss/core/0.33.2: + /@unocss/core/0.33.4: resolution: { - integrity: sha512-o6x1SyO9gUHMhXagUNekZ0Bj/GOg1a2QSorFBg1NoR36GHuX+Uz9UJqzHPx5QS7g2jbJdeR01zG9pwVw0R5Tlg== + integrity: sha512-wI8XzlBUV/doEuMxWt26C52yvcbiw5ss0yHwW6Oq7KAjT8kwdyAAYQDbRB/rATirhY50n5P7xkyc5VY+9YiI6g== } dev: true - /@unocss/inspector/0.33.2: + /@unocss/inspector/0.33.4: resolution: { - integrity: sha512-3/DwcEvnrnIMDL0pCSAkFQoEDR64H/U+WP78vczF1gwBYXGp+feBSBCKvUy7EjU1SWzFh6FW821oSjhyyM8P8A== + integrity: sha512-YWMCQ/9Po1kil+wh8v/bKZvUqAZdgpbvQMP+LOGE2pLIT/NZmtAiag2KC8gPV6fi8imuUjuqPlmYc8C+bwhUCg== } dependencies: gzip-size: 6.0.0 sirv: 2.0.2 dev: true - /@unocss/preset-attributify/0.33.2: + /@unocss/preset-attributify/0.33.4: resolution: { - integrity: sha512-07SAPb/ehSDoigk80ivyGQcY0QqIonN99v8uZCZR4GtYaSJ8jHjL17TlXoWYMbbB26qdc0XxwWyajD2bQw1NaQ== + integrity: sha512-kxVLmjR1HKr5PLKdzQpbE9SHvyWc+hJBnrwtkLqoWAExn8Xl2u/i/R+KdfWnwhzitPNQuNsibunc11S8pTGwIA== } dependencies: - "@unocss/core": 0.33.2 + "@unocss/core": 0.33.4 dev: true - /@unocss/preset-icons/0.33.2: + /@unocss/preset-icons/0.33.4: resolution: { - integrity: sha512-KU5TFR1teW3FEtronf3ihVFK68UU+9h62umSxoxJtn9W7wsX/NXzysl2UN6usbWLcg6TjCpZAyPtuap1/29XSg== + integrity: sha512-jaUNd9c/fN+zmZNk9TTGkr6Mq1FDiDS00AkzBa5b7wMLJKZUcM78J+M8VpFvUTobUoCrTsyBKAg0B9TzofUVNg== } dependencies: "@iconify/utils": 1.0.32 - "@unocss/core": 0.33.2 + "@unocss/core": 0.33.4 transitivePeerDependencies: - supports-color dev: true - /@unocss/preset-mini/0.33.2: + /@unocss/preset-mini/0.33.4: resolution: { - integrity: sha512-Fa+BD5kGo3YQ87A67GzkLhxLzyL5LGyHTlnGsktMQOpcLVpiQKnWAjleCfDN3joSUcX/j7Yny+ruOR1XEFvrrQ== + integrity: sha512-hfY/n3unJ+OyKNadULfyPIcIv4wEMf7oeVe0rJ3su+Hlf+b+a6nGHqSkoZ3YjlGzcNXc2rX5plDBmx5fdCratQ== } dependencies: - "@unocss/core": 0.33.2 + "@unocss/core": 0.33.4 dev: true - /@unocss/preset-typography/0.33.2: + /@unocss/preset-typography/0.33.4: resolution: { - integrity: sha512-ArR/a3K4yEcUkJN6woHw6ClCHUBsKK0wcpZDJkcIOyJJI/a8NkNmJdH7uNAn1SnX4nyOIkdD2WTF3kU4f+mhVA== + integrity: sha512-lbOGF7PefFMlUDs7OYQBXfyXDVUvlNTt4MTuR3avg9zTM7k6maWXbQLbla5zBCOBQgSQzEiKc5mkhO9zJ7Ulxg== } dependencies: - "@unocss/core": 0.33.2 + "@unocss/core": 0.33.4 dev: true - /@unocss/preset-uno/0.33.2: + /@unocss/preset-uno/0.33.4: resolution: { - integrity: sha512-iFmYzGXicf8ny4lg5wGK9pGFmDbih2qWYZnNFS1PWwWe4a1rNJUO2ZKi0XesSvdTNNyrxzvWv+39rikGhlDwyw== + integrity: sha512-64zuTvaCiEBaTpFC0Idd4/9IG/U7hrXtx5lv38Vki3/N4Zxes5f8DXd8vi/qrGFVcCI5yV3Qw2Phr8ghFdVdvw== } dependencies: - "@unocss/core": 0.33.2 - "@unocss/preset-mini": 0.33.2 - "@unocss/preset-wind": 0.33.2 + "@unocss/core": 0.33.4 + "@unocss/preset-mini": 0.33.4 + "@unocss/preset-wind": 0.33.4 dev: true - /@unocss/preset-web-fonts/0.33.2: + /@unocss/preset-web-fonts/0.33.4: resolution: { - integrity: sha512-PxMhZiM5WpqXpSSUlJ+46au+te/ZJ77dpyv3HJ0leiMxUx3UWkUKOlNWyBUPWO61EpxlXisLEmdhEU/xyZ318g== + integrity: sha512-RBRJtpaB1ZNK+g5QFtIrcAOBjJMDmNo3P17tEstv47ml9VFwiQJPT3KF4Fmp2eHSSIBGJbwnFGfZ0/G8bUOdSw== } dependencies: - "@unocss/core": 0.33.2 - ohmyfetch: 0.4.16 + "@unocss/core": 0.33.4 + ohmyfetch: 0.4.17 dev: true - /@unocss/preset-wind/0.33.2: + /@unocss/preset-wind/0.33.4: resolution: { - integrity: sha512-ecuUaDMxOgflMDXSG+hBZ0C9R8tb36nVmyxctEd6oBBG8Trabd8wuZhlTvq59mEfcDcMtK77lgAfDlJxX+/GSQ== + integrity: sha512-JN8zxY54PnKfBYWOZylhbB586qgsl2EufKuee02ObKgR/k+ll2d3DX4zod3do/EuUW3541L3ajfk94LKxyBdeA== } dependencies: - "@unocss/core": 0.33.2 - "@unocss/preset-mini": 0.33.2 + "@unocss/core": 0.33.4 + "@unocss/preset-mini": 0.33.4 dev: true - /@unocss/reset/0.33.2: + /@unocss/reset/0.33.4: resolution: { - integrity: sha512-ArrkGVr8OEfCHZ5p3IiCi2sv5qXRJZ45zzhCr6vuwP+7+RbgMiyDKhV5oYqIGu7oxFesgXxeD+nRe/v4tKL33g== + integrity: sha512-5kqDu1WcZk9i0TPgLw6Un6BsZUR2jEDGIxAntgpmVTWhc5IUBTrORWw+9NMZAY1pea/WXTEWHxGQpQUaUQ7Sdw== } dev: true - /@unocss/scope/0.33.2: + /@unocss/scope/0.33.4: resolution: { - integrity: sha512-Pt267ptQwvdefq16dJxxCKTsWEiIdSfUfYv1KLsr7BQB/AFiiJLuRNn1rjUCrdYrLlA7riav9zdVk85x/u0PAg== + integrity: sha512-/81YmiMo4ae//lMR1eMKCX6FcU2rRCEEWc0gqhpoFicKaAkh1/F+upD7F3V5QBV2w+VIl6NXVx9LuYhf+bMQ6Q== } dev: true - /@unocss/transformer-compile-class/0.33.2: + /@unocss/transformer-compile-class/0.33.4: resolution: { - integrity: sha512-m9whHhhiv93yWyE+Dl5+tBHDItZ+ndiAicNqDYhu1mGsqi4nsPM6xJbbDibiXJWU2W4X+ZA6xhy3GvPkHut+tA== + integrity: sha512-LhCzF8a+WnCzEQatRBe6VJDAkYl77TEEcW0kkEnZEon25gwtZ6Eg4yFXDLotDJb6hfJn2ph9QLpralESldCrGQ== } dependencies: - "@unocss/core": 0.33.2 + "@unocss/core": 0.33.4 dev: true - /@unocss/transformer-directives/0.33.2: + /@unocss/transformer-directives/0.33.4: resolution: { - integrity: sha512-nv1Fxh5iIJPkS7APVZ8EJqjehKXOh5RVX8E1zIFNe0DPrU4xpzrWD8JT0uJJdkBa4eZakB+ElpErej0yc4mhgg== + integrity: sha512-jsIfOrUHeOZGrKHBSzZ022MRg+cyg/MJUFyupr0shuKkI4rZEJDF3y8R7+i46FKo19oL8kEWpz9Zb67gJwN7Kw== } dependencies: - "@unocss/core": 0.33.2 + "@unocss/core": 0.33.4 css-tree: 2.1.0 dev: true - /@unocss/transformer-variant-group/0.33.2: + /@unocss/transformer-variant-group/0.33.4: resolution: { - integrity: sha512-1fk9mYxpnTl6ieLZ3dZ451u0JpVaGy/EzA5CUYQrbXZJKeGcQQzu61okHQOTVAaOXWFkqhiVXbCMSPNGy7HMHA== + integrity: sha512-6ZI6hBWDqqU49SmP9+8d2VXnKJbzSl7YhoNN/DfyZdrSYYdfsaI2ymkiOSB0IEK5nYOpVHNtLt6l4LVTWq4XYQ== } dependencies: - "@unocss/core": 0.33.2 + "@unocss/core": 0.33.4 dev: true - /@unocss/vite/0.33.2_vite@2.9.8: + /@unocss/vite/0.33.4_vite@2.9.9: resolution: { - integrity: sha512-oRt1ejtUEHwGMKXfuXy9BiETkeV27J8miOKrlt+tlg/pm2y0h8113C12J0m15FS3cJhls4eBZs5umPr4J+shDw== + integrity: sha512-y8I99gVhs35rQShIfBl48M1G9SNNqEP/7EMMXd3NgA4cfLR//ElfdTrKZFuglJMng3FZeyUycdFTHN90dlX1yQ== } peerDependencies: vite: ^2.9.0 dependencies: "@rollup/pluginutils": 4.2.1 - "@unocss/config": 0.33.2 - "@unocss/core": 0.33.2 - "@unocss/inspector": 0.33.2 - "@unocss/scope": 0.33.2 - "@unocss/transformer-directives": 0.33.2 - magic-string: 0.26.1 - vite: 2.9.8_sass@1.51.0 + "@unocss/config": 0.33.4 + "@unocss/core": 0.33.4 + "@unocss/inspector": 0.33.4 + "@unocss/scope": 0.33.4 + "@unocss/transformer-directives": 0.33.4 + magic-string: 0.26.2 + vite: 2.9.9_sass@1.51.0 dev: true /@uppy/companion-client/2.0.6: @@ -1937,7 +1937,7 @@ packages: nanoid: 3.3.4 dev: false - /@vitejs/plugin-legacy/1.8.2_vite@2.9.8: + /@vitejs/plugin-legacy/1.8.2_vite@2.9.9: resolution: { integrity: sha512-NCOKU+pU+cxLMR9P9RTolEuOK+h+zYBXlknj+zGcKSj/NXBZYgA1GAH1FnO4zijoWRiTaiOm2ha9LQrELE7XHg== @@ -1951,7 +1951,7 @@ packages: magic-string: 0.26.1 regenerator-runtime: 0.13.9 systemjs: 6.12.1 - vite: 2.9.8_sass@1.51.0 + vite: 2.9.9_sass@1.51.0 dev: true /@vitejs/plugin-vue-jsx/1.3.10: @@ -1971,7 +1971,7 @@ packages: - supports-color dev: true - /@vitejs/plugin-vue/2.3.2_vite@2.9.8+vue@3.2.33: + /@vitejs/plugin-vue/2.3.2_vite@2.9.9+vue@3.2.33: resolution: { integrity: sha512-umyypfSHS4kQLdYAnJHhaASq7FRzNCdvcRoQ3uYGNk1/M4a+hXUd7ysN7BLhCrWH6uBokyCkFeUAaFDzSaaSrQ== @@ -1981,7 +1981,7 @@ packages: vite: ^2.5.10 vue: ^3.2.25 dependencies: - vite: 2.9.8_sass@1.51.0 + vite: 2.9.9_sass@1.51.0 vue: 3.2.33 dev: true @@ -3507,14 +3507,6 @@ packages: engines: { node: ">=8" } dev: true - /data-uri-to-buffer/4.0.0: - resolution: - { - integrity: sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA== - } - engines: { node: ">= 12" } - dev: true - /dayjs/1.11.2: resolution: { @@ -3941,10 +3933,10 @@ packages: ext: 1.6.0 dev: false - /esbuild-android-64/0.14.38: + /esbuild-android-64/0.14.39: resolution: { - integrity: sha512-aRFxR3scRKkbmNuGAK+Gee3+yFxkTJO/cx83Dkyzo4CnQl/2zVSurtG6+G86EQIZ+w+VYngVyK7P3HyTBKu3nw== + integrity: sha512-EJOu04p9WgZk0UoKTqLId9VnIsotmI/Z98EXrKURGb3LPNunkeffqQIkjS2cAvidh+OK5uVrXaIP229zK6GvhQ== } engines: { node: ">=12" } cpu: [x64] @@ -3953,10 +3945,10 @@ packages: dev: true optional: true - /esbuild-android-arm64/0.14.38: + /esbuild-android-arm64/0.14.39: resolution: { - integrity: sha512-L2NgQRWuHFI89IIZIlpAcINy9FvBk6xFVZ7xGdOwIm8VyhX1vNCEqUJO3DPSSy945Gzdg98cxtNt8Grv1CsyhA== + integrity: sha512-+twajJqO7n3MrCz9e+2lVOnFplRsaGRwsq1KL/uOy7xK7QdRSprRQcObGDeDZUZsacD5gUkk6OiHiYp6RzU3CA== } engines: { node: ">=12" } cpu: [arm64] @@ -3965,10 +3957,10 @@ packages: dev: true optional: true - /esbuild-darwin-64/0.14.38: + /esbuild-darwin-64/0.14.39: resolution: { - integrity: sha512-5JJvgXkX87Pd1Og0u/NJuO7TSqAikAcQQ74gyJ87bqWRVeouky84ICoV4sN6VV53aTW+NE87qLdGY4QA2S7KNA== + integrity: sha512-ImT6eUw3kcGcHoUxEcdBpi6LfTRWaV6+qf32iYYAfwOeV+XaQ/Xp5XQIBiijLeo+LpGci9M0FVec09nUw41a5g== } engines: { node: ">=12" } cpu: [x64] @@ -3977,10 +3969,10 @@ packages: dev: true optional: true - /esbuild-darwin-arm64/0.14.38: + /esbuild-darwin-arm64/0.14.39: resolution: { - integrity: sha512-eqF+OejMI3mC5Dlo9Kdq/Ilbki9sQBw3QlHW3wjLmsLh+quNfHmGMp3Ly1eWm981iGBMdbtSS9+LRvR2T8B3eQ== + integrity: sha512-/fcQ5UhE05OiT+bW5v7/up1bDsnvaRZPJxXwzXsMRrr7rZqPa85vayrD723oWMT64dhrgWeA3FIneF8yER0XTw== } engines: { node: ">=12" } cpu: [arm64] @@ -3989,10 +3981,10 @@ packages: dev: true optional: true - /esbuild-freebsd-64/0.14.38: + /esbuild-freebsd-64/0.14.39: resolution: { - integrity: sha512-epnPbhZUt93xV5cgeY36ZxPXDsQeO55DppzsIgWM8vgiG/Rz+qYDLmh5ts3e+Ln1wA9dQ+nZmVHw+RjaW3I5Ig== + integrity: sha512-oMNH8lJI4wtgN5oxuFP7BQ22vgB/e3Tl5Woehcd6i2r6F3TszpCnNl8wo2d/KvyQ4zvLvCWAlRciumhQg88+kQ== } engines: { node: ">=12" } cpu: [x64] @@ -4001,10 +3993,10 @@ packages: dev: true optional: true - /esbuild-freebsd-arm64/0.14.38: + /esbuild-freebsd-arm64/0.14.39: resolution: { - integrity: sha512-/9icXUYJWherhk+y5fjPI5yNUdFPtXHQlwP7/K/zg8t8lQdHVj20SqU9/udQmeUo5pDFHMYzcEFfJqgOVeKNNQ== + integrity: sha512-1GHK7kwk57ukY2yI4ILWKJXaxfr+8HcM/r/JKCGCPziIVlL+Wi7RbJ2OzMcTKZ1HpvEqCTBT/J6cO4ZEwW4Ypg== } engines: { node: ">=12" } cpu: [arm64] @@ -4013,10 +4005,10 @@ packages: dev: true optional: true - /esbuild-linux-32/0.14.38: + /esbuild-linux-32/0.14.39: resolution: { - integrity: sha512-QfgfeNHRFvr2XeHFzP8kOZVnal3QvST3A0cgq32ZrHjSMFTdgXhMhmWdKzRXP/PKcfv3e2OW9tT9PpcjNvaq6g== + integrity: sha512-g97Sbb6g4zfRLIxHgW2pc393DjnkTRMeq3N1rmjDUABxpx8SjocK4jLen+/mq55G46eE2TA0MkJ4R3SpKMu7dg== } engines: { node: ">=12" } cpu: [ia32] @@ -4025,10 +4017,10 @@ packages: dev: true optional: true - /esbuild-linux-64/0.14.38: + /esbuild-linux-64/0.14.39: resolution: { - integrity: sha512-uuZHNmqcs+Bj1qiW9k/HZU3FtIHmYiuxZ/6Aa+/KHb/pFKr7R3aVqvxlAudYI9Fw3St0VCPfv7QBpUITSmBR1Q== + integrity: sha512-4tcgFDYWdI+UbNMGlua9u1Zhu0N5R6u9tl5WOM8aVnNX143JZoBZLpCuUr5lCKhnD0SCO+5gUyMfupGrHtfggQ== } engines: { node: ">=12" } cpu: [x64] @@ -4037,10 +4029,10 @@ packages: dev: true optional: true - /esbuild-linux-arm/0.14.38: + /esbuild-linux-arm/0.14.39: resolution: { - integrity: sha512-FiFvQe8J3VKTDXG01JbvoVRXQ0x6UZwyrU4IaLBZeq39Bsbatd94Fuc3F1RGqPF5RbIWW7RvkVQjn79ejzysnA== + integrity: sha512-t0Hn1kWVx5UpCzAJkKRfHeYOLyFnXwYynIkK54/h3tbMweGI7dj400D1k0Vvtj2u1P+JTRT9tx3AjtLEMmfVBQ== } engines: { node: ">=12" } cpu: [arm] @@ -4049,10 +4041,10 @@ packages: dev: true optional: true - /esbuild-linux-arm64/0.14.38: + /esbuild-linux-arm64/0.14.39: resolution: { - integrity: sha512-HlMGZTEsBrXrivr64eZ/EO0NQM8H8DuSENRok9d+Jtvq8hOLzrxfsAT9U94K3KOGk2XgCmkaI2KD8hX7F97lvA== + integrity: sha512-23pc8MlD2D6Px1mV8GMglZlKgwgNKAO8gsgsLLcXWSs9lQsCYkIlMo/2Ycfo5JrDIbLdwgP8D2vpfH2KcBqrDQ== } engines: { node: ">=12" } cpu: [arm64] @@ -4061,10 +4053,10 @@ packages: dev: true optional: true - /esbuild-linux-mips64le/0.14.38: + /esbuild-linux-mips64le/0.14.39: resolution: { - integrity: sha512-qd1dLf2v7QBiI5wwfil9j0HG/5YMFBAmMVmdeokbNAMbcg49p25t6IlJFXAeLzogv1AvgaXRXvgFNhScYEUXGQ== + integrity: sha512-epwlYgVdbmkuRr5n4es3B+yDI0I2e/nxhKejT9H0OLxFAlMkeQZxSpxATpDc9m8NqRci6Kwyb/SfmD1koG2Zuw== } engines: { node: ">=12" } cpu: [mips64el] @@ -4073,10 +4065,10 @@ packages: dev: true optional: true - /esbuild-linux-ppc64le/0.14.38: + /esbuild-linux-ppc64le/0.14.39: resolution: { - integrity: sha512-mnbEm7o69gTl60jSuK+nn+pRsRHGtDPfzhrqEUXyCl7CTOCLtWN2bhK8bgsdp6J/2NyS/wHBjs1x8aBWwP2X9Q== + integrity: sha512-W/5ezaq+rQiQBThIjLMNjsuhPHg+ApVAdTz2LvcuesZFMsJoQAW2hutoyg47XxpWi7aEjJGrkS26qCJKhRn3QQ== } engines: { node: ">=12" } cpu: [ppc64] @@ -4085,10 +4077,10 @@ packages: dev: true optional: true - /esbuild-linux-riscv64/0.14.38: + /esbuild-linux-riscv64/0.14.39: resolution: { - integrity: sha512-+p6YKYbuV72uikChRk14FSyNJZ4WfYkffj6Af0/Tw63/6TJX6TnIKE+6D3xtEc7DeDth1fjUOEqm+ApKFXbbVQ== + integrity: sha512-IS48xeokcCTKeQIOke2O0t9t14HPvwnZcy+5baG13Z1wxs9ZrC5ig5ypEQQh4QMKxURD5TpCLHw2W42CLuVZaA== } engines: { node: ">=12" } cpu: [riscv64] @@ -4097,10 +4089,10 @@ packages: dev: true optional: true - /esbuild-linux-s390x/0.14.38: + /esbuild-linux-s390x/0.14.39: resolution: { - integrity: sha512-0zUsiDkGJiMHxBQ7JDU8jbaanUY975CdOW1YDrurjrM0vWHfjv9tLQsW9GSyEb/heSK1L5gaweRjzfUVBFoybQ== + integrity: sha512-zEfunpqR8sMomqXhNTFEKDs+ik7HC01m3M60MsEjZOqaywHu5e5682fMsqOlZbesEAAaO9aAtRBsU7CHnSZWyA== } engines: { node: ">=12" } cpu: [s390x] @@ -4109,10 +4101,10 @@ packages: dev: true optional: true - /esbuild-netbsd-64/0.14.38: + /esbuild-netbsd-64/0.14.39: resolution: { - integrity: sha512-cljBAApVwkpnJZfnRVThpRBGzCi+a+V9Ofb1fVkKhtrPLDYlHLrSYGtmnoTVWDQdU516qYI8+wOgcGZ4XIZh0Q== + integrity: sha512-Uo2suJBSIlrZCe4E0k75VDIFJWfZy+bOV6ih3T4MVMRJh1lHJ2UyGoaX4bOxomYN3t+IakHPyEoln1+qJ1qYaA== } engines: { node: ">=12" } cpu: [x64] @@ -4121,10 +4113,10 @@ packages: dev: true optional: true - /esbuild-openbsd-64/0.14.38: + /esbuild-openbsd-64/0.14.39: resolution: { - integrity: sha512-CDswYr2PWPGEPpLDUO50mL3WO/07EMjnZDNKpmaxUPsrW+kVM3LoAqr/CE8UbzugpEiflYqJsGPLirThRB18IQ== + integrity: sha512-secQU+EpgUPpYjJe3OecoeGKVvRMLeKUxSMGHnK+aK5uQM3n1FPXNJzyz1LHFOo0WOyw+uoCxBYdM4O10oaCAA== } engines: { node: ">=12" } cpu: [x64] @@ -4133,10 +4125,10 @@ packages: dev: true optional: true - /esbuild-sunos-64/0.14.38: + /esbuild-sunos-64/0.14.39: resolution: { - integrity: sha512-2mfIoYW58gKcC3bck0j7lD3RZkqYA7MmujFYmSn9l6TiIcAMpuEvqksO+ntBgbLep/eyjpgdplF7b+4T9VJGOA== + integrity: sha512-qHq0t5gePEDm2nqZLb+35p/qkaXVS7oIe32R0ECh2HOdiXXkj/1uQI9IRogGqKkK+QjDG+DhwiUw7QoHur/Rwg== } engines: { node: ">=12" } cpu: [x64] @@ -4145,10 +4137,10 @@ packages: dev: true optional: true - /esbuild-windows-32/0.14.38: + /esbuild-windows-32/0.14.39: resolution: { - integrity: sha512-L2BmEeFZATAvU+FJzJiRLFUP+d9RHN+QXpgaOrs2klshoAm1AE6Us4X6fS9k33Uy5SzScn2TpcgecbqJza1Hjw== + integrity: sha512-XPjwp2OgtEX0JnOlTgT6E5txbRp6Uw54Isorm3CwOtloJazeIWXuiwK0ONJBVb/CGbiCpS7iP2UahGgd2p1x+Q== } engines: { node: ">=12" } cpu: [ia32] @@ -4157,10 +4149,10 @@ packages: dev: true optional: true - /esbuild-windows-64/0.14.38: + /esbuild-windows-64/0.14.39: resolution: { - integrity: sha512-Khy4wVmebnzue8aeSXLC+6clo/hRYeNIm0DyikoEqX+3w3rcvrhzpoix0S+MF9vzh6JFskkIGD7Zx47ODJNyCw== + integrity: sha512-E2wm+5FwCcLpKsBHRw28bSYQw0Ikxb7zIMxw3OPAkiaQhLVr3dnVO8DofmbWhhf6b97bWzg37iSZ45ZDpLw7Ow== } engines: { node: ">=12" } cpu: [x64] @@ -4169,10 +4161,10 @@ packages: dev: true optional: true - /esbuild-windows-arm64/0.14.38: + /esbuild-windows-arm64/0.14.39: resolution: { - integrity: sha512-k3FGCNmHBkqdJXuJszdWciAH77PukEyDsdIryEHn9cKLQFxzhT39dSumeTuggaQcXY57UlmLGIkklWZo2qzHpw== + integrity: sha512-sBZQz5D+Gd0EQ09tZRnz/PpVdLwvp/ufMtJ1iDFYddDaPpZXKqPyaxfYBLs3ueiaksQ26GGa7sci0OqFzNs7KA== } engines: { node: ">=12" } cpu: [arm64] @@ -4190,35 +4182,35 @@ packages: requiresBuild: true dev: true - /esbuild/0.14.38: + /esbuild/0.14.39: resolution: { - integrity: sha512-12fzJ0fsm7gVZX1YQ1InkOE5f9Tl7cgf6JPYXRJtPIoE0zkWAbHdPHVPPaLi9tYAcEBqheGzqLn/3RdTOyBfcA== + integrity: sha512-2kKujuzvRWYtwvNjYDY444LQIA3TyJhJIX3Yo4+qkFlDDtGlSicWgeHVJqMUP/2sSfH10PGwfsj+O2ro1m10xQ== } engines: { node: ">=12" } hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-64: 0.14.38 - esbuild-android-arm64: 0.14.38 - esbuild-darwin-64: 0.14.38 - esbuild-darwin-arm64: 0.14.38 - esbuild-freebsd-64: 0.14.38 - esbuild-freebsd-arm64: 0.14.38 - esbuild-linux-32: 0.14.38 - esbuild-linux-64: 0.14.38 - esbuild-linux-arm: 0.14.38 - esbuild-linux-arm64: 0.14.38 - esbuild-linux-mips64le: 0.14.38 - esbuild-linux-ppc64le: 0.14.38 - esbuild-linux-riscv64: 0.14.38 - esbuild-linux-s390x: 0.14.38 - esbuild-netbsd-64: 0.14.38 - esbuild-openbsd-64: 0.14.38 - esbuild-sunos-64: 0.14.38 - esbuild-windows-32: 0.14.38 - esbuild-windows-64: 0.14.38 - esbuild-windows-arm64: 0.14.38 + esbuild-android-64: 0.14.39 + esbuild-android-arm64: 0.14.39 + esbuild-darwin-64: 0.14.39 + esbuild-darwin-arm64: 0.14.39 + esbuild-freebsd-64: 0.14.39 + esbuild-freebsd-arm64: 0.14.39 + esbuild-linux-32: 0.14.39 + esbuild-linux-64: 0.14.39 + esbuild-linux-arm: 0.14.39 + esbuild-linux-arm64: 0.14.39 + esbuild-linux-mips64le: 0.14.39 + esbuild-linux-ppc64le: 0.14.39 + esbuild-linux-riscv64: 0.14.39 + esbuild-linux-s390x: 0.14.39 + esbuild-netbsd-64: 0.14.39 + esbuild-openbsd-64: 0.14.39 + esbuild-sunos-64: 0.14.39 + esbuild-windows-32: 0.14.39 + esbuild-windows-64: 0.14.39 + esbuild-windows-arm64: 0.14.39 dev: true /escalade/3.1.1: @@ -4649,17 +4641,6 @@ packages: reusify: 1.0.4 dev: true - /fetch-blob/3.1.5: - resolution: - { - integrity: sha512-N64ZpKqoLejlrwkIAnb9iLSA3Vx/kjgzpcDhygcqJ2KKjky8nCgUQ+dzXtbrLaWZGZNmNfQTsiQ0weZ1svglHg== - } - engines: { node: ^12.20 || >= 14.13 } - dependencies: - node-domexception: 1.0.0 - web-streams-polyfill: 3.2.1 - dev: true - /file-entry-cache/6.0.1: resolution: { @@ -4767,16 +4748,6 @@ packages: mime-types: 2.1.35 dev: false - /formdata-polyfill/4.0.10: - resolution: - { - integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g== - } - engines: { node: ">=12.20.0" } - dependencies: - fetch-blob: 3.1.5 - dev: true - /fraction.js/4.2.0: resolution: { @@ -5832,6 +5803,16 @@ packages: sourcemap-codec: 1.4.8 dev: true + /magic-string/0.26.2: + resolution: + { + integrity: sha512-NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A== + } + engines: { node: ">=12" } + dependencies: + sourcemap-codec: 1.4.8 + dev: true + /make-error/1.3.6: resolution: { @@ -6113,24 +6094,11 @@ packages: } dev: false - /node-domexception/1.0.0: + /node-fetch-native/0.1.3: resolution: { - integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== + integrity: sha512-Jf1IQZdovUIv9E+5avmN6Sf+bND+rnMlODnBQhdE2VRyuWP9WgqZb/KEgPekh19DAN1X2C4vbS1VCOaz2OH19g== } - engines: { node: ">=10.5.0" } - dev: true - - /node-fetch/3.2.4: - resolution: - { - integrity: sha512-WvYJRN7mMyOLurFR2YpysQGuwYrJN+qrrpHjJDuKMcSPdfFccRUla/kng2mz6HWSBxJcqPbvatS6Gb4RhOzCJw== - } - engines: { node: ^12.20.0 || ^14.13.1 || >=16.0.0 } - dependencies: - data-uri-to-buffer: 4.0.0 - fetch-blob: 3.1.5 - formdata-polyfill: 4.0.10 dev: true /node-releases/2.0.4: @@ -6227,16 +6195,16 @@ packages: } dev: false - /ohmyfetch/0.4.16: + /ohmyfetch/0.4.17: resolution: { - integrity: sha512-QKzG0pPa+Rfqht8msM/GxH9P+TENMiNz32NK3Sdo4I950yxOuNzHdMZTYN+RDTE2nOvvdlCiPNFZKpOCY6jH5w== + integrity: sha512-jUpCDJIDlTZdS4PE3veoHIXoUSm2NRJfFMIROd29/qeOsbJEoEYBzJ6re+W1hskc44ej11IL//scfhckIcCN8Q== } dependencies: destr: 1.1.1 - node-fetch: 3.2.4 + node-fetch-native: 0.1.3 ufo: 0.8.4 - undici: 5.1.1 + undici: 5.2.0 dev: true /on-finished/2.3.0: @@ -8209,10 +8177,10 @@ packages: jiti: 1.13.0 dev: true - /undici/5.1.1: + /undici/5.2.0: resolution: { - integrity: sha512-CmK9JzLSMGx+2msOao8LhkKn3J7eKo2M50v0KZQ2XbiHcGqLS1HiIj01ceIm3jbUYlspw/FTSb6nMdSNyvVyaQ== + integrity: sha512-XY6+NS3WH9b3TKOHeNz2CjR+qrVz/k4fO9g3etPpLozRvULoQmZ1+dk9JbIz40ehn27xzFk4jYVU2MU3Nle62A== } engines: { node: ">=12.18" } dev: true @@ -8251,27 +8219,27 @@ packages: engines: { node: ">= 10.0.0" } dev: true - /unocss/0.33.2_vite@2.9.8: + /unocss/0.33.4_vite@2.9.9: resolution: { - integrity: sha512-ISGmthl9kNPujda/Yt25irdV9s9F3hr8MWpd/NE7Kv/qkZJC3/FvO/l/9d5ggkbgsAuGQrsfuaQnxT2p4k9Yug== + integrity: sha512-FZHuWa+6U34gvTT+ZPR/sLpuoQAQlhw5HRTSF1a4k0pVueyaTVl5VjQ41Wa7EX4PjKaf0DNiAdMj9y7akbj+7A== } engines: { node: ">=14" } dependencies: - "@unocss/cli": 0.33.2 - "@unocss/core": 0.33.2 - "@unocss/preset-attributify": 0.33.2 - "@unocss/preset-icons": 0.33.2 - "@unocss/preset-mini": 0.33.2 - "@unocss/preset-typography": 0.33.2 - "@unocss/preset-uno": 0.33.2 - "@unocss/preset-web-fonts": 0.33.2 - "@unocss/preset-wind": 0.33.2 - "@unocss/reset": 0.33.2 - "@unocss/transformer-compile-class": 0.33.2 - "@unocss/transformer-directives": 0.33.2 - "@unocss/transformer-variant-group": 0.33.2 - "@unocss/vite": 0.33.2_vite@2.9.8 + "@unocss/cli": 0.33.4 + "@unocss/core": 0.33.4 + "@unocss/preset-attributify": 0.33.4 + "@unocss/preset-icons": 0.33.4 + "@unocss/preset-mini": 0.33.4 + "@unocss/preset-typography": 0.33.4 + "@unocss/preset-uno": 0.33.4 + "@unocss/preset-web-fonts": 0.33.4 + "@unocss/preset-wind": 0.33.4 + "@unocss/reset": 0.33.4 + "@unocss/transformer-compile-class": 0.33.4 + "@unocss/transformer-directives": 0.33.4 + "@unocss/transformer-variant-group": 0.33.4 + "@unocss/vite": 0.33.4_vite@2.9.9 transitivePeerDependencies: - supports-color - vite @@ -8345,7 +8313,7 @@ packages: spdx-expression-parse: 3.0.1 dev: true - /vite-plugin-mock/2.9.6_b36be780fcabf2452078cfac5d8ea549: + /vite-plugin-mock/2.9.6_95c4cc53f4075e6399c4c5caf758f11f: resolution: { integrity: sha512-/Rm59oPppe/ncbkSrUuAxIQihlI2YcBmnbR4ST1RA2VzM1C0tEQc1KlbQvnUGhXECAGTaQN2JyasiwXP6EtKgg== @@ -8365,7 +8333,7 @@ packages: fast-glob: 3.2.11 mockjs: 1.1.0 path-to-regexp: 6.2.1 - vite: 2.9.8_sass@1.51.0 + vite: 2.9.9_sass@1.51.0 transitivePeerDependencies: - rollup - supports-color @@ -8388,10 +8356,10 @@ packages: svgo: 2.8.0 dev: true - /vite/2.9.8_sass@1.51.0: + /vite/2.9.9_sass@1.51.0: resolution: { - integrity: sha512-zsBGwn5UT3YS0NLSJ7hnR54+vUKfgzMUh/Z9CxF1YKEBVIe213+63jrFLmZphgGI5zXwQCSmqIdbPuE8NJywPw== + integrity: sha512-ffaam+NgHfbEmfw/Vuh6BHKKlI/XIAhxE5QSS7gFLIngxg171mg1P3a4LSRME0z2ZU1ScxoKzphkipcYwSD5Ew== } engines: { node: ">=12.2.0" } hasBin: true @@ -8407,7 +8375,7 @@ packages: stylus: optional: true dependencies: - esbuild: 0.14.38 + esbuild: 0.14.39 postcss: 8.4.13 resolve: 1.22.0 rollup: 2.72.1 @@ -8598,14 +8566,6 @@ packages: loose-envify: 1.4.0 dev: false - /web-streams-polyfill/3.2.1: - resolution: - { - integrity: sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q== - } - engines: { node: ">= 8" } - dev: true - /which-module/2.0.0: resolution: { integrity: sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= } dev: false diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue index 572ba6435..decd9c13a 100644 --- a/src/layout/components/setting/index.vue +++ b/src/layout/components/setting/index.vue @@ -17,6 +17,7 @@ import { emitter } from "/@/utils/mitt"; import { templateRef } from "@vueuse/core"; import { debounce } from "/@/utils/debounce"; import { themeColorsType } from "../../types"; +import { routerArrays } from "/@/layout/types"; import { useAppStoreHook } from "/@/store/modules/app"; import { shadeBgColor } from "../../theme/element-plus"; import { useEpThemeStoreHook } from "/@/store/modules/epTheme"; @@ -151,16 +152,7 @@ function onReset() { useMultiTagsStoreHook().multiTagsCacheChange(MultiTagsCache); toggleClass(Grey, "html-grey", document.querySelector("html")); toggleClass(Weak, "html-weakness", document.querySelector("html")); - useMultiTagsStoreHook().handleTags("equal", [ - { - path: "/welcome", - parentPath: "/", - meta: { - title: "menus.hshome", - icon: "home-filled" - } - } - ]); + useMultiTagsStoreHook().handleTags("equal", routerArrays); storageLocal.clear(); storageSession.clear(); } diff --git a/src/layout/components/tag/index.vue b/src/layout/components/tag/index.vue index 6c3543f28..ce0a22fd9 100644 --- a/src/layout/components/tag/index.vue +++ b/src/layout/components/tag/index.vue @@ -22,6 +22,7 @@ import closeRight from "/@/assets/svg/close_right.svg?component"; import { useI18n } from "vue-i18n"; import { emitter } from "/@/utils/mitt"; +import { routerArrays } from "/@/layout/types"; import { storageLocal } from "/@/utils/storage"; import { useRoute, useRouter } from "vue-router"; import { isEqual, isEmpty } from "lodash-unified"; @@ -313,17 +314,7 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) { other?: boolean ): void => { if (other) { - useMultiTagsStoreHook().handleTags("equal", [ - { - path: "/welcome", - parentPath: "/", - meta: { - title: "menus.hshome", - icon: "home-filled" - } - }, - obj - ]); + useMultiTagsStoreHook().handleTags("equal", [routerArrays[0], obj]); } else { // @ts-ignore delAliveRouteList = useMultiTagsStoreHook().handleTags("splice", "", { diff --git a/src/store/modules/multiTags.ts b/src/store/modules/multiTags.ts index bab831315..525f12f89 100644 --- a/src/store/modules/multiTags.ts +++ b/src/store/modules/multiTags.ts @@ -2,6 +2,7 @@ import { defineStore } from "pinia"; import { store } from "/@/store"; import { isUrl } from "/@/utils/is"; import { isEqual } from "lodash-unified"; +import { routerArrays } from "/@/layout/types"; import { storageLocal } from "/@/utils/storage"; import { multiType, positionType } from "./types"; @@ -11,16 +12,7 @@ export const useMultiTagsStore = defineStore({ // 存储标签页信息（路由信息） multiTags: storageLocal.getItem("responsive-configure").multiTagsCache ? storageLocal.getItem("responsive-tags") - : [ - { - path: "/welcome", - parentPath: "/", - meta: { - title: "menus.hshome", - icon: "home-filled" - } - } - ], + : routerArrays, multiTagsCache: storageLocal.getItem("responsive-configure").multiTagsCache }), getters: { diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 2b3dbad7b..806818227 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -2,6 +2,7 @@ import { defineStore } from "pinia"; import { store } from "/@/store"; import { userType } from "./types"; import { router } from "/@/router"; +import { routerArrays } from "/@/layout/types"; import { storageSession } from "/@/utils/storage"; import { getLogin, refreshToken } from "/@/api/user"; import { getToken, setToken, removeToken } from "/@/utils/auth"; @@ -62,16 +63,7 @@ export const useUserStore = defineStore({ this.name = ""; removeToken(); storageSession.clear(); - useMultiTagsStoreHook().handleTags("equal", [ - { - path: "/welcome", - parentPath: "/", - meta: { - title: "menus.hshome", - icon: "home-filled" - } - } - ]); + useMultiTagsStoreHook().handleTags("equal", routerArrays); router.push("/login"); }, // 刷新token diff --git a/src/utils/storage/responsive.ts b/src/utils/storage/responsive.ts index f36b980c6..0c6b56f7f 100644 --- a/src/utils/storage/responsive.ts +++ b/src/utils/storage/responsive.ts @@ -1,6 +1,7 @@ // 响应式storage import { App } from "vue"; import Storage from "responsive-storage"; +import { routerArrays } from "/@/layout/types"; export const injectResponsiveStorage = (app: App, config: ServerConfigs) => { const configObj = Object.assign( @@ -40,16 +41,7 @@ export const injectResponsiveStorage = (app: App, config: ServerConfigs) => { // 默认显示首页tag tags: { type: Array, - default: Storage.getData(undefined, "tags") ?? [ - { - path: "/welcome", - parentPath: "/", - meta: { - title: "menus.hshome", - icon: "home-filled" - } - } - ] + default: Storage.getData(undefined, "tags") ?? routerArrays } } : {}