fix: 修复导航菜单在使用iconfont图标时，选中/激活状态的样式显示异常问题

.nvmrc

@@ -1 +1 @@
-v22.14.0
+v22.20.0

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
+  "tailwindCSS.experimental.configFile": "src/style/tailwind.css",
   "editor.formatOnType": true,
   "editor.formatOnSave": true,
   "[vue]": {

CHANGELOG.en_US.md

@@ -1,8 +1,74 @@
+# 6.2.0 (2025-10-16)
+
+### 🎫 Features
+
+- Added full-screen `403`, `404`, and `500` error pages. These full-screen error pages are clear and secure, improving the user experience.
+
+### 🐞 Bug Fixes
+
+- Fixed an issue where the built-in homepage did not have a `name` configured, causing cache invalidation after setting the page cache.
+- Fixed an issue where, in an embedded same-origin `iframe` page, when the `beforeunload` event was registered, right-clicking a tab and reloading it would cause the browser to prompt two confirmation blocks.
+- Fixed an issue where pages with `keepAlive: true` set to cache invalidation when the initial load was slow.
+- Fixed an issue where multiple tabs could be activated simultaneously when using the same parameters in different routes.
+- Fixed an issue where the right-click menu on a tab displayed incorrectly when passing `params` parameters.
+
+### 🍏 Perf
+
+- Optimized the `nprogress` progress bar. It no longer displays when reloading a page or requesting an interface, improving the user experience.
+- Optimized the timing of capturing all unmatched routes and redirecting to a full-screen `404` page.
+- Explicitly configured the `Tailwind CSS` entry file path to improve the contextual recognition and prompting performance of the `Tailwind CSS IntelliSense` plugin
+
+# 6.1.0 (2025-07-31)
+
+### ✔️ Refactor
+
+- Upgrade to `vite7`, update dependencies, and related compatibility processing
+
+### 🐞 Bug fixes
+
+- Fixed a flickering issue in the `ReSegmented` segmented controller component when switching between light and dark styles
+- Fixed an issue where `resetRouter` did not clear all routing data
+- Fixed an issue where closing the left tab in the tabs window did not work properly
+
+### 🍏 Perf
+
+- Optimized navigation styles
+- Upgraded `@pureadmin/table` to be compatible with all `el-table` APIs in the latest `element-plus` version.
+
+# 6.0.0 (2025-04-10)
+
+### ✔️ Refactor
+
+- Refactor the icon module, use `@iconify/json` to replace the `@iconify-icons/*` dependency that is no longer maintained and updated, optimize the user experience, ensure that the icon library can be continuously updated and support `Tree-shaking`
+- Upgrade `tailwindcss` to `v4` version, bringing faster build speed, simpler installation and configuration, and providing a dedicated `vite` plug-in
+
+### 🎫 Feat
+
+- Add `Ai` chat component example
+- Add `tagOnClick` tag to switch global public events
+- Add code editor example
+- Add `Markdown` example
+- Add slider example
+
+### 🐞 Bug fixes
+
+- Fix `aria-hidden` error
+- Fix the problem that code hints cannot be displayed when using `this` syntax and update `pinia` related syntax
+
+### 🍏 Perf
+
+- Fix broken links in the waterfall infinite scrolling example
+- Update `vue-flow`, related compatibility processing
+- Delete the deprecated dependency package `eslint-define-config`, upgrade `eslint` to the latest version, related compatibility processing
+- Optimize `src/style/dark.scss` syntax
+- Optimize login parameter transfer
+- Use `keydown` to replace `keypress`, the `keypress` event has been deprecated
+
 # 5.9.0 (2024-12-10)
 
 ### ✔️Refactor
 
-- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/max/), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
+- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/service/#max-%E7%89%88%E6%9C%AC), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
 - Use [code-inspector-plugin](https://www.npmjs.com/package/code-inspector-plugin) to replace [vite-plugin-vue-inspector](https://www.npmjs.com/package/vite-plugin-vue-inspector)
 
 ### 🎫Feat

CHANGELOG.md

@@ -1,8 +1,74 @@
+# 6.2.0 (2025-10-16)
+
+### 🎫 Features
+
+- Added full-screen `403`, `404`, and `500` error pages. These full-screen error pages are clear and secure, improving the user experience.
+
+### 🐞 Bug Fixes
+
+- Fixed an issue where the built-in homepage did not have a `name` configured, causing cache invalidation after setting the page cache.
+- Fixed an issue where, in an embedded same-origin `iframe` page, when the `beforeunload` event was registered, right-clicking a tab and reloading it would cause the browser to prompt two confirmation blocks.
+- Fixed an issue where pages with `keepAlive: true` set to cache invalidation when the initial load was slow.
+- Fixed an issue where multiple tabs could be activated simultaneously when using the same parameters in different routes.
+- Fixed an issue where the right-click menu on a tab displayed incorrectly when passing `params` parameters.
+
+### 🍏 Perf
+
+- Optimized the `nprogress` progress bar. It no longer displays when reloading a page or requesting an interface, improving the user experience.
+- Optimized the timing of capturing all unmatched routes and redirecting to a full-screen `404` page.
+- Explicitly configured the `Tailwind CSS` entry file path to improve the contextual recognition and prompting performance of the `Tailwind CSS IntelliSense` plugin
+
+# 6.1.0 (2025-07-31)
+
+### ✔️ Refactor
+
+- Upgrade to `vite7`, update dependencies, and related compatibility processing
+
+### 🐞 Bug fixes
+
+- Fixed a flickering issue in the `ReSegmented` segmented controller component when switching between light and dark styles
+- Fixed an issue where `resetRouter` did not clear all routing data
+- Fixed an issue where closing the left tab in the tabs window did not work properly
+
+### 🍏 Perf
+
+- Optimized navigation styles
+- Upgraded `@pureadmin/table` to be compatible with all `el-table` APIs in the latest `element-plus` version.
+
+# 6.0.0 (2025-04-10)
+
+### ✔️ Refactor
+
+- Refactor the icon module, use `@iconify/json` to replace the `@iconify-icons/*` dependency that is no longer maintained and updated, optimize the user experience, ensure that the icon library can be continuously updated and support `Tree-shaking`
+- Upgrade `tailwindcss` to `v4` version, bringing faster build speed, simpler installation and configuration, and providing a dedicated `vite` plug-in
+
+### 🎫 Feat
+
+- Add `Ai` chat component example
+- Add `tagOnClick` tag to switch global public events
+- Add code editor example
+- Add `Markdown` example
+- Add slider example
+
+### 🐞 Bug fixes
+
+- Fix `aria-hidden` error
+- Fix the problem that code hints cannot be displayed when using `this` syntax and update `pinia` related syntax
+
+### 🍏 Perf
+
+- Fix broken links in the waterfall infinite scrolling example
+- Update `vue-flow`, related compatibility processing
+- Delete the deprecated dependency package `eslint-define-config`, upgrade `eslint` to the latest version, related compatibility processing
+- Optimize `src/style/dark.scss` syntax
+- Optimize login parameter transfer
+- Use `keydown` to replace `keypress`, the `keypress` event has been deprecated
+
 # 5.9.0 (2024-12-10)
 
 ### ✔️Refactor
 
-- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/max/), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
+- Upgrade `vite` to `v6` version, upgrade `sass` to the latest version, reconstruct the theme writing method, and deprecate [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme) , click to view [Related optimization point details](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115). For users who have the [Max version](https://pure-admin.cn/pages/service/#max-%E7%89%88%E6%9C%AC), it is strongly recommended to upgrade. Subsequent Max version users will enjoy a more modern, beautiful and highly customized theme color
 - Use [code-inspector-plugin](https://www.npmjs.com/package/code-inspector-plugin) to replace [vite-plugin-vue-inspector](https://www.npmjs.com/package/vite-plugin-vue-inspector)
 
 ### 🎫Feat

CHANGELOG.zh_CN.md

@@ -1,8 +1,74 @@
+# 6.2.0 (2025-10-16)
+
+### 🎫 Feat
+
+-  添加全屏`403`、`404`、`500`页面，全屏错误页面清晰且安全，提升用户体验
+
+### 🐞 Bug fixes
+
+- 修复内置的首页未设置`name`导致设置页面缓存后缓存无效的问题
+- 修复在内嵌同源`iframe`页面中，当其注册了`beforeunload`事件时，右键标签页点击重新加载导致浏览器弹出两次确认拦截的问题
+- 修复设置了`keepAlive: true`的页面在初次加载缓慢的情况下出现的页面缓存失效的问题
+- 修复不同路由使用相同参数时，多个标签页会同时被激活的问题
+- 修复`params`传参模式下标签页右键菜单显示不正确的问题
+
+### 🍏 Perf
+
+- 优化`nprogress`进度条，页面重进或接口请求时不再显示进度条，提升用户体验
+- 优化当捕获所有未匹配路由并跳转全屏`404`页面的时机
+- 显式配置`Tailwind CSS`入口文件路径，优化`Tailwind CSS IntelliSense`插件的上下文识别与提示性能
+
+# 6.1.0 (2025-07-31)
+
+### ✔️ Refactor
+
+- 升级至`vite7`，更新依赖，相关兼容处理
+
+### 🐞 Bug fixes
+
+- 修复`ReSegmented`分段控制器组件在浅色和深色整体风格切换时的闪烁问题
+- 修复`resetRouter`未清空全部路由数据问题
+- 修复标签页-关闭左侧标签页关闭异常问题
+
+### 🍏 Perf
+
+- 优化导航样式
+- 升级`@pureadmin/table`兼容最新版`element-plus`的`el-table`的所有`API`
+
+# 6.0.0 (2025-04-10)
+
+### ✔️ Refactor
+
+- 重构图标模块，使用`@iconify/json`替换不再维护更新的`@iconify-icons/*`依赖，优化使用体验，确保图标库可持续更新并支持`Tree-shaking`
+- 升级`tailwindcss`至`v4`版本，带来更快的构建速度、更简化的安装和配置、提供专属`vite`插件
+
+### 🎫 Feat
+
+- 添加`Ai`聊天组件示例
+- 添加`tagOnClick`标签切换全局公共事件
+- 添加代码编辑器示例
+- 添加`Markdown`示例
+- 添加滑块示例
+
+### 🐞 Bug fixes
+
+- 修复`aria-hidden`报错
+- 修复使用`this`语法时无法显示代码提示的问题并更新`pinia`相关语法
+
+### 🍏 Perf
+
+- 修复组件-瀑布流无限滚动示例中失效的链接
+- 更新`vue-flow`，相关兼容处理
+- 删除已弃用的依赖包`eslint-define-config`，升级`eslint`至最新版本，相关兼容处理
+- 优化`src/style/dark.scss`语法
+- 优化登录传参
+- 使用`keydown`替换`keypress`，`keypress`事件已弃用
+
 # 5.9.0 (2024-12-10)
 
 ### ✔️ Refactor
 
-- 升级`vite`至`v6`版本，升级`sass`至最新版，重构主题写法，弃用 [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme)，点击查看 [相关优化点细节](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115)。对于拥有 [Max版本](https://pure-admin.cn/pages/max/) 的用户平台强烈建议升级，后续`Max版本用户`会享有一套更现代、美观且自定义程度高的主题色
+- 升级`vite`至`v6`版本，升级`sass`至最新版，重构主题写法，弃用 [@pureadmin/theme](https://www.npmjs.com/package/@pureadmin/theme)，点击查看 [相关优化点细节](https://github.com/pure-admin/vue-pure-admin/pull/1188#issue-2630095115)。对于拥有 [Max版本](https://pure-admin.cn/pages/service/#max-%E7%89%88%E6%9C%AC) 的用户平台强烈建议升级，后续`Max版本用户`会享有一套更现代、美观且自定义程度高的主题色
 - 使用 [code-inspector-plugin](https://www.npmjs.com/package/code-inspector-plugin) 替换 [vite-plugin-vue-inspector](https://www.npmjs.com/package/vite-plugin-vue-inspector)
 
 ### 🎫 Feat

README.en-US.md

@@ -31,18 +31,10 @@ The simplified version is based on the shelf extracted from [vue-pure-admin](htt
 [Click me to view vue-pure-admin documentation](https://pure-admin.cn/)  
 [Click me to view @pureadmin/utils documentation](https://pure-admin-utils.netlify.app)
 
-## Quality service, software outsourcing, sponsorship support
+## Premium service
 
 [Click me for details](https://pure-admin.cn/pages/service/)
 
-## `js` version
-
-[Click me to view js version](https://pure-admin.cn/pages/js/)
-
-## `max` version
-
-[Click me to view the max version](https://pure-admin.cn/pages/max/)
-
 ## Tauri
 
 [Click Watch Tauri](https://github.com/pure-admin/tauri-pure-admin)
@@ -192,6 +184,7 @@ Thank you very much for your in-depth understanding of the source code and your
 |      [edgexie](https://github.com/edgexie)      |   [code](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie)    |
 |       [way-jm](https://github.com/way-jm)       |    [code](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm)    |
 |   [simple-hui](https://github.com/simple-hui)   |  [code](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui)  |
+|   [tinysimple](https://github.com/tinysimple)   |  [code](https://github.com/pure-admin/vue-pure-admin/commits?author=tinysimple)  |
 
 ## Git Contribution submission specification
 

README.md

@@ -32,18 +32,10 @@
 [点我查看 vue-pure-admin 文档](https://pure-admin.cn/)  
 [点我查看 @pureadmin/utils 文档](https://pure-admin-utils.netlify.app)
 
-## 优质服务、软件外包、赞助支持
+## 高级服务
 
 [点我查看详情](https://pure-admin.cn/pages/service/)
 
-## `js` 版本
-
-[点我查看 js 版本](https://pure-admin.cn/pages/js/)
-
-## `max` 版本
-
-[点我查看 max 版本](https://pure-admin.cn/pages/max/)
-
 ## `Tauri` 版本
 
 [点我查看 Tauri 版本](https://github.com/pure-admin/tauri-pure-admin)
@@ -193,6 +185,7 @@ docker run -dp 8080:80  --name pure-admin vue-pure-admin
 |      [edgexie](https://github.com/edgexie)      |   [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=edgexie)    |
 |       [way-jm](https://github.com/way-jm)       |    [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=way-jm)    |
 |   [simple-hui](https://github.com/simple-hui)   |  [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=simple-hui)  |
+|   [tinysimple](https://github.com/tinysimple)   |  [代码](https://github.com/pure-admin/vue-pure-admin/commits?author=tinysimple)  |
 
 ## `Git` 贡献提交规范
 

build/plugins.ts

@@ -6,6 +6,7 @@ import svgLoader from "vite-svg-loader";
 import Icons from "unplugin-icons/vite";
 import type { PluginOption } from "vite";
 import vueJsx from "@vitejs/plugin-vue-jsx";
+import tailwindcss from "@tailwindcss/vite";
 import { configCompressPlugin } from "./compress";
 import removeNoMatch from "vite-plugin-router-warn";
 import { visualizer } from "rollup-plugin-visualizer";
@@ -20,6 +21,7 @@ export function getPluginsList(
 ): PluginOption[] {
   const lifecycle = process.env.npm_lifecycle_event;
   return [
+    tailwindcss(),
     vue({
       template: {
         compilerOptions: {

eslint.config.js

@@ -1,11 +1,10 @@
 import js from "@eslint/js";
+import tseslint from "typescript-eslint";
 import pluginVue from "eslint-plugin-vue";
 import * as parserVue from "vue-eslint-parser";
 import configPrettier from "eslint-config-prettier";
 import pluginPrettier from "eslint-plugin-prettier";
 import { defineConfig, globalIgnores } from "eslint/config";
-import * as parserTypeScript from "@typescript-eslint/parser";
-import pluginTypeScript from "@typescript-eslint/eslint-plugin";
 
 export default defineConfig([
   globalIgnores([
@@ -20,7 +19,7 @@ export default defineConfig([
     ...js.configs.recommended,
     languageOptions: {
       globals: {
-        // index.d.ts
+        // types/index.d.ts
         RefType: "readonly",
         EmitType: "readonly",
         TargetContext: "readonly",
@@ -73,21 +72,10 @@ export default defineConfig([
       ]
     }
   },
-  {
+  ...tseslint.config({
+    extends: [...tseslint.configs.recommended],
     files: ["**/*.?([cm])ts", "**/*.?([cm])tsx"],
-    languageOptions: {
-      parser: parserTypeScript,
-      parserOptions: {
-        sourceType: "module",
-        warnOnUnsupportedTypeScriptVersion: false
-      }
-    },
-    plugins: {
-      "@typescript-eslint": pluginTypeScript
-    },
     rules: {
-      ...pluginTypeScript.configs.strict.rules,
-      "@typescript-eslint/ban-types": "off",
       "@typescript-eslint/no-redeclare": "error",
       "@typescript-eslint/ban-ts-comment": "off",
       "@typescript-eslint/no-explicit-any": "off",
@@ -114,20 +102,20 @@ export default defineConfig([
         }
       ]
     }
-  },
+  }),
   {
     files: ["**/*.d.ts"],
     rules: {
       "eslint-comments/no-unlimited-disable": "off",
       "import/no-duplicates": "off",
+      "no-restricted-syntax": "off",
       "unused-imports/no-unused-vars": "off"
     }
   },
   {
     files: ["**/*.?([cm])js"],
     rules: {
-      "@typescript-eslint/no-require-imports": "off",
+      "@typescript-eslint/no-require-imports": "off"
-      "@typescript-eslint/no-var-requires": "off"
     }
   },
   {
@@ -148,18 +136,19 @@ export default defineConfig([
           jsx: true
         },
         extraFileExtensions: [".vue"],
-        parser: "@typescript-eslint/parser",
+        parser: tseslint.parser,
         sourceType: "module"
       }
     },
     plugins: {
+      "@typescript-eslint": tseslint.plugin,
       vue: pluginVue
     },
     processor: pluginVue.processors[".vue"],
     rules: {
       ...pluginVue.configs.base.rules,
-      ...pluginVue.configs["vue3-essential"].rules,
+      ...pluginVue.configs.essential.rules,
-      ...pluginVue.configs["vue3-recommended"].rules,
+      ...pluginVue.configs.recommended.rules,
       "no-undef": "off",
       "no-unused-vars": "off",
       "vue/no-v-html": "off",

locales/en.yaml

@@ -80,9 +80,9 @@ menus:
   pureMarkdown: Markdown
   pureEditor: Editor
   pureAbnormal: Abnormal Page
-  pureFourZeroFour: "404"
+  purePageNotFound: "404"
-  pureFourZeroOne: "403"
+  pureAccessDenied: "403"
-  pureFive: "500"
+  pureServerError: "500"
   pureComponents: Components
   pureDialog: Dialog
   pureDrawer: Drawer

locales/zh-CN.yaml

@@ -80,9 +80,9 @@ menus:
   pureMarkdown: Markdown
   pureEditor: 编辑器
   pureAbnormal: 异常页面
-  pureFourZeroFour: "404"
+  purePageNotFound: "404"
-  pureFourZeroOne: "403"
+  pureAccessDenied: "403"
-  pureFive: "500"
+  pureServerError: "500"
   pureComponents: 组件
   pureDialog: 函数式弹框
   pureDrawer: 函数式抽屉

mock/mine.ts

@@ -25,7 +25,7 @@ export default defineFakeRoute([
     url: "/mine-logs",
     method: "get",
     response: () => {
-      let list = [
+      const list = [
         {
           id: 1,
           ip: faker.internet.ipv4(),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "5.9.0",
+  "version": "6.2.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -48,141 +48,141 @@
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@howdyjs/mouse-menu": "^2.1.6",
+    "@howdyjs/mouse-menu": "^2.1.7",
     "@infectoone/vue-ganttastic": "^2.3.2",
     "@logicflow/core": "^1.2.28",
     "@logicflow/extension": "^1.2.28",
     "@pureadmin/descriptions": "^1.2.1",
-    "@pureadmin/table": "^3.2.1",
+    "@pureadmin/table": "^3.3.0",
-    "@pureadmin/utils": "^2.6.0",
+    "@pureadmin/utils": "^2.6.2",
     "@vue-flow/background": "^1.3.2",
-    "@vue-flow/core": "^1.42.1",
+    "@vue-flow/core": "^1.47.0",
-    "@vueuse/core": "^12.5.0",
+    "@vueuse/core": "^13.9.0",
-    "@vueuse/motion": "^2.2.6",
+    "@vueuse/motion": "^3.0.3",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "@zxcvbn-ts/core": "^3.0.4",
     "animate.css": "^4.1.1",
-    "axios": "^1.7.9",
+    "axios": "^1.12.2",
     "china-area-data": "^5.0.1",
-    "codemirror": "^5.65.18",
+    "codemirror": "^5.65.20",
     "codemirror-editor-vue3": "^2.8.0",
     "cropperjs": "^1.6.2",
-    "dayjs": "^1.11.13",
+    "dayjs": "^1.11.18",
-    "deep-chat": "^2.1.1",
+    "deep-chat": "^2.2.2",
-    "echarts": "^5.6.0",
+    "echarts": "^6.0.0",
-    "el-table-infinite-scroll": "^3.0.6",
+    "el-table-infinite-scroll": "^3.0.7",
-    "element-plus": "^2.9.4",
+    "element-plus": "^2.11.4",
     "highlight.js": "^11.11.1",
     "intro.js": "^7.2.0",
     "js-cookie": "^3.0.5",
-    "jsbarcode": "^3.11.6",
+    "jsbarcode": "^3.12.1",
     "localforage": "^1.10.0",
     "mint-filter": "^4.0.3",
     "mitt": "^3.0.1",
     "mqtt": "4.3.7",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
-    "pinia": "^3.0.1",
+    "pinia": "^3.0.3",
-    "pinyin-pro": "^3.26.0",
+    "pinyin-pro": "^3.27.0",
-    "plus-pro-components": "^0.1.20",
+    "plus-pro-components": "^0.1.29",
     "qrcode": "^1.5.4",
     "qs": "^6.14.0",
     "responsive-storage": "^2.2.0",
     "sortablejs": "^1.15.6",
-    "swiper": "^11.2.3",
+    "swiper": "^12.0.2",
     "typeit": "^8.8.7",
     "v-contextmenu": "^3.2.0",
     "v3-infinite-loading": "^1.3.2",
-    "vditor": "^3.10.9",
+    "vditor": "^3.11.2",
     "version-rocket": "^1.7.4",
-    "vue": "^3.5.13",
+    "vue": "^3.5.22",
-    "vue-i18n": "^11.1.1",
+    "vue-i18n": "^11.1.12",
-    "vue-json-pretty": "^2.4.0",
+    "vue-json-pretty": "^2.5.0",
-    "vue-pdf-embed": "^2.1.2",
+    "vue-pdf-embed": "^2.1.3",
-    "vue-router": "^4.5.0",
+    "vue-router": "^4.5.1",
-    "vue-tippy": "^6.6.0",
+    "vue-tippy": "^6.7.1",
-    "vue-types": "^5.1.3",
+    "vue-types": "^6.0.0",
     "vue-virtual-scroller": "2.0.0-beta.8",
-    "vue-waterfall-plugin-next": "^2.6.5",
+    "vue-waterfall-plugin-next": "^2.6.9",
-    "vue3-danmaku": "^1.6.1",
+    "vue3-danmaku": "^1.6.6",
     "vue3-puzzle-vcode": "^1.1.7",
     "vuedraggable": "^4.1.0",
     "vxe-table": "4.6.25",
-    "wavesurfer.js": "^7.9.1",
+    "wavesurfer.js": "^7.11.0",
-    "xgplayer": "^3.0.20",
+    "xgplayer": "^3.0.23",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.7.1",
+    "@commitlint/cli": "^20.1.0",
-    "@commitlint/config-conventional": "^19.7.1",
+    "@commitlint/config-conventional": "^20.0.0",
-    "@commitlint/types": "^19.5.0",
+    "@commitlint/types": "^20.0.0",
-    "@eslint/js": "^9.20.0",
+    "@eslint/js": "^9.37.0",
-    "@faker-js/faker": "^9.5.0",
+    "@faker-js/faker": "^10.0.0",
-    "@iconify/json": "^2.2.319",
+    "@iconify/json": "^2.2.393",
     "@iconify/vue": "4.2.0",
-    "@intlify/unplugin-vue-i18n": "^6.0.3",
+    "@intlify/unplugin-vue-i18n": "^11.0.1",
-    "@types/codemirror": "^5.60.15",
+    "@tailwindcss/vite": "^4.1.14",
-    "@types/dagre": "^0.7.52",
+    "@types/codemirror": "^5.60.16",
+    "@types/dagre": "^0.7.53",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.17.19",
+    "@types/node": "^20.19.19",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qrcode": "^1.5.5",
-    "@types/qs": "^6.9.18",
+    "@types/qs": "^6.14.0",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.24.0",
+    "@vitejs/plugin-vue": "^6.0.1",
-    "@typescript-eslint/parser": "^8.24.0",
+    "@vitejs/plugin-vue-jsx": "^5.1.1",
-    "@vitejs/plugin-vue": "^5.2.1",
-    "@vitejs/plugin-vue-jsx": "^4.1.1",
-    "autoprefixer": "^10.4.20",
     "boxen": "^8.0.1",
-    "code-inspector-plugin": "^0.20.0",
+    "code-inspector-plugin": "^1.2.10",
-    "cssnano": "^7.0.6",
+    "cssnano": "^7.1.1",
     "dagre": "^0.8.5",
-    "eslint": "^9.23.0",
+    "eslint": "^9.37.0",
-    "eslint-config-prettier": "^10.0.1",
+    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.2.3",
+    "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-vue": "^9.32.0",
+    "eslint-plugin-vue": "^10.5.0",
     "gradient-string": "^3.0.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.4.3",
+    "lint-staged": "^16.2.3",
-    "postcss": "^8.5.2",
+    "postcss": "^8.5.6",
     "postcss-html": "^1.8.0",
-    "postcss-import": "^16.1.0",
+    "postcss-load-config": "^6.0.1",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.5.1",
+    "prettier": "^3.6.2",
     "rimraf": "^6.0.1",
-    "rollup-plugin-visualizer": "^5.14.0",
+    "rollup-plugin-visualizer": "^6.0.4",
-    "sass": "^1.85.0",
+    "sass": "^1.93.2",
-    "stylelint": "^16.14.1",
+    "stylelint": "^16.25.0",
-    "stylelint-config-recess-order": "^6.0.0",
+    "stylelint-config-recess-order": "^7.3.0",
-    "stylelint-config-recommended-vue": "^1.6.0",
+    "stylelint-config-recommended-vue": "^1.6.1",
     "stylelint-config-standard-scss": "^14.0.0",
     "stylelint-prettier": "^5.0.3",
-    "svgo": "^3.3.2",
+    "svgo": "^4.0.0",
-    "tailwindcss": "3.4.17",
+    "tailwindcss": "^4.1.14",
-    "typescript": "^5.7.3",
+    "typescript": "^5.9.3",
-    "unplugin-icons": "^22.1.0",
+    "typescript-eslint": "^8.46.0",
-    "vite": "^6.1.0",
+    "unplugin-icons": "^22.4.2",
+    "vite": "^7.1.9",
     "vite-plugin-cdn-import": "^1.0.1",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-fake-server": "^2.2.0",
     "vite-plugin-remove-console": "^2.2.0",
     "vite-plugin-router-warn": "^1.0.0",
     "vite-svg-loader": "^5.1.0",
-    "vue-eslint-parser": "^9.4.3",
+    "vue-eslint-parser": "^10.2.0",
-    "vue-tsc": "^2.2.0"
+    "vue-tsc": "^3.1.1"
   },
   "engines": {
-    "node": "^18.18.0 || ^20.9.0 || >=22.0.0",
+    "node": "^20.19.0 || >=22.13.0",
     "pnpm": ">=9"
   },
   "pnpm": {
     "allowedDeprecatedVersions": {
       "are-we-there-yet": "*",
       "sourcemap-codec": "*",
+      "lodash.isequal": "*",
       "domexception": "*",
       "w3c-hr-time": "*",
       "inflight": "*",
@@ -193,11 +193,6 @@
       "abab": "*",
       "glob": "*"
     },
-    "peerDependencyRules": {
-      "allowedVersions": {
-        "eslint": "9"
-      }
-    },
     "onlyBuiltDependencies": [
       "@parcel/watcher",
       "core-js",
@@ -205,6 +200,10 @@
       "esbuild",
       "typeit",
       "vue-demi"
+    ],
+    "ignoredBuiltDependencies": [
+      "@tailwindcss/oxide",
+      "vue3-danmaku"
     ]
   }
 }

postcss.config.js

@@ -3,10 +3,6 @@
 /** @type {import('postcss-load-config').Config} */
 export default {
   plugins: {
-    "postcss-import": {},
-    "tailwindcss/nesting": {},
-    tailwindcss: {},
-    autoprefixer: {},
     ...(process.env.NODE_ENV === "production" ? { cssnano: {} } : {})
   }
 };

public/platform-config.json

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

src/components/ReAnimateSelector/src/index.vue

@@ -95,7 +95,7 @@ function onMouseleave() {
           :view-style="{ overflow: 'hidden' }"
           class="border-t border-[#e5e7eb]"
         >
-          <ul class="flex flex-wrap justify-around mb-1">
+          <ul class="flex flex-wrap justify-around mb-1!">
             <li
               v-for="(animate, index) in animatesList"
               :key="index"

src/components/ReCropper/src/index.tsx

@@ -119,7 +119,7 @@ export default defineComponent({
         "p-[6px]",
         "h-[30px]",
         "w-[30px]",
-        "outline-none",
+        "outline-hidden",
         "rounded-[4px]",
         "cursor-pointer",
         "hover:bg-[rgba(0,0,0,0.06)]"

src/components/ReDialog/index.vue

@@ -79,7 +79,7 @@ const fullscreenClass = computed(() => {
     "el-dialog__close",
     "-translate-x-2",
     "cursor-pointer",
-    "hover:!text-[red]"
+    "hover:text-[red]!"
   ];
 });
 

src/components/ReFlowChart/src/Control.vue

@@ -3,7 +3,7 @@ import { ref, unref, onMounted } from "vue";
 import { LogicFlow } from "@logicflow/core";
 
 interface Props {
-  lf: LogicFlow;
+  lf?: LogicFlow;
   catTurboData?: boolean;
 }
 
@@ -114,7 +114,8 @@ onMounted(() => {
           :style="{
             cursor: item.disabled === false ? 'pointer' : 'not-allowed',
             color: item.disabled === false ? '' : '#00000040',
-            background: 'transparent'
+            background: 'transparent',
+            border: 'none'
           }"
           @click="onControl(item, key)"
         >

src/components/ReFlowChart/src/NodePanel.vue

@@ -9,8 +9,8 @@ type nodeListType = {
 };
 
 interface Props {
-  lf: LogicFlow;
+  lf?: LogicFlow;
-  nodeList: Array<nodeListType>;
+  nodeList?: Array<nodeListType>;
 }
 
 const props = withDefaults(defineProps<Props>(), {

src/components/ReFlowChart/src/assets/iconfont/iconfont.js

@@ -23,9 +23,9 @@
   function h() {
     n || ((n = !0), o());
   }
-  (t = function () {
+  ((t = function () {
     var c, t, e, o;
-    ((o = document.createElement("div")).innerHTML = i),
+    (((o = document.createElement("div")).innerHTML = i),
       (i = null),
       (e = o.getElementsByTagName("svg")[0]) &&
         ((e.style.position = "absolute"),
@@ -35,13 +35,13 @@
         (c = e),
         (t = document.body).firstChild
           ? ((o = c), (e = t.firstChild).parentNode.insertBefore(o, e))
-          : t.appendChild(c));
+          : t.appendChild(c)));
   }),
     document.addEventListener
       ? ~["complete", "loaded", "interactive"].indexOf(document.readyState)
         ? setTimeout(t, 0)
         : ((e = function () {
-            document.removeEventListener("DOMContentLoaded", e, !1), t();
+            (document.removeEventListener("DOMContentLoaded", e, !1), t());
           }),
           document.addEventListener("DOMContentLoaded", e, !1))
       : document.attachEvent &&
@@ -58,5 +58,5 @@
         })(),
         (a.onreadystatechange = function () {
           "complete" == a.readyState && ((a.onreadystatechange = null), h());
-        }));
+        })));
 })(window);

src/components/ReIcon/src/Select.vue

@@ -158,7 +158,7 @@ watch(
               :name="pane.name"
             >
               <el-scrollbar height="220px">
-                <ul class="flex flex-wrap px-2 ml-2">
+                <ul class="flex flex-wrap px-2! ml-2!">
                   <li
                     v-for="(item, key) in pageList"
                     :key="key"
@@ -198,7 +198,7 @@ watch(
               @current-change="onCurrentChange"
             />
             <el-button
-              class="justify-end mr-2 ml-2"
+              class="justify-end mx-2!"
               type="danger"
               size="small"
               text

src/components/ReIcon/src/hooks.ts

@@ -49,8 +49,10 @@ export function useRenderIcon(icon: any, attrs?: iconType): Component {
     return defineComponent({
       name: "Icon",
       render() {
-        const IconifyIcon =
+        if (!icon) return;
-          icon && icon.includes(":") ? IconifyIconOnline : IconifyIconOffline;
+        const IconifyIcon = icon.includes(":")
+          ? IconifyIconOnline
+          : IconifyIconOffline;
         return h(IconifyIcon, {
           icon,
           ...attrs

src/components/ReIcon/src/offlineIcon.ts

@@ -54,8 +54,8 @@ const icons = [
   // Remix Icon: https://github.com/Remix-Design/RemixIcon
   ["ri/mind-map", RiMindMap],
   ["ri/admin-fill", RiAdminFill],
-  ["ri/links-fill", RiTableLine],
+  ["ri/table-line", RiTableLine],
-  ["ri/table-line", RiLinksFill],
+  ["ri/links-fill", RiLinksFill],
   ["ri/admin-line", RiAdminLine],
   ["ri/list-check", RiListCheck],
   ["ri/search-line", RiSearchLine],

src/components/RePureTableBar/src/bar.tsx

@@ -87,9 +87,9 @@ export default defineComponent({
         "text-black",
         "dark:text-white",
         "duration-100",
-        "hover:!text-primary",
+        "hover:text-primary!",
         "cursor-pointer",
-        "outline-none"
+        "outline-hidden"
       ];
     });
 
@@ -255,12 +255,12 @@ export default defineComponent({
         <div
           {...attrs}
           class={[
-            "w-[99/100]",
+            "w-full",
             "px-2",
             "pb-2",
             "bg-bg_color",
             isFullscreen.value
-              ? ["!w-full", "!h-full", "z-[2002]", "fixed", "inset-0"]
+              ? ["h-full!", "z-2002", "fixed", "inset-0"]
               : "mt-2"
           ]}
         >
@@ -317,7 +317,7 @@ export default defineComponent({
               >
                 <div class={[topClass.value]}>
                   <el-checkbox
-                    class="!-mr-1"
+                    class="-mr-1!"
                     label="列展示"
                     v-model={checkAll.value}
                     indeterminate={isIndeterminate.value}
@@ -347,8 +347,8 @@ export default defineComponent({
                                 class={[
                                   "drag-btn w-[16px] mr-2",
                                   isFixedColumn(item)
-                                    ? "!cursor-no-drop"
+                                    ? "cursor-no-drop!"
-                                    : "!cursor-grab"
+                                    : "cursor-grab!"
                                 ]}
                                 onMouseenter={(event: {
                                   preventDefault: () => void;

src/components/ReSeamlessScroll/src/utils.ts

@@ -60,12 +60,15 @@ export function copyObj() {
     copyIsArray,
     clone,
     i = 1,
+    // eslint-disable-next-line prefer-rest-params
     target = arguments[0] || {}, // 使用||运算符，排除隐式强制类型转换为false的数据类型
     deep = false,
+    // eslint-disable-next-line prefer-const
     len = arguments.length;
   if (typeof target === "boolean") {
     deep = target;
 
+    // eslint-disable-next-line prefer-rest-params
     target = arguments[1] || {};
     i++;
   }
@@ -79,6 +82,7 @@ export function copyObj() {
   for (; i < len; i++) {
     //所以如果源对象中数据类型为Undefined或Null那么就会跳过本次循环，接着循环下一个源对象
 
+    // eslint-disable-next-line prefer-rest-params
     if ((options = arguments[i]) != null) {
       // 如果遇到源对象的数据类型为Boolean, Number for in循环会被跳过，不执行for in循环// src用于判断target对象是否存在name属性
       for (name in options) {

src/components/ReSegmented/src/index.css

@@ -98,7 +98,6 @@
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
-  transition: 0.1s;
 }
 
 .pure-segmented-group {

src/components/ReSplitPane/iconfont/iconfont.js

@@ -33,10 +33,10 @@
     }
     l();
   }
-  (t = function () {
+  ((t = function () {
     var e,
       t = document.createElement("div");
-    (t.innerHTML = i),
+    ((t.innerHTML = i),
       (i = null),
       (t = t.getElementsByTagName("svg")[0]) &&
         ((t.style.position = "absolute"),
@@ -44,13 +44,15 @@
         (t.style.height = 0),
         (t.style.overflow = "hidden"),
         (t = t),
-        (e = document.body).firstChild ? m(t, e.firstChild) : e.appendChild(t));
+        (e = document.body).firstChild
+          ? m(t, e.firstChild)
+          : e.appendChild(t)));
   }),
     document.addEventListener
       ? ~["complete", "loaded", "interactive"].indexOf(document.readyState)
         ? setTimeout(t, 0)
         : ((n = function () {
-            document.removeEventListener("DOMContentLoaded", n, !1), t();
+            (document.removeEventListener("DOMContentLoaded", n, !1), t());
           }),
           document.addEventListener("DOMContentLoaded", n, !1))
       : document.attachEvent &&
@@ -60,5 +62,5 @@
         a(),
         (o.onreadystatechange = function () {
           "complete" == o.readyState && ((o.onreadystatechange = null), l());
-        }));
+        })));
 })(window);

src/components/ReVxeTableBar/src/bar.tsx

@@ -80,9 +80,9 @@ export default defineComponent({
         "text-black",
         "dark:text-white",
         "duration-100",
-        "hover:!text-primary",
+        "hover:text-primary!",
         "cursor-pointer",
-        "outline-none"
+        "outline-hidden"
       ];
     });
 
@@ -248,12 +248,12 @@ export default defineComponent({
         <div
           {...attrs}
           class={[
-            "w-[99/100]",
+            "w-full",
             "px-2",
             "pb-2",
             "bg-bg_color",
             isFullscreen.value
-              ? ["!w-full", "!h-full", "z-[2002]", "fixed", "inset-0"]
+              ? ["h-full!", "z-2002", "fixed", "inset-0"]
               : "mt-2"
           ]}
         >
@@ -310,7 +310,7 @@ export default defineComponent({
               >
                 <div class={[topClass.value]}>
                   <el-checkbox
-                    class="!-mr-1"
+                    class="-mr-1!"
                     label="列展示"
                     v-model={checkAll.value}
                     indeterminate={isIndeterminate.value}
@@ -340,8 +340,8 @@ export default defineComponent({
                                 class={[
                                   "drag-btn w-[16px] mr-2",
                                   isFixedColumn(item)
-                                    ? "!cursor-no-drop"
+                                    ? "cursor-no-drop!"
-                                    : "!cursor-grab"
+                                    : "cursor-grab!"
                                 ]}
                                 onMouseenter={(event: {
                                   preventDefault: () => void;

src/directives/ripple/index.scss

@@ -13,10 +13,10 @@ $ripple-animation-visible-opacity: 0.25 !default;
     z-index: 0;
     width: 100%;
     height: 100%;
+    contain: strict;
     overflow: hidden;
     pointer-events: none;
     border-radius: inherit;
-    contain: strict;
   }
 
   &__animation {

src/directives/ripple/index.ts

@@ -32,8 +32,8 @@ const calculate = (
   const offset = el.getBoundingClientRect();
 
   // 获取点击位置距离 el 的垂直和水平距离
-  let localX = e.clientX - offset.left;
+  const localX = e.clientX - offset.left;
-  let localY = e.clientY - offset.top;
+  const localY = e.clientY - offset.top;
 
   let radius = 0;
   let scale = 0.3;

src/layout/components/lay-footer/index.vue

@@ -10,7 +10,7 @@ const TITLE = getConfig("Title");
   >
     Copyright © 2020-present
     <a
-      class="hover:text-primary"
+      class="hover:text-primary!"
       href="https://github.com/pure-admin"
       target="_blank"
     >

src/layout/components/lay-navbar/index.vue

@@ -33,7 +33,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
 </script>
 
 <template>
-  <div class="navbar bg-[#fff] shadow-sm shadow-[rgba(0,21,41,0.08)]">
+  <div class="navbar bg-[#fff] shadow-xs shadow-[rgba(0,21,41,0.08)]">
     <LaySidebarTopCollapse
       v-if="device === 'mobile'"
       class="hamburger-container"
@@ -54,13 +54,13 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
         <GlobalizationIcon
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
         />
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'zh')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'zh')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'zh')]"
               @click="translationCh"
             >
               <IconifyIconOffline
@@ -72,7 +72,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
             </el-dropdown-item>
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'en')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'en')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'en')]"
               @click="translationEn"
             >
               <span v-show="locale === 'en'" class="check-en">

src/layout/components/lay-notice/components/NoticeItem.vue

@@ -49,7 +49,7 @@ function hoverDescription(event, description) {
 
 <template>
   <div
-    class="notice-container border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
+    class="notice-container border-0 border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
   >
     <el-avatar
       v-if="noticeItem.avatar"

src/layout/components/lay-panel/index.vue

@@ -16,7 +16,7 @@ const iconClass = computed(() => {
     "flex",
     "justify-center",
     "items-center",
-    "outline-none",
+    "outline-hidden",
     "rounded-[4px]",
     "cursor-pointer",
     "transition-colors",
@@ -51,7 +51,7 @@ onBeforeUnmount(() => {
     <div class="right-panel-background" />
     <div ref="target" class="right-panel bg-bg_color">
       <div
-        class="project-configuration border-b-[1px] border-solid border-[var(--pure-border-color)]"
+        class="project-configuration border-0 border-b-[1px] border-solid border-[var(--pure-border-color)]"
       >
         <h4 class="dark:text-white">
           {{ t("panel.pureSystemSet") }}
@@ -78,7 +78,7 @@ onBeforeUnmount(() => {
       </el-scrollbar>
 
       <div
-        class="flex justify-end p-3 border-t-[1px] border-solid border-[var(--pure-border-color)]"
+        class="flex justify-end p-3 border-0 border-t-[1px] border-solid border-[var(--pure-border-color)]"
       >
         <el-button
           v-tippy="{

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

@@ -6,7 +6,7 @@ import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
 import ArrowUpLine from "~icons/ri/arrow-up-line";
 import ArrowDownLine from "~icons/ri/arrow-down-line";
 
-withDefaults(defineProps<{ total: number }>(), {
+withDefaults(defineProps<{ total?: number }>(), {
   total: 0
 });
 

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

@@ -6,8 +6,8 @@ import { useRouter } from "vue-router";
 import SearchResult from "./SearchResult.vue";
 import SearchFooter from "./SearchFooter.vue";
 import { useNav } from "@/layout/hooks/useNav";
+import { transformI18n } from "@/plugins/i18n";
 import SearchHistory from "./SearchHistory.vue";
-import { transformI18n, $t } from "@/plugins/i18n";
 import type { optionsItem, dragItem } from "../types";
 import { ref, computed, shallowRef, watch } from "vue";
 import { useDebounceFn, onKeyStroke } from "@vueuse/core";

src/layout/components/lay-setting/index.vue

@@ -20,8 +20,8 @@ import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
 import { useDark, useGlobal, debounce, isNumber } from "@pureadmin/utils";
 
 import Check from "~icons/ep/check";
-import LeftArrow from "~icons/ri/arrow-left-s-line";
+import LeftArrow from "~icons/ri/arrow-left-s-line?width=20&height=20";
-import RightArrow from "~icons/ri/arrow-right-s-line";
+import RightArrow from "~icons/ri/arrow-right-s-line?width=20&height=20";
 import DayIcon from "@/assets/svg/day.svg?component";
 import DarkIcon from "@/assets/svg/dark.svg?component";
 import SystemIcon from "@/assets/svg/system.svg?component";
@@ -189,7 +189,7 @@ const getThemeColor = computed(() => {
 });
 
 const pClass = computed(() => {
-  return ["mb-[12px]", "font-medium", "text-sm", "dark:text-white"];
+  return ["mb-[12px]!", "font-medium", "text-sm", "dark:text-white"];
 });
 
 const themeOptions = computed<Array<OptionsType>>(() => {
@@ -335,7 +335,7 @@ onUnmounted(() => removeMatchMedia);
         "
       />
 
-      <p :class="['mt-5', pClass]">{{ t("panel.pureThemeColor") }}</p>
+      <p :class="['mt-5!', pClass]">{{ t("panel.pureThemeColor") }}</p>
       <ul class="theme-color">
         <li
           v-for="(item, index) in themeColors"
@@ -354,7 +354,7 @@ onUnmounted(() => removeMatchMedia);
         </li>
       </ul>
 
-      <p :class="['mt-5', pClass]">{{ t("panel.pureLayoutModel") }}</p>
+      <p :class="['mt-5!', pClass]">{{ t("panel.pureLayoutModel") }}</p>
       <ul class="pure-theme">
         <li
           ref="verticalRef"
@@ -397,7 +397,7 @@ onUnmounted(() => removeMatchMedia);
       </ul>
 
       <span v-if="useAppStoreHook().getViewportWidth > 1280">
-        <p :class="['mt-5', pClass]">{{ t("panel.pureStretch") }}</p>
+        <p :class="['mt-5!', pClass]">{{ t("panel.pureStretch") }}</p>
         <Segmented
           resize
           class="mb-2 select-none"
@@ -426,21 +426,19 @@ onUnmounted(() => removeMatchMedia);
           >
             <IconifyIconOffline
               :icon="settings.stretch ? RightArrow : LeftArrow"
-              height="20"
             />
             <div
-              class="flex-grow border-b border-dashed"
+              class="grow border-0 border-b border-dashed"
               style="border-color: var(--el-color-primary)"
             />
             <IconifyIconOffline
               :icon="settings.stretch ? LeftArrow : RightArrow"
-              height="20"
             />
           </div>
         </button>
       </span>
 
-      <p :class="['mt-4', pClass]">{{ t("panel.pureTagsStyle") }}</p>
+      <p :class="['mt-4!', pClass]">{{ t("panel.pureTagsStyle") }}</p>
       <Segmented
         resize
         class="select-none"
@@ -449,7 +447,7 @@ onUnmounted(() => removeMatchMedia);
         @change="onChange"
       />
 
-      <p class="mt-5 font-medium text-sm dark:text-white">
+      <p class="mt-5! font-medium text-sm dark:text-white">
         {{ t("panel.pureInterfaceDisplay") }}
       </p>
       <ul class="setting">

src/layout/components/lay-sidebar/NavHorizontal.vue

@@ -84,13 +84,13 @@ onMounted(() => {
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
         <GlobalizationIcon
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
         />
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'zh')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'zh')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'zh')]"
               @click="translationCh"
             >
               <span v-show="locale === 'zh'" class="check-zh">
@@ -100,7 +100,7 @@ onMounted(() => {
             </el-dropdown-item>
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'en')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'en')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'en')]"
               @click="translationEn"
             >
               <span v-show="locale === 'en'" class="check-en">

src/layout/components/lay-sidebar/NavMix.vue

@@ -105,13 +105,13 @@ watch(
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
         <GlobalizationIcon
-          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
         />
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'zh')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'zh')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'zh')]"
               @click="translationCh"
             >
               <span v-show="locale === 'zh'" class="check-zh">
@@ -121,7 +121,7 @@ watch(
             </el-dropdown-item>
             <el-dropdown-item
               :style="getDropdownItemStyle(locale, 'en')"
-              :class="['dark:!text-white', getDropdownItemClass(locale, 'en')]"
+              :class="['dark:text-white!', getDropdownItemClass(locale, 'en')]"
               @click="translationEn"
             >
               <span v-show="locale === 'en'" class="check-en">

src/layout/components/lay-sidebar/components/SidebarBreadCrumb.vue

@@ -105,12 +105,12 @@ watch(
 </script>
 
 <template>
-  <el-breadcrumb class="!leading-[50px] select-none" separator="/">
+  <el-breadcrumb class="leading-[50px]! select-none" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item
         v-for="item in levelList"
         :key="item.path"
-        class="!inline !items-stretch"
+        class="inline! items-stretch!"
       >
         <a @click.prevent="handleLink(item)">
           {{ transformI18n(item.meta.title) }}

src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue

@@ -7,7 +7,7 @@ import { useNav } from "@/layout/hooks/useNav";
 import ArrowLeft from "~icons/ri/arrow-left-double-fill";
 
 interface Props {
-  isActive: boolean;
+  isActive?: boolean;
 }
 
 withDefaults(defineProps<Props>(), {

src/layout/components/lay-sidebar/components/SidebarItem.vue

@@ -61,6 +61,21 @@ const getSubMenuIconStyle = computed((): CSSProperties => {
   };
 });
 
+const textClass = computed(() => {
+  const item = props.item;
+  const baseClass = "w-full! text-inherit!";
+  if (
+    layout.value !== "horizontal" &&
+    isCollapse.value &&
+    !toRaw(item.meta.icon) &&
+    ((layout.value === "vertical" && item.parentId === null) ||
+      (layout.value === "mix" && item.pathList.length === 2))
+  ) {
+    return `${baseClass} min-w-[54px]! text-center! px-3!`;
+  }
+  return baseClass;
+});
+
 const expandCloseIcon = computed(() => {
   if (!getConfig()?.MenuArrowIconNoTransition) return "";
   return {
@@ -144,7 +159,7 @@ function resolvePath(routePath) {
             item?.pathList?.length === 2)
         "
         truncated
-        class="!w-full !pl-4 !text-inherit"
+        class="w-full! px-3! min-w-[54px]! text-center! text-inherit!"
       >
         {{ transformI18n(onlyOneChild.meta.title) }}
       </el-text>
@@ -156,7 +171,7 @@ function resolvePath(routePath) {
               offset: [0, -10],
               theme: tooltipEffect
             }"
-            class="!w-full !text-inherit"
+            class="w-full! text-inherit!"
           >
             {{ transformI18n(onlyOneChild.meta.title) }}
           </ReText>
@@ -195,15 +210,7 @@ function resolvePath(routePath) {
           offset: [0, -10],
           theme: tooltipEffect
         }"
-        :class="{
+        :class="textClass"
-          '!w-full': true,
-          '!text-inherit': true,
-          '!pl-4':
-            layout !== 'horizontal' &&
-            isCollapse &&
-            !toRaw(item.meta.icon) &&
-            item.parentId === null
-        }"
       >
         {{ transformI18n(item.meta.title) }}
       </ReText>

src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue

@@ -7,7 +7,7 @@ import { useNav } from "@/layout/hooks/useNav";
 import MenuFold from "~icons/ri/menu-fold-fill";
 
 interface Props {
-  isActive: boolean;
+  isActive?: boolean;
 }
 
 withDefaults(defineProps<Props>(), {
@@ -23,7 +23,7 @@ const iconClass = computed(() => {
     "mb-1",
     "w-[16px]",
     "h-[16px]",
-    "inline-block",
+    "inline-block!",
     "align-middle",
     "cursor-pointer",
     "duration-[100ms]"

src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue

@@ -4,7 +4,7 @@ import MenuFold from "~icons/ri/menu-fold-fill";
 import MenuUnfold from "~icons/ri/menu-unfold-fill";
 
 interface Props {
-  isActive: boolean;
+  isActive?: boolean;
 }
 
 withDefaults(defineProps<Props>(), {
@@ -32,7 +32,7 @@ const toggleClick = () => {
   >
     <IconifyIconOffline
       :icon="isActive ? MenuFold : MenuUnfold"
-      class="inline-block align-middle hover:text-primary dark:hover:!text-white"
+      class="inline-block! align-middle hover:text-primary dark:hover:text-white!"
     />
   </div>
 </template>

src/layout/components/lay-tag/index.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { $t } from "@/plugins/i18n";
 import { emitter } from "@/utils/mitt";
+import NProgress from "@/utils/progress";
 import { RouteConfigs } from "../../types";
 import { useTags } from "../../hooks/useTag";
 import { routerArrays } from "@/layout/types";
@@ -206,12 +207,14 @@ function dynamicRouteTag(value: string): void {
 
 /** 刷新路由 */
 function onFresh() {
+  NProgress.start();
   const { fullPath, query } = unref(route);
   router.replace({
     path: "/redirect" + fullPath,
     query
   });
   handleAliveRoute(route as ToRouteType, "refresh");
+  NProgress.done();
 }
 
 function deleteDynamicTag(obj: any, current: any, tag?: string) {
@@ -254,7 +257,7 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
   if (tag === "other") {
     spliceRoute(1, 1, true);
   } else if (tag === "left") {
-    spliceRoute(fixedTags.length, valueIndex - 1, true);
+    spliceRoute(fixedTags.length, valueIndex - fixedTags.length);
   } else if (tag === "right") {
     spliceRoute(valueIndex + 1, multiTags.value.length);
   } else {
@@ -353,7 +356,7 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
       break;
   }
   setTimeout(() => {
-    showMenuModel(route.fullPath, route.query);
+    showMenuModel(route.fullPath, route.query, route.params);
   });
 }
 
@@ -388,15 +391,18 @@ function disabledMenus(value: boolean, fixedTag = false) {
 function showMenuModel(
   currentPath: string,
   query: object = {},
+  params: object = {},
   refresh = false
 ) {
   const allRoute = multiTags.value;
   const routeLength = multiTags.value.length;
   let currentIndex = -1;
-  if (isAllEmpty(query)) {
+  if (!isAllEmpty(params)) {
-    currentIndex = allRoute.findIndex(v => v.path === currentPath);
+    currentIndex = allRoute.findIndex(v => isEqual(v.params, params));
-  } else {
+  } else if (!isAllEmpty(query)) {
     currentIndex = allRoute.findIndex(v => isEqual(v.query, query));
+  } else {
+    currentIndex = allRoute.findIndex(v => v.path === currentPath);
   }
   function fixedTagDisabled() {
     if (allRoute[currentIndex]?.meta?.fixedTag) {
@@ -462,14 +468,14 @@ function openMenu(tag, e) {
   } else if (route.path !== tag.path && route.name !== tag.name) {
     // 右键菜单不匹配当前路由，隐藏刷新
     tagsViews[0].show = false;
-    showMenuModel(tag.path, tag.query);
+    showMenuModel(tag.path, tag.query, tag.params);
   } else if (multiTags.value.length === 2 && route.path !== tag.path) {
     showMenus(true);
     // 只有两个标签时不显示关闭其他标签页
     tagsViews[4].show = false;
-  } else if (route.path === tag.path) {
+    showMenuModel(tag.path, tag.query, tag.params);
-    // 右键当前激活的菜单
+  } else {
-    showMenuModel(tag.path, tag.query, true);
+    showMenuModel(tag.path, tag.query, tag.params, true);
   }
 
   currentSelect.value = tag;
@@ -589,7 +595,7 @@ onBeforeUnmount(() => {
         >
           <template v-if="showModel !== 'chrome'">
             <span
-              class="tag-title dark:!text-text_color_primary dark:hover:!text-primary"
+              class="tag-title dark:text-text_color_primary! dark:hover:text-primary!"
             >
               {{ transformI18n(item.meta.title) }}
             </span>

src/layout/frame.vue

@@ -19,13 +19,22 @@ const loading = ref(true);
 const currentRoute = useRoute();
 const frameSrc = ref<string>("");
 const frameRef = ref<HTMLElement | null>(null);
+const fallbackTimer = ref<number | null>(null);
+
 if (unref(currentRoute.meta)?.frameSrc) {
   frameSrc.value = unref(currentRoute.meta)?.frameSrc as string;
 }
-unref(currentRoute.meta)?.frameLoading === false && hideLoading();
+
+function clearFallbackTimer() {
+  if (fallbackTimer.value !== null) {
+    clearTimeout(fallbackTimer.value);
+    fallbackTimer.value = null;
+  }
+}
 
 function hideLoading() {
   loading.value = false;
+  clearFallbackTimer();
 }
 
 function init() {
@@ -34,32 +43,42 @@ function init() {
     if (!iframe) return;
     const _frame = iframe as any;
     if (_frame.attachEvent) {
-      _frame.attachEvent("onload", () => {
+      _frame.attachEvent("onload", hideLoading);
-        hideLoading();
-      });
     } else {
-      iframe.onload = () => {
+      iframe.onload = hideLoading;
-        hideLoading();
-      };
     }
   });
 }
 
+let isRedirect = false;
+
 watch(
   () => currentRoute.fullPath,
   path => {
     if (
       currentRoute.name === "Redirect" &&
-      path.includes(props.frameInfo?.fullPath)
+      props.frameInfo?.fullPath &&
+      path.includes(props.frameInfo.fullPath)
     ) {
-      frameSrc.value = path; // redirect时，置换成任意值，待重定向后 重新赋值
+      isRedirect = true;
       loading.value = true;
+      return;
     }
-    // 重新赋值
+    if (props.frameInfo?.fullPath === path && isRedirect) {
-    if (props.frameInfo?.fullPath === path) {
+      loading.value = true;
-      frameSrc.value = props.frameInfo?.frameSrc;
+      clearFallbackTimer();
+      const url = new URL(props.frameInfo.frameSrc, window.location.origin);
+      const joinChar = url.search ? "&" : "?";
+      frameSrc.value = `${props.frameInfo.frameSrc}${joinChar}t=${Date.now()}`;
+      fallbackTimer.value = window.setTimeout(() => {
+        if (loading.value) {
+          hideLoading();
+        }
+      }, 1500);
+      isRedirect = false;
     }
-  }
+  },
+  { immediate: true }
 );
 
 onMounted(() => {

src/layout/hooks/useNav.ts

@@ -64,7 +64,7 @@ export function useNav() {
 
   const getDropdownItemClass = computed(() => {
     return (locale, t) => {
-      return locale === t ? "" : "dark:hover:!text-primary";
+      return locale === t ? "" : "dark:hover:text-primary!";
     };
   });
 

src/layout/hooks/useTag.ts

@@ -114,14 +114,21 @@ export function useTags() {
   ]);
 
   function conditionHandle(item, previous, next) {
+    const currentName = route.name || "";
+    const itemName = item.name || "";
+
     if (isBoolean(route?.meta?.showLink) && route?.meta?.showLink === false) {
       if (Object.keys(route.query).length > 0) {
-        return isEqual(route.query, item.query) ? previous : next;
+        return currentName === itemName && isEqual(route.query, item.query)
+          ? previous
+          : next;
       } else {
-        return isEqual(route.params, item.params) ? previous : next;
+        return currentName === itemName && isEqual(route.params, item.params)
+          ? previous
+          : next;
       }
     } else {
-      return route.path === item.path ? previous : next;
+      return currentName === itemName ? previous : next;
     }
   }
 

src/layout/types.ts

@@ -6,6 +6,7 @@ export const routerArrays: Array<RouteConfigs> =
     ? [
         {
           path: "/welcome",
+          name: "Welcome",
           meta: {
             title: "menus.pureHome",
             icon: "ep/home-filled"

src/plugins/i18n.ts

@@ -10,7 +10,7 @@ import zhLocale from "element-plus/es/locale/lang/zh-cn";
 
 const siphonI18n = (function () {
   // 仅初始化一次国际化配置
-  let cache = Object.fromEntries(
+  const cache = Object.fromEntries(
     Object.entries(
       import.meta.glob("../../locales/*.y(a)?ml", { eager: true })
     ).map(([key, value]: any) => {

src/router/index.ts

@@ -7,7 +7,13 @@ import { buildHierarchyTree } from "@/utils/tree";
 import remainingRouter from "./modules/remaining";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-import { isUrl, openLink, storageLocal, isAllEmpty } from "@pureadmin/utils";
+import {
+  isUrl,
+  openLink,
+  cloneDeep,
+  isAllEmpty,
+  storageLocal
+} from "@pureadmin/utils";
 import {
   ascending,
   getTopMenu,
@@ -21,9 +27,9 @@ import {
 } from "./utils";
 import {
   type Router,
-  createRouter,
   type RouteRecordRaw,
-  type RouteComponent
+  type RouteComponent,
+  createRouter
 } from "vue-router";
 import {
   type DataInfo,
@@ -55,6 +61,9 @@ export const constantRoutes: Array<RouteRecordRaw> = formatTwoStageRoutes(
   formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
 );
 
+/** 初始的静态路由，用于退出登录时重置路由 */
+const initConstantRoutes: Array<RouteRecordRaw> = cloneDeep(constantRoutes);
+
 /** 用于渲染菜单，保持原始层级 */
 export const constantMenus: Array<RouteComponent> = ascending(
   routes.flat(Infinity)
@@ -85,20 +94,25 @@ export const router: Router = createRouter({
   }
 });
 
+/** 记录已经加载的页面路径 */
+const loadedPaths = new Set<string>();
+
+/** 重置已加载页面记录 */
+export function resetLoadedPaths() {
+  loadedPaths.clear();
+}
+
 /** 重置路由 */
 export function resetRouter() {
-  router.getRoutes().forEach(route => {
+  router.clearRoutes();
-    const { name, meta } = route;
+  for (const route of initConstantRoutes.concat(...(remainingRouter as any))) {
-    if (name && router.hasRoute(name) && meta?.backstage) {
+    router.addRoute(route);
-      router.removeRoute(name);
+  }
-      router.options.routes = formatTwoStageRoutes(
+  router.options.routes = formatTwoStageRoutes(
-        formatFlatteningRoutes(
+    formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
-          buildHierarchyTree(ascending(routes.flat(Infinity)))
+  );
-        )
-      );
-    }
-  });
   usePermissionStoreHook().clearAllCachePage();
+  resetLoadedPaths();
 }
 
 /** 路由白名单 */
@@ -107,6 +121,12 @@ const whiteList = ["/login"];
 const { VITE_HIDE_HOME } = import.meta.env;
 
 router.beforeEach((to: ToRouteType, _from, next) => {
+  to.meta.loaded = loadedPaths.has(to.path);
+
+  if (!to.meta.loaded) {
+    NProgress.start();
+  }
+
   if (to.meta?.keepAlive) {
     handleAliveRoute(to, "add");
     // 页面整体刷新和点击标签页刷新
@@ -115,7 +135,6 @@ router.beforeEach((to: ToRouteType, _from, next) => {
     }
   }
   const userInfo = storageLocal().getItem<DataInfo<number>>(userKey);
-  NProgress.start();
   const externalLink = isUrl(to?.name as string);
   if (!externalLink) {
     to.matched.some(item => {
@@ -201,7 +220,8 @@ router.beforeEach((to: ToRouteType, _from, next) => {
   }
 });
 
-router.afterEach(() => {
+router.afterEach(to => {
+  loadedPaths.add(to.path);
   NProgress.done();
 });
 

src/router/modules/error.ts

@@ -16,7 +16,7 @@ export default {
       name: "403",
       component: () => import("@/views/error/403.vue"),
       meta: {
-        title: $t("menus.pureFourZeroOne")
+        title: $t("menus.pureAccessDenied")
       }
     },
     {
@@ -24,7 +24,7 @@ export default {
       name: "404",
       component: () => import("@/views/error/404.vue"),
       meta: {
-        title: $t("menus.pureFourZeroFour")
+        title: $t("menus.purePageNotFound")
       }
     },
     {
@@ -32,7 +32,7 @@ export default {
       name: "500",
       component: () => import("@/views/error/500.vue"),
       meta: {
-        title: $t("menus.pureFive")
+        title: $t("menus.pureServerError")
       }
     }
   ]

src/router/modules/remaining.ts

@@ -8,8 +8,27 @@ export default [
     component: () => import("@/views/login/index.vue"),
     meta: {
       title: $t("menus.pureLogin"),
-      showLink: false,
+      showLink: false
-      rank: 101
+    }
+  },
+  // 全屏403（无权访问）页面
+  {
+    path: "/access-denied",
+    name: "AccessDenied",
+    component: () => import("@/views/error/403.vue"),
+    meta: {
+      title: $t("menus.pureAccessDenied"),
+      showLink: false
+    }
+  },
+  // 全屏500（服务器出错）页面
+  {
+    path: "/server-error",
+    name: "ServerError",
+    component: () => import("@/views/error/500.vue"),
+    meta: {
+      title: $t("menus.pureServerError"),
+      showLink: false
     }
   },
   {
@@ -17,8 +36,7 @@ export default [
     component: Layout,
     meta: {
       title: $t("status.pureLoad"),
-      showLink: false,
+      showLink: false
-      rank: 102
     },
     children: [
       {
@@ -28,6 +46,15 @@ export default [
       }
     ]
   },
+  {
+    path: "/account-settings",
+    name: "AccountSettings",
+    component: () => import("@/views/account-settings/index.vue"),
+    meta: {
+      title: $t("buttons.pureAccountSettings"),
+      showLink: false
+    }
+  },
   // 下面是一个无layout菜单的例子（一个全屏空白页面），因为这种情况极少发生，所以只需要在前端配置即可（配置路径：src/router/modules/remaining.ts）
   {
     path: "/empty",
@@ -35,18 +62,7 @@ export default [
     component: () => import("@/views/empty/index.vue"),
     meta: {
       title: $t("menus.pureEmpty"),
-      showLink: false,
+      showLink: false
-      rank: 103
-    }
-  },
-  {
-    path: "/account-settings",
-    name: "AccountSettings",
-    component: () => import("@/views/account-settings/index.vue"),
-    meta: {
-      title: $t("buttons.pureAccountSettings"),
-      showLink: false,
-      rank: 104
     }
   }
 ] satisfies Array<RouteConfigsTable>;

src/router/utils.ts

@@ -139,12 +139,17 @@ function findRouteByPath(path: string, routes: RouteRecordRaw[]) {
   }
 }
 
+/** 动态路由注册完成后，再添加全屏404（页面不存在）页面，避免刷新动态路由页面时误跳转到404页面 */
 function addPathMatch() {
   if (!router.hasRoute("pathMatch")) {
     router.addRoute({
-      path: "/:pathMatch(.*)",
+      path: "/:pathMatch(.*)*",
-      name: "pathMatch",
+      name: "PageNotFound",
-      redirect: "/error/404"
+      component: () => import("@/views/error/404.vue"),
+      meta: {
+        title: "menus.purePageNotFound",
+        showLink: false
+      }
     });
   }
 }
@@ -172,6 +177,8 @@ function handleAsyncRoutes(routeList) {
           const flattenRouters: any = router
             .getRoutes()
             .find(n => n.path === "/");
+          // 保持router.options.routes[0].children与path为"/"的children一致，防止数据不一致导致异常
+          flattenRouters.children = router.options.routes[0].children;
           router.addRoute(flattenRouters);
         }
       }

src/store/modules/multiTags.ts

@@ -80,22 +80,15 @@ export const useMultiTagsStore = defineStore("pure-multiTags", {
             if (isBoolean(tagVal?.meta?.showLink) && !tagVal?.meta?.showLink)
               return;
             const tagPath = tagVal.path;
-            // 判断tag是否已存在
             const tagHasExits = this.multiTags.some(tag => {
-              return tag.path === tagPath;
+              return (
+                tag.path === tagPath &&
+                isEqual(tag?.query, tagVal?.query) &&
+                isEqual(tag?.params, tagVal?.params)
+              );
             });
 
-            // 判断tag中的query键值是否相等
+            if (tagHasExits) return;
-            const tagQueryHasExits = this.multiTags.some(tag => {
-              return isEqual(tag?.query, tagVal?.query);
-            });
-
-            // 判断tag中的params键值是否相等
-            const tagParamsHasExits = this.multiTags.some(tag => {
-              return isEqual(tag?.params, tagVal?.params);
-            });
-
-            if (tagHasExits && tagQueryHasExits && tagParamsHasExits) return;
 
             // 动态路由可打开的最大数量
             const dynamicLevel = tagVal?.meta?.dynamicLevel ?? -1;

src/store/modules/permission.ts

@@ -2,7 +2,6 @@ import { defineStore } from "pinia";
 import {
   type cacheType,
   store,
-  debounce,
   ascending,
   getKeyList,
   filterTree,
@@ -33,33 +32,35 @@ export const usePermissionStore = defineStore("pure-permission", {
         this.constantMenus.concat(routes) as any
       );
     },
+    /** 监听缓存页面是否存在于标签页，不存在则删除 */
+    clearCache() {
+      let cacheLength = this.cachePageList.length;
+      const nameList = getKeyList(useMultiTagsStoreHook().multiTags, "name");
+      while (cacheLength > 0) {
+        nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) ===
+          -1 &&
+          this.cachePageList.splice(
+            this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]),
+            1
+          );
+        cacheLength--;
+      }
+    },
     cacheOperate({ mode, name }: cacheType) {
       const delIndex = this.cachePageList.findIndex(v => v === name);
       switch (mode) {
         case "refresh":
           this.cachePageList = this.cachePageList.filter(v => v !== name);
+          this.clearCache();
           break;
         case "add":
           this.cachePageList.push(name);
           break;
         case "delete":
           delIndex !== -1 && this.cachePageList.splice(delIndex, 1);
+          this.clearCache();
           break;
       }
-      /** 监听缓存页面是否存在于标签页，不存在则删除 */
-      debounce(() => {
-        let cacheLength = this.cachePageList.length;
-        const nameList = getKeyList(useMultiTagsStoreHook().multiTags, "name");
-        while (cacheLength > 0) {
-          nameList.findIndex(v => v === this.cachePageList[cacheLength - 1]) ===
-            -1 &&
-            this.cachePageList.splice(
-              this.cachePageList.indexOf(this.cachePageList[cacheLength - 1]),
-              1
-            );
-          cacheLength--;
-        }
-      })();
     },
     /** 清空缓存页面 */
     clearAllCachePage() {

src/style/reset.scss

@@ -1,12 +1,3 @@
-*,
-::before,
-::after {
-  box-sizing: border-box;
-  border-color: currentColor;
-  border-style: solid;
-  border-width: 0;
-}
-
 #app {
   width: 100%;
   height: 100%;

src/style/sidebar.scss

@@ -172,10 +172,6 @@
     .is-active > .el-sub-menu__title,
     .is-active.submenu-title-noDropdown {
       color: var(--pure-theme-sub-menu-active-text) !important;
-
-      i {
-        color: var(--pure-theme-sub-menu-active-text) !important;
-      }
     }
 
     .is-active {
@@ -270,10 +266,6 @@
     .is-active > .el-sub-menu__title,
     .is-active.submenu-title-noDropdown {
       color: var(--pure-theme-sub-menu-active-text) !important;
-
-      i {
-        color: var(--pure-theme-sub-menu-active-text) !important;
-      }
     }
 
     /* 子菜单中还有子菜单 */
@@ -374,10 +366,6 @@
     .is-active > .el-sub-menu__title,
     .is-active.submenu-title-noDropdown {
       color: var(--pure-theme-sub-menu-active-text) !important;
-
-      i {
-        color: var(--pure-theme-sub-menu-active-text) !important;
-      }
     }
 
     .nest-menu .el-sub-menu > .el-sub-menu__title,
@@ -541,10 +529,6 @@
     .is-active > .el-sub-menu__title,
     .is-active.submenu-title-noDropdown {
       color: var(--pure-theme-sub-menu-active-text) !important;
-
-      i {
-        color: var(--pure-theme-sub-menu-active-text) !important;
-      }
     }
 
     .is-active {
@@ -666,6 +650,10 @@ body[layout="horizontal"] {
 
   @include merge-style($sideBarWidth);
 
+  .el-menu {
+    --el-menu-hover-text-color: var(--pure-theme-menu-text) !important;
+  }
+
   .fixed-header,
   .main-container {
     transition: none !important;
@@ -687,6 +675,7 @@ body[layout="mix"] {
 
   .el-menu {
     --el-menu-hover-bg-color: transparent !important;
+    --el-menu-hover-text-color: var(--pure-theme-menu-text) !important;
   }
 
   .hideSidebar {

src/style/tailwind.css

@@ -1,21 +1,46 @@
-@tailwind base;
+@layer theme, base, components, utilities;
-@tailwind components;
+@import "tailwindcss/theme.css" layer(theme);
-@tailwind utilities;
+@import "tailwindcss/utilities.css" layer(utilities);
 
-@layer components {
+@custom-variant dark (&:is(.dark *));
-  .flex-c {
-    @apply flex justify-center items-center;
-  }
 
-  .flex-ac {
+@theme {
-    @apply flex justify-around items-center;
+  --color-bg_color: var(--el-bg-color);
-  }
+  --color-primary: var(--el-color-primary);
+  --color-text_color_primary: var(--el-text-color-primary);
+  --color-text_color_regular: var(--el-text-color-regular);
+}
 
-  .flex-bc {
+/*
-    @apply flex justify-between items-center;
+  The default border color has changed to `currentColor` in Tailwind CSS v4,
-  }
+  so we've added these compatibility styles to make sure everything still
+  looks the same as it did with Tailwind CSS v3.
 
-  .navbar-bg-hover {
+  If we ever want to remove these styles, we need to add an explicit border
-    @apply dark:text-white dark:hover:!bg-[#242424];
+  color utility to any element that depends on these defaults.
+*/
+@layer base {
+  *,
+  ::after,
+  ::before,
+  ::backdrop,
+  ::file-selector-button {
+    border-color: var(--color-gray-200, currentColor);
   }
 }
+
+@utility flex-c {
+  @apply flex justify-center items-center;
+}
+
+@utility flex-ac {
+  @apply flex justify-around items-center;
+}
+
+@utility flex-bc {
+  @apply flex justify-between items-center;
+}
+
+@utility navbar-bg-hover {
+  @apply dark:text-white dark:hover:bg-[#242424]!;
+}

src/utils/http/index.ts

@@ -10,7 +10,6 @@ import type {
   PureHttpRequestConfig
 } from "./types.d";
 import { stringify } from "qs";
-import NProgress from "../progress";
 import { getToken, formatToken } from "@/utils/auth";
 import { useUserStoreHook } from "@/store/modules/user";
 
@@ -61,8 +60,6 @@ class PureHttp {
   private httpInterceptorsRequest(): void {
     PureHttp.axiosInstance.interceptors.request.use(
       async (config: PureHttpRequestConfig): Promise<any> => {
-        // 开启进度条动画
-        NProgress.start();
         // 优先判断post/get等方法是否传入回调，否则执行初始化设置等回调
         if (typeof config.beforeRequestCallback === "function") {
           config.beforeRequestCallback(config);
@@ -121,8 +118,6 @@ class PureHttp {
     instance.interceptors.response.use(
       (response: PureHttpResponse) => {
         const $config = response.config;
-        // 关闭进度条动画
-        NProgress.done();
         // 优先判断post/get等方法是否传入回调，否则执行初始化设置等回调
         if (typeof $config.beforeResponseCallback === "function") {
           $config.beforeResponseCallback(response);
@@ -137,8 +132,6 @@ class PureHttp {
       (error: PureHttpError) => {
         const $error = error;
         $error.isCancelRequest = Axios.isCancel($error);
-        // 关闭进度条动画
-        NProgress.done();
         // 所有的响应异常 区分来源为取消请求/非取消请求
         return Promise.reject($error);
       }

src/utils/message.ts

@@ -8,6 +8,8 @@ type messageTypes = "info" | "success" | "warning" | "error";
 interface MessageParams {
   /** 消息类型，可选 `info` 、`success` 、`warning` 、`error` ，默认 `info` */
   type?: messageTypes;
+  /** 是否纯色，默认 `false` */
+  plain?: boolean;
   /** 自定义图标，该属性会覆盖 `type` 的图标 */
   icon?: any;
   /** 是否将 `message` 属性作为 `HTML` 片段处理，默认 `false` */
@@ -18,14 +20,14 @@ interface MessageParams {
   duration?: number;
   /** 是否显示关闭按钮，默认值 `false` */
   showClose?: boolean;
-  /** 文字是否居中，默认值 `false` */
+  /** `Message` 距离窗口顶部的偏移量，默认 `16` */
-  center?: boolean;
-  /** `Message` 距离窗口顶部的偏移量，默认 `20` */
   offset?: number;
   /** 设置组件的根元素，默认 `document.body` */
   appendTo?: string | HTMLElement;
   /** 合并内容相同的消息，不支持 `VNode` 类型的消息，默认值 `false` */
   grouping?: boolean;
+  /** 重复次数，类似于 `Badge` 。当和 `grouping` 属性一起使用时作为初始数量使用，默认值 `1` */
+  repeatNum?: number;
   /** 关闭时的回调函数, 参数为被关闭的 `message` 实例 */
   onClose?: Function | null;
 }
@@ -48,28 +50,30 @@ const message = (
     const {
       icon,
       type = "info",
+      plain = false,
       dangerouslyUseHTMLString = false,
       customClass = "antd",
       duration = 2000,
       showClose = false,
-      center = false,
+      offset = 16,
-      offset = 20,
       appendTo = document.body,
       grouping = false,
+      repeatNum = 1,
       onClose
     } = params;
 
     return ElMessage({
       message,
-      type,
       icon,
+      type,
+      plain,
       dangerouslyUseHTMLString,
       duration,
       showClose,
-      center,
       offset,
       appendTo,
       grouping,
+      repeatNum,
       // 全局搜 pure-message 即可知道该类的样式位置
       customClass: customClass === "antd" ? "pure-message" : "",
       onClose: () => (isFunction(onClose) ? onClose() : null)

src/utils/print.ts

@@ -140,8 +140,10 @@ Print.prototype = {
       "position:absolute;width:0;height:0;top:-10px;left:-10px;"
     );
 
+    // eslint-disable-next-line prefer-const
     w = f.contentWindow || f.contentDocument;
 
+    // eslint-disable-next-line prefer-const
     doc = f.contentDocument || f.contentWindow.document;
     doc.open();
     doc.write(content);

src/views/able/directives.vue

@@ -76,7 +76,7 @@ function onReset() {
           immediate: true,
           timeout: 1000
         }"
-        class="!w-[200px]"
+        class="w-[200px]!"
         clearable
         @clear="onInput"
       />
@@ -86,7 +86,7 @@ function onReset() {
       <el-input
         v-model="searchTwo"
         v-optimize="{ event: 'input', fn: onInputTwo, timeout: 400 }"
-        class="!w-[200px]"
+        class="w-[200px]!"
         clearable
       />
     </div>
@@ -100,7 +100,7 @@ function onReset() {
           timeout: 400,
           params: { name: '小明', sex: '男' }
         }"
-        class="!w-[200px]"
+        class="w-[200px]!"
         clearable
       />
     </div>
@@ -112,7 +112,7 @@ function onReset() {
       <el-input
         v-model="searchFour"
         v-optimize:throttle="{ event: 'input', fn: onInputFour, timeout: 1000 }"
-        class="!w-[200px]"
+        class="w-[200px]!"
         clearable
       />
     </div>
@@ -125,7 +125,7 @@ function onReset() {
           fn: onInputFive,
           params: { name: '小明', sex: '男' }
         }"
-        class="!w-[200px]"
+        class="w-[200px]!"
         clearable
       />
     </div>
@@ -134,7 +134,7 @@ function onReset() {
 
     <div class="mb-2">
       文本复制指令（双击输入框内容即可复制）
-      <el-input v-model="searchSix" v-copy="searchSix" class="!w-[200px]" />
+      <el-input v-model="searchSix" v-copy="searchSix" class="w-[200px]!" />
     </div>
     <div>
       文本复制指令（自定义触发事件，单击复制）

src/views/able/infinite-scroll.vue

@@ -51,7 +51,9 @@ const load = () => {
         代码位置 src/views/able/infinite-scroll.vue
       </el-link>
     </template>
-    <p class="mb-2">{{ isBottom ? "已加载全部页" : `加载到第 ${page} 页` }}</p>
+    <div class="mb-2">
+      {{ isBottom ? "已加载全部页" : `加载到第 ${page} 页` }}
+    </div>
     <el-table
       v-el-table-infinite-scroll="load"
       border

src/views/able/mqtt-client.vue

@@ -194,7 +194,7 @@ onUnmounted(() => {
         基于
         <el-link
           type="primary"
-          :underline="false"
+          underline="never"
           href="https://github.com/mqttjs/MQTT.js"
           target="_blank"
         >
@@ -203,7 +203,7 @@ onUnmounted(() => {
         和 免费的公共MQTT代理
         <el-link
           type="primary"
-          :underline="false"
+          underline="never"
           href="broker.emqx.io"
           target="_blank"
         >

src/views/able/pinyin.vue

@@ -21,8 +21,8 @@ defineOptions({
       </div>
     </template>
     <p v-html="html('带 音 调')" />
-    <p class="mt-2" v-html="html('不 带 音 调', { toneType: 'none' })" />
+    <p class="mt-2!" v-html="html('不 带 音 调', { toneType: 'none' })" />
-    <p class="mt-2 custom" v-html="html('自 定 义 样 式')" />
+    <p class="mt-2! custom" v-html="html('自 定 义 样 式')" />
   </el-card>
 </template>
 

src/views/able/print/index.vue

@@ -83,7 +83,7 @@ const tableData: User[] = [
         <span class="font-medium">打印功能（报表、图表、图片）</span>
         <el-select
           v-model="value"
-          class="!w-[100px] mr-2"
+          class="w-[100px]! mr-2"
           placeholder="Select"
           size="small"
         >

src/views/able/sensitive.vue

@@ -45,6 +45,6 @@ function onInput() {
       </el-tag>
     </div>
     <el-input v-model="modelValue" @input="onInput" />
-    <p class="mt-2">{{ modelValue }}</p>
+    <p class="mt-2!">{{ modelValue }}</p>
   </el-card>
 </template>

src/views/able/watermark.vue

@@ -53,7 +53,7 @@ onBeforeUnmount(() => {
         代码位置 src/views/able/watermark.vue
       </el-link>
     </template>
-    <el-space wrap class="!mb-2">
+    <el-space wrap class="mb-2!">
       <span> 请输入要创建水印的值：</span>
       <el-input v-model="value" class="mr-4" style="width: 200px" clearable />
       <span>请选择要创建水印的颜色：</span>

src/views/able/wavesurfer/index.vue

@@ -103,13 +103,13 @@ onBeforeUnmount(() => {
     </template>
     <div
       v-loading="loading"
-      class="w-8/12 !m-auto !mt-[20px]"
+      class="w-8/12 m-auto! mt-[20px]!"
       element-loading-background="transparent"
     >
       <div ref="wavesurferRef" />
       <div v-show="totalTime" class="flex justify-between">
         <span class="text-[#81888f]">00:00</span>
-        <h1 class="text-4xl mt-2">{{ curTime }}</h1>
+        <h1 class="text-4xl mt-2!">{{ curTime }}</h1>
         <span class="text-[#81888f]">{{ totalTime }}</span>
       </div>
       <div v-show="totalTime" class="flex mt-2 w-[180px] justify-around m-auto">

src/views/about/columns.tsx

@@ -7,7 +7,7 @@ export function useColumns() {
       minWidth: 100,
       cellRenderer: () => {
         return (
-          <el-tag size="large" class="!text-base">
+          <el-tag size="large" class="text-base!">
             {version}
           </el-tag>
         );
@@ -18,7 +18,7 @@ export function useColumns() {
       minWidth: 120,
       cellRenderer: () => {
         return (
-          <el-tag size="large" class="!text-base">
+          <el-tag size="large" class="text-base!">
             {lastBuildTime}
           </el-tag>
         );
@@ -29,7 +29,7 @@ export function useColumns() {
       minWidth: 140,
       cellRenderer: () => {
         return (
-          <el-tag size="large" class="!text-base">
+          <el-tag size="large" class="text-base!">
             {engines.node}
           </el-tag>
         );
@@ -40,7 +40,7 @@ export function useColumns() {
       minWidth: 140,
       cellRenderer: () => {
         return (
-          <el-tag size="large" class="!text-base">
+          <el-tag size="large" class="text-base!">
             {engines.pnpm}
           </el-tag>
         );

src/views/account-settings/components/AccountManagement.vue

@@ -43,7 +43,7 @@ function onClick(item) {
       deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
     ]"
   >
-    <h3 class="my-8">账户管理</h3>
+    <h3 class="my-8!">账户管理</h3>
     <div v-for="(item, index) in list" :key="index">
       <div class="flex items-center">
         <div class="flex-1">

src/views/account-settings/components/Preferences.vue

@@ -38,7 +38,7 @@ function onChange(val, item) {
       deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
     ]"
   >
-    <h3 class="my-8">偏好设置</h3>
+    <h3 class="my-8!">偏好设置</h3>
     <div v-for="(item, index) in list" :key="index">
       <div class="flex items-center">
         <div class="flex-1">

src/views/account-settings/components/Profile.vue

@@ -110,7 +110,7 @@ getMine().then(res => {
       deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
     ]"
   >
-    <h3 class="my-8">个人信息</h3>
+    <h3 class="my-8!">个人信息</h3>
     <el-form
       ref="userInfoFormRef"
       label-position="top"
@@ -128,7 +128,7 @@ getMine().then(res => {
           :show-file-list="false"
           :on-change="onChange"
         >
-          <el-button plain class="ml-4">
+          <el-button plain class="ml-4!">
             <IconifyIconOffline :icon="uploadLine" />
             <span class="ml-2">更新头像</span>
           </el-button>

src/views/account-settings/components/SecurityLog.vue

@@ -78,7 +78,7 @@ onMounted(() => {
       deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
     ]"
   >
-    <h3 class="my-8">安全日志</h3>
+    <h3 class="my-8!">安全日志</h3>
     <pure-table
       row-key="id"
       table-layout="auto"

src/views/account-settings/index.vue

@@ -70,26 +70,28 @@ getMine().then(res => {
   <el-container class="h-full">
     <el-aside
       v-if="isOpen"
-      class="pure-account-settings overflow-hidden px-2 dark:!bg-[var(--el-bg-color)] border-r-[1px] border-[var(--pure-border-color)]"
+      class="pure-account-settings overflow-hidden px-2 dark:bg-(--el-bg-color)! border-r-[1px] border-[var(--pure-border-color)]"
       :width="deviceDetection() ? '180px' : '240px'"
     >
       <el-menu :default-active="witchPane" class="pure-account-settings-menu">
-        <el-menu-item
+        <div
-          class="hover:!transition-all hover:!duration-200 hover:!text-base !h-[50px]"
+          class="h-[50px]! text-[var(--pure-theme-menu-text)] cursor-pointer text-sm transition-all duration-300 ease-in-out hover:scale-105 will-change-transform transform-gpu origin-center hover:text-base! hover:text-[var(--pure-theme-menu-title-hover)]!"
           @click="router.go(-1)"
         >
-          <div class="flex items-center">
+          <div
+            class="h-full flex items-center px-[var(--el-menu-base-level-padding)]"
+          >
             <IconifyIconOffline :icon="leftLine" />
             <span class="ml-2">返回</span>
           </div>
-        </el-menu-item>
+        </div>
         <div class="flex items-center ml-8 mt-4 mb-4">
           <el-avatar :size="48" :src="userInfo.avatar" />
           <div class="ml-4 flex flex-col max-w-[130px]">
-            <ReText class="font-bold !self-baseline">
+            <ReText class="font-bold self-baseline!">
               {{ userInfo.nickname }}
             </ReText>
-            <ReText class="!self-baseline" type="info">
+            <ReText class="self-baseline!" type="info">
               {{ userInfo.username }}
             </ReText>
           </div>

src/views/components/animatecss.vue

@@ -36,6 +36,6 @@ watch(animate, () => {
         代码位置 src/views/components/animatecss.vue
       </el-link>
     </template>
-    <ReAnimateSelector v-model="animate" class="!w-[200px]" />
+    <ReAnimateSelector v-model="animate" class="w-[200px]!" />
   </el-card>
 </template>

src/views/components/check-button.vue

@@ -109,7 +109,7 @@ watch(size, val =>
         代码位置 src/views/components/check-button.vue
       </el-link>
     </template>
-    <p class="mb-2">单选（紧凑风格的按钮样式）</p>
+    <div class="mb-2">单选（紧凑风格的按钮样式）</div>
     <el-radio-group
       v-model="radio"
       :size="dynamicSize"
@@ -121,7 +121,7 @@ watch(size, val =>
     </el-radio-group>
     <el-divider />
 
-    <p class="mb-2">单选（带有边框）</p>
+    <div class="mb-2">单选（带有边框）</div>
     <el-radio-group
       v-model="radioBox"
       :size="dynamicSize"
@@ -133,7 +133,7 @@ watch(size, val =>
     </el-radio-group>
     <el-divider />
 
-    <p class="mb-2">单选（自定义内容）</p>
+    <div class="mb-2">单选（自定义内容）</div>
     <el-radio-group
       v-model="radioCustom"
       :size="dynamicSize"
@@ -160,7 +160,7 @@ watch(size, val =>
     </el-radio-group>
     <el-divider />
 
-    <p class="mb-2">多选（紧凑风格的按钮样式）</p>
+    <div class="mb-2">多选（紧凑风格的按钮样式）</div>
     <el-checkbox-group
       v-model="checkboxGroup"
       :size="dynamicSize"
@@ -172,7 +172,7 @@ watch(size, val =>
     </el-checkbox-group>
     <el-divider />
 
-    <p class="mb-2">多选（带有边框）</p>
+    <div class="mb-2">多选（带有边框）</div>
     <el-checkbox-group
       v-model="checkboxGroupBox"
       :size="dynamicSize"
@@ -184,7 +184,7 @@ watch(size, val =>
     </el-checkbox-group>
     <el-divider />
 
-    <p class="mb-2">多选（来点不一样的体验）</p>
+    <div class="mb-2">多选（来点不一样的体验）</div>
     <el-checkbox-group
       v-model="checkboxGroupCustom"
       class="pure-checkbox"
@@ -218,14 +218,14 @@ watch(size, val =>
     </el-checkbox-group>
     <el-divider />
 
-    <p>可控制间距的按钮样式</p>
+    <div>可控制间距的按钮样式</div>
     <el-slider
       v-model="spaceSize"
-      class="mb-2 !w-[300px]"
+      class="mb-2 w-[300px]!"
       :show-tooltip="false"
       :disabled="size === 'disabled'"
     />
-    <p class="mb-2">单选</p>
+    <div class="mb-2">单选</div>
     <el-space wrap :size="spaceSize">
       <el-check-tag
         v-for="(tag, index) in checkTag"
@@ -241,7 +241,7 @@ watch(size, val =>
         {{ tag.title }}
       </el-check-tag>
     </el-space>
-    <p class="mb-2 mt-4">
+    <div class="mb-2 mt-4">
       多选
       {{
         getKeyList(
@@ -249,7 +249,7 @@ watch(size, val =>
           "title"
         )
       }}
-    </p>
+    </div>
     <el-space wrap :size="spaceSize">
       <el-check-tag
         v-for="(tag, index) in checkGroupTag"
@@ -267,7 +267,7 @@ watch(size, val =>
     </el-space>
     <el-divider />
 
-    <p class="mb-2">单个可选按钮</p>
+    <div class="mb-2">单个可选按钮</div>
     <el-check-tag
       :class="[
         'select-none',

src/views/components/check-card.vue

@@ -69,7 +69,7 @@ watch(size, val =>
       </el-link>
     </template>
 
-    <p class="mb-2 mt-4">单选</p>
+    <div class="mb-2 mt-4">单选</div>
     <PlusCheckCardGroup
       v-model="list"
       :options="options"
@@ -77,7 +77,7 @@ watch(size, val =>
       :disabled="size === 'disabled'"
     />
 
-    <p class="mb-2 mt-4">多选</p>
+    <div class="mb-2 mt-4">多选</div>
     <PlusCheckCardGroup
       v-model="list1"
       :options="options"

src/views/components/collapse.vue

@@ -50,12 +50,12 @@ const handleChange = (val: string[]) => {
       </el-link>
     </template>
 
-    <p class="mb-2">基础用法</p>
+    <div class="mb-2">基础用法</div>
     <el-radio-group v-model="radio" class="mb-3">
       <el-radio value="">可同时展开多个面板</el-radio>
       <el-radio value="accordion">每次只能展开一个面板</el-radio>
     </el-radio-group>
-    <el-button size="small" text bg class="ml-8 mb-1" @click="onClick">
+    <el-button size="small" text bg class="ml-8! mb-1!" @click="onClick">
       外部触发打开、关闭
     </el-button>
     <el-collapse

src/views/components/color-picker.vue

@@ -73,7 +73,7 @@ function onClick() {
       </el-link>
     </template>
 
-    <p class="mb-2">不同尺寸、选择透明度、预定义颜色</p>
+    <div class="mb-2">不同尺寸、选择透明度、预定义颜色</div>
     <el-color-picker
       v-model="color"
       show-alpha
@@ -83,7 +83,7 @@ function onClick() {
     />
     <el-divider />
 
-    <p class="mb-2">外部触发器</p>
+    <div class="mb-2">外部触发器</div>
     <el-space wrap>
       <el-color-picker
         ref="colorPickerRef"

src/views/components/contextmenu/basic.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="mb-2">基础用法</p>
+    <div class="mb-2">基础用法</div>
     <div v-contextmenu:contextmenu class="wrapper">
       <code>右键点击此区域</code>
     </div>

src/views/components/contextmenu/menuDynamic.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="mb-2">动态菜单</p>
+    <div class="mb-2">动态菜单</div>
     <div v-contextmenu:contextmenu class="wrapper">
       <code>右键点击此区域</code>
     </div>

src/views/components/contextmenu/menuGroup.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="mb-2">按钮组</p>
+    <div class="mb-2">按钮组</div>
     <div v-contextmenu:contextmenu class="wrapper">
       <code>右键点击此区域</code>
     </div>

src/views/components/date-picker.vue

@@ -160,11 +160,11 @@ watch(size, val =>
       </el-link>
     </template>
 
-    <p class="mb-2">选择某一天</p>
+    <div class="mb-2">选择某一天</div>
     <el-date-picker
       v-model="value"
       type="date"
-      class="!w-[160px]"
+      class="w-[160px]!"
       placeholder="请选择"
       :disabled-date="disabledDate"
       :shortcuts="shortcuts"
@@ -175,12 +175,12 @@ watch(size, val =>
       :disabled="size === 'disabled'"
     />
 
-    <p class="mb-2 mt-4">选择周、月、年或多个日期</p>
+    <div class="mb-2 mt-4">选择周、月、年或多个日期</div>
     <el-space wrap>
       <el-date-picker
         v-model="value1"
         type="week"
-        class="!w-[160px]"
+        class="w-[160px]!"
         format="YYYY年第ww周"
         placeholder="选择某年中的某周"
         :size="dynamicSize"
@@ -189,7 +189,7 @@ watch(size, val =>
       <el-date-picker
         v-model="value2"
         type="month"
-        class="!w-[160px]"
+        class="w-[160px]!"
         placeholder="选择某月"
         :size="dynamicSize"
         :disabled="size === 'disabled'"
@@ -197,7 +197,7 @@ watch(size, val =>
       <el-date-picker
         v-model="value3"
         type="year"
-        class="!w-[160px]"
+        class="w-[160px]!"
         placeholder="选择某年"
         :size="dynamicSize"
         :disabled="size === 'disabled'"
@@ -205,18 +205,18 @@ watch(size, val =>
       <el-date-picker
         v-model="value4"
         type="dates"
-        class="!w-[160px]"
+        class="w-[160px]!"
         placeholder="选择多个日期"
         :size="dynamicSize"
         :disabled="size === 'disabled'"
       />
     </el-space>
 
-    <p class="mb-2 mt-4">选择一段时间</p>
+    <div class="mb-2 mt-4">选择一段时间</div>
     <el-date-picker
       v-model="value5"
       type="daterange"
-      class="!w-[240px]"
+      class="w-[240px]!"
       unlink-panels
       range-separator="至"
       start-placeholder="开始时间"
@@ -229,7 +229,7 @@ watch(size, val =>
       :disabled="size === 'disabled'"
     />
 
-    <p class="mb-2 mt-4">选择月份范围</p>
+    <div class="mb-2 mt-4">选择月份范围</div>
     <el-date-picker
       v-model="value6"
       type="monthrange"
@@ -245,7 +245,7 @@ watch(size, val =>
       :disabled="size === 'disabled'"
     />
 
-    <p class="mb-2 mt-4">日期格式</p>
+    <div class="mb-2 mt-4">日期格式</div>
     <el-radio-group
       v-model="dateFormat"
       class="mb-2"
@@ -261,7 +261,7 @@ watch(size, val =>
       <el-date-picker
         v-model="value7"
         type="date"
-        class="!w-[160px]"
+        class="w-[160px]!"
         placeholder="请选择日期"
         format="YYYY/MM/DD"
         :value-format="dateFormat"
@@ -271,18 +271,18 @@ watch(size, val =>
       <span class="ml-2">{{ value7 }}</span>
     </el-space>
 
-    <p class="mb-2 mt-4">自定义前缀</p>
+    <div class="mb-2 mt-4">自定义前缀</div>
     <el-date-picker
       v-model="value8"
       type="date"
-      class="!w-[160px]"
+      class="w-[160px]!"
       placeholder="请选择日期"
       :prefix-icon="useRenderIcon('twemoji:spiral-calendar')"
       :size="dynamicSize"
       :disabled="size === 'disabled'"
     />
 
-    <p class="mb-2 mt-4">自定义内容</p>
+    <div class="mb-2 mt-4">自定义内容</div>
     <el-date-picker
       v-model="value9"
       type="date"

src/views/components/datetime-picker.vue

@@ -186,18 +186,18 @@ watch(size, val =>
       </el-link>
     </template>
 
-    <p class="mb-2">日期和时间点</p>
+    <div class="mb-2">日期和时间点</div>
     <el-date-picker
       v-model="value"
       type="datetime"
-      class="!w-[200px]"
+      class="w-[200px]!"
       placeholder="请选择日期时间"
       :shortcuts="shortcuts"
       :size="dynamicSize"
       :disabled="size === 'disabled'"
     />
 
-    <p class="mb-2 mt-4">日期时间格式</p>
+    <div class="mb-2 mt-4">日期时间格式</div>
     <el-radio-group
       v-model="datetimeFormat"
       class="mb-2"
@@ -213,7 +213,7 @@ watch(size, val =>
       <el-date-picker
         v-model="value1"
         type="datetime"
-        class="!w-[200px]"
+        class="w-[200px]!"
         placeholder="请选择日期时间"
         format="YYYY/MM/DD hh:mm:ss"
         :value-format="datetimeFormat"
@@ -223,7 +223,7 @@ watch(size, val =>
       <span class="ml-2">{{ value1 }}</span>
     </el-space>
 
-    <p class="mb-2 mt-4">日期和时间范围</p>
+    <div class="mb-2 mt-4">日期和时间范围</div>
     <el-date-picker
       v-model="value2"
       type="datetimerange"
@@ -238,9 +238,9 @@ watch(size, val =>
       :disabled="size === 'disabled'"
     />
 
-    <p class="mb-2 mt-4">
+    <div class="mb-2 mt-4">
       弹出面板位置可控（如果弹出位置不足以完整展示面板会自动调整位置）
-    </p>
+    </div>
     <el-space wrap class="w-[400px]">
       <el-check-tag
         v-for="(tag, index) in checkTag"

src/views/components/dialog/form.vue

@@ -3,7 +3,7 @@ import { ref } from "vue";
 
 // 声明 props 类型
 export interface FormProps {
-  formInline: {
+  formInline?: {
     user: string;
     region: string;
   };
@@ -28,14 +28,14 @@ const newFormInline = ref(props.formInline);
     <el-form-item label="姓名">
       <el-input
         v-model="newFormInline.user"
-        class="!w-[220px]"
+        class="w-[220px]!"
         placeholder="请输入姓名"
       />
     </el-form-item>
     <el-form-item label="城市">
       <el-select
         v-model="newFormInline.region"
-        class="!w-[220px]"
+        class="w-[220px]!"
         placeholder="请选择城市"
       >
         <el-option label="上海" value="上海" />

src/views/components/dialog/formPrimitive.vue

@@ -3,7 +3,7 @@ import { useVModel } from "@vueuse/core";
 
 // 声明 props 类型
 export interface FormProps {
-  data: string;
+  data?: string;
 }
 
 // 声明 props 默认值
@@ -18,5 +18,5 @@ const data = useVModel(props, "data", emit);
 </script>
 
 <template>
-  <el-input v-model="data" class="!w-[220px]" placeholder="请输入内容" />
+  <el-input v-model="data" class="w-[220px]!" placeholder="请输入内容" />
 </template>

src/views/components/drawer/form.vue

@@ -3,7 +3,7 @@ import { ref } from "vue";
 
 // 声明 props 类型
 export interface FormProps {
-  formInline: {
+  formInline?: {
     user: string;
     region: string;
   };
@@ -28,14 +28,14 @@ const newFormInline = ref(props.formInline);
     <el-form-item label="姓名">
       <el-input
         v-model="newFormInline.user"
-        class="!w-[220px]"
+        class="w-[220px]!"
         placeholder="请输入姓名"
       />
     </el-form-item>
     <el-form-item label="城市">
       <el-select
         v-model="newFormInline.region"
-        class="!w-[220px]"
+        class="w-[220px]!"
         placeholder="请选择城市"
       >
         <el-option label="上海" value="上海" />

src/views/components/drawer/formPrimitive.vue

@@ -3,7 +3,7 @@ import { useVModel } from "@vueuse/core";
 
 // 声明 props 类型
 export interface FormProps {
-  data: string;
+  data?: string;
 }
 
 // 声明 props 默认值
@@ -18,5 +18,5 @@ const data = useVModel(props, "data", emit);
 </script>
 
 <template>
-  <el-input v-model="data" class="!w-[220px]" placeholder="请输入内容" />
+  <el-input v-model="data" class="w-[220px]!" placeholder="请输入内容" />
 </template>

src/views/components/el-button.vue

@@ -84,7 +84,7 @@ watch(size, val =>
       </el-link>
     </template>
 
-    <p class="mb-2">基础按钮</p>
+    <div class="mb-2">基础按钮</div>
     <el-radio-group v-model="baseRadio" class="mb-3">
       <el-radio label="default" value="default" />
       <el-radio label="plain" value="plain" />
@@ -117,7 +117,7 @@ watch(size, val =>
     </el-space>
     <el-divider />
 
-    <p class="mb-4">加载状态按钮</p>
+    <div class="mb-4">加载状态按钮</div>
     <el-button
       text
       bg
@@ -166,7 +166,7 @@ watch(size, val =>
     </el-button>
     <el-divider />
 
-    <p class="mb-4">自定义元素标签。例如：按钮、div、链接</p>
+    <div class="mb-4">自定义元素标签。例如：按钮、div、链接</div>
     <el-button :size="dynamicSize" :disabled="size === 'disabled'">
       button 标签
     </el-button>
@@ -196,7 +196,7 @@ watch(size, val =>
     </el-button>
     <el-divider />
 
-    <p class="mb-4">自定义颜色</p>
+    <div class="mb-4">自定义颜色</div>
     <el-space wrap>
       <el-button
         color="#626aef"

src/views/components/message.vue

@@ -25,7 +25,7 @@ defineOptions({
       </el-link>
     </template>
 
-    <h4 class="mb-4">Element Plus 的消息提示，点击弹出提示信息</h4>
+    <h4 class="mb-4!">Element Plus 的消息提示，点击弹出提示信息</h4>
 
     <el-space wrap>
       <el-button
@@ -121,7 +121,7 @@ defineOptions({
 
     <el-divider />
 
-    <h4 class="mb-4">
+    <h4 class="mb-4!">
       类似 Ant Design 风格的消息提示，点击弹出提示信息（基于 ElMessage
       样式改版，不会影响 ElMessage
       原本样式，使用和打包大小成本极低并适配整体暗色风格）

src/views/components/progress.vue

@@ -32,7 +32,7 @@ const format = percentage => (percentage === 100 ? "Full" : `${percentage}%`);
       </el-link>
     </template>
 
-    <p class="mb-4">直线进度条动画</p>
+    <div class="mb-4">直线进度条动画</div>
     <div class="w-1/4">
       <el-progress indeterminate :percentage="50" class="mb-4" />
       <el-progress
@@ -61,7 +61,7 @@ const format = percentage => (percentage === 100 ? "Full" : `${percentage}%`);
       />
     </div>
 
-    <p class="mb-4">进度条内显示百分比标识</p>
+    <div class="mb-4">进度条内显示百分比标识</div>
     <div class="w-1/4">
       <el-progress
         :text-inside="true"
@@ -97,7 +97,7 @@ const format = percentage => (percentage === 100 ? "Full" : `${percentage}%`);
       />
     </div>
 
-    <p class="mb-4">自定义内容</p>
+    <div class="mb-4">自定义内容</div>
     <div class="w-1/4 demo-progress">
       <el-progress :percentage="50">
         <el-button text>自定义内容</el-button>

src/views/components/segmented.vue

@@ -220,39 +220,39 @@ watch(size, val => (dynamicSize.value = size.value));
       </el-link>
     </template>
     <el-scrollbar>
-      <p class="mb-2">
+      <div class="mb-2">
         基础用法（v-model）<span class="text-primary">
           {{ optionsBasis[value].label }}
         </span>
-      </p>
+      </div>
       <Segmented v-model="value" :options="optionsBasis" :size="dynamicSize" />
       <el-divider />
-      <p class="mb-2">tooltip 提示</p>
+      <div class="mb-2">tooltip 提示</div>
       <Segmented :options="optionsTooltip" :size="dynamicSize" />
       <el-divider />
-      <p class="mb-2">change 事件</p>
+      <div class="mb-2">change 事件</div>
       <Segmented
         :options="optionsChange"
         :size="dynamicSize"
         @change="onChange"
       />
       <el-divider />
-      <p class="mb-2">禁用</p>
+      <div class="mb-2">禁用</div>
       <Segmented :options="optionsDisabled" :size="dynamicSize" />
       <el-divider />
-      <p class="mb-2">全局禁用</p>
+      <div class="mb-2">全局禁用</div>
       <Segmented :options="optionsBasis" :size="dynamicSize" disabled />
       <el-divider />
-      <p class="mb-2">block 属性(将宽度调整为父元素宽度)</p>
+      <div class="mb-2">block 属性(将宽度调整为父元素宽度)</div>
       <Segmented :options="optionsBlock" block :size="dynamicSize" />
       <el-divider />
-      <p class="mb-2">可设置图标</p>
+      <div class="mb-2">可设置图标</div>
       <Segmented :options="optionsIcon" :size="dynamicSize" />
       <el-divider />
-      <p class="mb-2">只设置图标</p>
+      <div class="mb-2">只设置图标</div>
       <Segmented :options="optionsOnlyIcon" :size="dynamicSize" />
       <el-divider />
-      <p class="mb-2">自定义渲染</p>
+      <div class="mb-2">自定义渲染</div>
       <Segmented :options="optionsLabel" :size="dynamicSize" />
     </el-scrollbar>
   </el-card>

src/views/components/selector.vue

@@ -49,7 +49,7 @@ const selectedVal = ({ left, right }): void => {
         :disabled="item.disabled"
         @selectedVal="selectedVal"
       />
-      <h4 v-if="!item.disabled" class="mt-3">选中范围：{{ selectRange }}</h4>
+      <h4 v-if="!item.disabled" class="mt-3!">选中范围：{{ selectRange }}</h4>
     </el-card>
   </div>
 </template>

src/views/components/slider/index.vue

@@ -29,28 +29,28 @@ defineOptions({
         </el-link>
       </div>
     </template>
-    <p class="mb-2">基础用法</p>
+    <div class="mb-2">基础用法</div>
     <Base />
     <el-divider />
-    <p class="mb-2">离散值</p>
+    <div class="mb-2">离散值</div>
     <Step />
     <el-divider />
-    <p class="mb-2">带有输入框的滑块</p>
+    <div class="mb-2">带有输入框的滑块</div>
     <Input />
     <el-divider />
-    <p class="mb-2">不同尺寸</p>
+    <div class="mb-2">不同尺寸</div>
     <Size />
     <el-divider />
-    <p class="mb-2">位置</p>
+    <div class="mb-2">位置</div>
     <Placement />
     <el-divider />
-    <p class="mb-2">范围选择</p>
+    <div class="mb-2">范围选择</div>
     <Range />
     <el-divider />
-    <p class="mb-2">垂直模式</p>
+    <div class="mb-2">垂直模式</div>
     <Vertical />
     <el-divider />
-    <p class="mb-2">显示标记</p>
+    <div class="mb-2">显示标记</div>
     <Marks class="mb-6" />
   </el-card>
 </template>

src/views/components/statistic.vue

@@ -63,7 +63,7 @@ function reset() {
             format="HH:mm:ss"
             :value="value1"
           />
-          <el-button class="mt-2" type="primary" text bg @click="reset">
+          <el-button class="mt-2!" type="primary" text bg @click="reset">
             重置
           </el-button>
         </re-col>