release: update 3.6.4

style: 删除多余样式（请务必删除）
perf: 将baseURL和全局环境代理删除，可直接在vite.config.ts编写，即方便又支持多个代理地址
2025-11-03 13:44:47 +08:00 · 2022-11-10 12:17:05 +08:00 · 2022-11-10 12:11:16 +08:00 · 2022-11-10 11:47:07 +08:00 · 2022-11-09 01:17:19 +08:00 · 2022-11-08 18:14:33 +08:00
38 changed files with 293 additions and 738 deletions
--- a/.env.development
+++ b/.env.development
@@ -4,11 +4,5 @@ VITE_PORT = 8848
 # 开发环境读取配置文件路径
 VITE_PUBLIC_PATH = /

-# 开发环境代理
-VITE_PROXY_DOMAIN = /api
-
 # 开发环境路由历史模式
 VITE_ROUTER_HISTORY = "hash"
-
-# 开发环境后端地址
-VITE_PROXY_DOMAIN_REAL = "http://127.0.0.1:3000"
--- a/.env.production
+++ b/.env.production
@@ -4,9 +4,6 @@ VITE_PUBLIC_PATH = /
 # 线上环境路由历史模式
 VITE_ROUTER_HISTORY = "hash"

-# 线上环境后端地址
-VITE_PROXY_DOMAIN_REAL = ""
-
 # 是否为打包后的文件提供传统浏览器兼容性支持 支持 true 不支持 false
 VITE_LEGACY = false

--- a/.env.staging
+++ b/.env.staging
@@ -7,16 +7,13 @@ VITE_PUBLIC_PATH = /
 # 线上环境路由历史模式
 VITE_ROUTER_HISTORY = "hash"

-# 线上环境后端地址
-VITE_PROXY_DOMAIN_REAL = ""
-
 # 是否为打包后的文件提供传统浏览器兼容性支持 支持 true 不支持 false
 VITE_LEGACY = false

 # 是否在打包时使用cdn替换本地库 替换 true 不替换 false
-VITE_CDN = false
+VITE_CDN = true

 # 是否启用gzip压缩或brotli压缩（分两种情况，删除原始文件和不删除原始文件）
 # 压缩时不删除原始文件的配置：gzip、brotli、both（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
 # 压缩时删除原始文件的配置：gzip-clear、brotli-clear、both-clear（同时开启 gzip 与 brotli 压缩）、none（不开启压缩，默认）
-VITE_COMPRESSION = "none"
+VITE_COMPRESSION = "both-clear"
--- a/CHANGELOG.en_US.md
+++ b/CHANGELOG.en_US.md
@@ -1,3 +1,18 @@
+# 3.6.4 (2022-11-10)
+
+### 🎫 Feat
+
+- Menu icon `icon` supports using online icons
+
+### 🐞 Bug fixes
+
+- Fixed `vxe-button` font color issue after mouse overlay and some other style issues
+
+### 🍏 Perf
+
+- Optimize the routing guard, if you have logged in and there is login information, you cannot jump to the routing whitelist, but continue to stay on the current page
+- Removed `baseURL` and global environment proxy, and can be written directly in `vite.config.ts`, which is convenient and supports multiple proxy addresses
+
 # 3.6.3 (2022-11-01)

 ### 🎫 Feat
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# 3.6.4 (2022-11-10)
+
+### 🎫 Feat
+
+- Menu icon `icon` supports using online icons
+
+### 🐞 Bug fixes
+
+- Fixed `vxe-button` font color issue after mouse overlay and some other style issues
+
+### 🍏 Perf
+
+- Optimize the routing guard, if you have logged in and there is login information, you cannot jump to the routing whitelist, but continue to stay on the current page
+- Removed `baseURL` and global environment proxy, and can be written directly in `vite.config.ts`, which is convenient and supports multiple proxy addresses
+
 # 3.6.3 (2022-11-01)

 ### 🎫 Feat
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,3 +1,18 @@
+# 3.6.4 (2022-11-10)
+
+### 🎫 Feat
+
+- 菜单图标 `icon` 支持使用在线图标
+
+### 🐞 Bug fixes
+
+- 修复 `vxe-button` 鼠标覆盖后字体颜色问题以及一些别的样式问题
+
+### 🍏 Perf
+
+- 优化路由守卫，如果已经登录并存在登录信息后不能跳转到路由白名单，而是继续保持在当前页面
+- 将 `baseURL` 和全局环境代理删除，可直接在 `vite.config.ts` 编写，即方便又支持多个代理地址
+
 # 3.6.3 (2022-11-01)

 ### 🎫 Feat
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -8,18 +8,17 @@

 ## Introduction

