Merge branch 'main' into refactor/tailwindcss

.nvmrc

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

.vscode/settings.json

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

CHANGELOG.en_US.md

@@ -1,74 +1,8 @@
-# 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/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
+- 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
 - 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,74 +1,8 @@
-# 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/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
+- 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
 - 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,74 +1,8 @@
-# 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/service/#max-%E7%89%88%E6%9C%AC) 的用户平台强烈建议升级，后续`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/max/) 的用户平台强烈建议升级，后续`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
@@ -231,8 +165,8 @@
 
 - 修复`windwos`下点击注册页面会出现滚动条问题
 - 修复`windows`下页面切换，内容区会出现滚动条问题
-- 修复`pure-table`带状态表格在深色主题模式下状态样式消失的问题
+- 修复`pure-table`带状态表格在深色整体风格下状态样式消失的问题
-- 修复系统配置中开启灰色模式和深色主题模式，刷新页面主题模式异常
+- 修复系统配置中开启灰色模式和深色整体风格，刷新页面整体风格异常
 
 ### 🍏 Perf
 
@@ -285,7 +219,7 @@
 - 内嵌`iframe`页支持设置`keepAlive`，保持页面状态
 - 优化导航，弹出的菜单超出内容区自适应且可滚动
 - 添加文件上传示例
-- 添加主题模式自适应操作系统浅色、深色、自动主题功能
+- 添加整体风格自适应操作系统浅色、深色、自动主题功能
 - 添加页脚
 - 支持多标签页打开已经登录的系统后无需再登录并添加内免登录功能（用户可选择免登录的天数）
 - 带来高级感的终端命令行
@@ -485,7 +419,7 @@
 - 修复菜单搜索功能弹框打开后搜索框未自动聚集的问题
 - 修复按 `ESC` 退出全屏后，工具栏按钮文案展示问题
 - 修复移动端通知栏 `tooltip` 点击穿透问题
-- 修复当左侧菜单收起后，切换到 `horizontal` 菜单布局时文字不展示的问题
+- 修复当左侧菜单收起后，切换到 `horizontal` 导航模式时文字不展示的问题
 - 修复导航 `tab` 关闭其他标签页无法重置状态问题
 - 修复 `getHistoryMode` 函数中环境变量未初始化带来的页面热更新报错
 - 修复导航 `tab` 过多导致关闭左侧标签页无法正常显示

README.en-US.md

@@ -31,10 +31,18 @@ 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)
 
-## Premium service
+## Quality service, software outsourcing, sponsorship support
 
 [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)
@@ -184,7 +192,6 @@ 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,10 +32,18 @@
 [点我查看 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)
