release: update 3.6.4

* feat: add danmaku demo

* fix: /@/改为@/

* fix: update

.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"

.env.production

@@ -4,9 +4,6 @@ VITE_PUBLIC_PATH = /
 # 线上环境路由历史模式
 VITE_ROUTER_HISTORY = "hash"
 
-# 线上环境后端地址
-VITE_PROXY_DOMAIN_REAL = ""
-
 # 是否为打包后的文件提供传统浏览器兼容性支持 支持 true 不支持 false
 VITE_LEGACY = false
 

.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"

CHANGELOG.en_US.md

@@ -1,3 +1,36 @@
+# 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
+
+- Static resource classification and packaging
+- Add danmaku component `demo`
+
+### 🐞 Bug fixes
+
+- Fix the `collapse` property added in the latest version of `tailwindcss` conflicts with the platform `class` class name
+- Fix that when the `token` expires, if the page has multiple requests, the `token` will be refreshed repeatedly
+
+# 3.6.2 (2022-10-27)
+
+### ✔️ refactor
+
+- Replace `/@/` alias with `@/` alias
+
 # 3.6.1 (2022-10-27)
 
 ### 🎫 Feat

CHANGELOG.md

@@ -1,3 +1,36 @@
+# 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
+
+- Static resource classification and packaging
+- Add danmaku component `demo`
+
+### 🐞 Bug fixes
+
+- Fix the `collapse` property added in the latest version of `tailwindcss` conflicts with the platform `class` class name
+- Fix that when the `token` expires, if the page has multiple requests, the `token` will be refreshed repeatedly
+
+# 3.6.2 (2022-10-27)
+
+### ✔️ refactor
+
+- Replace `/@/` alias with `@/` alias
+
 # 3.6.1 (2022-10-27)
 
 ### 🎫 Feat

CHANGELOG.zh_CN.md

@@ -1,3 +1,36 @@
+# 3.6.4 (2022-11-10)
+
+### 🎫 Feat
+
+- 菜单图标 `icon` 支持使用在线图标
+
+### 🐞 Bug fixes
+
+- 修复 `vxe-button` 鼠标覆盖后字体颜色问题以及一些别的样式问题
+
+### 🍏 Perf
+
+- 优化路由守卫，如果已经登录并存在登录信息后不能跳转到路由白名单，而是继续保持在当前页面
+- 将 `baseURL` 和全局环境代理删除，可直接在 `vite.config.ts` 编写，即方便又支持多个代理地址
+
+# 3.6.3 (2022-11-01)
+
+### 🎫 Feat
+
+- 静态资源分类打包
+- 添加弹幕组件 `demo`
+
+### 🐞 Bug fixes
+
+- 修复 `tailwindcss` 最新版新增的 `collapse` 属性与平台 `class` 类名冲突
+- 修复当 `token` 过期后，如果页面有多个请求会重复刷新 `token`
+
+# 3.6.2 (2022-10-27)
+
+### ✔️ refactor
+
+- 使用`@/`别名替换`/@/`别名
+
 # 3.6.1 (2022-10-27)
 
 ### 🎫 Feat

README.en-US.md

@@ -8,22 +8,22 @@
 
 ## 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 the domestic documentation site](https://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](https://xiaoxian521.github.io/pure-admin-doc)