-vue-pure-admin is a free and open source middle and back-end template. Using the latest `vue3` `vite2` `Element-Plus` `TypeScript` and other mainstream technology development, the out-of-the-box middle and back-end front-end solutions can also be used for learning reference.
+`vue-pure-admin` is an open source free and out-of-the-box middle and background management system template. Developed using the latest mainstream technologies such as `Vue3`, `Vite`, `Element-Plus`, `TypeScript`, `Pinia`, `Tailwindcss`

 ## Supporting Video

 - [Click Watch Tutorial](https://www.bilibili.com/video/BV1534y1S7HV)
 - [Click Watch UI Design](https://www.bilibili.com/video/BV17g411T7rq)

-## Docs
+## Docs (support `PWA` fast, offline access)

- [Click me to view the domestic documentation site](http://yiming_chang.gitee.io/pure-admin-doc)
- [Click me to view foreign document site 1](https://xiaoxian521.github.io/pure-admin-doc)
- [Click me to view foreign document site 2](https://pure-admin-doc.vercel.app)
+- [Click me to view the domestic documentation site](https://yiming_chang.gitee.io/pure-admin-doc)
+- [Click me to view foreign document site](https://xiaoxian521.github.io/pure-admin-doc)

 ## Thin version (offering non-internationalized and internationalized versions)

@@ -32,9 +31,8 @@ vue-pure-admin is a free and open source middle and back-end template. Using the

 ## Preview

- [Click me to view the domestic preview station](http://yiming_chang.gitee.io/vue-pure-admin)
- [Click me to view foreign preview site 1](https://xiaoxian521.github.io/vue-pure-admin)
- [Click me to view foreign preview station 2](https://vue-pure-admin.vercel.app)
+- [Click me to view the domestic preview station](https://yiming_chang.gitee.io/vue-pure-admin)
+- [Click me to view foreign preview site](https://xiaoxian521.github.io/vue-pure-admin)

 - PC
 <p align="center">
--- a/README.md
+++ b/README.md
@@ -8,18 +8,17 @@

 ## 简介

-vue-pure-admin 是一个免费开源的中后台模版。使用了最新的`vue3` `vite2` `Element-Plus` `TypeScript`等主流技术开发，开箱即用的中后台前端解决方案，也可用于学习参考。
+`vue-pure-admin` 是一款开源免费且开箱即用的中后台管理系统模版。使用了最新的 `Vue3`、`Vite`、`Element-Plus`、`TypeScript`、`Pinia`、`Tailwindcss` 等主流技术开发

 ## 配套视频

 - [点我查看教程](https://www.bilibili.com/video/BV1534y1S7HV)
 - [点我查看 UI 设计](https://www.bilibili.com/video/BV17g411T7rq)

-## 配套文档
+## 配套文档（支持 `PWA` 快速、离线访问）

- [点我查看国内文档站](http://yiming_chang.gitee.io/pure-admin-doc)
- [点我查看国外文档站 1](https://xiaoxian521.github.io/pure-admin-doc)
- [点我查看国外文档站 2](https://pure-admin-doc.vercel.app)
+- [点我查看国内文档站](https://yiming_chang.gitee.io/pure-admin-doc)
+- [点我查看国外文档站](https://xiaoxian521.github.io/pure-admin-doc)

 ## 精简版（提供非国际化、国际化两个版本选择）

@@ -32,9 +31,8 @@ vue-pure-admin 是一个免费开源的中后台模版。使用了最新的`vue3

 ## 预览

- [点我查看国内预览站](http://yiming_chang.gitee.io/vue-pure-admin)
- [点我查看国外预览站 1](https://xiaoxian521.github.io/vue-pure-admin)
- [点我查看国外预览站 2](https://vue-pure-admin.vercel.app)
+- [点我查看国内预览站](https://yiming_chang.gitee.io/vue-pure-admin)
+- [点我查看国外预览站](https://xiaoxian521.github.io/vue-pure-admin)

 - PC 端
 <p align="center">
--- a/build/index.ts
+++ b/build/index.ts
@@ -4,8 +4,6 @@ const warpperEnv = (envConf: Recordable): ViteEnv => {
  const ret: ViteEnv = {
    VITE_PORT: 8848,
    VITE_PUBLIC_PATH: "",
-    VITE_PROXY_DOMAIN: "",
-    VITE_PROXY_DOMAIN_REAL: "",
    VITE_ROUTER_HISTORY: "",
    VITE_LEGACY: false,
    VITE_CDN: false,
@@ -30,14 +28,9 @@ const warpperEnv = (envConf: Recordable): ViteEnv => {
  return ret;
 };

-/** 跨域代理重写 */
-const regExps = (value: string, reg: string): string => {
-  return value.replace(new RegExp(`^${reg}`, "g"), "");
-};
-
 /** 环境变量 */
 const loadEnv = (): ViteEnv => {
  return import.meta.env;
 };

-export { warpperEnv, regExps, loadEnv };
+export { warpperEnv, loadEnv };
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "vue-pure-admin",
-  "version": "3.6.3",
+  "version": "3.6.4",
  "private": true,
  "scripts": {
    "dev": "NODE_OPTIONS=--max-old-space-size=4096 vite",
@@ -117,9 +117,9 @@
    "@vue/eslint-config-prettier": "^7.0.0",
    "@vue/eslint-config-typescript": "^10.0.0",
    "@vue/runtime-core": "^3.2.40",
-    "autoprefixer": "^10.4.12",
+    "autoprefixer": "^10.4.13",
    "cloc": "^2.10.0",
-    "cssnano": "^5.1.13",
+    "cssnano": "^5.1.14",
    "eslint": "^8.8.0",
    "eslint-plugin-prettier": "^4.0.0",
    "eslint-plugin-vue": "^8.4.1",
@@ -127,14 +127,14 @@
    "husky": "^7.0.4",
    "lint-staged": "11.1.2",
    "picocolors": "^1.0.0",
-    "postcss": "^8.4.17",
+    "postcss": "^8.4.18",
    "postcss-html": "^1.5.0",
    "postcss-import": "^15.0.0",
    "postcss-scss": "^4.0.5",
    "prettier": "^2.5.1",
    "pretty-quick": "3.1.1",
    "rimraf": "3.0.2",
-    "rollup-plugin-visualizer": "^5.8.2",
+    "rollup-plugin-visualizer": "^5.8.3",
    "sass": "^1.53.0",
    "sass-loader": "^13.0.2",
    "stylelint": "^14.3.0",
@@ -143,15 +143,15 @@
    "stylelint-config-recommended": "^6.0.0",
    "stylelint-config-standard": "^24.0.0",
    "stylelint-order": "^5.0.0",
-    "tailwindcss": "^3.2.1",
-    "terser": "^5.15.0",
+    "tailwindcss": "^3.2.2",
+    "terser": "^5.15.1",
    "typescript": "^4.7.4",
    "unplugin-vue-define-options": "0.7.3",
    "vite": "^3.1.8",
    "vite-plugin-cdn-import": "^0.3.5",
    "vite-plugin-compression": "^0.5.1",
    "vite-plugin-mock": "^2.9.6",
-    "vite-plugin-remove-console": "^1.1.0",
+    "vite-plugin-remove-console": "^1.2.0",
    "vite-svg-loader": "^3.6.0",
    "vue-eslint-parser": "^8.2.0",
    "vue-tsc": "^0.40.13"
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -47,12 +47,12 @@ specifiers:
  "@wangeditor/editor": ^5.1.21
  "@wangeditor/editor-for-vue": ^5.1.12
  animate.css: ^4.1.1
-  autoprefixer: ^10.4.12
+  autoprefixer: ^10.4.13
  axios: ^1.1.3
  china-area-data: ^5.0.1
  cloc: ^2.10.0
  cropperjs: ^1.5.12
-  cssnano: ^5.1.13
+  cssnano: ^5.1.14
  dayjs: ^1.11.5
  driver.js: ^0.9.8
  echarts: ^5.4.0
@@ -76,7 +76,7 @@ specifiers:
  path: ^0.12.7
  picocolors: ^1.0.0
  pinia: ^2.0.23
-  postcss: ^8.4.17
+  postcss: ^8.4.18
  postcss-html: ^1.5.0
  postcss-import: ^15.0.0
  postcss-scss: ^4.0.5
@@ -87,7 +87,7 @@ specifiers:
  resize-observer-polyfill: ^1.5.1
  responsive-storage: ^2.1.0
  rimraf: 3.0.2
-  rollup-plugin-visualizer: ^5.8.2
+  rollup-plugin-visualizer: ^5.8.3
  sass: ^1.53.0
  sass-loader: ^13.0.2
  sortablejs: ^1.15.0
@@ -98,8 +98,8 @@ specifiers:
  stylelint-config-standard: ^24.0.0
  stylelint-order: ^5.0.0
  swiper: ^8.4.4
-  tailwindcss: ^3.2.1
-  terser: ^5.15.0
+  tailwindcss: ^3.2.2
+  terser: ^5.15.1
  typeit: ^8.7.0
  typescript: ^4.7.4
  unplugin-vue-define-options: 0.7.3
@@ -108,7 +108,7 @@ specifiers:
  vite-plugin-cdn-import: ^0.3.5
  vite-plugin-compression: ^0.5.1
  vite-plugin-mock: ^2.9.6
-  vite-plugin-remove-console: ^1.1.0
+  vite-plugin-remove-console: ^1.2.0
  vite-svg-loader: ^3.6.0
  vue: ^3.2.40
  vue-eslint-parser: ^8.2.0
@@ -217,9 +217,9 @@ devDependencies:
  "@vue/eslint-config-prettier": 7.0.0_eslint@8.25.0+prettier@2.7.1
  "@vue/eslint-config-typescript": 10.0.0_07d3deb2283d82fbf0376bf257049d49
  "@vue/runtime-core": 3.2.40
-  autoprefixer: 10.4.12_postcss@8.4.17
+  autoprefixer: 10.4.13_postcss@8.4.18
  cloc: 2.10.0
-  cssnano: 5.1.13_postcss@8.4.17
+  cssnano: 5.1.14_postcss@8.4.18
  eslint: 8.25.0
  eslint-plugin-prettier: 4.2.1_eslint@8.25.0+prettier@2.7.1
  eslint-plugin-vue: 8.7.1_eslint@8.25.0
@@ -227,14 +227,14 @@ devDependencies:
  husky: 7.0.4
  lint-staged: 11.1.2
  picocolors: 1.0.0
-  postcss: 8.4.17
+  postcss: 8.4.18
  postcss-html: 1.5.0
-  postcss-import: 15.0.0_postcss@8.4.17
-  postcss-scss: 4.0.5_postcss@8.4.17
+  postcss-import: 15.0.0_postcss@8.4.18
+  postcss-scss: 4.0.5_postcss@8.4.18
  prettier: 2.7.1
  pretty-quick: 3.1.1_prettier@2.7.1
  rimraf: 3.0.2
-  rollup-plugin-visualizer: 5.8.2
+  rollup-plugin-visualizer: 5.8.3
  sass: 1.55.0
  sass-loader: 13.1.0_sass@1.55.0
  stylelint: 14.13.0
@@ -243,7 +243,7 @@ devDependencies:
  stylelint-config-recommended: 6.0.0_stylelint@14.13.0
  stylelint-config-standard: 24.0.0_stylelint@14.13.0
  stylelint-order: 5.0.0_stylelint@14.13.0
-  tailwindcss: 3.2.1
+  tailwindcss: 3.2.2
  terser: 5.15.1
  typescript: 4.8.4
  unplugin-vue-define-options: 0.7.3_vite@3.1.8+vue@3.2.40
@@ -251,7 +251,7 @@ devDependencies:
  vite-plugin-cdn-import: 0.3.5
  vite-plugin-compression: 0.5.1_vite@3.1.8
  vite-plugin-mock: 2.9.6_mockjs@1.1.0+vite@3.1.8
-  vite-plugin-remove-console: 1.1.0
+  vite-plugin-remove-console: 1.2.0
  vite-svg-loader: 3.6.0
  vue-eslint-parser: 8.3.0_eslint@8.25.0
  vue-tsc: 0.40.13_typescript@4.8.4
@@ -904,7 +904,7 @@ packages:
      chalk: 4.1.2
    dev: true

-  /@csstools/selector-specificity/2.0.2_cd239324a5aeb6e3cee0fb61f6a33448:
+  /@csstools/selector-specificity/2.0.2_1d546e2941f6b4ca889831b9fbdc79d8:
    resolution:
      {
        integrity: sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg==
@@ -914,7 +914,7 @@ packages:
      postcss: ^8.2
      postcss-selector-parser: ^6.0.10
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-selector-parser: 6.0.10
    dev: true

@@ -2067,7 +2067,7 @@ packages:
      "@vue/shared": 3.2.40
      estree-walker: 2.0.2
      magic-string: 0.25.9
-      postcss: 8.4.17
+      postcss: 8.4.18
      source-map: 0.6.1

  /@vue/compiler-ssr/3.2.40:
@@ -2531,10 +2531,10 @@ packages:
    dependencies:
      cac: 6.7.14
      color: 4.2.3
-      cssnano: 5.1.13_postcss@8.4.17
-      cssnano-preset-lite: 2.1.3_postcss@8.4.17
+      cssnano: 5.1.14_postcss@8.4.18
+      cssnano-preset-lite: 2.1.3_postcss@8.4.18
      fs-extra: 10.1.0
-      postcss: 8.4.17
+      postcss: 8.4.18
      prettier: 2.7.1
      uuid: 8.3.2
    dev: true
@@ -2846,10 +2846,10 @@ packages:
      }
    dev: false

-  /autoprefixer/10.4.12_postcss@8.4.17:
+  /autoprefixer/10.4.13_postcss@8.4.18:
    resolution:
      {
-        integrity: sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==
+        integrity: sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==
      }
    engines: { node: ^10 || ^12 || >=14 }
    hasBin: true
@@ -2857,11 +2857,11 @@ packages:
      postcss: ^8.1.0
    dependencies:
      browserslist: 4.21.4
-      caniuse-lite: 1.0.30001418
+      caniuse-lite: 1.0.30001431
      fraction.js: 4.2.0
      normalize-range: 0.1.2
      picocolors: 1.0.0
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

@@ -2939,7 +2939,7 @@ packages:
    engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 }
    hasBin: true
    dependencies:
-      caniuse-lite: 1.0.30001418
+      caniuse-lite: 1.0.30001431
      electron-to-chromium: 1.4.276
      node-releases: 2.0.6
      update-browserslist-db: 1.0.10_browserslist@4.21.4
@@ -3028,15 +3028,15 @@ packages:
      }
    dependencies:
      browserslist: 4.21.4
-      caniuse-lite: 1.0.30001418
+      caniuse-lite: 1.0.30001431
      lodash.memoize: 4.1.2
      lodash.uniq: 4.5.0
    dev: true

-  /caniuse-lite/1.0.30001418:
+  /caniuse-lite/1.0.30001431:
    resolution:
      {
-        integrity: sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg==
+        integrity: sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==
      }
    dev: true

@@ -3421,7 +3421,7 @@ packages:
      which: 2.0.2
    dev: true

-  /css-declaration-sorter/6.3.1_postcss@8.4.17:
+  /css-declaration-sorter/6.3.1_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==
@@ -3430,7 +3430,7 @@ packages:
    peerDependencies:
      postcss: ^8.0.9
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

  /css-functions-list/3.1.0:
@@ -3482,48 +3482,48 @@ packages:
    hasBin: true
    dev: true

-  /cssnano-preset-default/5.2.12_postcss@8.4.17:
+  /cssnano-preset-default/5.2.13_postcss@8.4.18:
    resolution:
      {
-        integrity: sha512-OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew==
+        integrity: sha512-PX7sQ4Pb+UtOWuz8A1d+Rbi+WimBIxJTRyBdgGp1J75VU0r/HFQeLnMYgHiCAp6AR4rqrc7Y4R+1Rjk3KJz6DQ==
      }
    engines: { node: ^10 || ^12 || >=14.0 }
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      css-declaration-sorter: 6.3.1_postcss@8.4.17
-      cssnano-utils: 3.1.0_postcss@8.4.17
-      postcss: 8.4.17
-      postcss-calc: 8.2.4_postcss@8.4.17
-      postcss-colormin: 5.3.0_postcss@8.4.17
-      postcss-convert-values: 5.1.2_postcss@8.4.17
-      postcss-discard-comments: 5.1.2_postcss@8.4.17
-      postcss-discard-duplicates: 5.1.0_postcss@8.4.17
-      postcss-discard-empty: 5.1.1_postcss@8.4.17
-      postcss-discard-overridden: 5.1.0_postcss@8.4.17
-      postcss-merge-longhand: 5.1.6_postcss@8.4.17
-      postcss-merge-rules: 5.1.2_postcss@8.4.17
-      postcss-minify-font-values: 5.1.0_postcss@8.4.17
-      postcss-minify-gradients: 5.1.1_postcss@8.4.17
-      postcss-minify-params: 5.1.3_postcss@8.4.17
-      postcss-minify-selectors: 5.2.1_postcss@8.4.17
-      postcss-normalize-charset: 5.1.0_postcss@8.4.17
-      postcss-normalize-display-values: 5.1.0_postcss@8.4.17
-      postcss-normalize-positions: 5.1.1_postcss@8.4.17
-      postcss-normalize-repeat-style: 5.1.1_postcss@8.4.17
-      postcss-normalize-string: 5.1.0_postcss@8.4.17
-      postcss-normalize-timing-functions: 5.1.0_postcss@8.4.17
-      postcss-normalize-unicode: 5.1.0_postcss@8.4.17
-      postcss-normalize-url: 5.1.0_postcss@8.4.17
-      postcss-normalize-whitespace: 5.1.1_postcss@8.4.17
-      postcss-ordered-values: 5.1.3_postcss@8.4.17
-      postcss-reduce-initial: 5.1.0_postcss@8.4.17
-      postcss-reduce-transforms: 5.1.0_postcss@8.4.17
-      postcss-svgo: 5.1.0_postcss@8.4.17
-      postcss-unique-selectors: 5.1.1_postcss@8.4.17
+      css-declaration-sorter: 6.3.1_postcss@8.4.18
+      cssnano-utils: 3.1.0_postcss@8.4.18
+      postcss: 8.4.18
+      postcss-calc: 8.2.4_postcss@8.4.18
+      postcss-colormin: 5.3.0_postcss@8.4.18
+      postcss-convert-values: 5.1.3_postcss@8.4.18
+      postcss-discard-comments: 5.1.2_postcss@8.4.18
+      postcss-discard-duplicates: 5.1.0_postcss@8.4.18
+      postcss-discard-empty: 5.1.1_postcss@8.4.18
+      postcss-discard-overridden: 5.1.0_postcss@8.4.18
+      postcss-merge-longhand: 5.1.7_postcss@8.4.18
+      postcss-merge-rules: 5.1.3_postcss@8.4.18
+      postcss-minify-font-values: 5.1.0_postcss@8.4.18
+      postcss-minify-gradients: 5.1.1_postcss@8.4.18
+      postcss-minify-params: 5.1.4_postcss@8.4.18
+      postcss-minify-selectors: 5.2.1_postcss@8.4.18
+      postcss-normalize-charset: 5.1.0_postcss@8.4.18
+      postcss-normalize-display-values: 5.1.0_postcss@8.4.18
+      postcss-normalize-positions: 5.1.1_postcss@8.4.18
+      postcss-normalize-repeat-style: 5.1.1_postcss@8.4.18
+      postcss-normalize-string: 5.1.0_postcss@8.4.18
+      postcss-normalize-timing-functions: 5.1.0_postcss@8.4.18
+      postcss-normalize-unicode: 5.1.1_postcss@8.4.18
+      postcss-normalize-url: 5.1.0_postcss@8.4.18
+      postcss-normalize-whitespace: 5.1.1_postcss@8.4.18
+      postcss-ordered-values: 5.1.3_postcss@8.4.18
+      postcss-reduce-initial: 5.1.1_postcss@8.4.18
+      postcss-reduce-transforms: 5.1.0_postcss@8.4.18
+      postcss-svgo: 5.1.0_postcss@8.4.18
+      postcss-unique-selectors: 5.1.1_postcss@8.4.18
    dev: true

-  /cssnano-preset-lite/2.1.3_postcss@8.4.17:
+  /cssnano-preset-lite/2.1.3_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-samvnCll/DUVZu0Qc+JH36nt7dlaOT7WjOgg8SbLJ78sp51JZ12s2hyerxrarjPBG4O53rErUtOY2IYLYgBGEQ==
@@ -3532,14 +3532,14 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      cssnano-utils: 3.1.0_postcss@8.4.17
-      postcss: 8.4.17
-      postcss-discard-comments: 5.1.2_postcss@8.4.17
-      postcss-discard-empty: 5.1.1_postcss@8.4.17
-      postcss-normalize-whitespace: 5.1.1_postcss@8.4.17
+      cssnano-utils: 3.1.0_postcss@8.4.18
+      postcss: 8.4.18
+      postcss-discard-comments: 5.1.2_postcss@8.4.18
+      postcss-discard-empty: 5.1.1_postcss@8.4.18
+      postcss-normalize-whitespace: 5.1.1_postcss@8.4.18
    dev: true

-  /cssnano-utils/3.1.0_postcss@8.4.17:
+  /cssnano-utils/3.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
@@ -3548,21 +3548,21 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

-  /cssnano/5.1.13_postcss@8.4.17:
+  /cssnano/5.1.14_postcss@8.4.18:
    resolution:
      {
-        integrity: sha512-S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ==
+        integrity: sha512-Oou7ihiTocbKqi0J1bB+TRJIQX5RMR3JghA8hcWSw9mjBLQ5Y3RWqEDoYG3sRNlAbCIXpqMoZGbq5KDR3vdzgw==
      }
    engines: { node: ^10 || ^12 || >=14.0 }
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      cssnano-preset-default: 5.2.12_postcss@8.4.17
+      cssnano-preset-default: 5.2.13_postcss@8.4.18
      lilconfig: 2.0.6
-      postcss: 8.4.17
+      postcss: 8.4.18
      yaml: 1.10.2
    dev: true

@@ -6683,7 +6683,7 @@ packages:
      tslib: 2.4.0
    dev: false

-  /postcss-calc/8.2.4_postcss@8.4.17:
+  /postcss-calc/8.2.4_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==
@@ -6691,12 +6691,12 @@ packages:
    peerDependencies:
      postcss: ^8.2.2
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-selector-parser: 6.0.10
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-colormin/5.3.0_postcss@8.4.17:
+  /postcss-colormin/5.3.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==
@@ -6708,25 +6708,25 @@ packages:
      browserslist: 4.21.4
      caniuse-api: 3.0.0
      colord: 2.9.3
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-convert-values/5.1.2_postcss@8.4.17:
+  /postcss-convert-values/5.1.3_postcss@8.4.18:
    resolution:
      {
-        integrity: sha512-c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g==
+        integrity: sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==
      }
    engines: { node: ^10 || ^12 || >=14.0 }
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
      browserslist: 4.21.4
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-discard-comments/5.1.2_postcss@8.4.17:
+  /postcss-discard-comments/5.1.2_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==
@@ -6735,10 +6735,10 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

-  /postcss-discard-duplicates/5.1.0_postcss@8.4.17:
+  /postcss-discard-duplicates/5.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==
@@ -6747,10 +6747,10 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

-  /postcss-discard-empty/5.1.1_postcss@8.4.17:
+  /postcss-discard-empty/5.1.1_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==
@@ -6759,10 +6759,10 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

-  /postcss-discard-overridden/5.1.0_postcss@8.4.17:
+  /postcss-discard-overridden/5.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
@@ -6771,7 +6771,7 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

  /postcss-html/1.5.0:
@@ -6783,11 +6783,11 @@ packages:
    dependencies:
      htmlparser2: 8.0.1
      js-tokens: 8.0.0
-      postcss: 8.4.17
-      postcss-safe-parser: 6.0.0_postcss@8.4.17
+      postcss: 8.4.18
+      postcss-safe-parser: 6.0.0_postcss@8.4.18
    dev: true

-  /postcss-import/14.1.0_postcss@8.4.17:
+  /postcss-import/14.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==
@@ -6796,13 +6796,13 @@ packages:
    peerDependencies:
      postcss: ^8.0.0
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
      read-cache: 1.0.0
      resolve: 1.22.1
    dev: true

-  /postcss-import/15.0.0_postcss@8.4.17:
+  /postcss-import/15.0.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-Y20shPQ07RitgBGv2zvkEAu9bqvrD77C9axhj/aA1BQj4czape2MdClCExvB27EwYEJdGgKZBpKanb0t1rK2Kg==
@@ -6811,13 +6811,13 @@ packages:
    peerDependencies:
      postcss: ^8.0.0
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
      read-cache: 1.0.0
      resolve: 1.22.1
    dev: true

-  /postcss-js/4.0.0_postcss@8.4.17:
+  /postcss-js/4.0.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==
@@ -6827,10 +6827,10 @@ packages:
      postcss: ^8.3.3
    dependencies:
      camelcase-css: 2.0.1
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

-  /postcss-load-config/3.1.4_postcss@8.4.17:
+  /postcss-load-config/3.1.4_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
@@ -6846,7 +6846,7 @@ packages:
        optional: true
    dependencies:
      lilconfig: 2.0.6
-      postcss: 8.4.17
+      postcss: 8.4.18
      yaml: 1.10.2
    dev: true

@@ -6857,24 +6857,24 @@ packages:
      }
    dev: true

-  /postcss-merge-longhand/5.1.6_postcss@8.4.17:
+  /postcss-merge-longhand/5.1.7_postcss@8.4.18:
    resolution:
      {
-        integrity: sha512-6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw==
+        integrity: sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==
      }
    engines: { node: ^10 || ^12 || >=14.0 }
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
-      stylehacks: 5.1.0_postcss@8.4.17
+      stylehacks: 5.1.1_postcss@8.4.18
    dev: true

-  /postcss-merge-rules/5.1.2_postcss@8.4.17:
+  /postcss-merge-rules/5.1.3_postcss@8.4.18:
    resolution:
      {
-        integrity: sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ==
+        integrity: sha512-LbLd7uFC00vpOuMvyZop8+vvhnfRGpp2S+IMQKeuOZZapPRY4SMq5ErjQeHbHsjCUgJkRNrlU+LmxsKIqPKQlA==
      }
    engines: { node: ^10 || ^12 || >=14.0 }
    peerDependencies:
@@ -6882,12 +6882,12 @@ packages:
    dependencies:
      browserslist: 4.21.4
      caniuse-api: 3.0.0
-      cssnano-utils: 3.1.0_postcss@8.4.17
-      postcss: 8.4.17
+      cssnano-utils: 3.1.0_postcss@8.4.18
+      postcss: 8.4.18
      postcss-selector-parser: 6.0.10
    dev: true

-  /postcss-minify-font-values/5.1.0_postcss@8.4.17:
+  /postcss-minify-font-values/5.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==
@@ -6896,11 +6896,11 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-minify-gradients/5.1.1_postcss@8.4.17:
+  /postcss-minify-gradients/5.1.1_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==
@@ -6910,27 +6910,27 @@ packages:
      postcss: ^8.2.15
    dependencies:
      colord: 2.9.3
-      cssnano-utils: 3.1.0_postcss@8.4.17
-      postcss: 8.4.17
+      cssnano-utils: 3.1.0_postcss@8.4.18
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-minify-params/5.1.3_postcss@8.4.17:
+  /postcss-minify-params/5.1.4_postcss@8.4.18:
    resolution:
      {
-        integrity: sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg==
+        integrity: sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==
      }
    engines: { node: ^10 || ^12 || >=14.0 }
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
      browserslist: 4.21.4
-      cssnano-utils: 3.1.0_postcss@8.4.17
-      postcss: 8.4.17
+      cssnano-utils: 3.1.0_postcss@8.4.18
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-minify-selectors/5.2.1_postcss@8.4.17:
+  /postcss-minify-selectors/5.2.1_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==
@@ -6939,11 +6939,11 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-selector-parser: 6.0.10
    dev: true

-  /postcss-nested/6.0.0_postcss@8.4.17:
+  /postcss-nested/6.0.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==
@@ -6952,11 +6952,11 @@ packages:
    peerDependencies:
      postcss: ^8.2.14
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-selector-parser: 6.0.10
    dev: true

-  /postcss-normalize-charset/5.1.0_postcss@8.4.17:
+  /postcss-normalize-charset/5.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==
@@ -6965,10 +6965,10 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

-  /postcss-normalize-display-values/5.1.0_postcss@8.4.17:
+  /postcss-normalize-display-values/5.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==
@@ -6977,11 +6977,11 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-normalize-positions/5.1.1_postcss@8.4.17:
+  /postcss-normalize-positions/5.1.1_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==
@@ -6990,11 +6990,11 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-normalize-repeat-style/5.1.1_postcss@8.4.17:
+  /postcss-normalize-repeat-style/5.1.1_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==
@@ -7003,11 +7003,11 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-normalize-string/5.1.0_postcss@8.4.17:
+  /postcss-normalize-string/5.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==
@@ -7016,11 +7016,11 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-normalize-timing-functions/5.1.0_postcss@8.4.17:
+  /postcss-normalize-timing-functions/5.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==
@@ -7029,25 +7029,25 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-normalize-unicode/5.1.0_postcss@8.4.17:
+  /postcss-normalize-unicode/5.1.1_postcss@8.4.18:
    resolution:
      {
-        integrity: sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==
+        integrity: sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==
      }
    engines: { node: ^10 || ^12 || >=14.0 }
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
      browserslist: 4.21.4
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-normalize-url/5.1.0_postcss@8.4.17:
+  /postcss-normalize-url/5.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==
@@ -7057,11 +7057,11 @@ packages:
      postcss: ^8.2.15
    dependencies:
      normalize-url: 6.1.0
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-normalize-whitespace/5.1.1_postcss@8.4.17:
+  /postcss-normalize-whitespace/5.1.1_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==
@@ -7070,11 +7070,11 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-ordered-values/5.1.3_postcss@8.4.17:
+  /postcss-ordered-values/5.1.3_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==
@@ -7083,15 +7083,15 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      cssnano-utils: 3.1.0_postcss@8.4.17
-      postcss: 8.4.17
+      cssnano-utils: 3.1.0_postcss@8.4.18
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

-  /postcss-reduce-initial/5.1.0_postcss@8.4.17:
+  /postcss-reduce-initial/5.1.1_postcss@8.4.18:
    resolution:
      {
-        integrity: sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==
+        integrity: sha512-//jeDqWcHPuXGZLoolFrUXBDyuEGbr9S2rMo19bkTIjBQ4PqkaO+oI8wua5BOUxpfi97i3PCoInsiFIEBfkm9w==
      }
    engines: { node: ^10 || ^12 || >=14.0 }
    peerDependencies:
@@ -7099,10 +7099,10 @@ packages:
    dependencies:
      browserslist: 4.21.4
      caniuse-api: 3.0.0
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

-  /postcss-reduce-transforms/5.1.0_postcss@8.4.17:
+  /postcss-reduce-transforms/5.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==
@@ -7111,7 +7111,7 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
    dev: true

@@ -7122,7 +7122,7 @@ packages:
      }
    dev: true

-  /postcss-safe-parser/6.0.0_postcss@8.4.17:
+  /postcss-safe-parser/6.0.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
@@ -7131,10 +7131,10 @@ packages:
    peerDependencies:
      postcss: ^8.3.3
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

-  /postcss-scss/4.0.5_postcss@8.4.17:
+  /postcss-scss/4.0.5_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-F7xpB6TrXyqUh3GKdyB4Gkp3QL3DDW1+uI+gxx/oJnUt/qXI4trj5OGlp9rOKdoABGULuqtqeG+3HEVQk4DjmA==
@@ -7143,7 +7143,7 @@ packages:
    peerDependencies:
      postcss: ^8.3.3
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

  /postcss-selector-parser/6.0.10:
@@ -7157,7 +7157,7 @@ packages:
      util-deprecate: 1.0.2
    dev: true

-  /postcss-sorting/7.0.1_postcss@8.4.17:
+  /postcss-sorting/7.0.1_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==
@@ -7165,10 +7165,10 @@ packages:
    peerDependencies:
      postcss: ^8.3.9
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
    dev: true

-  /postcss-svgo/5.1.0_postcss@8.4.17:
+  /postcss-svgo/5.1.0_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==
@@ -7177,12 +7177,12 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-value-parser: 4.2.0
      svgo: 2.8.0
    dev: true

-  /postcss-unique-selectors/5.1.1_postcss@8.4.17:
+  /postcss-unique-selectors/5.1.1_postcss@8.4.18:
    resolution:
      {
        integrity: sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==
@@ -7191,7 +7191,7 @@ packages:
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-selector-parser: 6.0.10
    dev: true

@@ -7202,10 +7202,10 @@ packages:
      }
    dev: true

-  /postcss/8.4.17:
+  /postcss/8.4.18:
    resolution:
      {
-        integrity: sha512-UNxNOLQydcOFi41yHNMcKRZ39NeXlr8AxGuZJsdub8vIb12fHzcq37DTU/QtbI6WLxNg2gF9Z+8qtRwTj1UI1Q==
+        integrity: sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==
      }
    engines: { node: ^10 || ^12 || >=14 }
    dependencies:
@@ -7570,15 +7570,15 @@ packages:
      magic-string: 0.25.9
    dev: true

-  /rollup-plugin-visualizer/5.8.2:
+  /rollup-plugin-visualizer/5.8.3:
    resolution:
      {
-        integrity: sha512-Fh7KoAa7FVVOojmyyX9ro7fBSR7mPG2cgfDbA877HM4IeJJtSZO+I/R3h/u6TB8wVP5J4pXPpTaRMSREyqCS3g==
+        integrity: sha512-QGJk4Bqe4AOat5AjipOh8esZH1nck5X2KFpf4VytUdSUuuuSwvIQZjMGgjcxe/zXexltqaXp5Vx1V3LmnQH15Q==
      }
    engines: { node: ">=14" }
    hasBin: true
    peerDependencies:
-      rollup: ^2.0.0
+      rollup: 2.x || 3.x
    peerDependenciesMeta:
      rollup:
        optional: true
@@ -8093,17 +8093,17 @@ packages:
      tslib: 2.4.0
    dev: false

-  /stylehacks/5.1.0_postcss@8.4.17:
+  /stylehacks/5.1.1_postcss@8.4.18:
    resolution:
      {
-        integrity: sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==
+        integrity: sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==
      }
    engines: { node: ^10 || ^12 || >=14.0 }
    peerDependencies:
      postcss: ^8.2.15
    dependencies:
      browserslist: 4.21.4
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-selector-parser: 6.0.10
    dev: true

@@ -8165,8 +8165,8 @@ packages:
    peerDependencies:
      stylelint: ^14.0.0
    dependencies:
-      postcss: 8.4.17
-      postcss-sorting: 7.0.1_postcss@8.4.17
+      postcss: 8.4.18
+      postcss-sorting: 7.0.1_postcss@8.4.18
      stylelint: 14.13.0
    dev: true

@@ -8178,7 +8178,7 @@ packages:
    engines: { node: ^12.20.0 || ^14.13.1 || >=16.0.0 }
    hasBin: true
    dependencies:
-      "@csstools/selector-specificity": 2.0.2_cd239324a5aeb6e3cee0fb61f6a33448
+      "@csstools/selector-specificity": 2.0.2_1d546e2941f6b4ca889831b9fbdc79d8
      balanced-match: 2.0.0
      colord: 2.9.3
      cosmiconfig: 7.0.1
@@ -8201,10 +8201,10 @@ packages:
      micromatch: 4.0.5
      normalize-path: 3.0.0
      picocolors: 1.0.0
-      postcss: 8.4.17
+      postcss: 8.4.18
      postcss-media-query-parser: 0.2.3
      postcss-resolve-nested-selector: 0.1.1
-      postcss-safe-parser: 6.0.0_postcss@8.4.17
+      postcss-safe-parser: 6.0.0_postcss@8.4.18
      postcss-selector-parser: 6.0.10
      postcss-value-parser: 4.2.0
      resolve-from: 5.0.0
@@ -8315,10 +8315,10 @@ packages:
      strip-ansi: 6.0.1
    dev: true

-  /tailwindcss/3.2.1:
+  /tailwindcss/3.2.2:
    resolution:
      {
-        integrity: sha512-Uw+GVSxp5CM48krnjHObqoOwlCt5Qo6nw1jlCRwfGy68dSYb/LwS9ZFidYGRiM+w6rMawkZiu1mEMAsHYAfoLg==
+        integrity: sha512-c2GtSdqg+harR4QeoTmex0Ngfg8IIHNeLQH5yr2B9uZbZR1Xt1rYbjWOWTcj3YLTZhrmZnPowoQDbSRFyZHQ5Q==
      }
    engines: { node: ">=12.13.0" }
    hasBin: true
@@ -8337,11 +8337,11 @@ packages:
      normalize-path: 3.0.0
      object-hash: 3.0.0
      picocolors: 1.0.0
-      postcss: 8.4.17
-      postcss-import: 14.1.0_postcss@8.4.17
-      postcss-js: 4.0.0_postcss@8.4.17
-      postcss-load-config: 3.1.4_postcss@8.4.17
-      postcss-nested: 6.0.0_postcss@8.4.17
+      postcss: 8.4.18
+      postcss-import: 14.1.0_postcss@8.4.18
+      postcss-js: 4.0.0_postcss@8.4.18
+      postcss-load-config: 3.1.4_postcss@8.4.18
+      postcss-nested: 6.0.0_postcss@8.4.18
      postcss-selector-parser: 6.0.10
      postcss-value-parser: 4.2.0
      quick-lru: 5.1.1
@@ -8782,10 +8782,10 @@ packages:
      - supports-color
    dev: true

-  /vite-plugin-remove-console/1.1.0:
+  /vite-plugin-remove-console/1.2.0:
    resolution:
      {
-        integrity: sha512-FZ0gLEsRqgHPCl+blHpT3h004+InKrGddmBXTfs7Cj/xWY7FdHpL9Zc9kgjxh8zIzjZ/MblsPDDEqg5BVHIXDA==
+        integrity: sha512-1fm50pJswSeTJZZ6wBPp9Q0xUhdMqo5+drd39XRVrJ/9LmSvZ90JXf1P7P68aCTNJSf6C1KTAo7sq0PctYZURg==
      }
    dev: true

@@ -8822,7 +8822,7 @@ packages:
        optional: true
    dependencies:
      esbuild: 0.15.10
-      postcss: 8.4.17
+      postcss: 8.4.18
      resolve: 1.22.1
      rollup: 2.78.1
      sass: 1.55.0
--- a/public/serverConfig.json
+++ b/public/serverConfig.json
@@ -1,5 +1,5 @@
 {
-  "Version": "3.6.3",
+  "Version": "3.6.4",
  "Title": "PureAdmin",
  "FixedHeader": true,
  "HiddenSideBar": false,
--- a/src/api/list.ts
+++ b/src/api/list.ts
@@ -1,4 +1,4 @@
-import { http } from "../utils/http";
+import { http } from "@/utils/http";

 type Result = {
  success: boolean;
--- a/src/api/mock.ts
+++ b/src/api/mock.ts
@@ -1,4 +1,4 @@
-import { http } from "../utils/http";
+import { http } from "@/utils/http";

 type Result = {
  success: boolean;
--- a/src/api/routes.ts
+++ b/src/api/routes.ts
@@ -1,4 +1,4 @@
-import { http } from "../utils/http";
+import { http } from "@/utils/http";

 type Result = {
  success: boolean;
--- a/src/api/system.ts
+++ b/src/api/system.ts
@@ -1,4 +1,4 @@
-import { http } from "../utils/http";
+import { http } from "@/utils/http";

 type Result = {
  success: boolean;
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -1,4 +1,4 @@
-import { http } from "../utils/http";
+import { http } from "@/utils/http";

 export type UserResult = {
  success: boolean;
--- a/src/components/ReIcon/index.ts
+++ b/src/components/ReIcon/index.ts
@@ -3,7 +3,7 @@ import iconifyIconOnline from "./src/iconifyIconOnline";
 import iconSelect from "./src/Select.vue";
 import fontIcon from "./src/iconfont";

-/** 离线图标组件 */
+/** 本地图标组件 */
 const IconifyIconOffline = iconifyIconOffline;
 /** 在线图标组件 */
 const IconifyIconOnline = iconifyIconOnline;
--- a/src/components/ReIcon/src/hooks.ts
+++ b/src/components/ReIcon/src/hooks.ts
@@ -3,7 +3,8 @@ import { h, defineComponent, Component } from "vue";
 import { IconifyIconOnline, IconifyIconOffline, FontIcon } from "../index";

 /**
- * 支持fontawesome4、5+、iconfont、remixicon、element-plus的icons、自定义svg
+ * 支持 `iconfont`、自定义 `svg` 以及 `iconify` 中所有的图标
+ * @see 点击查看文档图标篇 {@link https://yiming_chang.gitee.io/pure-admin-doc/pages/icon/}
 * @param icon 必传 图标
 * @param attrs 可选 iconType 属性
 * @returns Component
@@ -34,11 +35,12 @@ export function useRenderIcon(icon: any, attrs?: iconType): Component {
    // svg
    return icon;
  } else {
+    // 通过是否存在 : 符号来判断是在线还是本地图标，存在即是在线图标，反之
    return defineComponent({
      name: "Icon",
      render() {
        const IconifyIcon =
-          attrs && attrs["online"] ? IconifyIconOnline : IconifyIconOffline;
+          icon && icon.includes(":") ? IconifyIconOnline : IconifyIconOffline;
        return h(IconifyIcon, {
          icon: icon,
          ...attrs
--- a/src/components/ReIcon/src/iconifyIconOffline.ts
+++ b/src/components/ReIcon/src/iconifyIconOffline.ts
@@ -161,7 +161,7 @@ addIcon("unExpand", UnExpand);
 import LocationCompany from "@iconify-icons/carbon/location-company";
 addIcon("location-company", LocationCompany);

-// Iconify Icon在Vue里离线使用（用于内网环境）https://docs.iconify.design/icon-components/vue/offline.html
+// Iconify Icon在Vue里本地使用（用于内网环境）https://docs.iconify.design/icon-components/vue/offline.html
 export default defineComponent({
  name: "IconifyIconOffline",
  components: { IconifyIcon },
--- a/src/components/ReIcon/src/types.ts
+++ b/src/components/ReIcon/src/types.ts
@@ -11,7 +11,6 @@ export interface iconType {
  horizontalAlign?: boolean;
  verticalAlign?: boolean;
  align?: string;
-  online?: boolean;
  onLoad?: Function;
  includes?: Function;

--- a/src/layout/hooks/useDataThemeChange.ts
+++ b/src/layout/hooks/useDataThemeChange.ts
@@ -69,7 +69,7 @@ export function useDataThemeChange() {
    return new TinyColor(color).shade(10).toString();
  };

-  /** 设置ep主题色 */
+  /** 设置 `element-plus` 主题色 */
  const setEpThemeColor = (color: string) => {
    useEpThemeStoreHook().setEpThemeColor(color);
    body.style.setProperty("--el-color-primary-active", shadeBgColor(color));
--- a/src/layout/theme/index.ts
+++ b/src/layout/theme/index.ts
@@ -20,7 +20,6 @@ const themeColors = {
    menuHover: "#4091f7",
    subMenuBg: "#0f0303",
    subMenuActiveBg: "#4091f7",
-    navTextColor: "#fff",
    menuText: "rgb(254 254 254 / 65%)",
    sidebarLogo: "#002140",
    menuTitleHover: "#fff",
@@ -33,7 +32,6 @@ const themeColors = {
    menuHover: "#e0ebf6",
    subMenuBg: "#fff",
    subMenuActiveBg: "#e0ebf6",
-    navTextColor: "#7a80b4",
    menuText: "#7a80b4",
    sidebarLogo: "#fff",
    menuTitleHover: "#000",
@@ -46,7 +44,6 @@ const themeColors = {
    menuHover: "#e13c39",
    subMenuBg: "#000",
    subMenuActiveBg: "#e13c39",
-    navTextColor: "#red",
    menuText: "rgb(254 254 254 / 65.1%)",
    sidebarLogo: "#42090c",
    menuTitleHover: "#fff",
@@ -59,7 +56,6 @@ const themeColors = {
    menuHover: "#e85f33",
    subMenuBg: "#0f0603",
    subMenuActiveBg: "#e85f33",
-    navTextColor: "#fff",
    menuText: "rgb(254 254 254 / 65%)",
    sidebarLogo: "#441708",
    menuTitleHover: "#fff",
@@ -72,7 +68,6 @@ const themeColors = {
    menuHover: "#f6da4d",
    subMenuBg: "#0f0603",
    subMenuActiveBg: "#f6da4d",
-    navTextColor: "#fff",
    menuText: "rgb(254 254 254 / 65%)",
    sidebarLogo: "#443b05",
    menuTitleHover: "#fff",
@@ -85,7 +80,6 @@ const themeColors = {
    menuHover: "#59bfc1",
    subMenuBg: "#000",
    subMenuActiveBg: "#59bfc1",
-    navTextColor: "#7a80b4",
    menuText: "#7a80b4",
    sidebarLogo: "#053434",
    menuTitleHover: "#fff",
@@ -98,7 +92,6 @@ const themeColors = {
    menuHover: "#60ac80",
    subMenuBg: "#000",
    subMenuActiveBg: "#60ac80",
-    navTextColor: "#7a80b4",
    menuText: "#7a80b4",
    sidebarLogo: "#112f21",
    menuTitleHover: "#fff",
@@ -111,7 +104,6 @@ const themeColors = {
    menuHover: "#d84493",
    subMenuBg: "#000",
    subMenuActiveBg: "#d84493",
-    navTextColor: "#7a80b4",
    menuText: "#7a80b4",
    sidebarLogo: "#3f0d29",
    menuTitleHover: "#fff",
@@ -124,7 +116,6 @@ const themeColors = {
    menuHover: "#693ac9",
    subMenuBg: "#000",
    subMenuActiveBg: "#693ac9",
-    navTextColor: "#7a80b4",
    menuText: "#7a80b4",
    sidebarLogo: "#1f0c38",
    menuTitleHover: "#fff",
@@ -147,7 +138,6 @@ export const genScssMultipleScopeVars = (): MultipleScopeVarsItem[] => {
        $menuHover: ${themeColors[key].menuHover} !default;
        $subMenuBg: ${themeColors[key].subMenuBg} !default;
        $subMenuActiveBg: ${themeColors[key].subMenuActiveBg} !default;
-        $navTextColor: ${themeColors[key].navTextColor} !default;
        $menuText: ${themeColors[key].menuText} !default;
        $sidebarLogo: ${themeColors[key].sidebarLogo} !default;
        $menuTitleHover: ${themeColors[key].menuTitleHover} !default;
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -134,6 +134,10 @@ router.beforeEach((to: toRouteType, _from, next) => {
      else document.title = transformI18n(item.meta.title);
    });
  }
+  /** 如果已经登录并存在登录信息后不能跳转到路由白名单，而是继续保持在当前页面 */
+  function toCorrectRoute() {
+    whiteList.includes(to.fullPath) ? next(_from.fullPath) : next();
+  }
  if (userInfo) {
    // 无权限跳转403页面
    if (to.meta?.roles && !isOneOfArray(to.meta?.roles, userInfo?.roles)) {
@@ -145,7 +149,7 @@ router.beforeEach((to: toRouteType, _from, next) => {
        openLink(to?.name as string);
        NProgress.done();
      } else {
-        next();
+        toCorrectRoute();
      }
    } else {
      // 刷新
@@ -175,7 +179,7 @@ router.beforeEach((to: toRouteType, _from, next) => {
          }
          router.push(to.fullPath);
        });
-      next();
+      toCorrectRoute();
    }
  } else {
    if (to.path !== "/login") {
--- a/src/style/dark.scss
+++ b/src/style/dark.scss
@@ -129,7 +129,7 @@ html.dark {
    color: var(--el-text-color-primary);
  }

-  .vxe-button.type--button.size--medium:hover {
+  .vxe-button.type--button:hover {
    background: var(--el-color-primary) !important;
  }

--- a/src/style/index.scss
+++ b/src/style/index.scss
@@ -20,7 +20,8 @@
  filter: invert(80%);
 }

-/* 重置 vxe-table 中 pager 样式 */
+/* 重置 vxe-table 样式 */
+.vxe-button.type--button.theme--primary:hover,
 .vxe-pager .vxe-pager--num-btn:not(.is--disabled).is--active {
  color: #fff !important;
 }
--- a/src/style/sidebar.scss
+++ b/src/style/sidebar.scss
@@ -68,10 +68,6 @@
    }
  }

-  .el-popper.is-light {
-    border: none !important;
-  }
-
  .sidebar-container {
    /* 展开动画 */
    transition: width var(--pure-transition-duration);
@@ -233,11 +229,9 @@
      .search-container,
      /* 告警 */
      .dropdown-badge,
-      /* 全屏 */
-      .screen-full,
      /* 国际化 */
      .globalization,
-      /* 登录名 */
+      /* 用户名 */
      .el-dropdown-link,
      /* 设置 */
      .set-icon {
@@ -587,11 +581,9 @@ body[layout="vertical"] {
  .search-container,
  /* 告警 */
  .dropdown-badge,
-  /* 全屏 */
-  .screen-full,
  /* 国际化 */
  .globalization,
-  /* 登录名 */
+  /* 用户名 */
  .el-dropdown-link,
  /* 设置 */
  .set-icon {
--- a/src/utils/http/index.ts
+++ b/src/utils/http/index.ts
@@ -11,21 +11,12 @@ import {
 } from "./types.d";
 import { stringify } from "qs";
 import NProgress from "../progress";
-// import { loadEnv } from "@build/index";
 import { getToken, formatToken } from "@/utils/auth";
 import { useUserStoreHook } from "@/store/modules/user";

-// 加载环境变量 VITE_PROXY_DOMAIN（开发环境）  VITE_PROXY_DOMAIN_REAL（打包后的线上环境）
-// const { VITE_PROXY_DOMAIN, VITE_PROXY_DOMAIN_REAL } = loadEnv();
-
 // 相关配置请参考：www.axios-js.com/zh-cn/docs/#axios-request-config-1
 const defaultConfig: AxiosRequestConfig = {
-  // baseURL:
-  //   process.env.NODE_ENV === "production"
-  //     ? VITE_PROXY_DOMAIN_REAL
-  //     : VITE_PROXY_DOMAIN,
-  // 当前使用mock模拟请求，将baseURL制空，如果你的环境用到了http请求，请删除下面的baseURL启用上面的baseURL，并将第14行、19行代码注释取消
-  baseURL: "",
+  // 请求超时时间
  timeout: 10000,
  headers: {
    Accept: "application/json, text/plain, */*",
--- a/src/views/components/danmaku/danmu.js
+++ b/src/views/components/danmaku/danmu.js
@@ -19,432 +19,7 @@ const customDanmus = [
  }
 ];

-// 弹幕来自b站首页
-const danmus = [
-  "草",
-  "高技术力",
-  "汤姆逊波纹疾走…啊哒哒哒哒哒哒……",
-  "此曲一出，非死即伤",
-  "这播放量不应该啊",
-  "牛皮！",
-  "全  文  背  诵",
-  "ohhhhhhh",
-  "NICE",
-  "草这死亡姿势",
-  "日常迫害团长",
-  "溜了溜了",
-  "火钳刘明",
-  "真实",
-  "汤姆逊波纹疾走",
-  "不  要  停  下  来  啊",
-  "泥 给 路 打 油",
-  "停下来了",
-  "草",
-  "完全一致",
-  "你怎么还没有被禁赛",
-  "6P41波纹疾走!!!",
-  "牛逼",
-  "草",
-  "草",
-  "cccccccc",
-  "人才不火系列",
-  "双厨狂喜",
-  "双厨曝炸",
-  "火钳留名",
-  "火钳留名",
-  "牛逼啊",
-  "草",
-  "草",
-  "要素过多",
-  "火钳刘明",
-  "高技术力suki",
-  "bo良ki影觉得很赞",
-  "你们的下一句话是名场面",
-  "Niiice",
-  "太草了",
-  "哈哈哈哈",
-  "火钳刘明",
-  "6p41疾走",
-  "袭击妈妈",
-  "占戈哥欠走己",
-  "又看jojo又玩r6的人恐怕太少了吧",
-  "好活当赏",
-  "要素过多",
-  "动作也太流畅了吧",
-  "世界名画",
-  "好活，当赏",
-  "全程高能",
-  "新人都是怪物.jpg",
-  "我的人质啊",
-  "袭击妈妈锁孔看她",
-  "完全不会画画（大嘘）",
-  "好活",
-  "爆头 2333333",
-  "把队友杀了的屑",
-  "动作指导:奥尔加",
-  "草",
-  "要素过多",
-  "噗",
-  "让你玩手机",
-  "6啊",
-  "我负责救人质",
-  "三厨狂喜",
-  "三厨狂喜",
-  "万能日语",
-  "耶———————格——————————",
-  "6P41波纹疾走",
-  "“哦”踩点还行",
-  "火钳刘明。",
-  "哎地唉洗",
-  "这枪不是m249啊，等等叫什么来的",
-  "火钳刘明",
-  "光棍节， 。去过",
-  "炸死队友哈哈哈",
-  "火钳刘明",
-  "火钳刘明",
-  "cao",
-  "火钳刘明",
-  "提前Niiiiiiiice！",
-  "火钳刘明",
-  "神仙UP",
-  "又被爆头了",
-  "6p41疾走",
-  "好活",
-  "人质好好笑啊",
-  "不要停下来啊",
-  "好活啊！！",
-  "6P41波纹疾走 （换成AK是不是更爽）",
-  "恭喜你发现宝藏",
-  "恭喜你发现宝藏",
-  "恭喜你发现宝藏",
-  "前方高能",
-  "封禁30分钟",
-  "火钳刘明",
-  "该赏",
-  "我靠，就冲着高帧数，投币了",
-  "不 要 停 下 来 啊（指你给路）",
-  "卧槽 无情",
-  "草",
-  "ADS草",
-  "世界线收束",
-  "火钳刘明",
-  "人质：给我把抢我跟他拼了",
-  "小车灵魂",
-  "卧槽这帧数",
-  "jojoの奇妙转场",
-  "niiiiiiice",
-  "好活",
-  "要素过多",
-  "6p41",
-  "TK*3移除对战",
-  "这场景布置有弹丸那味儿了",
-  "草",
-  "草",
-  "不要让战斗停下来",
-  "火钳留名",
-  "炸死俩盾哈哈",
-  "太草了，",
-  "万能日语",
-  "伪渲染(确信)",
-  "要素过多",
-  "火钳刘明",
-  "卧槽",
-  "炸死队友",
-  "危",
-  "这才是真正的高技术力",
-  "高技术力suki",
-  "火钳刘明",
-  "欺负我不懂日语系列",
-  "我打我自己",
-  "帧数爆炸",
-  "危",
-  "危",
-  "要素过多",
-  "巨真实这小车",
-  "牛逼",
-  "帧数高的吓人",
-  "5v5→3v3",
-  "我都是俄式救援",
-  "niiiiiiiiiiiice",
-  "别啊！",
-  "尼给路嗒呦",
-  "目测会火",
-  "双厨狂喜",
-  "人质已解救（脱）",
-  "哈哈哈哈哈",
-  "要素过多",
-  "nb",
-  "杀了两个队友不就被踢出去了吗",
-  "这是新人？",
-  "没毛病",
-  "一甲fuze",
-  "要素过多",
-  "大————头————",
-  "人————质————",
-  "这是组长吗？",
-  "不是M249，是PKP",
-  "卡其脱离太",
-  "等等JOJO是你？",
-  "我就是又看JOJO又玩r6",
-  "二乔？？？？？？",
-  "这也太流畅了吧",
-  "这tm能出番了这帧数和技术",
-  "kpm波纹疾走",
-  "大制作",
-  "太草了",
-  "耶——格——",
-  "高技术力",
-  "精神小车",
-  "左轮庸医",
-  "袭击人质，锁孔看他",
-  "奈~~斯 屑队友被杀✓",
-  "惨  盾兵  惨",
-  "打敌人误伤不算",
-  "不要停下来啊! (指解救人质)",
-  "嘴巴被贴胶还能说话的人质是鉴",
-  "哈哈哈哈哈哈哈哈哈",
-  "一局11杀",
-  "二乔同款姿势 哈哈",
-  "耶格！",
-  "看",
-  "鉴作无误",
-  "双出狂喜",
-  "为什么不是中文",
-  "经典咚咚咚………三声雷，带你飞",
-  "要素过多",
-  "jojo",
-  "三厨狂喜",
-  "我也是又看又玩",
-  "我都听到lisalisa了doge",
-  "你给路打油",
-  "确实质量很高啊",
-  "NICE",
-  "银魂？",
-  "火钳刘明",
-  "我就是又看jojo又玩R6（1631小时）的，你有什么事吗？",
-  "哟西哟西",
-  "要素过多",
-  "我也是看JOJO，玩r6",
-  "nokk",
-  "800小时r6加二刷jojo在此",
-  "好活",
-  "jojo",
-  "fuze the hostage",
-  "不要停下来！！！！！",
-  "pkppkp波纹疾走",
-  "新人都是怪物吗？",
-  "23333333",
-  "我先来，首页通知书",
-  "咚咚咚放这里。。。",
-  "火钳刘明",
-  "火钳刘明",
-  "火钳刘明",
-  "队友都炸",
-  "nice",
-  "哈哈哈哈",
-  "人质:危！",
-  "危",
-  "火钳刘明",
-  "人质  卒",
-  "你币有了",
-  "打投组",
-  "恭喜首頁通知書！",
-  "要素溢出",
-  "HOSTAGE KIA",
-  "233",
-  "是无托版的PKP",
-  "666",
-  "hostage KIA",
-  "tk哈哈哈",
-  "要素过多",
-  "这个肌肉我可以惹",
-  "6的飞起",
-  "jo风",
-  "混入了奇怪的东西",
-  "草",
-  "袭击妈妈，锁孔看她",
-  "哈哈哈哈哈哈",
-  "，",
-  "草",
-  "牛逼",
-  "高技术力啊",
-  "opp",
-  "X",
-  "组长！",
-  "草（中日双语）",
-  "哈哈哈哈哈哈",
-  "-500",
-  ".",
-  "看封面识内容系列",
-  "草",
-  "首页通知书",
-  "要素过多",
-  "但是不会画画",
-  "草",
-  "不要停下来啊！",
-  "梅开三度",
-  "四回啊四回",
-  "高帧好评",
-  "人质已解脱",
-  "草",
-  "强",
-  "好活！",
-  "好流畅",
-  "草",
-  "666",
-  "好活儿当赏",
-  "新人都是怪物系列",
-  "高技术力",
-  "niiiiiiiiiiiiiiice",
-  "人质危",
-  "哈哈哈哈",
-  "带制作，三连了",
-  "鉴作",
-  "咚咚咚",
-  "咚咚咚咚棒棒棒棒",
-  "要素过多",
-  "不应该是打中耳机吗",
-  "高技术力",
-  "完了",
-  "彩虹六号牛批",
-  "口罩都有荒木线，佛了",
-  "哈哈哈",
-  "要素爆炸",
-  "高技术力",
-  "cao caocaocaocao",
-  "哈哈哈哈哈哈哈",
-  "等等，2乔这里说的是30分钟",
-  "首页通知书",
-  "海     岸     线",
-  "pkp波纹疾走",
-  "耶————————格————————",
-  "人 质 凶 手 -500",
-  "队友：WDNMD",
-  "jojo？？？",
-  "点进来之前我以为是fuze饮料。。",
-  "要素过多",
-  "绝了",
-  "要素过多",
-  "灭 霸",
-  "新人都是魔鬼",
-  "帧数爆炸",
-  "Cluster Charge activated！",
-  "要素过多",
-  "Hostage KIA，Mission failed",
-  "人质已解脱。。。",
-  "开 幕 雷 击",
-  "哈哈哈哈",
-  "ADS草死了",
-  "+0",
-  "牛批牛批",
-  "拜见大神",
-  "阿虚",
-  "这帧数，感觉在看动漫",
-  "卡其脱离太",
-  "双厨狂喜",
-  "问问",
-  "不要停下来啊！！！！！",
-  "h",
-  "不要停下来啊",
-  "要真30分钟都不用结束回合了，都开始第二局游戏了",
-  "这也太强了",
-  "。。。。。。。。。。。。",
-  "hoho",
-  "要素过多",
-  "哈哈哈哈哈哈哈哈哈哈哈哈哈哈",
-  "哈哈哈哈哈哈哈哈哈哈",
-  ".00",
-  "哈哈",
-  "万能的日语",
-  "首页通知书",
-  "我卡了？",
-  "hhhhh",
-  "大盾闪盾好惨",
-  "哈哈哈哈哈哈哈哈哈",
-  "草",
-  "要素太多受不了哈哈哈哈哈哈哈",
-  "火钳刘明",
-  "首页通知书",
-  "lisalisa",
-  "这是什么蛇皮操作，看不懂",
-  "敌 我 不 分",
-  "草",
-  "666",
-  "哈哈哈哈啊哈哈哈",
-  "完全一致",
-  "要素过多",
-  "你又双叒叕发现了新的宝藏",
-  "火钳刘明",
-  "2333",
-  "高  技  术  力",
-  "三梗合一",
-  "四梗合一",
-  "火钳刘明",
-  "杀2个队友不是直接飞了吗",
-  "首页通知书",
-  "海岸线",
-  "是延迟",
-  "好活当赏",
-  "这个我遇到过，fuze就是我，人质敌人队友都被我杀掉了，被老外骂并被踢了",
-  "草素过多",
-  "人质——  再不能起",
-  "必须三联",
-  "开始吟唱",
-  "不要停下来啊",
-  "草",
-  "？？？？？？？？？？？？？？？？？",
-  "tab+shift",
-  "帧数高的和动画一样",
-  "wwwwwwwwwwww",
-  "好强",
-  "23333333",
-  "好活当赏",
-  "此曲一出",
-  "要素过载",
-  "火钳刘明",
-  "要素过载",
-  "好活！！！！",
-  "开始吟唱",
-  "我听得懂咋办，在线等，很急",
-  "哇哇哇好高清",
-  ".",
-  "医 学 奇 迹",
-  "jo里jo气的",
-  "jojo画风",
-  "哈哈哈哈哈哈",
-  "俄式反恐",
-  "别拦我，老子把3个ADS都丢他脸上",
-  "-500",
-  "万 能 日 语",
-  "666",
-  "人质杀手",
-  "做的真的棒。",
-  "我NM笑疯",
-  "双厨狂喜",
-  "玛撒卡！这是袭击妈妈配音？",
-  "nice",
-  "jojo!",
-  "JO小鬼来力",
-  "真实",
-  "我又玩R6又看JOJO",
-  "完  全  不  会  画  画",
-  "秀儿",
-  "是系统自动踢人的，老外来不及踢你",
-  "6p41波纹疾走",
-  "火钳刘明",
-  "lisalisa？？？？？",
-  "盾——兵——（悲）",
-  "就是没有汤姆逊，汤姆逊波纹疾走！！",
-  "要素过多",
-  "。。。。？？",
-  "组长你怎么了组长",
-  "UP:我 完 全 不 会 画 画",
-  "再来亿遍",
-  "泥给路带呦～",
-  "哈哈哈哈哈哈哈哈哈",
-  "哈哈哈哈哈哈哈哈哈",
-  "火钳刘明"
-];
+const danmus = ["1", "2", "3", "4", "5", "6", "7", "8", "9"];

 const getDanmuData = () => {
  return danmus.map((text, index) => {
--- a/src/views/login/components/phone.vue
+++ b/src/views/login/components/phone.vue
@@ -62,9 +62,7 @@ function onBack() {
            clearable
            v-model="ruleForm.verifyCode"
            :placeholder="t('login.smsVerifyCode')"
-            :prefix-icon="
-              useRenderIcon('ri:shield-keyhole-line', { online: true })
-            "
+            :prefix-icon="useRenderIcon('ri:shield-keyhole-line')"
          />
          <el-button
            :disabled="isDisabled"
--- a/src/views/login/components/regist.vue
+++ b/src/views/login/components/regist.vue
@@ -110,9 +110,7 @@ function onBack() {
            clearable
            v-model="ruleForm.verifyCode"
            :placeholder="t('login.smsVerifyCode')"
-            :prefix-icon="
-              useRenderIcon('ri:shield-keyhole-line', { online: true })
-            "
+            :prefix-icon="useRenderIcon('ri:shield-keyhole-line')"
          />
          <el-button
            :disabled="isDisabled"
--- a/src/views/login/components/update.vue
+++ b/src/views/login/components/update.vue
@@ -83,9 +83,7 @@ function onBack() {
            clearable
            v-model="ruleForm.verifyCode"
            :placeholder="t('login.smsVerifyCode')"
-            :prefix-icon="
-              useRenderIcon('ri:shield-keyhole-line', { online: true })
-            "
+            :prefix-icon="useRenderIcon('ri:shield-keyhole-line')"
          />
          <el-button
            :disabled="isDisabled"
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -67,7 +67,7 @@ const onLogin = async (formEl: FormInstance | undefined) => {
  await formEl.validate((valid, fields) => {
    if (valid) {
      useUserStoreHook()
-        .loginByUsername({ username: ruleForm.username })
+        .loginByUsername({ username: ruleForm.username, password: "admin123" })
        .then(res => {
          if (res.success) {
            // 获取后端路由
@@ -207,9 +207,7 @@ watch(imgCode, value => {
                  clearable
                  v-model="ruleForm.verifyCode"
                  :placeholder="t('login.verifyCode')"
-                  :prefix-icon="
-                    useRenderIcon('ri:shield-keyhole-line', { online: true })
-                  "
+                  :prefix-icon="useRenderIcon('ri:shield-keyhole-line')"
                >
                  <template v-slot:append>
                    <ReImageVerify v-model:code="imgCode" />
--- a/src/views/permission/page/index.vue
+++ b/src/views/permission/page/index.vue
@@ -30,7 +30,7 @@ const options = [

 function onChange() {
  useUserStoreHook()
-    .loginByUsername({ username: username.value })
+    .loginByUsername({ username: username.value, password: "admin123" })
    .then(res => {
      if (res.success) {
        usePermissionStoreHook().clearAllCachePage();
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -240,21 +240,21 @@ function onHide() {
        <el-button-group>
          <el-button
            type="primary"
-            :icon="useRenderIcon('fa:plus-square-o', { online: true })"
+            :icon="useRenderIcon('fa:plus-square-o')"
            @click="onAdd"
          >
            {{ t("buttons.hsadd") }}
          </el-button>
          <el-button
            type="primary"
-            :icon="useRenderIcon('fa:folder-open-o', { online: true })"
+            :icon="useRenderIcon('fa:folder-open-o')"
            @click="onExpand"
          >
            {{ t("buttons.hsexpendAll") }}
          </el-button>
          <el-button
            type="primary"
-            :icon="useRenderIcon('fa:folder-o', { online: true })"
+            :icon="useRenderIcon('fa:folder-o')"
            @click="onUnExpand"
          >
            {{ t("buttons.hscollapseAll") }}
@@ -301,7 +301,7 @@ function onHide() {
          <el-button
            link
            type="primary"
-            :icon="useRenderIcon('fa:plus-square-o', { online: true })"
+            :icon="useRenderIcon('fa:plus-square-o')"
            @click="onAddChild(row)"
          >
            新增子类型
@@ -310,7 +310,7 @@ function onHide() {
            v-show="row.model"
            link
            type="primary"
-            :icon="useRenderIcon('fa:cog', { online: true })"
+            :icon="useRenderIcon('fa:cog')"
            @click="onDeploy(row)"
          >
            字典配置
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -86,8 +86,6 @@ declare global {
  declare interface ViteEnv {
    VITE_PORT: number;
    VITE_PUBLIC_PATH: string;
-    VITE_PROXY_DOMAIN: string;
-    VITE_PROXY_DOMAIN_REAL: string;
    VITE_ROUTER_HISTORY: string;
    VITE_LEGACY: boolean;
    VITE_CDN: boolean;
--- a/types/index.ts
+++ b/types/index.ts
@@ -1,3 +1,4 @@
+import { type FunctionalComponent } from "vue";
 import { type RouteComponent } from "vue-router";

 export interface StorageConfigs {
@@ -64,7 +65,7 @@ export interface RouteChildrenConfigsTable {
    /** 菜单名称（兼容国际化、非国际化，如何用国际化的写法就必须在根目录的`locales`文件夹下对应添加） `必填` */
    title: string;
    /** 菜单图标 `可选` */
-    icon?: string;
+    icon?: string | FunctionalComponent;
    /** 菜单名称右侧的额外图标，支持`fontawesome`、`iconfont`、`element-plus-icon` `可选` */
    extraIcon?: {
      svg?: boolean;
@@ -122,7 +123,7 @@ export interface RouteConfigsTable {
    /** 菜单名称（兼容国际化、非国际化，如何用国际化的写法就必须在根目录的`locales`文件夹下对应添加）`必填` */
    title: string;
    /** 菜单图标 `可选` */
-    icon?: string;
+    icon?: string | FunctionalComponent;
    /** 是否在菜单中显示（默认`true`）`可选` */
    showLink?: boolean;
    /** 菜单升序排序，值越高排的越后（只针对顶级路由）`可选` */
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,7 +1,7 @@
 import dayjs from "dayjs";
 import { resolve } from "path";
 import pkg from "./package.json";
-import { warpperEnv, regExps } from "./build";
+import { warpperEnv } from "./build";
 import { getPluginsList } from "./build/plugins";
 import { UserConfigExport, ConfigEnv, loadEnv } from "vite";

@@ -31,9 +31,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
    VITE_PORT,
    VITE_LEGACY,
    VITE_COMPRESSION,
-    VITE_PUBLIC_PATH,
-    VITE_PROXY_DOMAIN,
-    VITE_PROXY_DOMAIN_REAL
+    VITE_PUBLIC_PATH
  } = warpperEnv(loadEnv(mode, root));
  return {
    base: VITE_PUBLIC_PATH,
@@ -48,18 +46,8 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => {
      // 端口号
      port: VITE_PORT,
      host: "0.0.0.0",
-      // 本地跨域代理
-      proxy:
-        VITE_PROXY_DOMAIN_REAL.length > 0
-          ? {
-              [VITE_PROXY_DOMAIN]: {
-                target: VITE_PROXY_DOMAIN_REAL,
-                // ws: true,
-                changeOrigin: true,
-                rewrite: (path: string) => regExps(path, VITE_PROXY_DOMAIN)
-              }
-            }
-          : null
+      // 本地跨域代理 https://cn.vitejs.dev/config/server-options.html#server-proxy
+      proxy: {}
    },
    plugins: getPluginsList(command, VITE_LEGACY, VITE_CDN, VITE_COMPRESSION),
    optimizeDeps: {
Author	SHA1	Message	Date
xiaoxian521	c19fbb1473	release: update `3.6.4`	2022-11-10 12:17:05 +08:00
xiaoxian521	3cdebf4ee9	style: 删除多余样式（请务必删除）	2022-11-10 12:11:16 +08:00
xiaoxian521	2bb433c3cd	perf: 将`baseURL`和全局环境代理删除，可直接在`vite.config.ts`编写，即方便又支持多个代理地址	2022-11-10 11:47:07 +08:00
xiaoxian521	731e9b2f57	chore: update	2022-11-09 01:17:19 +08:00
xiaoxian521	b606fa454d	perf: 优化路由守卫	2022-11-08 18:14:33 +08:00
xiaoxian521	c6bd3f11b6	chore: update devDependencies	2022-11-08 13:52:59 +08:00
xiaoxian521	d11398274a	feat: 菜单图标 `icon` 支持使用在线图标	2022-11-08 12:05:07 +08:00
xiaoxian521	b2081b3481	perf: 优化代码	2022-11-08 01:30:04 +08:00
xiaoxian521	f5b7ee5a81	docs: update	2022-11-08 00:48:16 +08:00
xiaoxian521	20a1293a55	style: `vxe-button` color in hover	2022-11-02 22:48:35 +08:00