@@ -185,7 +193,6 @@ 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` 贡献提交规范
 

eslint.config.js

@@ -5,7 +5,6 @@ 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 eslintPluginBetterTailwindcss from "eslint-plugin-better-tailwindcss";
 
 export default defineConfig([
   globalIgnores([
@@ -73,11 +72,8 @@ export default defineConfig([
       ]
     }
   },
-  ...tseslint.configs.recommended.map(config => ({
+  ...tseslint.config({
-    ...config,
+    extends: [...tseslint.configs.recommended],
-    files: ["**/*.?([cm])ts", "**/*.?([cm])tsx"]
-  })),
-  {
     files: ["**/*.?([cm])ts", "**/*.?([cm])tsx"],
     rules: {
       "@typescript-eslint/no-redeclare": "error",
@@ -106,7 +102,7 @@ export default defineConfig([
         }
       ]
     }
-  },
+  }),
   {
     files: ["**/*.d.ts"],
     rules: {
@@ -173,20 +169,5 @@ export default defineConfig([
         }
       ]
     }
-  },
-  {
-    files: ["**/*.vue", "**/*.tsx"],
-    plugins: {
-      "better-tailwindcss": eslintPluginBetterTailwindcss
-    },
-    rules: {
-      "better-tailwindcss/enforce-consistent-variable-syntax": "warn",
-      "better-tailwindcss/enforce-canonical-classes": "warn"
-    },
-    settings: {
-      "better-tailwindcss": {
-        entryPoint: "src/style/tailwind.css"
-      }
-    }
   }
 ]);

locales/en.yaml

@@ -31,15 +31,15 @@ panel:
   pureCloseSystemSet: Close System Configs
   pureClearCacheAndToLogin: Clear cache and return to login page
   pureClearCache: Clear Cache
-  pureThemeMode: Theme Mode
+  pureOverallStyle: Overall Style
-  pureThemeModeLight: Light
+  pureOverallStyleLight: Light
-  pureThemeModeLightTip: Set sail freshly and light up the comfortable work interface
+  pureOverallStyleLightTip: Set sail freshly and light up the comfortable work interface
-  pureThemeModeDark: Dark
+  pureOverallStyleDark: Dark
-  pureThemeModeDarkTip: Moonlight Overture, indulge in the tranquility and elegance of the night
+  pureOverallStyleDarkTip: Moonlight Overture, indulge in the tranquility and elegance of the night
-  pureThemeModeSystem: Auto
+  pureOverallStyleSystem: Auto
-  pureThemeModeSystemTip: Synchronize time, the interface naturally responds to morning and dusk
+  pureOverallStyleSystemTip: Synchronize time, the interface naturally responds to morning and dusk
   pureThemeColor: Theme Color
-  pureMenuLayout: Menu Layout
+  pureLayoutModel: Layout Model
   pureVerticalTip: The menu on the left is familiar and friendly
   pureHorizontalTip: Top menu, concise overview
   pureMixTip: Mixed menu, flexible
@@ -80,9 +80,9 @@ menus:
   pureMarkdown: Markdown
   pureEditor: Editor
   pureAbnormal: Abnormal Page
-  purePageNotFound: "404"
+  pureFourZeroFour: "404"
-  pureAccessDenied: "403"
+  pureFourZeroOne: "403"
-  pureServerError: "500"
+  pureFive: "500"
   pureComponents: Components
   pureDialog: Dialog
   pureDrawer: Drawer
@@ -108,7 +108,6 @@ menus:
   pureTypeit: Typeit
   pureJsonEditor: JSON Editor
   pureColorPicker: Color Picker
-  pureColorPickerPanel: Color PickerPanel
   pureDatePicker: Date Picker
   pureDateTimePicker: DateTimePicker
   pureTimePicker: TimePicker

locales/zh-CN.yaml

@@ -31,15 +31,15 @@ panel:
   pureCloseSystemSet: 关闭配置
   pureClearCacheAndToLogin: 清空缓存并返回登录页
   pureClearCache: 清空缓存
-  pureThemeMode: 主题模式
+  pureOverallStyle: 整体风格
-  pureThemeModeLight: 浅色
+  pureOverallStyleLight: 浅色
-  pureThemeModeLightTip: 清新启航，点亮舒适的工作界面
+  pureOverallStyleLightTip: 清新启航，点亮舒适的工作界面
-  pureThemeModeDark: 深色
+  pureOverallStyleDark: 深色
-  pureThemeModeDarkTip: 月光序曲，沉醉于夜的静谧雅致
+  pureOverallStyleDarkTip: 月光序曲，沉醉于夜的静谧雅致
-  pureThemeModeSystem: 自动
+  pureOverallStyleSystem: 自动
-  pureThemeModeSystemTip: 同步时光，界面随晨昏自然呼应
+  pureOverallStyleSystemTip: 同步时光，界面随晨昏自然呼应
   pureThemeColor: 主题色
-  pureMenuLayout: 菜单布局
+  pureLayoutModel: 导航模式
   pureVerticalTip: 左侧菜单，亲切熟悉
   pureHorizontalTip: 顶部菜单，简洁概览
   pureMixTip: 混合菜单，灵活多变
@@ -80,9 +80,9 @@ menus:
   pureMarkdown: Markdown
   pureEditor: 编辑器
   pureAbnormal: 异常页面
-  purePageNotFound: "404"
+  pureFourZeroFour: "404"
-  pureAccessDenied: "403"
+  pureFourZeroOne: "403"
-  pureServerError: "500"
+  pureFive: "500"
   pureComponents: 组件
   pureDialog: 函数式弹框
   pureDrawer: 函数式抽屉
@@ -108,7 +108,6 @@ menus:
   pureTypeit: 打字机
   pureJsonEditor: JSON编辑器
   pureColorPicker: 颜色选择器
-  pureColorPickerPanel: 颜色选择器面板
   pureDatePicker: 日期选择器
   pureDateTimePicker: 日期时间选择器
   pureTimePicker: 时间选择器

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "6.2.0",
+  "version": "5.9.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -48,135 +48,134 @@
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@howdyjs/mouse-menu": "^2.1.7",
+    "@howdyjs/mouse-menu": "^2.1.6",
     "@infectoone/vue-ganttastic": "^2.3.2",
     "@logicflow/core": "^1.2.28",
     "@logicflow/extension": "^1.2.28",
     "@pureadmin/descriptions": "^1.2.1",
-    "@pureadmin/table": "^3.3.0",
+    "@pureadmin/table": "^3.2.1",
-    "@pureadmin/utils": "^2.6.3",
+    "@pureadmin/utils": "^2.6.0",
     "@vue-flow/background": "^1.3.2",
-    "@vue-flow/core": "^1.48.0",
+    "@vue-flow/core": "^1.42.5",
-    "@vueuse/core": "^14.1.0",
+    "@vueuse/core": "^12.8.2",
-    "@vueuse/motion": "^3.0.3",
+    "@vueuse/motion": "^2.2.6",
     "@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.13.2",
+    "axios": "^1.8.4",
     "china-area-data": "^5.0.1",
-    "codemirror": "^5.65.20",
+    "codemirror": "^5.65.19",
     "codemirror-editor-vue3": "^2.8.0",
     "cropperjs": "^1.6.2",
-    "dayjs": "^1.11.19",
+    "dayjs": "^1.11.13",
-    "deep-chat": "^2.3.0",
+    "deep-chat": "^2.1.1",
-    "echarts": "^6.0.0",
+    "echarts": "^5.6.0",
-    "el-table-infinite-scroll": "^3.0.8",
+    "el-table-infinite-scroll": "^3.0.6",
-    "element-plus": "^2.11.9",
+    "element-plus": "^2.9.7",
     "highlight.js": "^11.11.1",
     "intro.js": "^7.2.0",
     "js-cookie": "^3.0.5",
-    "jsbarcode": "^3.12.1",
+    "jsbarcode": "^3.11.6",
     "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.4",
+    "pinia": "^3.0.1",
-    "pinyin-pro": "^3.27.0",
+    "pinyin-pro": "^3.26.0",
-    "plus-pro-components": "^0.1.30",
+    "plus-pro-components": "^0.1.21",
     "qrcode": "^1.5.4",
     "qs": "^6.14.0",
     "responsive-storage": "^2.2.0",
     "sortablejs": "^1.15.6",
-    "swiper": "^12.0.3",
+    "swiper": "^11.2.6",
     "typeit": "^8.8.7",
     "v-contextmenu": "^3.2.0",
     "v3-infinite-loading": "^1.3.2",
-    "vditor": "^3.11.2",
+    "vditor": "^3.10.9",
     "version-rocket": "^1.7.4",
-    "vue": "^3.5.25",
+    "vue": "^3.5.13",
-    "vue-i18n": "^11.2.2",
+    "vue-i18n": "^11.1.2",
-    "vue-json-pretty": "^2.6.0",
+    "vue-json-pretty": "^2.4.0",
-    "vue-pdf-embed": "^2.1.3",
+    "vue-pdf-embed": "^2.1.2",
-    "vue-router": "^4.6.3",
+    "vue-router": "^4.5.0",
-    "vue-tippy": "^6.7.1",
+    "vue-tippy": "^6.7.0",
-    "vue-types": "^6.0.0",
+    "vue-types": "^5.1.3",
     "vue-virtual-scroller": "2.0.0-beta.8",
-    "vue-waterfall-plugin-next": "^2.6.9",
+    "vue-waterfall-plugin-next": "^2.6.5",
-    "vue3-danmaku": "^1.6.6",
+    "vue3-danmaku": "^1.6.1",
     "vue3-puzzle-vcode": "^1.1.7",
     "vuedraggable": "^4.1.0",
     "vxe-table": "4.6.25",
-    "wavesurfer.js": "^7.11.1",
+    "wavesurfer.js": "^7.9.4",
-    "xgplayer": "^3.0.23",
+    "xgplayer": "^3.0.21",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@commitlint/cli": "^20.1.0",
+    "@commitlint/cli": "^19.8.0",
-    "@commitlint/config-conventional": "^20.0.0",
+    "@commitlint/config-conventional": "^19.8.0",
-    "@commitlint/types": "^20.0.0",
+    "@commitlint/types": "^19.8.0",
-    "@eslint/js": "^9.39.1",
+    "@eslint/js": "^9.24.0",
-    "@faker-js/faker": "^10.1.0",
+    "@faker-js/faker": "^9.6.0",
-    "@iconify/json": "^2.2.412",
+    "@iconify/json": "^2.2.321",
     "@iconify/vue": "4.2.0",
-    "@intlify/unplugin-vue-i18n": "^11.0.1",
+    "@intlify/unplugin-vue-i18n": "^6.0.5",
-    "@tailwindcss/vite": "^4.1.17",
+    "@tailwindcss/vite": "^4.1.3",
-    "@types/codemirror": "^5.60.17",
+    "@types/codemirror": "^5.60.15",
-    "@types/dagre": "^0.7.53",
+    "@types/dagre": "^0.7.52",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.19.25",
+    "@types/node": "^20.17.28",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
-    "@types/qrcode": "^1.5.6",
+    "@types/qrcode": "^1.5.5",
-    "@types/qs": "^6.14.0",
+    "@types/qs": "^6.9.18",
-    "@types/sortablejs": "^1.15.9",
+    "@types/sortablejs": "^1.15.8",
-    "@vitejs/plugin-vue": "^6.0.2",
+    "@vitejs/plugin-vue": "^5.2.3",
-    "@vitejs/plugin-vue-jsx": "^5.1.2",
+    "@vitejs/plugin-vue-jsx": "^4.1.2",
     "boxen": "^8.0.1",
-    "code-inspector-plugin": "^1.3.0",
+    "code-inspector-plugin": "^0.20.7",
-    "cssnano": "^7.1.2",
+    "cssnano": "^7.0.6",
     "dagre": "^0.8.5",
-    "eslint": "^9.39.1",
+    "eslint": "^9.24.0",
-    "eslint-config-prettier": "^10.1.8",
+    "eslint-config-prettier": "^10.1.1",
-    "eslint-plugin-better-tailwindcss": "4.0.0-beta.6",
+    "eslint-plugin-prettier": "^5.2.6",
-    "eslint-plugin-prettier": "^5.5.4",
+    "eslint-plugin-vue": "^10.0.0",
-    "eslint-plugin-vue": "^10.6.2",
     "gradient-string": "^3.0.0",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.7",
+    "lint-staged": "^15.5.0",
-    "postcss": "^8.5.6",
+    "postcss": "^8.5.3",
     "postcss-html": "^1.8.0",
     "postcss-load-config": "^6.0.1",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.7.3",
+    "prettier": "^3.5.3",
-    "rimraf": "^6.1.2",
+    "rimraf": "^6.0.1",
-    "rollup-plugin-visualizer": "^6.0.5",
+    "rollup-plugin-visualizer": "^5.14.0",
-    "sass": "^1.94.2",
+    "sass": "^1.86.0",
-    "stylelint": "^16.26.1",
+    "stylelint": "^16.17.0",
-    "stylelint-config-recess-order": "^7.4.0",
+    "stylelint-config-recess-order": "^6.0.0",
-    "stylelint-config-recommended-vue": "^1.6.1",
+    "stylelint-config-recommended-vue": "^1.6.0",
     "stylelint-config-standard-scss": "^14.0.0",
     "stylelint-prettier": "^5.0.3",
-    "svgo": "^4.0.0",
+    "svgo": "^3.3.2",
-    "tailwindcss": "^4.1.17",
+    "tailwindcss": "^4.1.3",
-    "typescript": "^5.9.3",
+    "typescript": "^5.8.2",
-    "typescript-eslint": "^8.48.0",
+    "typescript-eslint": "^8.29.1",
-    "unplugin-icons": "^22.5.0",
+    "unplugin-icons": "^22.1.0",
-    "vite": "^7.2.4",
+    "vite": "^6.2.3",
     "vite-plugin-cdn-import": "^1.0.1",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-fake-server": "^2.2.2",
+    "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": "^10.2.0",
+    "vue-eslint-parser": "^10.1.3",
-    "vue-tsc": "^3.1.5"
+    "vue-tsc": "^2.2.8"
   },
   "engines": {
-    "node": "^20.19.0 || >=22.13.0",
+    "node": "^18.18.0 || ^20.9.0 || >=22.0.0",
     "pnpm": ">=9"
   },
   "pnpm": {
@@ -201,10 +200,6 @@
       "esbuild",
       "typeit",
       "vue-demi"
-    ],
-    "ignoredBuiltDependencies": [
-      "@tailwindcss/oxide",
-      "vue3-danmaku"
     ]
   }
 }

public/platform-config.json

@@ -1,5 +1,5 @@
 {
-  "Version": "6.2.0",
+  "Version": "5.9.0",
   "Title": "PureAdmin",
   "FixedHeader": true,
   "HiddenSideBar": false,
@@ -9,7 +9,7 @@
   "Layout": "vertical",
   "Theme": "light",
   "DarkMode": false,
-  "ThemeMode": "light",
+  "OverallStyle": "light",
   "Grey": false,
   "Weak": false,
   "HideTabs": 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/ReDialog/type.ts

@@ -35,20 +35,8 @@ type DialogProps = {
   top?: string;
   /** 是否需要遮罩层，默认 `true` */
   modal?: boolean;
-  /** 是否允许穿透遮罩层，默认 `false`。使用时需将 `modal` 属性设置为 `false` */
-  modalPenetrable?: boolean;
-  /** 遮罩的自定义类名 */
-  modalClass?: string;
-  /** `header` 部分的自定义 `class` 名 */
-  headerClass?: string;
-  /** `body` 部分的自定义 `class` 名 */
-  bodyClass?: string;
-  /** `footer` 部分的自定义 `class` 名 */
-  footerClass?: string;
   /** `Dialog` 自身是否插入至 `body` 元素上。嵌套的 `Dialog` 必须指定该属性并赋值为 `true`，默认 `false` */
   appendToBody?: boolean;
-  /** `Dialog` 挂载到哪个 `DOM` 元素，该属性会覆盖 `append-to-body` 属性，默认 `body` */
-  appendTo?: string | HTMLElement;
   /** 是否在 `Dialog` 出现时将 `body` 滚动锁定，默认 `true` */
   lockScroll?: boolean;
   /** `Dialog` 的自定义类名 */
@@ -69,22 +57,12 @@ type DialogProps = {
   beforeClose?: (done: DoneFn) => void;
   /** 为 `Dialog` 启用可拖拽功能，默认 `false` */
   draggable?: boolean;
-  /** 拖动范围可以超出可视区，默认 `false` */
-  overflow?: boolean;
   /** 是否让 `Dialog` 的 `header` 和 `footer` 部分居中排列，默认 `false` */
   center?: boolean;
   /** 是否水平垂直对齐对话框，默认 `false` */
   alignCenter?: boolean;
   /** 当关闭 `Dialog` 时，销毁其中的元素，默认 `false` */
   destroyOnClose?: boolean;
-  /** 自定义关闭图标，默认 `Close` */
-  closeIcon?: string | Component;
-  /** 和原生的 `CSS` 的 `z-index` 相同，改变 `z` 轴的顺序 */
-  zIndex?: number;
-  /** `header` 的 `aria-level` 属性 */
-  headerAriaLevel?: string;
-  /** 对话框动画的自定义过渡配置。可以是一个字符串（过渡名称），也可以是一个包含 `Vue` 过渡属性的对象，默认 `dialog-fade` */
-  transition?: string | object;
 };
 
 //element-plus.org/zh-CN/component/popconfirm.html#attributes

src/components/ReDrawer/type.ts

@@ -6,6 +6,7 @@ type ArgsType = {
   /** `cancel` 点击取消按钮、`sure` 点击确定按钮、`close` 点击右上角关闭按钮或空白页或按下了 `esc` 键 */
   command: "cancel" | "sure" | "close";
 };
+
 type ButtonType =
   | "primary"
   | "success"
@@ -19,11 +20,11 @@ type DrawerProps = {
   visible?: boolean;
   /** `Drawer` 自身是否插入至 `body` 元素上。嵌套的 `Drawer` 必须指定该属性并赋值为 `true`，默认 `false` */
   appendToBody?: boolean;
-  /** 挂载到哪个 `DOM` 元素，会覆盖 `appendToBody` 属性，默认 `body` */
+  /** 挂载到哪个 `DOM` 元素 将覆盖 `appendToBody` */
   appendTo?: string;
   /** 是否在 `Drawer` 出现时将 `body` 滚动锁定，默认 `true` */
   lockScroll?: boolean;
-  /** 关闭前的回调，会暂停 `Drawer` 的关闭，回调函数内执行 `done` 参数方法的时候才是真正关闭对话框的时候 */
+  /** 关闭前的回调，会暂停 `Drawer` 的关闭 回调函数内执行 `done` 参数方法的时候才是真正关闭对话框的时候 */
   beforeClose?: (done: DoneFn) => void;
   /** 是否可以通过点击 `modal` 关闭 `Drawer` ，默认 `true` */
   closeOnClickModal?: boolean;
@@ -43,13 +44,9 @@ type DrawerProps = {
   destroyOnClose?: boolean;
   /** 是否需要遮罩层，默认 `true` */
   modal?: boolean;
-  /** 是否允许穿透遮罩层，默认 `false`。使用时需将 `modal` 属性设置为 `false` */
-  modalPenetrable?: boolean;
   /** `Drawer` 打开的方向，默认 `rtl` */
   direction?: "rtl" | "ltr" | "ttb" | "btt";
-  /** 是否启用可调整大小的功能，默认 `false` */
+  /** `Drawer` 窗体的大小, 当使用 `number` 类型时, 以像素为单位, 当使用 `string` 类型时, 请传入 `'x%'`, 否则便会以 `number` 类型解释 */
-  resizable?: boolean;
-  /** `Drawer` 窗体的大小, 当使用 `number` 类型时, 以像素为单位, 当使用 `string` 类型时, 请传入 `'x%'`, 否则便会以 `number` 类型解释，默认 `30%` */
   size?: string | number;
   /** `Drawer` 的标题 */
   title?: string;
@@ -57,12 +54,6 @@ type DrawerProps = {
   withHeader?: boolean;
   /** 遮罩层的自定义类名 */
   modalClass?: string;
-  /** `header` 部分的自定义 `class` 名 */
-  headerClass?: string;
-  /** `body` 部分的自定义 `class` 名 */
-  bodyClass?: string;
-  /** `footer` 部分的自定义 `class` 名 */
-  footerClass?: string;
   /** 设置 `z-index` */
   zIndex?: number;
   /** `header` 的 `aria-level` 属性，默认 `2` */

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 mx-2!"
+              class="justify-end mr-2 ml-2"
               type="danger"
               size="small"
               text

src/components/ReIcon/src/hooks.ts

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

src/components/RePureTableBar/src/bar.tsx

@@ -100,7 +100,7 @@ export default defineComponent({
         "pt-[3px]",
         "px-[11px]",
         "border-b-[1px]",
-        "border-b-solid",
+        "border-solid",
         "border-[#dcdfe6]",
         "dark:border-[#303030]"
       ];
@@ -260,7 +260,7 @@ export default defineComponent({
             "pb-2",
             "bg-bg_color",
             isFullscreen.value
-              ? ["h-full!", "z-2002", "fixed", "inset-0"]
+              ? ["w-full!", "h-full!", "z-2002", "fixed", "inset-0"]
               : "mt-2"
           ]}
         >

src/components/ReSegmented/src/index.css

@@ -98,6 +98,7 @@
   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,15 +44,13 @@
         (t.style.height = 0),
         (t.style.overflow = "hidden"),
         (t = t),
-        (e = document.body).firstChild
+        (e = document.body).firstChild ? m(t, e.firstChild) : e.appendChild(t));
-          ? 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 &&
@@ -62,5 +60,5 @@
         a(),
         (o.onreadystatechange = function () {
           "complete" == o.readyState && ((o.onreadystatechange = null), l());
-        })));
+        }));
 })(window);

src/components/ReVxeTableBar/src/bar.tsx

@@ -93,7 +93,7 @@ export default defineComponent({
         "pt-[3px]",
         "px-[11px]",
         "border-b-[1px]",
-        "border-b-solid",
+        "border-solid",
         "border-[#dcdfe6]",
         "dark:border-[#303030]"
       ];
@@ -253,7 +253,7 @@ export default defineComponent({
             "pb-2",
             "bg-bg_color",
             isFullscreen.value
-              ? ["h-full!", "z-2002", "fixed", "inset-0"]
+              ? ["w-full!", "h-full!", "z-2002", "fixed", "inset-0"]
               : "mt-2"
           ]}
         >

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

@@ -10,10 +10,8 @@ export interface RippleOptions {
   circle?: boolean;
 }
 
-export interface RippleDirectiveBinding extends Omit<
+export interface RippleDirectiveBinding
-  DirectiveBinding,
+  extends Omit<DirectiveBinding, "modifiers" | "value"> {
-  "modifiers" | "value"
-> {
   value?: boolean | { class: string };
   modifiers: {
     center?: boolean;

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-white shadow-xs 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"

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

@@ -49,7 +49,7 @@ function hoverDescription(event, description) {
 
 <template>
   <div
-    class="notice-container border-0 border-b 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

@@ -51,7 +51,7 @@ onBeforeUnmount(() => {
     <div class="right-panel-background" />
     <div ref="target" class="right-panel bg-bg_color">
       <div
-        class="project-configuration border-0 border-b border-solid border-(--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-0 border-t border-solid border-(--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/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

@@ -37,7 +37,7 @@ const horizontalRef = ref();
 
 const {
   dataTheme,
-  themeMode,
+  overallStyle,
   layoutTheme,
   themeColors,
   toggleClass,
@@ -50,7 +50,7 @@ if (unref(layoutTheme)) {
   const layout = unref(layoutTheme).layout;
   const theme = unref(layoutTheme).theme;
   document.documentElement.setAttribute("data-theme", theme);
-  setMenuLayout(layout);
+  setLayoutModel(layout);
 }
 
 /** 默认灵动模式 */
@@ -195,24 +195,24 @@ const pClass = computed(() => {
 const themeOptions = computed<Array<OptionsType>>(() => {
   return [
     {
-      label: t("panel.pureThemeModeLight"),
+      label: t("panel.pureOverallStyleLight"),
       icon: DayIcon,
       theme: "light",
-      tip: t("panel.pureThemeModeLightTip"),
+      tip: t("panel.pureOverallStyleLightTip"),
       iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
     },
     {
-      label: t("panel.pureThemeModeDark"),
+      label: t("panel.pureOverallStyleDark"),
       icon: DarkIcon,
       theme: "dark",
-      tip: t("panel.pureThemeModeDarkTip"),
+      tip: t("panel.pureOverallStyleDarkTip"),
       iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
     },
     {
-      label: t("panel.pureThemeModeSystem"),
+      label: t("panel.pureOverallStyleSystem"),
       icon: SystemIcon,
       theme: "system",
-      tip: t("panel.pureThemeModeSystemTip"),
+      tip: t("panel.pureOverallStyleSystemTip"),
       iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
     }
   ];
@@ -238,8 +238,8 @@ const markOptions = computed<Array<OptionsType>>(() => {
   ];
 });
 
-/** 设置菜单布局 */
+/** 设置导航模式 */
-function setMenuLayout(layout: string) {
+function setLayoutModel(layout: string) {
   layoutTheme.value.layout = layout;
   window.document.body.setAttribute("layout", layout);
   $storage.layout = {
@@ -249,7 +249,7 @@ function setMenuLayout(layout: string) {
     sidebarStatus: $storage.layout?.sidebarStatus,
     epThemeColor: $storage.layout?.epThemeColor,
     themeColor: $storage.layout?.themeColor,
-    themeMode: $storage.layout?.themeMode
+    overallStyle: $storage.layout?.overallStyle
   };
   useAppStoreHook().setLayout(layout);
 }
@@ -276,15 +276,15 @@ watch($storage, ({ layout }) => {
 
 const mediaQueryList = window.matchMedia("(prefers-color-scheme: dark)");
 
-/** 根据操作系统主题设置平台主题模式 */
+/** 根据操作系统主题设置平台整体风格 */
 function updateTheme() {
-  if (themeMode.value !== "system") return;
+  if (overallStyle.value !== "system") return;
   if (mediaQueryList.matches) {
     dataTheme.value = true;
   } else {
     dataTheme.value = false;
   }
-  dataThemeChange(themeMode.value);
+  dataThemeChange(overallStyle.value);
 }
 
 function removeMatchMedia() {
@@ -317,18 +317,18 @@ onUnmounted(() => removeMatchMedia);
 <template>
   <LayPanel>
     <div class="p-5">
-      <p :class="pClass">{{ t("panel.pureThemeMode") }}</p>
+      <p :class="pClass">{{ t("panel.pureOverallStyle") }}</p>
       <Segmented
         resize
         class="select-none"
-        :modelValue="themeMode === 'system' ? 2 : dataTheme ? 1 : 0"
+        :modelValue="overallStyle === 'system' ? 2 : dataTheme ? 1 : 0"
         :options="themeOptions"
         @change="
           theme => {
             theme.index === 1 && theme.index !== 2
               ? (dataTheme = true)
               : (dataTheme = false);
-            themeMode = theme.option.theme;
+            overallStyle = theme.option.theme;
             dataThemeChange(theme.option.theme);
             theme.index === 2 && watchSystemThemeChange();
           }
@@ -354,7 +354,7 @@ onUnmounted(() => removeMatchMedia);
         </li>
       </ul>
 
-      <p :class="['mt-5!', pClass]">{{ t("panel.pureMenuLayout") }}</p>
+      <p :class="['mt-5!', pClass]">{{ t("panel.pureLayoutModel") }}</p>
       <ul class="pure-theme">
         <li
           ref="verticalRef"
@@ -363,7 +363,7 @@ onUnmounted(() => removeMatchMedia);
             zIndex: 41000
           }"
           :class="layoutTheme.layout === 'vertical' ? 'is-select' : ''"
-          @click="setMenuLayout('vertical')"
+          @click="setLayoutModel('vertical')"
         >
           <div />
           <div />
@@ -376,7 +376,7 @@ onUnmounted(() => removeMatchMedia);
             zIndex: 41000
           }"
           :class="layoutTheme.layout === 'horizontal' ? 'is-select' : ''"
-          @click="setMenuLayout('horizontal')"
+          @click="setLayoutModel('horizontal')"
         >
           <div />
           <div />
@@ -389,7 +389,7 @@ onUnmounted(() => removeMatchMedia);
             zIndex: 41000
           }"
           :class="layoutTheme.layout === 'mix' ? 'is-select' : ''"
-          @click="setMenuLayout('mix')"
+          @click="setLayoutModel('mix')"
         >
           <div />
           <div />
@@ -416,7 +416,7 @@ onUnmounted(() => removeMatchMedia);
         <button
           v-else
           v-ripple="{ class: 'text-gray-300' }"
-          class="bg-transparent flex-c w-full h-20 rounded-md border border-(--pure-border-color)"
+          class="bg-transparent flex-c w-full h-20 rounded-md border border-[var(--pure-border-color)]"
           @click="setStretch(!settings.stretch)"
         >
           <div

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

@@ -61,21 +61,6 @@ 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 {
@@ -159,7 +144,7 @@ function resolvePath(routePath) {
             item?.pathList?.length === 2)
         "
         truncated
-        class="w-full! px-3! min-w-[54px]! text-center! text-inherit!"
+        class="w-full! pl-4! text-inherit!"
       >
         {{ transformI18n(onlyOneChild.meta.title) }}
       </el-text>
@@ -210,7 +195,15 @@ function resolvePath(routePath) {
           offset: [0, -10],
           theme: tooltipEffect
         }"
-        :class="textClass"
+        :class="{
+          '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/SidebarTopCollapse.vue

@@ -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.scss

@@ -321,9 +321,10 @@
 
   .chrome-tab-divider {
     position: absolute;
-    left: 7px;
+    right: 7px;
     width: 1px;
     height: 14px;
+    background-color: #2b2d2f;
   }
 
   &:hover {

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

@@ -1,7 +1,6 @@
 <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";
@@ -207,14 +206,12 @@ 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) {
@@ -257,7 +254,7 @@ function deleteDynamicTag(obj: any, current: any, tag?: string) {
   if (tag === "other") {
     spliceRoute(1, 1, true);
   } else if (tag === "left") {
-    spliceRoute(fixedTags.length, valueIndex - fixedTags.length);
+    spliceRoute(fixedTags.length, valueIndex - 1, true);
   } else if (tag === "right") {
     spliceRoute(valueIndex + 1, multiTags.value.length);
   } else {
@@ -356,7 +353,7 @@ function onClickDrop(key, item, selectRoute?: RouteConfigs) {
       break;
   }
   setTimeout(() => {
-    showMenuModel(route.fullPath, route.query, route.params);
+    showMenuModel(route.fullPath, route.query);
   });
 }
 
@@ -391,18 +388,15 @@ 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(params)) {
+  if (isAllEmpty(query)) {
-    currentIndex = allRoute.findIndex(v => isEqual(v.params, params));
-  } else if (!isAllEmpty(query)) {
-    currentIndex = allRoute.findIndex(v => isEqual(v.query, query));
-  } else {
     currentIndex = allRoute.findIndex(v => v.path === currentPath);
+  } else {
+    currentIndex = allRoute.findIndex(v => isEqual(v.query, query));
   }
   function fixedTagDisabled() {
     if (allRoute[currentIndex]?.meta?.fixedTag) {
@@ -468,14 +462,14 @@ function openMenu(tag, e) {
   } else if (route.path !== tag.path && route.name !== tag.name) {
     // 右键菜单不匹配当前路由，隐藏刷新
     tagsViews[0].show = false;
-    showMenuModel(tag.path, tag.query, tag.params);
+    showMenuModel(tag.path, tag.query);
   } else if (multiTags.value.length === 2 && route.path !== tag.path) {
     showMenus(true);
     // 只有两个标签时不显示关闭其他标签页
     tagsViews[4].show = false;
-    showMenuModel(tag.path, tag.query, tag.params);
+  } else if (route.path === tag.path) {
-  } else {
+    // 右键当前激活的菜单
-    showMenuModel(tag.path, tag.query, tag.params, true);
+    showMenuModel(tag.path, tag.query, true);
   }
 
   currentSelect.value = tag;
@@ -618,10 +612,6 @@ onBeforeUnmount(() => {
             />
           </template>
           <div v-else class="chrome-tab">
-            <span
-              v-if="index !== 0 && index !== activeIndex"
-              class="chrome-tab-divider bg-[#e2e2e2] dark:bg-[#2d2d2d]"
-            />
             <div class="chrome-tab__bg">
               <TagChrome />
             </div>
@@ -635,6 +625,7 @@ onBeforeUnmount(() => {
             >
               <IconifyIconOffline :icon="Close" />
             </span>
+            <span class="chrome-tab-divider" />
           </div>
         </div>
       </div>

src/layout/frame.vue

@@ -19,22 +19,13 @@ 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() {
@@ -43,42 +34,32 @@ function init() {
     if (!iframe) return;
     const _frame = iframe as any;
     if (_frame.attachEvent) {
-      _frame.attachEvent("onload", hideLoading);
+      _frame.attachEvent("onload", () => {
+        hideLoading();
+      });
     } else {
-      iframe.onload = hideLoading;
+      iframe.onload = () => {
+        hideLoading();
+      };
     }
   });
 }
 
-let isRedirect = false;
-
 watch(
   () => currentRoute.fullPath,
   path => {
     if (
       currentRoute.name === "Redirect" &&
-      props.frameInfo?.fullPath &&
+      path.includes(props.frameInfo?.fullPath)
-      path.includes(props.frameInfo.fullPath)
     ) {
-      isRedirect = true;
+      frameSrc.value = path; // redirect时，置换成任意值，待重定向后 重新赋值
       loading.value = true;
-      return;
     }
-    if (props.frameInfo?.fullPath === path && isRedirect) {
+    // 重新赋值
-      loading.value = true;
+    if (props.frameInfo?.fullPath === path) {
-      clearFallbackTimer();
+      frameSrc.value = props.frameInfo?.frameSrc;
-      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/useDataThemeChange.ts

@@ -33,7 +33,7 @@ export function useDataThemeChange() {
 
   const { $storage } = useGlobal<GlobalPropertiesApi>();
   const dataTheme = ref<boolean>($storage?.layout?.darkMode);
-  const themeMode = ref<string>($storage?.layout?.themeMode);
+  const overallStyle = ref<string>($storage?.layout?.overallStyle);
   const body = document.documentElement as HTMLElement;
 
   function toggleClass(flag: boolean, clsName: string, target?: HTMLElement) {
@@ -59,7 +59,7 @@ export function useDataThemeChange() {
       sidebarStatus: $storage.layout?.sidebarStatus,
       epThemeColor: $storage.layout?.epThemeColor,
       themeColor: isClick ? theme : storageThemeColor,
-      themeMode: themeMode.value
+      overallStyle: overallStyle.value
     };
 
     if (theme === "default" || theme === "light") {
@@ -89,9 +89,9 @@ export function useDataThemeChange() {
     }
   };
 
-  /** 浅色、深色主题模式切换 */
+  /** 浅色、深色整体风格切换 */
-  function dataThemeChange(mode?: string) {
+  function dataThemeChange(overall?: string) {
-    themeMode.value = mode;
+    overallStyle.value = overall;
     if (useEpThemeStoreHook().epTheme === "light" && dataTheme.value) {
       setLayoutThemeColor("default", false);
     } else {
@@ -126,7 +126,7 @@ export function useDataThemeChange() {
   return {
     body,
     dataTheme,
-    themeMode,
+    overallStyle,
     layoutTheme,
     themeColors,
     onReset,

src/layout/hooks/useLayout.ts

@@ -29,7 +29,7 @@ export function useLayout() {
         sidebarStatus: $config?.SidebarStatus ?? true,
         epThemeColor: $config?.EpThemeColor ?? "#409EFF",
         themeColor: $config?.Theme ?? "light",
-        themeMode: $config?.ThemeMode ?? "light"
+        overallStyle: $config?.OverallStyle ?? "light"
       };
     }
     /** 灰色模式、色弱模式、隐藏标签页 */

src/layout/hooks/useTag.ts

@@ -114,21 +114,14 @@ 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 currentName === itemName && isEqual(route.query, item.query)
+        return isEqual(route.query, item.query) ? previous : next;
-          ? previous
-          : next;
       } else {
-        return currentName === itemName && isEqual(route.params, item.params)
+        return isEqual(route.params, item.params) ? previous : next;
-          ? previous
-          : next;
       }
     } else {
-      return currentName === itemName ? previous : next;
+      return route.path === item.path ? previous : next;
     }
   }
 

src/layout/index.vue

@@ -67,16 +67,16 @@ const set: setType = reactive({
   })
 });
 
-function setTheme(menuLayout: string) {
+function setTheme(layoutModel: string) {
-  window.document.body.setAttribute("layout", menuLayout);
+  window.document.body.setAttribute("layout", layoutModel);
   $storage.layout = {
-    layout: `${menuLayout}`,
+    layout: `${layoutModel}`,
     theme: $storage.layout?.theme,
     darkMode: $storage.layout?.darkMode,
     sidebarStatus: $storage.layout?.sidebarStatus,
     epThemeColor: $storage.layout?.epThemeColor,
     themeColor: $storage.layout?.themeColor,
-    themeMode: $storage.layout?.themeMode
+    overallStyle: $storage.layout?.overallStyle
   };
 }
 
@@ -123,7 +123,7 @@ onMounted(() => {
 });
 
 onBeforeMount(() => {
-  useDataThemeChange().dataThemeChange($storage.layout?.themeMode);
+  useDataThemeChange().dataThemeChange($storage.layout?.overallStyle);
 });
 
 const LayHeader = defineComponent({

src/layout/types.ts

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

src/plugins/elementPlus.ts

@@ -3,13 +3,15 @@ import type { App, Component } from "vue";
 import {
   /**
    * 为了方便演示平台将 element-plus 导出的所有组件引入，实际使用中如果你没用到哪个组件，将其注释掉就行
-   * 导出来源：https://github.com/element-plus/element-plus/blob/dev/packages/element-plus/component.ts#L116-L226
+   * 导出来源：https://github.com/element-plus/element-plus/blob/dev/packages/element-plus/component.ts#L111-L211
    * */
   ElAffix,
   ElAlert,
   ElAutocomplete,
   ElAutoResizer,
   ElAvatar,
+  ElAnchor,
+  ElAnchorLink,
   ElBacktop,
   ElBadge,
   ElBreadcrumb,
@@ -30,7 +32,6 @@ import {
   ElCollapse,
   ElCollapseItem,
   ElCollapseTransition,
-  ElColorPickerPanel,
   ElColorPicker,
   ElConfigProvider,
   ElContainer,
@@ -39,7 +40,6 @@ import {
   ElHeader,
   ElMain,
   ElDatePicker,
-  ElDatePickerPanel,
   ElDescriptions,
   ElDescriptionsItem,
   ElDialog,
@@ -56,7 +56,6 @@ import {
   ElImageViewer,
   ElInput,
   ElInputNumber,
-  ElInputTag,
   ElLink,
   ElMenu,
   ElMenuItem,
@@ -108,22 +107,17 @@ import {
   ElWatermark,
   ElTour,
   ElTourStep,
-  ElAnchor,
-  ElAnchorLink,
   ElSegmented,
-  ElMention,
-  ElSplitter,
-  ElSplitterPanel,
   /**
    * 为了方便演示平台将 element-plus 导出的所有插件引入，实际使用中如果你没用到哪个插件，将其注释掉就行
    * 导出来源：https://github.com/element-plus/element-plus/blob/dev/packages/element-plus/plugin.ts#L11-L16
    * */
-  ElInfiniteScroll, // v-infinite-scroll 指令
   ElLoading, // v-loading 指令
+  ElInfiniteScroll, // v-infinite-scroll 指令
+  ElPopoverDirective, // v-popover 指令
   ElMessage, // $message 全局属性对象globalProperties
   ElMessageBox, // $msgbox、$alert、$confirm、$prompt 全局属性对象globalProperties
-  ElNotification, // $notify 全局属性对象globalProperties
+  ElNotification // $notify 全局属性对象globalProperties
-  ElPopoverDirective // v-popover 指令
 } from "element-plus";
 
 const components = [
@@ -132,6 +126,8 @@ const components = [
   ElAutocomplete,
   ElAutoResizer,
   ElAvatar,
+  ElAnchor,
+  ElAnchorLink,
   ElBacktop,
   ElBadge,
   ElBreadcrumb,
@@ -152,7 +148,6 @@ const components = [
   ElCollapse,
   ElCollapseItem,
   ElCollapseTransition,
-  ElColorPickerPanel,
   ElColorPicker,
   ElConfigProvider,
   ElContainer,
@@ -161,7 +156,6 @@ const components = [
   ElHeader,
   ElMain,
   ElDatePicker,
-  ElDatePickerPanel,
   ElDescriptions,
   ElDescriptionsItem,
   ElDialog,
@@ -178,7 +172,6 @@ const components = [
   ElImageViewer,
   ElInput,
   ElInputNumber,
-  ElInputTag,
   ElLink,
   ElMenu,
   ElMenuItem,
@@ -230,21 +223,16 @@ const components = [
   ElWatermark,
   ElTour,
   ElTourStep,
-  ElAnchor,
+  ElSegmented
-  ElAnchorLink,
-  ElSegmented,
-  ElMention,
-  ElSplitter,
-  ElSplitterPanel
 ];
 
 const plugins = [
-  ElInfiniteScroll,
   ElLoading,
+  ElInfiniteScroll,
+  ElPopoverDirective,
   ElMessage,
   ElMessageBox,
-  ElNotification,
+  ElNotification
-  ElPopoverDirective
 ];
 
 /** 按需引入`element-plus` */

src/router/index.ts

@@ -7,13 +7,7 @@ import { buildHierarchyTree } from "@/utils/tree";
 import remainingRouter from "./modules/remaining";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-import {
+import { isUrl, openLink, storageLocal, isAllEmpty } from "@pureadmin/utils";
-  isUrl,
-  openLink,
-  cloneDeep,
-  isAllEmpty,
-  storageLocal
-} from "@pureadmin/utils";
 import {
   ascending,
   getTopMenu,
@@ -27,9 +21,9 @@ import {
 } from "./utils";
 import {
   type Router,
+  createRouter,
   type RouteRecordRaw,
-  type RouteComponent,
+  type RouteComponent
-  createRouter
 } from "vue-router";
 import {
   type DataInfo,
@@ -61,9 +55,6 @@ 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)
@@ -94,25 +85,20 @@ export const router: Router = createRouter({
   }
 });
 
-/** 记录已经加载的页面路径 */
-const loadedPaths = new Set<string>();
-
-/** 重置已加载页面记录 */
-export function resetLoadedPaths() {
-  loadedPaths.clear();
-}
-
 /** 重置路由 */
 export function resetRouter() {
-  router.clearRoutes();
+  router.getRoutes().forEach(route => {
-  for (const route of initConstantRoutes.concat(...(remainingRouter as any))) {
+    const { name, meta } = route;
-    router.addRoute(route);
+    if (name && router.hasRoute(name) && meta?.backstage) {
-  }
+      router.removeRoute(name);
-  router.options.routes = formatTwoStageRoutes(
+      router.options.routes = formatTwoStageRoutes(
-    formatFlatteningRoutes(buildHierarchyTree(ascending(routes.flat(Infinity))))
+        formatFlatteningRoutes(
-  );
+          buildHierarchyTree(ascending(routes.flat(Infinity)))
+        )
+      );
+    }
+  });
   usePermissionStoreHook().clearAllCachePage();
-  resetLoadedPaths();
 }
 
 /** 路由白名单 */
@@ -121,12 +107,6 @@ 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");
     // 页面整体刷新和点击标签页刷新
@@ -135,6 +115,7 @@ 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 => {
@@ -220,8 +201,7 @@ router.beforeEach((to: ToRouteType, _from, next) => {
   }
 });
 
-router.afterEach(to => {
+router.afterEach(() => {
-  loadedPaths.add(to.path);
   NProgress.done();
 });
 

src/router/modules/components.ts

@@ -119,7 +119,8 @@ export default {
       name: "PureSlider",
       component: () => import("@/views/components/slider/index.vue"),
       meta: {
-        title: $t("menus.pureSlider")
+        title: $t("menus.pureSlider"),
+        extraIcon: "IF-pure-iconfont-new svg"
       }
     },
     {
@@ -194,15 +195,6 @@ export default {
         title: $t("menus.pureColorPicker")
       }
     },
-    {
-      path: "/components/color-picker-panel",
-      name: "ColorPickerPanel",
-      component: () => import("@/views/components/color-picker-panel.vue"),
-      meta: {
-        title: $t("menus.pureColorPickerPanel"),
-        extraIcon: "IF-pure-iconfont-new svg"
-      }
-    },
     {
       path: "/components/selector",
       name: "Selector",

src/router/modules/error.ts

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

src/router/modules/remaining.ts

@@ -8,27 +8,8 @@ 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
     }
   },
   {
@@ -36,7 +17,8 @@ export default [
     component: Layout,
     meta: {
       title: $t("status.pureLoad"),
-      showLink: false
+      showLink: false,
+      rank: 102
     },
     children: [
       {
@@ -46,15 +28,6 @@ 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",
@@ -62,7 +35,18 @@ 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,17 +139,12 @@ function findRouteByPath(path: string, routes: RouteRecordRaw[]) {
   }
 }
 
-/** 动态路由注册完成后，再添加全屏404（页面不存在）页面，避免刷新动态路由页面时误跳转到404页面 */
 function addPathMatch() {
   if (!router.hasRoute("pathMatch")) {
     router.addRoute({
-      path: "/:pathMatch(.*)*",
+      path: "/:pathMatch(.*)",
-      name: "PageNotFound",
+      name: "pathMatch",
-      component: () => import("@/views/error/404.vue"),
+      redirect: "/error/404"
-      meta: {
-        title: "menus.purePageNotFound",
-        showLink: false
-      }
     });
   }
 }
@@ -177,8 +172,6 @@ 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/app.ts

@@ -18,7 +18,7 @@ export const useAppStore = defineStore("pure-app", {
       withoutAnimation: false,
       isClickCollapse: false
     },
-    // 这里的layout用于监听容器拖拉后恢复对应的菜单布局
+    // 这里的layout用于监听容器拖拉后恢复对应的导航模式
     layout:
       storageLocal().getItem<StorageConfigs>(
         `${responsiveStorageNameSpace()}layout`

src/store/modules/epTheme.ts

@@ -21,7 +21,7 @@ export const useEpThemeStore = defineStore("pure-epTheme", {
     getEpThemeColor(state) {
       return state.epThemeColor;
     },
-    /** 用于mix菜单布局下hamburger-svg的fill属性 */
+    /** 用于mix导航模式下hamburger-svg的fill属性 */
     fill(state) {
       if (state.epTheme === "light") {
         return "#409eff";

src/store/modules/multiTags.ts

@@ -80,15 +80,22 @@ 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 (
+              return tag.path === tagPath;
-                tag.path === tagPath &&
-                isEqual(tag?.query, tagVal?.query) &&
-                isEqual(tag?.params, tagVal?.params)
-              );
             });
 
-            if (tagHasExits) return;
+            // 判断tag中的query键值是否相等
+            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,6 +2,7 @@ import { defineStore } from "pinia";
 import {
   type cacheType,
   store,
+  debounce,
   ascending,
   getKeyList,
   filterTree,
@@ -32,35 +33,33 @@ 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/sidebar.scss

@@ -172,6 +172,10 @@
     .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 {
@@ -266,6 +270,10 @@
     .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;
+      }
     }
 
     /* 子菜单中还有子菜单 */
@@ -366,6 +374,10 @@
     .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,
@@ -529,6 +541,10 @@
     .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 {
@@ -650,10 +666,6 @@ 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;
@@ -675,7 +687,6 @@ 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/utils/http/index.ts

@@ -10,6 +10,7 @@ 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";
 
@@ -60,6 +61,8 @@ 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);
@@ -118,6 +121,8 @@ class PureHttp {
     instance.interceptors.response.use(
       (response: PureHttpResponse) => {
         const $config = response.config;
+        // 关闭进度条动画
+        NProgress.done();
         // 优先判断post/get等方法是否传入回调，否则执行初始化设置等回调
         if (typeof $config.beforeResponseCallback === "function") {
           $config.beforeResponseCallback(response);
@@ -132,6 +137,8 @@ class PureHttp {
       (error: PureHttpError) => {
         const $error = error;
         $error.isCancelRequest = Axios.isCancel($error);
+        // 关闭进度条动画
+        NProgress.done();
         // 所有的响应异常 区分来源为取消请求/非取消请求
         return Promise.reject($error);
       }

src/utils/localforage/types.d.ts

@@ -65,7 +65,8 @@ interface LocalForageDbMethodsOptional {
 }
 
 interface LocalForageDriverDbMethods
-  extends LocalForageDbMethodsCore, LocalForageDriverMethodsOptional {}
+  extends LocalForageDbMethodsCore,
+    LocalForageDriverMethodsOptional {}
 
 interface LocalForageDriverSupportFunc {
   (): Promise<boolean>;
@@ -93,7 +94,8 @@ interface LocalForageSerializer {
 }
 
 interface LocalForageDbMethods
-  extends LocalForageDbMethodsCore, LocalForageDbMethodsOptional {}
+  extends LocalForageDbMethodsCore,
+    LocalForageDbMethodsOptional {}
 
 export interface LocalForage extends LocalForageDbMethods {
   LOCALSTORAGE: string;

src/utils/message.ts

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

src/utils/responsive.ts

@@ -19,8 +19,8 @@ export const injectResponsiveStorage = (app: App, config: PlatformConfigs) => {
         darkMode: config.DarkMode ?? false,
         sidebarStatus: config.SidebarStatus ?? true,
         epThemeColor: config.EpThemeColor ?? "#409EFF",
-        themeColor: config.Theme ?? "light", // 主题色（对应系统配置中的主题色，与theme不同的是它不会受到浅色、深色主题模式切换的影响，只会在手动点击主题色时改变）
+        themeColor: config.Theme ?? "light", // 主题色（对应系统配置中的主题色，与theme不同的是它不会受到浅色、深色整体风格切换的影响，只会在手动点击主题色时改变）
-        themeMode: config.ThemeMode ?? "light" // 主题模式（浅色：light、深色：dark、自动：system）
+        overallStyle: config.OverallStyle ?? "light" // 整体风格（浅色：light、深色：dark、自动：system）
       },
       // 系统配置-界面显示
       configure: Storage.getData("configure", nameSpace) ?? {

src/views/able/excel.vue

@@ -89,7 +89,7 @@ const exportExcel = () => {
       </el-link>
     </template>
     <el-button type="primary" @click="exportExcel">导出Excel</el-button>
-    <div class="h-100 mt-3">
+    <div class="h-[25rem] mt-3">
       <el-auto-resizer>
         <template #default="{ height, width }">
           <el-table-v2

src/views/able/mqtt-client.vue

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

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

@@ -38,7 +38,10 @@ function onClick(item) {
 
 <template>
   <div
-    :class="['min-w-[180px]', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']"
+    :class="[
+      'min-w-[180px]',
+      deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
+    ]"
   >
     <h3 class="my-8!">账户管理</h3>
     <div v-for="(item, index) in list" :key="index">

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

@@ -33,7 +33,10 @@ function onChange(val, item) {
 
 <template>
   <div
-    :class="['min-w-[180px]', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']"
+    :class="[
+      'min-w-[180px]',
+      deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
+    ]"
   >
     <h3 class="my-8!">偏好设置</h3>
     <div v-for="(item, index) in list" :key="index">

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

@@ -105,7 +105,10 @@ getMine().then(res => {
 
 <template>
   <div
-    :class="['min-w-[180px]', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']"
+    :class="[
+      'min-w-[180px]',
+      deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
+    ]"
   >
     <h3 class="my-8!">个人信息</h3>
     <el-form

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

@@ -73,7 +73,10 @@ onMounted(() => {
 
 <template>
   <div
-    :class="['min-w-[180px]', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']"
+    :class="[
+      'min-w-[180px]',
+      deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
+    ]"
   >
     <h3 class="my-8!">安全日志</h3>
     <pure-table

src/views/account-settings/index.vue

@@ -25,7 +25,7 @@ const router = useRouter();
 const isOpen = ref(deviceDetection() ? false : true);
 const { $storage } = useGlobal<GlobalPropertiesApi>();
 onBeforeMount(() => {
-  useDataThemeChange().dataThemeChange($storage.layout?.themeMode);
+  useDataThemeChange().dataThemeChange($storage.layout?.overallStyle);
 });
 
 const userInfo = ref({
@@ -70,21 +70,19 @@ getMine().then(res => {
   <el-container class="h-full">
     <el-aside
       v-if="isOpen"
-      class="pure-account-settings overflow-hidden px-2 dark:bg-(--el-bg-color)! border-r border-(--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">
-        <div
+        <el-menu-item
-          class="h-[50px]! text-(--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-(--pure-theme-menu-title-hover)!"
+          class="hover:transition-all! hover:duration-200! hover:text-base! h-[50px]!"
           @click="router.go(-1)"
         >
-          <div
+          <div class="flex items-center">
-            class="h-full flex items-center px-(--el-menu-base-level-padding)"
-          >
             <IconifyIconOffline :icon="leftLine" />
             <span class="ml-2">返回</span>
           </div>
-        </div>
+        </el-menu-item>
         <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]">

src/views/components/cascader.vue

@@ -38,7 +38,7 @@ const handleChange = value => {
     <el-row :gutter="24">
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
         <div class="flex flex-col items-center justify-center">
-          <span class="text-(--el-color-primary)">
+          <span class="text-[var(--el-color-primary)]">
             1. 二级联动（不带“全部”选项）
             <el-cascader
               v-model="selectedOptions1"
@@ -67,7 +67,7 @@ const handleChange = value => {
       </el-col>
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
         <div class="flex flex-col items-center justify-center mt-3">
-          <span class="text-(--el-color-primary)">
+          <span class="text-[var(--el-color-primary)]">
             2. 二级联动（带有“全部”选项）
             <el-cascader
               v-model="selectedOptions3"
@@ -96,7 +96,7 @@ const handleChange = value => {
       </el-col>
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
         <div class="flex flex-col items-center justify-center mt-3">
-          <span class="text-(--el-color-primary)">
+          <span class="text-[var(--el-color-primary)]">
             3. 三级联动（不带“全部”选项）
             <el-cascader
               v-model="selectedOptions2"
@@ -127,7 +127,7 @@ const handleChange = value => {
       </el-col>
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
         <div class="flex flex-col items-center justify-center mt-3">
-          <span class="text-(--el-color-primary)">
+          <span class="text-[var(--el-color-primary)]">
             4. 三级联动（带"全部选项"）
             <el-cascader
               v-model="selectedOptions4"

src/views/components/color-picker-panel.vue

@@ -1,68 +0,0 @@
-<script setup lang="ts">
-import { ref } from "vue";
-
-defineOptions({
-  name: "ColorPickerPanel"
-});
-
-const disabled = ref(false);
-const color = ref("rgba(255, 69, 0, 0.68)");
-const predefineColors = [
-  "#ff4500",
-  "#ff8c00",
-  "#ffd700",
-  "#90ee90",
-  "#00ced1",
-  "#1e90ff",
-  "#c71585",
-  "rgba(255, 69, 0, 0.68)",
-  "rgb(255, 120, 0)",
-  "hsv(51, 100, 98)",
-  "hsva(120, 40, 94, 0.5)",
-  "hsl(181, 100%, 37%)",
-  "hsla(209, 100%, 56%, 0.73)",
-  "#c7158577"
-];
-</script>
-
-<template>
-  <el-card shadow="never">
-    <template #header>
-      <div class="card-header">
-        <el-space wrap :size="40">
-          <el-link
-            v-tippy="{
-              content: '点击查看详细文档'
-            }"
-            href="https://element-plus.org/zh-CN/component/color-picker-panel.html"
-            target="_blank"
-            style="font-size: 16px; font-weight: 800"
-          >
-            颜色选择器面板
-          </el-link>
-          <el-radio-group v-model="disabled">
-            <el-radio :value="false">启用</el-radio>
-            <el-radio :value="true">禁用</el-radio>
-          </el-radio-group>
-        </el-space>
-      </div>
-      <el-link
-        class="mt-2"
-        href="https://github.com/pure-admin/vue-pure-admin/blob/main/src/views/components/color-picker-panel.vue"
-        target="_blank"
-      >
-        代码位置 src/views/components/color-picker-panel.vue
-      </el-link>
-    </template>
-
-    <div class="mb-2">选择透明度、预定义颜色、无边框</div>
-    <el-color-picker-panel
-      v-model="color"
-      show-alpha
-      :border="false"
-      :disabled="disabled"
-      :predefine="predefineColors"
-    />
-    <el-divider />
-  </el-card>
-</template>

src/views/components/dialog/index.vue

@@ -463,16 +463,6 @@ function onSureBtnLoading() {
     }
   });
 }
-
-// 自定义动画
-function onTransitionClick(title, transition) {
-  addDialog({
-    width: "30%",
-    title,
-    transition,
-    contentRenderer: () => <p>{JSON.stringify(transition)}</p>
-  });
-}
 </script>
 
 <template>
@@ -561,112 +551,5 @@ function onTransitionClick(title, transition) {
         点击底部确定按钮可开启按钮动画
       </el-button>
     </el-space>
-    <el-divider />
-    <el-space wrap>
-      <el-button
-        @click="onTransitionClick('淡入淡出动画（默认）', 'dialog-fade')"
-      >
-        淡入淡出动画（默认）
-      </el-button>
-      <el-button @click="onTransitionClick('缩放动画', 'dialog-scale')">
-        缩放动画
-      </el-button>
-      <el-button @click="onTransitionClick('滑动动画', 'dialog-slide')">
-        滑动动画
-      </el-button>
-      <el-button @click="onTransitionClick('弹跳动画', 'dialog-bounce')">
-        弹跳动画
-      </el-button>
-      <el-button
-        @click="
-          onTransitionClick('自定义动画事件处理器（可配置对象）', {
-            name: 'dialog-custom-object',
-            appear: true,
-            mode: 'out-in',
-            duration: 500
-          })
-        "
-      >
-        自定义动画事件处理器（可配置对象）
-      </el-button>
-    </el-space>
   </el-card>
 </template>
-
-<style>
-/* Scale Animation */
-.dialog-scale-enter-active,
-.dialog-scale-leave-active,
-.dialog-scale-enter-active .el-dialog,
-.dialog-scale-leave-active .el-dialog {
-  transition: all 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-}
-
-.dialog-scale-enter-from,
-.dialog-scale-leave-to {
-  opacity: 0;
-}
-
-.dialog-scale-enter-from .el-dialog,
-.dialog-scale-leave-to .el-dialog {
-  opacity: 0;
-  transform: scale(0.5);
-}
-
-/* Slide Animation */
-.dialog-slide-enter-active,
-.dialog-slide-leave-active,
-.dialog-slide-enter-active .el-dialog,
-.dialog-slide-leave-active .el-dialog {
-  transition: all 0.3s cubic-bezier(0.25, 0.46, 0.45, 0.94);
-}
-
-.dialog-slide-enter-from,
-.dialog-slide-leave-to {
-  opacity: 0;
-}
-
-.dialog-slide-enter-from .el-dialog,
-.dialog-slide-leave-to .el-dialog {
-  opacity: 0;
-  transform: translateY(-100px);
-}
-
-/* Bounce Animation */
-.dialog-bounce-enter-active,
-.dialog-bounce-leave-active,
-.dialog-bounce-enter-active .el-dialog,
-.dialog-bounce-leave-active .el-dialog {
-  transition: all 0.5s cubic-bezier(0.175, 0.885, 0.32, 1.275);
-}
-
-.dialog-bounce-enter-from,
-.dialog-bounce-leave-to {
-  opacity: 0;
-}
-
-.dialog-bounce-enter-from .el-dialog,
-.dialog-bounce-leave-to .el-dialog {
-  opacity: 0;
-  transform: scale(0.3) translateY(-50px);
-}
-
-/* Object Configuration Animation */
-.dialog-custom-object-enter-active,
-.dialog-custom-object-leave-active,
-.dialog-custom-object-enter-active .el-dialog,
-.dialog-custom-object-leave-active .el-dialog {
-  transition: all 0.5s cubic-bezier(0.25, 0.8, 0.25, 1);
-}
-
-.dialog-custom-object-enter-from,
-.dialog-custom-object-leave-to {
-  opacity: 0;
-}
-
-.dialog-custom-object-enter-from .el-dialog,
-.dialog-custom-object-leave-to .el-dialog {
-  opacity: 0;
-  transform: rotate(180deg) scale(0.5);
-}
-</style>

src/views/components/drawer/index.vue

@@ -422,17 +422,6 @@ function onSureBtnLoading() {
     }
   });
 }
-
-function onResizableClick(title, content, direction) {
-  addDrawer({
-    title,
-    direction,
-    resizable: true, // 启用可调整大小的功能
-    contentRenderer: () => (
-      <p class="text-[var(--el-color-primary)]">{content}</p> // jsx 语法 （注意在.vue文件启用jsx语法，需要在script开启lang="tsx"）
-    )
-  });
-}
 </script>
 
 <template>
@@ -509,28 +498,5 @@ function onResizableClick(title, content, direction) {
         点击底部确定按钮可开启按钮动画
       </el-button>
     </el-space>
-    <el-divider />
-    <el-space wrap>
-      <el-button
-        @click="onResizableClick('从左侧打开', '拖动抽屉右侧边缘', 'ltr')"
-      >
-        拖拽调整大小（从左侧打开）
-      </el-button>
-      <el-button
-        @click="onResizableClick('从右侧打开', '拖动抽屉左侧边缘', 'rtl')"
-      >
-        拖拽调整大小（从右侧打开）
-      </el-button>
-      <el-button
-        @click="onResizableClick('从顶部打开', '拖动抽屉底部边缘', 'ttb')"
-      >
-        拖拽调整大小（从顶部打开）
-      </el-button>
-      <el-button
-        @click="onResizableClick('从底部打开', '拖动抽屉顶部边缘', 'btt')"
-      >
-        拖拽调整大小（从底部打开）
-      </el-button>
-    </el-space>
   </el-card>
 </template>

src/views/components/message.vue

@@ -199,31 +199,6 @@ defineOptions({
 
     <el-divider />
 
-    <h4 class="mb-4!">
-      控制消息出现的位置，消息可以显示在窗口的顶部(默认) 或其他位置
-    </h4>
-
-    <el-space wrap>
-      <el-button @click="message('顶部中间')"> 顶部中间 </el-button>
-      <el-button @click="message('顶部左侧', { placement: 'top-left' })">
-        顶部左侧
-      </el-button>
-      <el-button @click="message('顶部右侧', { placement: 'top-right' })">
-        顶部右侧
-      </el-button>
-      <el-button @click="message('底部中间', { placement: 'bottom' })">
-        底部中间
-      </el-button>
-      <el-button @click="message('底部左侧', { placement: 'bottom-left' })">
-        底部左侧
-      </el-button>
-      <el-button @click="message('底部右侧', { placement: 'bottom-right' })">
-        底部右侧
-      </el-button>
-    </el-space>
-
-    <el-divider />
-
     <el-button @click="closeAllMessage"> 关闭所有消息提示 </el-button>
   </el-card>
 </template>

src/views/components/swiper.vue

@@ -106,7 +106,7 @@ const swiperExample: any[] = [
     </template>
     <el-row :gutter="10">
       <el-col v-for="item in swiperExample" :key="item.id" :span="12">
-        <h6 class="py-[16px]! text-base">{{ item.label }}</h6>
+        <h6 class="py-[16px] text-base">{{ item.label }}</h6>
         <swiper v-bind="item.options">
           <swiper-slide v-for="i in 5" :key="i">
             <div

src/views/components/tag.vue

@@ -107,7 +107,7 @@ const handleInputConfirm = () => {
         v-model="checked1"
         label="可移除"
       />
-      <el-button v-else size="small" text bg class="mr-6!" @click="onReset">
+      <el-button v-else size="small" text bg class="mr-6" @click="onReset">
         重置
       </el-button>
       <el-button
@@ -115,7 +115,7 @@ const handleInputConfirm = () => {
         size="small"
         text
         bg
-        class="mr-6! ml-4!"
+        class="mr-6 ml-4"
         @click="tagList = []"
       >
         移除全部

src/views/components/upload/index.vue

@@ -190,7 +190,7 @@ const onDownload = () => {
               class="el-upload-list__item-delete"
               @click="handleRemove(file)"
             >
-              <span title="移除" class="hover:text-(--el-color-danger)">
+              <span title="移除" class="hover:text-[var(--el-color-danger)]">
                 <IconifyIconOffline
                   :icon="Delete"
                   class="hover:scale-125 duration-100"
@@ -222,7 +222,7 @@ const onDownload = () => {
         type="info"
         class="img-name"
       >
-        <p class="text-white dark:text-black">
+        <p class="text-[#fff] dark:text-black">
           {{ fileList[curOpenImgIndex].name }}
         </p>
       </div>
@@ -232,7 +232,7 @@ const onDownload = () => {
     </p>
     <el-divider />
 
-    <p class="my-4!">
+    <p class="mb-4! mt-4">
       结合表单校验进行<span class="text-[red]">手动上传</span>
       <span class="text-[14px]">
         （可先打开浏览器控制台找到Network，然后填写表单内容后点击点提交观察请求变化）

src/views/components/waterfall/index.vue

@@ -106,7 +106,7 @@ onMounted(() => {
             />
           </div>
           <div class="px-4 pt-2 pb-4 border-t border-t-gray-800">
-            <h4 class="pb-4! text-gray-50 group-hover:text-yellow-300">
+            <h4 class="pb-4 text-gray-50 group-hover:text-yellow-300">
               {{ item.name }}
             </h4>
             <div
@@ -115,7 +115,7 @@ onMounted(() => {
               <div class="text-gray-50">$ {{ item.price }}</div>
               <div>
                 <button
-                  class="px-3! rounded-full bg-red-500 text-sm text-white shadow-lg transition-all duration-300 hover:bg-red-600 border-0"
+                  class="px-3 h-7 rounded-full bg-red-500 text-sm text-white shadow-lg transition-all duration-300 hover:bg-red-600"
                   @click.stop="handleDelete(item, index)"
                 >
                   删除
@@ -129,7 +129,7 @@ onMounted(() => {
 
     <!-- <div class="flex justify-center py-10">
         <button
-          class="px-5! py-2! rounded-full bg-gray-700 text-md text-white cursor-pointer hover:bg-gray-800 transition-all duration-300 border-0"
+          class="px-5 py-2 rounded-full bg-gray-700 text-md text-white cursor-pointer hover:bg-gray-800 transition-all duration-300"
           @click="handleLoadMore"
         >
           加载更多

src/views/error/403.vue

@@ -10,11 +10,9 @@ const router = useRouter();
 </script>
 
 <template>
-  <div
+  <div class="flex justify-center items-center h-[640px]">
-    class="flex flex-col md:flex-row justify-center items-center min-h-full w-full p-4 md:p-0"
-  >
     <noAccess />
-    <div class="mt-8 md:ml-12 md:mt-0 text-center md:text-left">
+    <div class="ml-12">
       <p
         v-motion
         class="font-medium text-4xl mb-4! dark:text-white"
@@ -34,7 +32,7 @@ const router = useRouter();
       </p>
       <p
         v-motion
-        class="text-xl mb-4! text-gray-500"
+        class="mb-4! text-gray-500"
         :initial="{
           opacity: 0,
           y: 100
@@ -52,7 +50,6 @@ const router = useRouter();
       <el-button
         v-motion
         type="primary"
-        class="block mx-auto md:inline-block md:mx-0"
         :initial="{
           opacity: 0,
           y: 100
@@ -71,9 +68,3 @@ const router = useRouter();
     </div>
   </div>
 </template>
-
-<style scoped>
-.main-content {
-  margin: 0 !important;
-}
-</style>

src/views/error/404.vue

@@ -10,11 +10,9 @@ const router = useRouter();
 </script>
 
 <template>
-  <div
+  <div class="flex justify-center items-center h-[640px]">
-    class="flex flex-col md:flex-row justify-center items-center min-h-full w-full p-4 md:p-0"
-  >
     <noExist />
-    <div class="mt-8 md:ml-12 md:mt-0 text-center md:text-left">
+    <div class="ml-12">
       <p
         v-motion
         class="font-medium text-4xl mb-4! dark:text-white"
@@ -34,7 +32,7 @@ const router = useRouter();
       </p>
       <p
         v-motion
-        class="text-xl mb-4! text-gray-500"
+        class="mb-4! text-gray-500"
         :initial="{
           opacity: 0,
           y: 100
@@ -52,7 +50,6 @@ const router = useRouter();
       <el-button
         v-motion
         type="primary"
-        class="block mx-auto md:inline-block md:mx-0"
         :initial="{
           opacity: 0,
           y: 100
@@ -71,9 +68,3 @@ const router = useRouter();
     </div>
   </div>
 </template>
-
-<style scoped>
-.main-content {
-  margin: 0 !important;
-}
-</style>

src/views/error/500.vue

@@ -10,11 +10,9 @@ const router = useRouter();
 </script>
 
 <template>
-  <div
+  <div class="flex justify-center items-center h-[640px]">
-    class="flex flex-col md:flex-row justify-center items-center min-h-full w-full p-4 md:p-0"
-  >
     <noServer />
-    <div class="mt-8 md:ml-12 md:mt-0 text-center md:text-left">
+    <div class="ml-12">
       <p
         v-motion
         class="font-medium text-4xl mb-4! dark:text-white"
@@ -34,7 +32,7 @@ const router = useRouter();
       </p>
       <p
         v-motion
-        class="text-xl mb-4! text-gray-500"
+        class="mb-4! text-gray-500"
         :initial="{
           opacity: 0,
           y: 100
@@ -52,7 +50,6 @@ const router = useRouter();
       <el-button
         v-motion
         type="primary"
-        class="block mx-auto md:inline-block md:mx-0"
         :initial="{
           opacity: 0,
           y: 100
@@ -71,9 +68,3 @@ const router = useRouter();
     </div>
   </div>
 </template>
-
-<style scoped>
-.main-content {
-  margin: 0 !important;
-}
-</style>

src/views/flow-chart/index.vue

@@ -68,7 +68,7 @@ onMounted(() => {
         <span class="font-medium">
           流程图组件，采用开源的
           <el-link
-            href="https://site.logic-flow.cn/tutorial/get-started"
+            href="https://site.logic-flow.cn/docs/#/zh/guide/start"
             target="_blank"
             style="margin: 0 4px 5px; font-size: 16px"
           >

src/views/guide/index.vue

@@ -4,7 +4,7 @@ import intro from "intro.js";
 import "intro.js/minified/introjs.min.css";
 
 type GuideStep = {
-  element: HTMLElement;
+  element: string | HTMLElement;
   title: string;
   intro: string;
   position: "left" | "right" | "top" | "bottom";
@@ -16,43 +16,47 @@ defineOptions({
 
 const GUIDE_STEPS = [
   {
-    element: document.querySelector(".sidebar-logo-container"),
+    element: document.querySelector(".sidebar-logo-container") as
+      | string
+      | HTMLElement,
     title: "项目名称和Logo",
     intro: "您可以在这里设置项目名称和Logo",
     position: "left"
   },
   {
-    element: document.querySelector("#header-search"),
+    element: document.querySelector("#header-search") as string | HTMLElement,
     title: "搜索菜单",
     intro: "您可以在这里搜索想要查看的菜单",
     position: "left"
   },
   {
-    element: document.querySelector("#header-translation"),
+    element: document.querySelector("#header-translation") as
+      | string
+      | HTMLElement,
     title: "国际化",
     intro: "您可以在这里进行语言切换",
     position: "left"
   },
   {
-    element: document.querySelector("#full-screen"),
+    element: document.querySelector("#full-screen") as string | HTMLElement,
     title: "全屏",
     intro: "您可以在这里进行全屏切换",
     position: "left"
   },
   {
-    element: document.querySelector("#header-notice"),
+    element: document.querySelector("#header-notice") as string | HTMLElement,
     title: "消息通知",
     intro: "您可以在这里查看管理员发送的消息",
     position: "left"
   },
   {
-    element: document.querySelector(".set-icon"),
+    element: document.querySelector(".set-icon") as string | HTMLElement,
     title: "系统配置",
     intro: "您可以在这里查看系统配置",
     position: "left"
   },
   {
-    element: document.querySelector(".tags-view"),
+    element: document.querySelector(".tags-view") as string | HTMLElement,
     title: "多标签页",
     intro: "这里是您访问过的页面的历史",
     position: "bottom"

src/views/login/index.vue

@@ -52,8 +52,8 @@ const currentPage = computed(() => {
 const { t } = useI18n();
 const { initStorage } = useLayout();
 initStorage();
-const { dataTheme, themeMode, dataThemeChange } = useDataThemeChange();
+const { dataTheme, overallStyle, dataThemeChange } = useDataThemeChange();
-dataThemeChange(themeMode.value);
+dataThemeChange(overallStyle.value);
 const { title, getDropdownItemStyle, getDropdownItemClass } = useNav();
 const { locale, translationCh, translationEn } = useTranslationLang();
 
@@ -135,7 +135,7 @@ watch(loginDay, value => {
       <!-- 国际化 -->
       <el-dropdown trigger="click">
         <globalization
-          class="hover:text-primary hover:bg-transparent! w-[20px] h-[20px] ml-1.5 cursor-pointer outline-hidden duration-300"
+          class="hover:text-primary hover:bg-[transparent]! w-[20px] h-[20px] ml-1.5 cursor-pointer outline-hidden duration-300"
         />
         <template #dropdown>
           <el-dropdown-menu class="translation">
@@ -340,7 +340,7 @@ watch(loginDay, value => {
     >
       Copyright © 2020-present
       <a
-        class="hover:text-primary!"
+        class="hover:text-primary"
         href="https://github.com/pure-admin"
         target="_blank"
       >

src/views/monitor/logs/login/index.vue

@@ -103,7 +103,7 @@ const {
         <div
           v-if="selectedNum > 0"
           v-motion-fade
-          class="bg-(--el-fill-color-light) w-full h-[46px] mb-2 pl-4 flex items-center"
+          class="bg-[var(--el-fill-color-light)] w-full h-[46px] mb-2 pl-4 flex items-center"
         >
           <div class="flex-auto">
             <span
@@ -118,7 +118,7 @@ const {
           </div>
           <el-popconfirm title="是否确认删除?" @confirm="onbatchDel">
             <template #reference>
-              <el-button type="danger" text class="mr-1!"> 批量删除 </el-button>
+              <el-button type="danger" text class="mr-1"> 批量删除 </el-button>
             </template>
           </el-popconfirm>
         </div>

src/views/monitor/logs/operation/index.vue

@@ -103,7 +103,7 @@ const {
         <div
           v-if="selectedNum > 0"
           v-motion-fade
-          class="bg-(--el-fill-color-light) w-full h-[46px] mb-2 pl-4 flex items-center"
+          class="bg-[var(--el-fill-color-light)] w-full h-[46px] mb-2 pl-4 flex items-center"
         >
           <div class="flex-auto">
             <span
@@ -118,7 +118,7 @@ const {
           </div>
           <el-popconfirm title="是否确认删除?" @confirm="onbatchDel">
             <template #reference>
-              <el-button type="danger" text class="mr-1!"> 批量删除 </el-button>
+              <el-button type="danger" text class="mr-1"> 批量删除 </el-button>
             </template>
           </el-popconfirm>
         </div>

src/views/monitor/logs/system/index.vue

@@ -95,7 +95,7 @@ const {
         <div
           v-if="selectedNum > 0"
           v-motion-fade
-          class="bg-(--el-fill-color-light) w-full h-[46px] mb-2 pl-4 flex items-center"
+          class="bg-[var(--el-fill-color-light)] w-full h-[46px] mb-2 pl-4 flex items-center"
         >
           <div class="flex-auto">
             <span
@@ -110,7 +110,7 @@ const {
           </div>
           <el-popconfirm title="是否确认删除?" @confirm="onbatchDel">
             <template #reference>
-              <el-button type="danger" text class="mr-1!"> 批量删除 </el-button>
+              <el-button type="danger" text class="mr-1"> 批量删除 </el-button>
             </template>
           </el-popconfirm>
         </div>

src/views/system/user/index.vue

@@ -128,7 +128,7 @@ const {
           <div
             v-if="selectedNum > 0"
             v-motion-fade
-            class="bg-(--el-fill-color-light) w-full h-[46px] mb-2 pl-4 flex items-center"
+            class="bg-[var(--el-fill-color-light)] w-full h-[46px] mb-2 pl-4 flex items-center"
           >
             <div class="flex-auto">
               <span
@@ -143,7 +143,7 @@ const {
             </div>
             <el-popconfirm title="是否确认删除?" @confirm="onbatchDel">
               <template #reference>
-                <el-button type="danger" text class="mr-1!">
+                <el-button type="danger" text class="mr-1">
                   批量删除
                 </el-button>
               </template>

src/views/system/user/tree.vue

@@ -117,7 +117,7 @@ defineExpose({ onTreeReset });
         </template>
       </el-input>
       <el-dropdown :hide-on-click="false">
-        <More2Fill class="w-[28px] cursor-pointer outline-hidden" />
+        <More2Fill class="w-[28px] cursor-pointer outline-none" />
         <template #dropdown>
           <el-dropdown-menu>
             <el-dropdown-item>

src/views/system/user/utils/hook.tsx

@@ -419,7 +419,7 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
               />
             </ElFormItem>
           </ElForm>
-          <div class="my-4 flex">
+          <div class="mt-4 flex">
             {pwdProgress.map(({ color, text }, idx) => (
               <div
                 class="w-[19vw]"

src/views/table/base/fluidHeight.vue

@@ -77,6 +77,8 @@ const onAddItem = () => {
         </el-button>
       </template>
     </pure-table>
-    <el-button class="w-full mt-4!" @click="onAddItem"> Add Item </el-button>
+    <el-button class="mt-4" style="width: 100%" @click="onAddItem">
+      Add Item
+    </el-button>
   </div>
 </template>

src/views/table/high/excel/index.vue

@@ -6,7 +6,7 @@ const { columns, dataList, exportExcel } = useColumns();
 
 <template>
   <div>
-    <el-button type="primary" class="mb-[20px]!" @click="exportExcel">
+    <el-button type="primary" class="mb-[20px]" @click="exportExcel">
       导出
     </el-button>
     <pure-table row-key="id" border :data="dataList" :columns="columns" />

src/views/table/high/header/index.vue

@@ -9,7 +9,7 @@ const { columns, dataList, onChange } = useColumns();
 
 <template>
   <div>
-    <el-button type="primary" class="mb-[20px]!" @click="onChange">
+    <el-button type="primary" class="mb-[20px]" @click="onChange">
       切换表头
     </el-button>
     <pure-table

src/views/table/high/prints/index.vue

@@ -9,7 +9,7 @@ const { columns, dataList, print, cellStyle, rowStyle, headerCellStyle } =
 
 <template>
   <div>
-    <el-button type="primary" class="mb-[20px]!" @click="print">
+    <el-button type="primary" class="mb-[20px]" @click="print">
       打印
     </el-button>
     <!-- rowHoverBgColor="transparent" 鼠标经过行时，去掉行的背景色 -->

src/views/tabs/index.vue

@@ -62,7 +62,7 @@ function onCloseTags() {
       <el-button
         v-for="index in 6"
         :key="index"
-        class="m-2!"
+        class="m-2"
         @click="toDetail({ id: index }, 'query')"
       >
         打开{{ index }}详情页
@@ -83,7 +83,7 @@ function onCloseTags() {
       <el-button
         v-for="index in 6"
         :key="index"
-        class="m-2!"
+        class="m-2"
         @click="toDetail({ id: index }, 'params')"
       >
         打开{{ index }}详情页
@@ -112,7 +112,7 @@ function onCloseTags() {
         <span>{{ transformI18n(data.meta.title) }}</span>
       </template>
     </el-tree-select>
-    <el-button class="m-2!" @click="onCloseTags">关闭标签</el-button>
+    <el-button class="m-2" @click="onCloseTags">关闭标签</el-button>
 
     <el-divider />
     <el-button @click="router.push({ name: 'Menu1-2-2' })">

types/global.d.ts

@@ -93,7 +93,7 @@ declare global {
     Layout?: string;
     Theme?: string;
     DarkMode?: boolean;
-    ThemeMode?: string;
+    OverallStyle?: string;
     Grey?: boolean;
     Weak?: boolean;
     HideTabs?: boolean;
@@ -140,7 +140,7 @@ declare global {
     sidebarStatus?: boolean;
     epThemeColor?: string;
     themeColor?: string;
-    themeMode?: string;
+    overallStyle?: string;
     showLogo?: boolean;
     showModel?: string;
     menuSearchHistory?: number;
@@ -169,7 +169,7 @@ declare global {
       sidebarStatus?: boolean;
       epThemeColor?: string;
       themeColor?: string;
-      themeMode?: string;
+      overallStyle?: string;
     };
     configure: {
       grey?: boolean;

types/router.d.ts

@@ -56,8 +56,6 @@ declare global {
      * 而通过设置`activePath`指定激活菜单即可获得高亮，`activePath`为指定激活菜单的`path`）
      */
     activePath?: string;
-    /** 当前页面是否已经加载过 */
-    loaded?: boolean;
   }
 
   /**