-- [Click me to view foreign document site 2](https://pure-admin-doc.vercel.app)
 
-## Thin
+## Thin version (offering non-internationalized and internationalized versions)
 
-- [Click Watch Thin](https://github.com/xiaoxian521/pure-admin-thin)
+- [Click me to view the non-internationalized version](https://github.com/xiaoxian521/pure-admin-thin)
+- [Click me to view Internationalization version](https://github.com/xiaoxian521/pure-admin-thin/tree/i18n)
 
 ## Tauri
 
@@ -31,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 the domestic preview station](https://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 site](https://xiaoxian521.github.io/vue-pure-admin)
-- [Click me to view foreign preview station 2](https://vue-pure-admin.vercel.app)
 
 - PC
 <p align="center">

README.md

@@ -8,22 +8,22 @@
 
 ## 简介
 
-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)
+- [点我查看国内文档站](https://yiming_chang.gitee.io/pure-admin-doc)
-- [点我查看国外文档站 1](https://xiaoxian521.github.io/pure-admin-doc)
+- [点我查看国外文档站](https://xiaoxian521.github.io/pure-admin-doc)
-- [点我查看国外文档站 2](https://pure-admin-doc.vercel.app)
 
-## 精简版
+## 精简版（提供非国际化、国际化两个版本选择）
 
-- [点我查看精简版](https://github.com/xiaoxian521/pure-admin-thin)
+- [点我查看非国际化精简版](https://github.com/xiaoxian521/pure-admin-thin)
+- [点我查看国际化精简版](https://github.com/xiaoxian521/pure-admin-thin/tree/i18n)
 
 ## Tauri 版
 
@@ -31,9 +31,8 @@ vue-pure-admin 是一个免费开源的中后台模版。使用了最新的`vue3
 
 ## 预览
 
-- [点我查看国内预览站](http://yiming_chang.gitee.io/vue-pure-admin)
+- [点我查看国内预览站](https://yiming_chang.gitee.io/vue-pure-admin)
-- [点我查看国外预览站 1](https://xiaoxian521.github.io/vue-pure-admin)
+- [点我查看国外预览站](https://xiaoxian521.github.io/vue-pure-admin)
-- [点我查看国外预览站 2](https://vue-pure-admin.vercel.app)
 
 - PC 端
 <p align="center">

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 };

build/plugins.ts

@@ -11,8 +11,8 @@ import VueI18n from "@intlify/vite-plugin-vue-i18n";
 import { visualizer } from "rollup-plugin-visualizer";
 import removeConsole from "vite-plugin-remove-console";
 import themePreprocessorPlugin from "@pureadmin/theme";
-import { genScssMultipleScopeVars } from "/@/layout/theme";
 import DefineOptions from "unplugin-vue-define-options/vite";
+import { genScssMultipleScopeVars } from "../src/layout/theme";
 
 export function getPluginsList(
   command: string,

locales/en.yaml

@@ -94,6 +94,7 @@ menus:
   hsPdf: PDF Preview
   hsExecl: Export Excel
   hsInfiniteScroll: Table Infinite Scroll
+  hsdanmaku: Danmaku Components
 status:
   hsLoad: Loading...
 login:

locales/zh-CN.yaml

@@ -94,6 +94,7 @@ menus:
   hsPdf: PDF预览
   hsExecl: 导出Excel
   hsInfiniteScroll: 表格无限滚动
+  hsdanmaku: 弹幕组件
 status:
   hsLoad: 加载中...
 login:

mock/asyncRoutes.ts

@@ -68,8 +68,8 @@ const permissionRouter = {
       path: "/permission/page/index",
       name: "PermissionPage",
       meta: {
-        roles: ["admin", "common"],
+        title: "menus.permissionPage",
-        title: "menus.permissionPage"
+        roles: ["admin", "common"]
       }
     },
     {

mock/refreshToken.ts

@@ -10,8 +10,8 @@ export default [
         return {
           success: true,
           data: {
-            accessToken: "eyJhbGciOiJIUzUxMiJ9.admin",
+            accessToken: "eyJhbGciOiJIUzUxMiJ9.newAdmin",
-            refreshToken: "eyJhbGciOiJIUzUxMiJ9.adminRefresh",
+            refreshToken: "eyJhbGciOiJIUzUxMiJ9.newAdminRefresh",
             // `expires`选择这种日期格式是为了方便调试，后端直接设置时间戳或许更方便（每次都应该递增）。如果后端返回的是时间戳格式，前端开发请来到这个目录`src/utils/auth.ts`，把第`38`行的代码换成expires = data.expires即可。
             expires: "2023/10/30 23:59:59"
           }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "3.6.1",
+  "version": "3.6.4",
   "private": true,
   "scripts": {
     "dev": "NODE_OPTIONS=--max-old-space-size=4096 vite",
@@ -77,6 +77,7 @@
     "vue-router": "^4.1.6",
     "vue-types": "^4.2.1",
     "vue-virtual-scroller": "^2.0.0-alpha.1",
+    "vue3-danmaku": "^1.0.0",
     "vuedraggable": "^4.1.0",
     "vxe-table": "^4.3.5",
     "xe-utils": "^3.5.7",
@@ -116,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",
@@ -126,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",
@@ -142,15 +143,15 @@
     "stylelint-config-recommended": "^6.0.0",
     "stylelint-config-standard": "^24.0.0",
     "stylelint-order": "^5.0.0",
-    "tailwindcss": "^3.2.1",
+    "tailwindcss": "^3.2.2",
-    "terser": "^5.15.0",
+    "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"

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
+  tailwindcss: ^3.2.2
-  terser: ^5.15.0
+  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
@@ -120,6 +120,7 @@ specifiers:
   vue-tsc: ^0.40.13
   vue-types: ^4.2.1
   vue-virtual-scroller: ^2.0.0-alpha.1
+  vue3-danmaku: ^1.0.0
   vuedraggable: ^4.1.0
   vxe-table: ^4.3.5
   xe-utils: ^3.5.7
@@ -176,6 +177,7 @@ dependencies:
   vue-router: 4.1.6_vue@3.2.40
   vue-types: 4.2.1_vue@3.2.40
   vue-virtual-scroller: 2.0.0-alpha.1_vue@3.2.40
+  vue3-danmaku: 1.0.0_vue@3.2.40
   vuedraggable: 4.1.0_vue@3.2.40
   vxe-table: 4.3.5_vue@3.2.40+xe-utils@3.5.7
   xe-utils: 3.5.7
@@ -215,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
@@ -225,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-import: 15.0.0_postcss@8.4.18
-  postcss-scss: 4.0.5_postcss@8.4.17
+  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
@@ -241,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
@@ -249,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
@@ -902,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==
@@ -912,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
 
@@ -2065,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:
@@ -2529,10 +2531,10 @@ packages:
     dependencies:
       cac: 6.7.14
       color: 4.2.3
-      cssnano: 5.1.13_postcss@8.4.17
+      cssnano: 5.1.14_postcss@8.4.18
-      cssnano-preset-lite: 2.1.3_postcss@8.4.17
+      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
@@ -2844,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
@@ -2855,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
 
@@ -2937,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
@@ -3026,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
 
@@ -3419,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==
@@ -3428,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:
@@ -3480,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
+      css-declaration-sorter: 6.3.1_postcss@8.4.18
-      cssnano-utils: 3.1.0_postcss@8.4.17
+      cssnano-utils: 3.1.0_postcss@8.4.18
-      postcss: 8.4.17
+      postcss: 8.4.18
-      postcss-calc: 8.2.4_postcss@8.4.17
+      postcss-calc: 8.2.4_postcss@8.4.18
-      postcss-colormin: 5.3.0_postcss@8.4.17
+      postcss-colormin: 5.3.0_postcss@8.4.18
-      postcss-convert-values: 5.1.2_postcss@8.4.17
+      postcss-convert-values: 5.1.3_postcss@8.4.18
-      postcss-discard-comments: 5.1.2_postcss@8.4.17
+      postcss-discard-comments: 5.1.2_postcss@8.4.18
-      postcss-discard-duplicates: 5.1.0_postcss@8.4.17
+      postcss-discard-duplicates: 5.1.0_postcss@8.4.18
-      postcss-discard-empty: 5.1.1_postcss@8.4.17
+      postcss-discard-empty: 5.1.1_postcss@8.4.18
-      postcss-discard-overridden: 5.1.0_postcss@8.4.17
+      postcss-discard-overridden: 5.1.0_postcss@8.4.18
-      postcss-merge-longhand: 5.1.6_postcss@8.4.17
+      postcss-merge-longhand: 5.1.7_postcss@8.4.18
-      postcss-merge-rules: 5.1.2_postcss@8.4.17
+      postcss-merge-rules: 5.1.3_postcss@8.4.18
-      postcss-minify-font-values: 5.1.0_postcss@8.4.17
+      postcss-minify-font-values: 5.1.0_postcss@8.4.18
-      postcss-minify-gradients: 5.1.1_postcss@8.4.17
+      postcss-minify-gradients: 5.1.1_postcss@8.4.18
-      postcss-minify-params: 5.1.3_postcss@8.4.17
+      postcss-minify-params: 5.1.4_postcss@8.4.18
-      postcss-minify-selectors: 5.2.1_postcss@8.4.17
+      postcss-minify-selectors: 5.2.1_postcss@8.4.18
-      postcss-normalize-charset: 5.1.0_postcss@8.4.17
+      postcss-normalize-charset: 5.1.0_postcss@8.4.18
-      postcss-normalize-display-values: 5.1.0_postcss@8.4.17
+      postcss-normalize-display-values: 5.1.0_postcss@8.4.18
-      postcss-normalize-positions: 5.1.1_postcss@8.4.17
+      postcss-normalize-positions: 5.1.1_postcss@8.4.18
-      postcss-normalize-repeat-style: 5.1.1_postcss@8.4.17
+      postcss-normalize-repeat-style: 5.1.1_postcss@8.4.18
-      postcss-normalize-string: 5.1.0_postcss@8.4.17
+      postcss-normalize-string: 5.1.0_postcss@8.4.18
-      postcss-normalize-timing-functions: 5.1.0_postcss@8.4.17
+      postcss-normalize-timing-functions: 5.1.0_postcss@8.4.18
-      postcss-normalize-unicode: 5.1.0_postcss@8.4.17
+      postcss-normalize-unicode: 5.1.1_postcss@8.4.18
-      postcss-normalize-url: 5.1.0_postcss@8.4.17
+      postcss-normalize-url: 5.1.0_postcss@8.4.18
-      postcss-normalize-whitespace: 5.1.1_postcss@8.4.17
+      postcss-normalize-whitespace: 5.1.1_postcss@8.4.18
-      postcss-ordered-values: 5.1.3_postcss@8.4.17
+      postcss-ordered-values: 5.1.3_postcss@8.4.18
-      postcss-reduce-initial: 5.1.0_postcss@8.4.17
+      postcss-reduce-initial: 5.1.1_postcss@8.4.18
-      postcss-reduce-transforms: 5.1.0_postcss@8.4.17
+      postcss-reduce-transforms: 5.1.0_postcss@8.4.18
-      postcss-svgo: 5.1.0_postcss@8.4.17
+      postcss-svgo: 5.1.0_postcss@8.4.18
-      postcss-unique-selectors: 5.1.1_postcss@8.4.17
+      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==
@@ -3530,14 +3532,14 @@ packages:
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      cssnano-utils: 3.1.0_postcss@8.4.17
+      cssnano-utils: 3.1.0_postcss@8.4.18
-      postcss: 8.4.17
+      postcss: 8.4.18
-      postcss-discard-comments: 5.1.2_postcss@8.4.17
+      postcss-discard-comments: 5.1.2_postcss@8.4.18
-      postcss-discard-empty: 5.1.1_postcss@8.4.17
+      postcss-discard-empty: 5.1.1_postcss@8.4.18
-      postcss-normalize-whitespace: 5.1.1_postcss@8.4.17
+      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==
@@ -3546,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
 
@@ -6681,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==
@@ -6689,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==
@@ -6706,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==
@@ -6733,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==
@@ -6745,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==
@@ -6757,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==
@@ -6769,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:
@@ -6781,11 +6783,11 @@ packages:
     dependencies:
       htmlparser2: 8.0.1
       js-tokens: 8.0.0
-      postcss: 8.4.17
+      postcss: 8.4.18
-      postcss-safe-parser: 6.0.0_postcss@8.4.17
+      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==
@@ -6794,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==
@@ -6809,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==
@@ -6825,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==
@@ -6844,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
 
@@ -6855,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:
@@ -6880,12 +6882,12 @@ packages:
     dependencies:
       browserslist: 4.21.4
       caniuse-api: 3.0.0
-      cssnano-utils: 3.1.0_postcss@8.4.17
+      cssnano-utils: 3.1.0_postcss@8.4.18
-      postcss: 8.4.17
+      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==
@@ -6894,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==
@@ -6908,27 +6910,27 @@ packages:
       postcss: ^8.2.15
     dependencies:
       colord: 2.9.3
-      cssnano-utils: 3.1.0_postcss@8.4.17
+      cssnano-utils: 3.1.0_postcss@8.4.18
-      postcss: 8.4.17
+      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
+      cssnano-utils: 3.1.0_postcss@8.4.18
-      postcss: 8.4.17
+      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==
@@ -6937,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==
@@ -6950,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==
@@ -6963,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==
@@ -6975,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==
@@ -6988,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==
@@ -7001,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==
@@ -7014,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==
@@ -7027,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==
@@ -7055,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==
@@ -7068,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==
@@ -7081,15 +7083,15 @@ packages:
     peerDependencies:
       postcss: ^8.2.15
     dependencies:
-      cssnano-utils: 3.1.0_postcss@8.4.17
+      cssnano-utils: 3.1.0_postcss@8.4.18
-      postcss: 8.4.17
+      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:
@@ -7097,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==
@@ -7109,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
 
@@ -7120,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==
@@ -7129,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==
@@ -7141,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:
@@ -7155,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==
@@ -7163,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==
@@ -7175,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==
@@ -7189,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
 
@@ -7200,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:
@@ -7568,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
@@ -8091,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
 
@@ -8163,8 +8165,8 @@ packages:
     peerDependencies:
       stylelint: ^14.0.0
     dependencies:
-      postcss: 8.4.17
+      postcss: 8.4.18
-      postcss-sorting: 7.0.1_postcss@8.4.17
+      postcss-sorting: 7.0.1_postcss@8.4.18
       stylelint: 14.13.0
     dev: true
 
@@ -8176,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
@@ -8199,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
@@ -8313,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
@@ -8335,11 +8337,11 @@ packages:
       normalize-path: 3.0.0
       object-hash: 3.0.0
       picocolors: 1.0.0
-      postcss: 8.4.17
+      postcss: 8.4.18
-      postcss-import: 14.1.0_postcss@8.4.17
+      postcss-import: 14.1.0_postcss@8.4.18
-      postcss-js: 4.0.0_postcss@8.4.17
+      postcss-js: 4.0.0_postcss@8.4.18
-      postcss-load-config: 3.1.4_postcss@8.4.17
+      postcss-load-config: 3.1.4_postcss@8.4.18
-      postcss-nested: 6.0.0_postcss@8.4.17
+      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
@@ -8780,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
 
@@ -8820,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
@@ -9027,6 +9029,17 @@ packages:
       "@vue/shared": 3.2.40
     dev: false
 
+  /vue3-danmaku/1.0.0_vue@3.2.40:
+    resolution:
+      {
+        integrity: sha512-1DVPQeQBdv/iGyuumebZLKPHcfvSgPwxe/ExKF1jc/dJ3MINbXkw23iIajE8JKNvttagOX7eZnuwWnQ4ug8pqg==
+      }
+    peerDependencies:
+      vue: ^3.0.0
+    dependencies:
+      vue: 3.2.40
+    dev: false
+
   /vuedraggable/4.1.0_vue@3.2.40:
     resolution:
       {

public/serverConfig.json

@@ -1,5 +1,5 @@
 {
-  "Version": "3.6.1",
+  "Version": "3.6.4",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,

src/api/list.ts

@@ -1,4 +1,4 @@
-import { http } from "../utils/http";
+import { http } from "@/utils/http";
 
 type Result = {
   success: boolean;

src/api/mock.ts

@@ -1,4 +1,4 @@
-import { http } from "../utils/http";
+import { http } from "@/utils/http";
 
 type Result = {
   success: boolean;

src/api/routes.ts

@@ -1,4 +1,4 @@
-import { http } from "../utils/http";
+import { http } from "@/utils/http";
 
 type Result = {
   success: boolean;

src/api/system.ts

@@ -1,4 +1,4 @@
-import { http } from "../utils/http";
+import { http } from "@/utils/http";
 
 type Result = {
   success: boolean;

src/api/user.ts

@@ -1,4 +1,4 @@
-import { http } from "../utils/http";
+import { http } from "@/utils/http";
 
 export type UserResult = {
   success: boolean;

src/components/ReAuth/src/auth.tsx

@@ -1,5 +1,5 @@
 import { defineComponent, Fragment } from "vue";
-import { hasAuth } from "/@/router/utils";
+import { hasAuth } from "@/router/utils";
 
 export default defineComponent({
   name: "Auth",

src/components/ReCountTo/src/normal/props.ts

@@ -1,5 +1,5 @@
 import { PropType } from "vue";
-import { propTypes } from "/@/utils/propTypes";
+import { propTypes } from "@/utils/propTypes";
 export const countToProps = {
   startVal: propTypes.number.def(0),
   endVal: propTypes.number.def(2020),

src/components/ReCountTo/src/rebound/props.ts

@@ -1,5 +1,5 @@
 import { PropType } from "vue";
-import { propTypes } from "/@/utils/propTypes";
+import { propTypes } from "@/utils/propTypes";
 export const reboundProps = {
   delay: propTypes.number.def(1),
   blur: propTypes.number.def(2),

src/components/ReFlop/src/filpper.tsx

@@ -1,5 +1,5 @@
 import { defineComponent, ref } from "vue";
-import { propTypes } from "/@/utils/propTypes";
+import { propTypes } from "@/utils/propTypes";
 import "./filpper.css";
 
 const props = {

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;

src/components/ReIcon/src/Select.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { cloneDeep } from "lodash-unified";
 import { ref, computed, CSSProperties, toRef, watch } from "vue";
-import { IconJson } from "/@/components/ReIcon/data";
+import { IconJson } from "@/components/ReIcon/data";
 type ParameterCSSProperties = (item?: string) => CSSProperties | undefined;
 
 defineOptions({

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

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 },

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;
 

src/components/ReMap/src/Amap.vue

@@ -2,8 +2,8 @@
 import { reactive, getCurrentInstance, onBeforeMount, onUnmounted } from "vue";
 import { deviceDetection } from "@pureadmin/utils";
 import AMapLoader from "@amap/amap-jsapi-loader";
-import { mapJson } from "/@/api/mock";
+import { mapJson } from "@/api/mock";
-import car from "/@/assets/car.png";
+import car from "@/assets/car.png";
 
 export interface MapConfigureInter {
   on: Fn;

src/components/ReQrcode/src/index.tsx

@@ -10,7 +10,7 @@ import {
 import "./index.scss";
 import { cloneDeep } from "lodash-unified";
 import { isString } from "@pureadmin/utils";
-import { propTypes } from "/@/utils/propTypes";
+import { propTypes } from "@/utils/propTypes";
 import { IconifyIconOffline } from "../../ReIcon";
 import QRCode, { QRCodeRenderersOptions } from "qrcode";
 

src/components/ReTable/src/bar.tsx

@@ -1,5 +1,5 @@
 import { defineComponent, ref, computed, PropType } from "vue";
-import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
+import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import { IconifyIconOffline } from "../../ReIcon";
 
 export const loadingSvg = `

src/directives/auth/index.ts

@@ -1,4 +1,4 @@
-import { hasAuth } from "/@/router/utils";
+import { hasAuth } from "@/router/utils";
 import { Directive, type DirectiveBinding } from "vue";
 
 export const auth: Directive = {

src/directives/elResizeDetector/index.ts

@@ -1,7 +1,7 @@
 import { Directive, type DirectiveBinding, type VNode } from "vue";
 import elementResizeDetectorMaker from "element-resize-detector";
 import type { Erd } from "element-resize-detector";
-import { emitter } from "/@/utils/mitt";
+import { emitter } from "@/utils/mitt";
 
 const erd: Erd = elementResizeDetectorMaker({
   strategy: "scroll"

src/layout/components/appMain.vue

@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { useGlobal } from "@pureadmin/utils";
-import backTop from "/@/assets/svg/back_top.svg?component";
+import backTop from "@/assets/svg/back_top.svg?component";
 import { h, computed, Transition, defineComponent } from "vue";
-import { usePermissionStoreHook } from "/@/store/modules/permission";
+import { usePermissionStoreHook } from "@/store/modules/permission";
 
 const props = defineProps({
   fixedHeader: Boolean

src/layout/components/navbar.vue

@@ -2,12 +2,11 @@
 import Search from "./search/index.vue";
 import Notice from "./notice/index.vue";
 import mixNav from "./sidebar/mixNav.vue";
-import avatars from "/@/assets/avatars.jpg";
+import { useNav } from "@/layout/hooks/useNav";
-import { useNav } from "/@/layout/hooks/useNav";
 import Breadcrumb from "./sidebar/breadCrumb.vue";
 import topCollapse from "./sidebar/topCollapse.vue";
 import { useTranslationLang } from "../hooks/useTranslationLang";
-import globalization from "/@/assets/svg/globalization.svg?component";
+import globalization from "@/assets/svg/globalization.svg?component";
 
 const {
   layout,
@@ -82,8 +81,11 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
       </el-dropdown>
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
-        <span class="el-dropdown-link navbar-bg-hover">
+        <span class="el-dropdown-link navbar-bg-hover select-none">
-          <img v-if="avatars" :src="avatars" :style="avatarsStyle" />
+          <img
+            src="https://avatars.githubusercontent.com/u/44761321?v=4"
+            :style="avatarsStyle"
+          />
           <p v-if="username" class="dark:text-white">{{ username }}</p>
         </span>
         <template #dropdown>

src/layout/components/panel/index.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import { onClickOutside } from "@vueuse/core";
-import { emitter } from "/@/utils/mitt";
+import { emitter } from "@/utils/mitt";
 
 let show = ref<Boolean>(false);
 const target = ref(null);

src/layout/components/search/components/SearchFooter.vue

@@ -17,9 +17,10 @@
 </template>
 
 <script lang="ts" setup>
-import enterOutlined from "/@/assets/svg/enter_outlined.svg?component";
+import mdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component";
-import mdiKeyboardEsc from "/@/assets/svg/mdi_keyboard_esc.svg?component";
+import enterOutlined from "@/assets/svg/enter_outlined.svg?component";
 </script>
+
 <style lang="scss" scoped>
 .search-footer {
   display: flex;

src/layout/components/search/components/SearchModal.vue

@@ -3,12 +3,12 @@ import { useRouter } from "vue-router";
 import { cloneDeep } from "lodash-unified";
 import SearchResult from "./SearchResult.vue";
 import SearchFooter from "./SearchFooter.vue";
-import { useNav } from "/@/layout/hooks/useNav";
+import { useNav } from "@/layout/hooks/useNav";
-import { transformI18n } from "/@/plugins/i18n";
+import { transformI18n } from "@/plugins/i18n";
 import { deleteChildren } from "@pureadmin/utils";
 import { useDebounceFn, onKeyStroke } from "@vueuse/core";
 import { ref, watch, computed, nextTick, shallowRef } from "vue";
-import { usePermissionStoreHook } from "/@/store/modules/permission";
+import { usePermissionStoreHook } from "@/store/modules/permission";
 
 interface Props {
   /** 弹窗显隐 */

src/layout/components/search/components/SearchResult.vue

@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import { computed } from "vue";
 import { useI18n } from "vue-i18n";
-import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
+import { useEpThemeStoreHook } from "@/store/modules/epTheme";
-import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import enterOutlined from "/@/assets/svg/enter_outlined.svg?component";
+import enterOutlined from "@/assets/svg/enter_outlined.svg?component";
 
 const { t } = useI18n();
 

src/layout/components/setting/index.vue

@@ -8,18 +8,18 @@ import {
   nextTick,
   useCssModule
 } from "vue";
-import { getConfig } from "/@/config";
+import { getConfig } from "@/config";
 import { useRouter } from "vue-router";
 import panel from "../panel/index.vue";
-import { emitter } from "/@/utils/mitt";
+import { emitter } from "@/utils/mitt";
-import { resetRouter } from "/@/router";
+import { resetRouter } from "@/router";
 import { templateRef } from "@vueuse/core";
-import { removeToken } from "/@/utils/auth";
+import { removeToken } from "@/utils/auth";
-import { routerArrays } from "/@/layout/types";
+import { routerArrays } from "@/layout/types";
-import { useNav } from "/@/layout/hooks/useNav";
+import { useNav } from "@/layout/hooks/useNav";
-import { useAppStoreHook } from "/@/store/modules/app";
+import { useAppStoreHook } from "@/store/modules/app";
-import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
+import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
-import { useDataThemeChange } from "/@/layout/hooks/useDataThemeChange";
+import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
 import {
   useDark,
   debounce,
@@ -29,8 +29,8 @@ import {
 } from "@pureadmin/utils";
 import { toggleTheme } from "@pureadmin/theme/dist/browser-utils";
 
-import dayIcon from "/@/assets/svg/day.svg?component";
+import dayIcon from "@/assets/svg/day.svg?component";
-import darkIcon from "/@/assets/svg/dark.svg?component";
+import darkIcon from "@/assets/svg/dark.svg?component";
 
 const router = useRouter();
 const { device } = useNav();

src/layout/components/sidebar/breadCrumb.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { isEqual } from "lodash-unified";
-import { transformI18n } from "/@/plugins/i18n";
+import { transformI18n } from "@/plugins/i18n";
 import { ref, watch, onMounted, toRaw } from "vue";
-import { getParentPaths, findRouteByPath } from "/@/router/utils";
+import { getParentPaths, findRouteByPath } from "@/router/utils";
-import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
+import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { useRoute, useRouter, RouteLocationMatched } from "vue-router";
 
 const route = useRoute();

src/layout/components/sidebar/horizontal.vue

@@ -3,11 +3,10 @@ import Search from "../search/index.vue";
 import Notice from "../notice/index.vue";
 import { ref, watch, nextTick } from "vue";
 import SidebarItem from "./sidebarItem.vue";
-import avatars from "/@/assets/avatars.jpg";
+import { useNav } from "@/layout/hooks/useNav";
-import { useNav } from "/@/layout/hooks/useNav";
 import { useTranslationLang } from "../../hooks/useTranslationLang";
-import { usePermissionStoreHook } from "/@/store/modules/permission";
+import { usePermissionStoreHook } from "@/store/modules/permission";
-import globalization from "/@/assets/svg/globalization.svg?component";
+import globalization from "@/assets/svg/globalization.svg?component";
 
 const menuRef = ref();
 
@@ -97,7 +96,10 @@ watch(
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link navbar-bg-hover">
-          <img v-if="avatars" :src="avatars" :style="avatarsStyle" />
+          <img
+            src="https://avatars.githubusercontent.com/u/44761321?v=4"
+            :style="avatarsStyle"
+          />
           <p v-if="username" class="dark:text-white">{{ username }}</p>
         </span>
         <template #dropdown>

src/layout/components/sidebar/logo.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useNav } from "/@/layout/hooks/useNav";
+import { useNav } from "@/layout/hooks/useNav";
 
 const props = defineProps({
   collapse: Boolean
@@ -9,7 +9,7 @@ const { title } = useNav();
 </script>
 
 <template>
-  <div class="sidebar-logo-container" :class="{ collapse: props.collapse }">
+  <div class="sidebar-logo-container" :class="{ collapses: props.collapse }">
     <transition name="sidebarLogoFade">
       <router-link
         v-if="props.collapse"
@@ -65,7 +65,7 @@ const { title } = useNav();
     }
   }
 
-  .collapse {
+  .collapses {
     .sidebar-logo {
       margin-right: 0;
     }

src/layout/components/sidebar/mixNav.vue

@@ -1,15 +1,14 @@
 <script setup lang="ts">
 import Search from "../search/index.vue";
 import Notice from "../notice/index.vue";
-import avatars from "/@/assets/avatars.jpg";
+import { useNav } from "@/layout/hooks/useNav";
-import { useNav } from "/@/layout/hooks/useNav";
+import { transformI18n } from "@/plugins/i18n";
-import { transformI18n } from "/@/plugins/i18n";
 import { ref, toRaw, watch, onMounted, nextTick } from "vue";
-import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import { getParentPaths, findRouteByPath } from "/@/router/utils";
+import { getParentPaths, findRouteByPath } from "@/router/utils";
 import { useTranslationLang } from "../../hooks/useTranslationLang";
-import { usePermissionStoreHook } from "/@/store/modules/permission";
+import { usePermissionStoreHook } from "@/store/modules/permission";
-import globalization from "/@/assets/svg/globalization.svg?component";
+import globalization from "@/assets/svg/globalization.svg?component";
 
 const menuRef = ref();
 let defaultActive = ref(null);
@@ -128,8 +127,11 @@ watch(
       </el-dropdown>
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
-        <span class="el-dropdown-link navbar-bg-hover">
+        <span class="el-dropdown-link navbar-bg-hover select-none">
-          <img v-if="avatars" :src="avatars" :style="avatarsStyle" />
+          <img
+            src="https://avatars.githubusercontent.com/u/44761321?v=4"
+            :style="avatarsStyle"
+          />
           <p v-if="username" class="dark:text-white">{{ username }}</p>
         </span>
         <template #dropdown>

src/layout/components/sidebar/sidebarItem.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import path from "path";
 import { childrenType } from "../../types";
-import { useNav } from "/@/layout/hooks/useNav";
+import { useNav } from "@/layout/hooks/useNav";
-import { transformI18n } from "/@/plugins/i18n";
+import { transformI18n } from "@/plugins/i18n";
-import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { ref, toRaw, PropType, nextTick, computed, CSSProperties } from "vue";
 
 const { layout, isCollapse } = useNav();

src/layout/components/sidebar/vertical.vue

@@ -1,15 +1,15 @@
 <script setup lang="ts">
 import Logo from "./logo.vue";
 import { useRoute } from "vue-router";
-import { emitter } from "/@/utils/mitt";
+import { emitter } from "@/utils/mitt";
 import SidebarItem from "./sidebarItem.vue";
 import leftCollapse from "./leftCollapse.vue";
 import type { StorageConfigs } from "/#/index";
-import { useNav } from "/@/layout/hooks/useNav";
+import { useNav } from "@/layout/hooks/useNav";
 import { storageLocal } from "@pureadmin/utils";
 import { ref, computed, watch, onBeforeMount } from "vue";
-import { findRouteByPath, getParentPaths } from "/@/router/utils";
+import { findRouteByPath, getParentPaths } from "@/router/utils";
-import { usePermissionStoreHook } from "/@/store/modules/permission";
+import { usePermissionStoreHook } from "@/store/modules/permission";
 
 const route = useRoute();
 const showLogo = ref(

src/layout/components/tag/index.vue

@@ -1,14 +1,14 @@
 <script setup lang="ts">
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
-import { emitter } from "/@/utils/mitt";
+import { emitter } from "@/utils/mitt";
 import { RouteConfigs } from "../../types";
 import { useTags } from "../../hooks/useTag";
-import { routerArrays } from "/@/layout/types";
+import { routerArrays } from "@/layout/types";
 import { isEqual, isEmpty } from "lodash-unified";
-import { useSettingStoreHook } from "/@/store/modules/settings";
+import { useSettingStoreHook } from "@/store/modules/settings";
 import { ref, watch, unref, nextTick, onBeforeMount } from "vue";
-import { handleAliveRoute, delAliveRoutes } from "/@/router/utils";
+import { handleAliveRoute, delAliveRoutes } from "@/router/utils";
-import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
+import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { useResizeObserver, useDebounceFn, useFullscreen } from "@vueuse/core";
 
 const {
@@ -499,7 +499,7 @@ onMounted(() => {
       <IconifyIconOffline icon="arrow-left-s-line" @click="handleScroll(200)" />
     </span>
     <div ref="scrollbarDom" class="scroll-container">
-      <div class="tab" ref="tabDom" :style="getTabStyle">
+      <div class="tab select-none" ref="tabDom" :style="getTabStyle">
         <div
           :ref="'dynamic' + index"
           v-for="(item, index) in multiTags"

src/layout/hooks/useDataThemeChange.ts

@@ -1,11 +1,11 @@
 import { ref } from "vue";
-import { getConfig } from "/@/config";
+import { getConfig } from "@/config";
 import { find } from "lodash-unified";
 import { useLayout } from "./useLayout";
 import { themeColorsType } from "../types";
 import { TinyColor } from "@ctrl/tinycolor";
 import { useGlobal } from "@pureadmin/utils";
-import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
+import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import {
   darken,
   lighten,
@@ -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));

src/layout/hooks/useLayout.ts

@@ -2,7 +2,7 @@ import { computed } from "vue";
 import { useI18n } from "vue-i18n";
 import { routerArrays } from "../types";
 import { useGlobal } from "@pureadmin/utils";
-import { useMultiTagsStore } from "/@/store/modules/multiTags";
+import { useMultiTagsStore } from "@/store/modules/multiTags";
 
 export function useLayout() {
   const { $storage, $config } = useGlobal<GlobalPropertiesApi>();

src/layout/hooks/useNav.ts

@@ -1,15 +1,15 @@
 import { computed } from "vue";
-import { getConfig } from "/@/config";
+import { getConfig } from "@/config";
 import { useRouter } from "vue-router";
-import { emitter } from "/@/utils/mitt";
+import { emitter } from "@/utils/mitt";
 import { routeMetaType } from "../types";
 import { useGlobal } from "@pureadmin/utils";
-import { transformI18n } from "/@/plugins/i18n";
+import { transformI18n } from "@/plugins/i18n";
-import { router, remainingPaths } from "/@/router";
+import { router, remainingPaths } from "@/router";
-import { useAppStoreHook } from "/@/store/modules/app";
+import { useAppStoreHook } from "@/store/modules/app";
 import { i18nChangeLanguage } from "@wangeditor/editor";
-import { useUserStoreHook } from "/@/store/modules/user";
+import { useUserStoreHook } from "@/store/modules/user";
-import { useEpThemeStoreHook } from "/@/store/modules/epTheme";
+import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 
 const errorInfo = "当前路由配置不正确，请检查配置";
 

src/layout/hooks/useTag.ts

@@ -13,9 +13,9 @@ import { isEqual } from "lodash-unified";
 import type { StorageConfigs } from "/#/index";
 import { useEventListener } from "@vueuse/core";
 import { useRoute, useRouter } from "vue-router";
-import { transformI18n, $t } from "/@/plugins/i18n";
+import { transformI18n, $t } from "@/plugins/i18n";
-import { useSettingStoreHook } from "/@/store/modules/settings";
+import { useSettingStoreHook } from "@/store/modules/settings";
-import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
+import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { storageLocal, toggleClass, hasClass } from "@pureadmin/utils";
 
 export function useTags() {

src/layout/index.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { setType } from "./types";
-import { emitter } from "/@/utils/mitt";
+import { emitter } from "@/utils/mitt";
 import { useLayout } from "./hooks/useLayout";
-import { useAppStoreHook } from "/@/store/modules/app";
+import { useAppStoreHook } from "@/store/modules/app";
-import { useSettingStoreHook } from "/@/store/modules/settings";
+import { useSettingStoreHook } from "@/store/modules/settings";
 import { deviceDetection, useDark, useGlobal } from "@pureadmin/utils";
 import { h, reactive, computed, onMounted, defineComponent } from "vue";
 
@@ -13,7 +13,7 @@ import appMain from "./components/appMain.vue";
 import setting from "./components/setting/index.vue";
 import Vertical from "./components/sidebar/vertical.vue";
 import Horizontal from "./components/sidebar/horizontal.vue";
-import backTop from "/@/assets/svg/back_top.svg?component";
+import backTop from "@/assets/svg/back_top.svg?component";
 
 const { isDark } = useDark();
 const { layout } = useLayout();

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;

src/main.ts

@@ -1,15 +1,15 @@
 import App from "./App.vue";
 import router from "./router";
-import { setupStore } from "/@/store";
+import { setupStore } from "@/store";
 import ElementPlus from "element-plus";
+import { useI18n } from "@/plugins/i18n";
 import { getServerConfig } from "./config";
 import { createApp, Directive } from "vue";
-import { useI18n } from "../src/plugins/i18n";
 import { MotionPlugin } from "@vueuse/motion";
-import { useEcharts } from "/@/plugins/echarts";
+import { useEcharts } from "@/plugins/echarts";
+import { useTable } from "@/plugins/vxe-table";
 import VirtualScroller from "vue-virtual-scroller";
-import { useTable } from "../src/plugins/vxe-table";
+import { injectResponsiveStorage } from "@/utils/responsive";
-import { injectResponsiveStorage } from "/@/utils/responsive";
 
 import Table from "@pureadmin/table";
 import PureDescriptions from "@pureadmin/descriptions";
@@ -32,7 +32,7 @@ import "vue-virtual-scroller/dist/vue-virtual-scroller.css";
 const app = createApp(App);
 
 // 自定义指令
-import * as directives from "/@/directives";
+import * as directives from "@/directives";
 Object.keys(directives).forEach(key => {
   app.directive(key, (directives as { [key: string]: Directive })[key]);
 });
@@ -48,7 +48,7 @@ app.component("IconifyIconOnline", IconifyIconOnline);
 app.component("FontIcon", FontIcon);
 
 // 全局注册按钮级别权限组件
-import { Auth } from "/@/components/ReAuth";
+import { Auth } from "@/components/ReAuth";
 app.component("Auth", Auth);
 
 getServerConfig(app).then(async config => {

src/plugins/vxe-table/index.ts

@@ -2,7 +2,7 @@ import "xe-utils";
 import "./index.scss";
 import XEUtils from "xe-utils";
 import { App, unref } from "vue";
-import { i18n } from "/@/plugins/i18n";
+import { i18n } from "@/plugins/i18n";
 import "font-awesome/css/font-awesome.min.css";
 import zh from "vxe-table/lib/locale/lang/zh-CN";
 import en from "vxe-table/lib/locale/lang/en-US";

src/router/index.ts

@@ -1,11 +1,11 @@
-import { getConfig } from "/@/config";
+import { getConfig } from "@/config";
 import { toRouteType } from "./types";
-import NProgress from "/@/utils/progress";
+import NProgress from "@/utils/progress";
 import { findIndex } from "lodash-unified";
-import { transformI18n } from "/@/plugins/i18n";
+import { transformI18n } from "@/plugins/i18n";
-import { sessionKey, type DataInfo } from "/@/utils/auth";
+import { sessionKey, type DataInfo } from "@/utils/auth";
-import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
+import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
-import { usePermissionStoreHook } from "/@/store/modules/permission";
+import { usePermissionStoreHook } from "@/store/modules/permission";
 import {
   Router,
   createRouter,
@@ -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") {

src/router/modules/able.ts

@@ -1,4 +1,4 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
 
 const ableRouter: RouteConfigsTable = {
@@ -13,7 +13,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/watermark",
       name: "WaterMark",
-      component: () => import("/@/views/able/watermark.vue"),
+      component: () => import("@/views/able/watermark.vue"),
       meta: {
         title: $t("menus.hsWatermark")
       }
@@ -21,7 +21,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/print",
       name: "Print",
-      component: () => import("/@/views/able/print.vue"),
+      component: () => import("@/views/able/print.vue"),
       meta: {
         title: $t("menus.hsPrint")
       }
@@ -29,7 +29,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/download",
       name: "Download",
-      component: () => import("/@/views/able/download.vue"),
+      component: () => import("@/views/able/download.vue"),
       meta: {
         title: $t("menus.hsDownload")
       }
@@ -37,7 +37,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/iconSelect",
       name: "IconSelect",
-      component: () => import("/@/views/able/icon-select.vue"),
+      component: () => import("@/views/able/icon-select.vue"),
       meta: {
         title: $t("menus.hsIconSelect")
       }
@@ -45,7 +45,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/timeline",
       name: "TimeLine",
-      component: () => import("/@/views/able/timeline.vue"),
+      component: () => import("@/views/able/timeline.vue"),
       meta: {
         title: $t("menus.hsTimeline")
       }
@@ -53,7 +53,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/menuTree",
       name: "MenuTree",
-      component: () => import("/@/views/able/menu-tree.vue"),
+      component: () => import("@/views/able/menu-tree.vue"),
       meta: {
         title: $t("menus.hsMenuTree")
       }
@@ -61,7 +61,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/lineTree",
       name: "LineTree",
-      component: () => import("/@/views/able/line-tree.vue"),
+      component: () => import("@/views/able/line-tree.vue"),
       meta: {
         title: $t("menus.hsLineTree")
       }
@@ -69,7 +69,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/antTabs",
       name: "AntTabs",
-      component: () => import("/@/views/able/ant-tabs.vue"),
+      component: () => import("@/views/able/ant-tabs.vue"),
       meta: {
         title: $t("menus.hsAntTabs")
       }
@@ -77,7 +77,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/antAnchor",
       name: "AntAnchor",
-      component: () => import("/@/views/able/ant-anchor.vue"),
+      component: () => import("@/views/able/ant-anchor.vue"),
       meta: {
         title: $t("menus.hsAntAnchor")
       }
@@ -85,7 +85,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/antTreeSelect",
       name: "AntTreeSelect",
-      component: () => import("/@/views/able/ant-treeSelect.vue"),
+      component: () => import("@/views/able/ant-treeSelect.vue"),
       meta: {
         title: $t("menus.hsAntTreeSelect")
       }
@@ -93,7 +93,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/debounce",
       name: "Debounce",
-      component: () => import("/@/views/able/debounce.vue"),
+      component: () => import("@/views/able/debounce.vue"),
       meta: {
         title: $t("menus.hsDebounce")
       }
@@ -101,7 +101,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/barcode",
       name: "BarCode",
-      component: () => import("/@/views/able/barcode.vue"),
+      component: () => import("@/views/able/barcode.vue"),
       meta: {
         title: $t("menus.hsBarcode")
       }
@@ -109,7 +109,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/qrcode",
       name: "QrCode",
-      component: () => import("/@/views/able/qrcode.vue"),
+      component: () => import("@/views/able/qrcode.vue"),
       meta: {
         title: $t("menus.hsQrcode")
       }
@@ -117,7 +117,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/cascader",
       name: "Cascader",
-      component: () => import("/@/views/able/cascader.vue"),
+      component: () => import("@/views/able/cascader.vue"),
       meta: {
         title: $t("menus.hsCascader")
       }
@@ -125,7 +125,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/swiper",
       name: "Swiper",
-      component: () => import("/@/views/able/swiper.vue"),
+      component: () => import("@/views/able/swiper.vue"),
       meta: {
         title: $t("menus.hsSwiper")
       }
@@ -133,7 +133,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/virtualList",
       name: "VirtualList",
-      component: () => import("/@/views/able/virtual-list/index.vue"),
+      component: () => import("@/views/able/virtual-list/index.vue"),
       meta: {
         title: $t("menus.hsVirtualList")
       }
@@ -141,7 +141,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/pdf",
       name: "Pdf",
-      component: () => import("/@/views/able/pdf.vue"),
+      component: () => import("@/views/able/pdf.vue"),
       meta: {
         title: $t("menus.hsPdf")
       }
@@ -149,7 +149,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/execl",
       name: "Execl",
-      component: () => import("/@/views/able/execl.vue"),
+      component: () => import("@/views/able/execl.vue"),
       meta: {
         title: $t("menus.hsExecl")
       }
@@ -157,7 +157,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/able/infiniteScroll",
       name: "InfiniteScroll",
-      component: () => import("/@/views/able/infinite-scroll.vue"),
+      component: () => import("@/views/able/infinite-scroll.vue"),
       meta: {
         title: $t("menus.hsInfiniteScroll")
       }

src/router/modules/about.ts

@@ -1,4 +1,4 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
 
 const aboutRouter: RouteConfigsTable = {
@@ -13,7 +13,7 @@ const aboutRouter: RouteConfigsTable = {
     {
       path: "/about/index",
       name: "About",
-      component: () => import("/@/views/about/index.vue"),
+      component: () => import("@/views/about/index.vue"),
       meta: {
         title: $t("menus.hsAbout")
       }

src/router/modules/components.ts

@@ -1,4 +1,4 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
 
 const componentsRouter: RouteConfigsTable = {
@@ -13,7 +13,7 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/video",
       name: "Video",
-      component: () => import("/@/views/components/video/index.vue"),
+      component: () => import("@/views/components/video/index.vue"),
       meta: {
         title: $t("menus.hsvideo")
       }
@@ -21,7 +21,7 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/map",
       name: "Map",
-      component: () => import("/@/views/components/map/index.vue"),
+      component: () => import("@/views/components/map/index.vue"),
       meta: {
         title: $t("menus.hsmap"),
         keepAlive: true,
@@ -33,7 +33,7 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/draggable",
       name: "Draggable",
-      component: () => import("/@/views/components/draggable/index.vue"),
+      component: () => import("@/views/components/draggable/index.vue"),
       meta: {
         title: $t("menus.hsdraggable"),
         transition: {
@@ -45,7 +45,7 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/splitPane",
       name: "SplitPane",
-      component: () => import("/@/views/components/split-pane/index.vue"),
+      component: () => import("@/views/components/split-pane/index.vue"),
       meta: {
         title: $t("menus.hssplitPane"),
         extraIcon: {
@@ -57,7 +57,7 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/button",
       name: "Button",
-      component: () => import("/@/views/components/button/index.vue"),
+      component: () => import("@/views/components/button/index.vue"),
       meta: {
         title: $t("menus.hsbutton")
       }
@@ -65,7 +65,7 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/cropping",
       name: "Cropping",
-      component: () => import("/@/views/components/cropping/index.vue"),
+      component: () => import("@/views/components/cropping/index.vue"),
       meta: {
         title: $t("menus.hscropping")
       }
@@ -73,7 +73,7 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/countTo",
       name: "CountTo",
-      component: () => import("/@/views/components/count-to/index.vue"),
+      component: () => import("@/views/components/count-to/index.vue"),
       meta: {
         title: $t("menus.hscountTo")
       }
@@ -81,7 +81,7 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/selector",
       name: "Selector",
-      component: () => import("/@/views/components/selector/index.vue"),
+      component: () => import("@/views/components/selector/index.vue"),
       meta: {
         title: $t("menus.hsselector")
       }
@@ -89,7 +89,7 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/seamlessScroll",
       name: "SeamlessScroll",
-      component: () => import("/@/views/components/seamless-scroll/index.vue"),
+      component: () => import("@/views/components/seamless-scroll/index.vue"),
       meta: {
         title: $t("menus.hsseamless")
       }
@@ -97,7 +97,7 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/contextmenu",
       name: "ContextMenu",
-      component: () => import("/@/views/components/contextmenu/index.vue"),
+      component: () => import("@/views/components/contextmenu/index.vue"),
       meta: {
         title: $t("menus.hscontextmenu")
       }
@@ -105,7 +105,7 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/typeit",
       name: "Typeit",
-      component: () => import("/@/views/components/typeit/index.vue"),
+      component: () => import("@/views/components/typeit/index.vue"),
       meta: {
         title: $t("menus.hstypeit")
       }
@@ -113,10 +113,18 @@ const componentsRouter: RouteConfigsTable = {
     {
       path: "/components/json-editor",
       name: "JsonEditor",
-      component: () => import("/@/views/components/json-editor/index.vue"),
+      component: () => import("@/views/components/json-editor/index.vue"),
       meta: {
         title: $t("menus.hsjsoneditor")
       }
+    },
+    {
+      path: "/components/danmaku",
+      name: "Danmaku",
+      component: () => import("@/views/components/danmaku/index.vue"),
+      meta: {
+        title: $t("menus.hsdanmaku")
+      }
     }
   ]
 };

src/router/modules/editor.ts

@@ -1,4 +1,4 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
 
 const editorRouter: RouteConfigsTable = {
@@ -13,7 +13,7 @@ const editorRouter: RouteConfigsTable = {
     {
       path: "/editor/index",
       name: "Editor",
-      component: () => import("/@/views/editor/index.vue"),
+      component: () => import("@/views/editor/index.vue"),
       meta: {
         title: $t("menus.hseditor"),
         keepAlive: true

src/router/modules/error.ts

@@ -1,4 +1,4 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
 
 const errorRouter: RouteConfigsTable = {
@@ -13,7 +13,7 @@ const errorRouter: RouteConfigsTable = {
     {
       path: "/error/403",
       name: "403",
-      component: () => import("/@/views/error/403.vue"),
+      component: () => import("@/views/error/403.vue"),
       meta: {
         title: $t("menus.hsfourZeroOne")
       }
@@ -21,7 +21,7 @@ const errorRouter: RouteConfigsTable = {
     {
       path: "/error/404",
       name: "404",
-      component: () => import("/@/views/error/404.vue"),
+      component: () => import("@/views/error/404.vue"),
       meta: {
         title: $t("menus.hsfourZeroFour")
       }
@@ -29,7 +29,7 @@ const errorRouter: RouteConfigsTable = {
     {
       path: "/error/500",
       name: "500",
-      component: () => import("/@/views/error/500.vue"),
+      component: () => import("@/views/error/500.vue"),
       meta: {
         title: $t("menus.hsFive")
       }

src/router/modules/flowchart.ts

@@ -1,4 +1,4 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
 
 const flowChartRouter: RouteConfigsTable = {
@@ -13,7 +13,7 @@ const flowChartRouter: RouteConfigsTable = {
     {
       path: "/flowChart/index",
       name: "FlowChart",
-      component: () => import("/@/views/flow-chart/index.vue"),
+      component: () => import("@/views/flow-chart/index.vue"),
       meta: {
         title: $t("menus.hsflowChart")
       }

src/router/modules/formdesign.ts

@@ -1,4 +1,4 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
 
 const formDesignRouter: RouteConfigsTable = {
@@ -13,7 +13,7 @@ const formDesignRouter: RouteConfigsTable = {
     {
       path: "/formDesign/index",
       name: "FormDesign",
-      component: () => import("/@/views/form-design/index.vue"),
+      component: () => import("@/views/form-design/index.vue"),
       meta: {
         title: $t("menus.hsFormDesign")
       }

src/router/modules/guide.ts

@@ -1,4 +1,4 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
 
 const guideRouter: RouteConfigsTable = {
@@ -13,7 +13,7 @@ const guideRouter: RouteConfigsTable = {
     {
       path: "/guide/index",
       name: "Guide",
-      component: () => import("/@/views/guide/index.vue"),
+      component: () => import("@/views/guide/index.vue"),
       meta: {
         title: $t("menus.hsguide")
       }

src/router/modules/home.ts

@@ -1,6 +1,6 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
-const Layout = () => import("/@/layout/index.vue");
+const Layout = () => import("@/layout/index.vue");
 
 const homeRouter: RouteConfigsTable = {
   path: "/",
@@ -16,7 +16,7 @@ const homeRouter: RouteConfigsTable = {
     {
       path: "/welcome",
       name: "Welcome",
-      component: () => import("/@/views/welcome/index.vue"),
+      component: () => import("@/views/welcome/index.vue"),
       meta: {
         title: $t("menus.hshome")
       }

src/router/modules/list.ts

@@ -1,4 +1,4 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
 
 const ableRouter: RouteConfigsTable = {
@@ -13,7 +13,7 @@ const ableRouter: RouteConfigsTable = {
     {
       path: "/list/card",
       name: "ListCard",
-      component: () => import("/@/views/list/card/index.vue"),
+      component: () => import("@/views/list/card/index.vue"),
       meta: {
         icon: "card",
         title: $t("menus.hsListCard"),

src/router/modules/nested.ts

@@ -1,4 +1,4 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
 
 const nestedRouter: RouteConfigsTable = {
@@ -20,7 +20,7 @@ const nestedRouter: RouteConfigsTable = {
       children: [
         {
           path: "/nested/menu1/menu1-1",
-          component: () => import("/@/views/nested/menu1/menu1-1/index.vue"),
+          component: () => import("@/views/nested/menu1/menu1-1/index.vue"),
           name: "Menu1-1",
           meta: {
             title: $t("menus.hsmenu1-1"),
@@ -38,7 +38,7 @@ const nestedRouter: RouteConfigsTable = {
             {
               path: "/nested/menu1/menu1-2/menu1-2-1",
               component: () =>
-                import("/@/views/nested/menu1/menu1-2/menu1-2-1/index.vue"),
+                import("@/views/nested/menu1/menu1-2/menu1-2-1/index.vue"),
               name: "Menu1-2-1",
               meta: {
                 title: $t("menus.hsmenu1-2-1"),
@@ -48,7 +48,7 @@ const nestedRouter: RouteConfigsTable = {
             {
               path: "/nested/menu1/menu1-2/menu1-2-2",
               component: () =>
-                import("/@/views/nested/menu1/menu1-2/menu1-2-2/index.vue"),
+                import("@/views/nested/menu1/menu1-2/menu1-2-2/index.vue"),
               name: "Menu1-2-2",
               meta: {
                 title: $t("menus.hsmenu1-2-2"),
@@ -63,7 +63,7 @@ const nestedRouter: RouteConfigsTable = {
         },
         {
           path: "/nested/menu1/menu1-3",
-          component: () => import("/@/views/nested/menu1/menu1-3/index.vue"),
+          component: () => import("@/views/nested/menu1/menu1-3/index.vue"),
           name: "Menu1-3",
           meta: {
             title: $t("menus.hsmenu1-3"),
@@ -75,7 +75,7 @@ const nestedRouter: RouteConfigsTable = {
     {
       path: "/nested/menu2",
       name: "Menu2",
-      component: () => import("/@/views/nested/menu2/index.vue"),
+      component: () => import("@/views/nested/menu2/index.vue"),
       meta: {
         title: $t("menus.hsmenu2"),
         keepAlive: true

src/router/modules/ppt.ts

@@ -1,5 +1,5 @@
 import type { RouteConfigsTable } from "/#/index";
-const IFrame = () => import("/@/layout/frameView.vue");
+const IFrame = () => import("@/layout/frameView.vue");
 
 const pptRouter: RouteConfigsTable = {
   path: "/ppt",

src/router/modules/remaining.ts

@@ -1,12 +1,12 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
-const Layout = () => import("/@/layout/index.vue");
+const Layout = () => import("@/layout/index.vue");
 
 const remainingRouter: Array<RouteConfigsTable> = [
   {
     path: "/login",
     name: "Login",
-    component: () => import("/@/views/login/index.vue"),
+    component: () => import("@/views/login/index.vue"),
     meta: {
       title: $t("menus.hslogin"),
       showLink: false,
@@ -26,7 +26,7 @@ const remainingRouter: Array<RouteConfigsTable> = [
       {
         path: "/redirect/:path(.*)",
         name: "Redirect",
-        component: () => import("/@/layout/redirect.vue")
+        component: () => import("@/layout/redirect.vue")
       }
     ]
   },
@@ -34,7 +34,7 @@ const remainingRouter: Array<RouteConfigsTable> = [
   {
     path: "/empty",
     name: "Empty",
-    component: () => import("/@/views/empty/index.vue"),
+    component: () => import("@/views/empty/index.vue"),
     meta: {
       title: $t("menus.hsempty"),
       showLink: false,

src/router/modules/result.ts

@@ -1,4 +1,4 @@
-import { $t } from "/@/plugins/i18n";
+import { $t } from "@/plugins/i18n";
 import type { RouteConfigsTable } from "/#/index";
 
 const resultRouter: RouteConfigsTable = {
@@ -13,7 +13,7 @@ const resultRouter: RouteConfigsTable = {
     {
       path: "/result/success",
       name: "Success",
-      component: () => import("/@/views/result/success.vue"),
+      component: () => import("@/views/result/success.vue"),
       meta: {
         title: $t("menus.hsSuccess")
       }
@@ -21,7 +21,7 @@ const resultRouter: RouteConfigsTable = {
     {
       path: "/result/fail",
       name: "Fail",
-      component: () => import("/@/views/result/fail.vue"),
+      component: () => import("@/views/result/fail.vue"),
       meta: {
         title: $t("menus.hsFail")
       }

src/router/utils.ts

@@ -10,7 +10,7 @@ import { router } from "./index";
 import { isProxy, toRaw } from "vue";
 import { loadEnv } from "../../build";
 import { useTimeoutFn } from "@vueuse/core";
-import { RouteConfigs } from "/@/layout/types";
+import { RouteConfigs } from "@/layout/types";
 import {
   isString,
   storageSession,
@@ -18,14 +18,14 @@ import {
   isIncludeAllChildren
 } from "@pureadmin/utils";
 import { cloneDeep, intersection } from "lodash-unified";
-import { sessionKey, type DataInfo } from "/@/utils/auth";
+import { sessionKey, type DataInfo } from "@/utils/auth";
-import { usePermissionStoreHook } from "/@/store/modules/permission";
+import { usePermissionStoreHook } from "@/store/modules/permission";
-const IFrame = () => import("/@/layout/frameView.vue");
+const IFrame = () => import("@/layout/frameView.vue");
 // https://cn.vitejs.dev/guide/features.html#glob-import
 const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}");
 
 // 动态路由
-import { getAsyncRoutes } from "/@/api/routes";
+import { getAsyncRoutes } from "@/api/routes";
 
 /** 按照路由中meta下的rank等级升序来排序路由 */
 function ascending(arr: any[]) {

src/store/modules/app.ts

@@ -1,7 +1,7 @@
-import { store } from "/@/store";
+import { store } from "@/store";
 import { appType } from "./types";
 import { defineStore } from "pinia";
-import { getConfig } from "/@/config";
+import { getConfig } from "@/config";
 import type { StorageConfigs } from "/#/index";
 import { deviceDetection, storageLocal } from "@pureadmin/utils";
 

src/store/modules/epTheme.ts

@@ -1,6 +1,6 @@
-import { store } from "/@/store";
+import { store } from "@/store";
 import { defineStore } from "pinia";
-import { getConfig } from "/@/config";
+import { getConfig } from "@/config";
 import type { StorageConfigs } from "/#/index";
 import { storageLocal } from "@pureadmin/utils";
 

src/store/modules/multiTags.ts

@@ -1,8 +1,8 @@
 import { defineStore } from "pinia";
-import { store } from "/@/store";
+import { store } from "@/store";
 import { isEqual } from "lodash-unified";
 import type { StorageConfigs } from "/#/index";
-import { routerArrays } from "/@/layout/types";
+import { routerArrays } from "@/layout/types";
 import { multiType, positionType } from "./types";
 import { isUrl, storageLocal } from "@pureadmin/utils";
 

src/store/modules/permission.ts

@@ -1,8 +1,8 @@
 import { defineStore } from "pinia";
-import { store } from "/@/store";
+import { store } from "@/store";
 import { cacheType } from "./types";
-import { constantMenus } from "/@/router";
+import { constantMenus } from "@/router";
-import { ascending, filterTree, filterNoPermissionTree } from "/@/router/utils";
+import { ascending, filterTree, filterNoPermissionTree } from "@/router/utils";
 
 export const usePermissionStore = defineStore({
   id: "pure-permission",

src/store/modules/settings.ts

@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
-import { store } from "/@/store";
+import { store } from "@/store";
 import { setType } from "./types";
-import { getConfig } from "/@/config";
+import { getConfig } from "@/config";
 
 export const useSettingStore = defineStore({
   id: "pure-setting",

src/store/modules/user.ts

@@ -1,22 +1,18 @@
 import { defineStore } from "pinia";
-import { store } from "/@/store";
+import { store } from "@/store";
 import { userType } from "./types";
-import { routerArrays } from "/@/layout/types";
+import { routerArrays } from "@/layout/types";
-import { router, resetRouter } from "/@/router";
+import { router, resetRouter } from "@/router";
 import { storageSession } from "@pureadmin/utils";
-import { getLogin, refreshTokenApi } from "/@/api/user";
+import { getLogin, refreshTokenApi } from "@/api/user";
-import { UserResult, RefreshTokenResult } from "/@/api/user";
+import { UserResult, RefreshTokenResult } from "@/api/user";
-import { useMultiTagsStoreHook } from "/@/store/modules/multiTags";
+import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
-import {
+import { type DataInfo, setToken, removeToken, sessionKey } from "@/utils/auth";
-  type DataInfo,
-  setToken,
-  removeToken,
-  sessionKey
-} from "/@/utils/auth";
 
 export const useUserStore = defineStore({
   id: "pure-user",
   state: (): userType => ({
+    // 用户名
     username:
       storageSession.getItem<DataInfo<number>>(sessionKey)?.username ?? "",
     // 页面级别权限

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;
   }
 

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;
 }

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 {

src/utils/README.md

@@ -1,5 +1,5 @@
 ### 注意
 
-- [文档](https://pure-admin-utils.vercel.app)
+- `vue-pure-admin` 从 `3.3.0` 版本之后（不包括 `3.3.0` 版本），大部分工具和 `hooks` 都集成到了[@pureadmin/utils](https://xiaoxian521.github.io/pure-admin-utils-docs/)
 - [npm](https://www.npmjs.com/package/@pureadmin/utils)
-- vue-pure-admin 从 3.3.0 版本之后（不包括 3.3.0 版本），大部分工具和 hooks 都集成到了[@pureadmin/utils](https://pure-admin-utils.vercel.app)
+- [文档代码地址](https://github.com/xiaoxian521/pure-admin-utils-docs)

src/utils/auth.ts

@@ -1,6 +1,6 @@
 import Cookies from "js-cookie";
 import { storageSession } from "@pureadmin/utils";
-import { useUserStoreHook } from "/@/store/modules/user";
+import { useUserStoreHook } from "@/store/modules/user";
 
 export interface DataInfo<T> {
   /** token */
@@ -70,3 +70,8 @@ export function removeToken() {
   Cookies.remove(TokenKey);
   sessionStorage.removeItem(sessionKey);
 }
+
+/** 格式化token（jwt格式） */
+export const formatToken = (token: string): string => {
+  return "Bearer " + token;
+};

src/utils/http/README.md

@@ -3,7 +3,7 @@
 ### Get 请求
 
 ```
-import { http } from "/@/utils/http";
+import { http } from "@/utils/http";
 
 // params传参
 http.request('get', '/xxx', { params: param });
@@ -15,7 +15,7 @@ http.request('get', '/xxx?message=' + msg);
 ### Post 请求
 
 ```
-import { http } from "/@/utils/http";
+import { http } from "@/utils/http";
 
 // params传参
 http.request('post', '/xxx', { params: param });

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 { getToken } from "/@/utils/auth";
+import { useUserStoreHook } from "@/store/modules/user";
-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, */*",
@@ -43,27 +34,43 @@ class PureHttp {
     this.httpInterceptorsRequest();
     this.httpInterceptorsResponse();
   }
+
+  /** token过期后，暂存待执行的请求 */
+  private static requests = [];
+
+  /** 防止重复刷新token */
+  private static isRefreshing = false;
+
   /** 初始化配置对象 */
   private static initConfig: PureHttpRequestConfig = {};
 
   /** 保存当前Axios实例对象 */
   private static axiosInstance: AxiosInstance = Axios.create(defaultConfig);
 
+  /** 重连原始请求 */
+  private static retryOriginalRequest(config: PureHttpRequestConfig) {
+    return new Promise(resolve => {
+      PureHttp.requests.push((token: string) => {
+        config.headers["Authorization"] = formatToken(token);
+        resolve(config);
+      });
+    });
+  }
+
   /** 请求拦截 */
   private httpInterceptorsRequest(): void {
     PureHttp.axiosInstance.interceptors.request.use(
       async (config: PureHttpRequestConfig) => {
-        const $config = config;
         // 开启进度条动画
         NProgress.start();
         // 优先判断post/get等方法是否传入回掉，否则执行初始化设置等回掉
         if (typeof config.beforeRequestCallback === "function") {
-          config.beforeRequestCallback($config);
+          config.beforeRequestCallback(config);
-          return $config;
+          return config;
         }
         if (PureHttp.initConfig.beforeRequestCallback) {
-          PureHttp.initConfig.beforeRequestCallback($config);
+          PureHttp.initConfig.beforeRequestCallback(config);
-          return $config;
+          return config;
         }
         /** 请求白名单，放置一些不需要token的接口（通过设置请求白名单，防止token过期后再请求造成的死循环问题） */
         const whiteList = ["/refreshToken", "/login"];
@@ -75,21 +82,30 @@ class PureHttp {
                 const now = new Date().getTime();
                 const expired = parseInt(data.expires) - now <= 0;
                 if (expired) {
-                  // token过期刷新
+                  if (!PureHttp.isRefreshing) {
-                  useUserStoreHook()
+                    PureHttp.isRefreshing = true;
-                    .handRefreshToken({ refreshToken: data.refreshToken })
+                    // token过期刷新
-                    .then(res => {
+                    useUserStoreHook()
-                      config.headers["Authorization"] =
+                      .handRefreshToken({ refreshToken: data.refreshToken })
-                        "Bearer " + res.data.accessToken;
+                      .then(res => {
-                      resolve($config);
+                        const token = res.data.accessToken;
-                    });
+                        config.headers["Authorization"] = formatToken(token);
+                        PureHttp.requests.forEach(cb => cb(token));
+                        PureHttp.requests = [];
+                      })
+                      .finally(() => {
+                        PureHttp.isRefreshing = false;
+                      });
+                  }
+                  resolve(PureHttp.retryOriginalRequest(config));
                 } else {
-                  config.headers["Authorization"] =
+                  config.headers["Authorization"] = formatToken(
-                    "Bearer " + data.accessToken;
+                    data.accessToken
-                  resolve($config);
+                  );
+                  resolve(config);
                 }
               } else {
-                resolve($config);
+                resolve(config);
               }
             });
       },

src/utils/responsive.ts

@@ -1,7 +1,7 @@
 // 响应式storage
 import { App } from "vue";
 import Storage from "responsive-storage";
-import { routerArrays } from "/@/layout/types";
+import { routerArrays } from "@/layout/types";
 
 const nameSpace = "responsive-";
 

src/views/able/barcode.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import ReBarcode from "/@/components/ReBarcode";
+import ReBarcode from "@/components/ReBarcode";
 
 defineOptions({
   name: "BarCode"

src/views/able/cascader.vue

@@ -6,7 +6,7 @@ import {
   regionDataPlus,
   regionData,
   CodeToText
-} from "/@/utils/chinaArea";
+} from "@/utils/chinaArea";
 import { ref } from "vue";
 
 defineOptions({

src/views/able/icon-select.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import { IconSelect } from "/@/components/ReIcon";
+import { IconSelect } from "@/components/ReIcon";
 
 defineOptions({
   name: "IconSelect"

src/views/able/line-tree.vue

@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { computed } from "vue";
 import { cloneDeep } from "lodash-unified";
-import { transformI18n } from "/@/plugins/i18n";
+import { transformI18n } from "@/plugins/i18n";
-import ElTreeLine from "/@/components/ReTreeLine";
+import ElTreeLine from "@/components/ReTreeLine";
 import { extractPathList, deleteChildren } from "@pureadmin/utils";
-import { usePermissionStoreHook } from "/@/store/modules/permission";
+import { usePermissionStoreHook } from "@/store/modules/permission";
 
 defineOptions({
   name: "LineTree"

src/views/able/menu-tree.vue

@@ -2,10 +2,10 @@
 import { ref, computed } from "vue";
 import { cloneDeep } from "lodash-unified";
 import type { ElTreeV2 } from "element-plus";
-import { transformI18n } from "/@/plugins/i18n";
+import { transformI18n } from "@/plugins/i18n";
-import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { extractPathList, deleteChildren } from "@pureadmin/utils";
-import { usePermissionStoreHook } from "/@/store/modules/permission";
+import { usePermissionStoreHook } from "@/store/modules/permission";
 import type { TreeNode } from "element-plus/es/components/tree-v2/src/types";
 
 defineOptions({

src/views/able/print.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import Print from "/@/utils/print";
+import Print from "@/utils/print";
 import { reactive, ref } from "vue";
 import { VxeTablePropTypes } from "vxe-table";
 import Line from "../welcome/components/Line.vue";
@@ -165,9 +165,9 @@ const tableData: User[] = [
               :value="item.value"
             />
           </el-select>
-          <el-button size="small" type="primary" @click="onPrint"
+          <el-button size="small" type="primary" @click="onPrint">
-            >打印</el-button
+            打印
-          >
+          </el-button>
         </div>
       </div>
     </template>
@@ -300,7 +300,7 @@ const tableData: User[] = [
       >
         <p class="font-medium pt-1">Image</p>
         <img
-          src="../../assets/avatars.jpg"
+          src="https://avatars.githubusercontent.com/u/44761321?v=4"
           alt="avatars"
           class="img"
           style="width: 200px; height: 200px; margin: 50px auto"

src/views/able/qrcode.vue

@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import { ref, unref } from "vue";
 import { ElMessage } from "element-plus";
-import avatars from "/@/assets/avatars.jpg";
+import ReQrcode from "@/components/ReQrcode";
-import ReQrcode from "/@/components/ReQrcode";
 
 defineOptions({
   name: "QrCode"
@@ -90,7 +89,10 @@ const disabledClick = () => {
         <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
           <el-card shadow="hover" class="mb-[10px] text-center">
             <div class="font-bold">logo配置</div>
-            <ReQrcode :text="qrcodeText" :logo="avatars" />
+            <ReQrcode
+              :text="qrcodeText"
+              logo="https://avatars.githubusercontent.com/u/44761321?v=4"
+            />
           </el-card>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
@@ -99,7 +101,7 @@ const disabledClick = () => {
             <ReQrcode
               :text="qrcodeText"
               :logo="{
-                src: avatars,
+                src: 'https://avatars.githubusercontent.com/u/44761321?v=4',
                 logoSize: 0.2,
                 borderSize: 0.05,
                 borderRadius: 50,

src/views/able/timeline.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
+import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import { useRenderFlicker } from "/@/components/ReFlicker";
+import { useRenderFlicker } from "@/components/ReFlicker";
 
 defineOptions({
   name: "TimeLine"

src/views/components/count-to/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ReNormalCountTo, ReboundCountTo } from "/@/components/ReCountTo";
+import { ReNormalCountTo, ReboundCountTo } from "@/components/ReCountTo";
 
 defineOptions({
   name: "CountTo"

src/views/components/cropping/index.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref, nextTick } from "vue";
-import Cropper from "/@/components/ReCropper";
+import Cropper from "@/components/ReCropper";
 import img from "./picture.jpeg";
 
 defineOptions({