Merge branch 'main' into pages

.gitignore

@@ -1,10 +1,9 @@
 node_modules
 .DS_Store
-dist
-dist-ssr
 *.local
 .eslintcache
 report.html
+dist
 vite.config.*.timestamp*
 
 yarn.lock

.husky/commit-msg

@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# shellcheck source=./_/husky.sh
-. "$(dirname "$0")/_/husky.sh"
-
-PATH="/usr/local/bin:$PATH"
-
-pnpm dlx commitlint --edit "$1"

.husky/common.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-command_exists () {
-  command -v "$1" >/dev/null 2>&1
-}
-
-# Workaround for Windows 10, Git Bash and Pnpm
-if command_exists winpty && test -t 1; then
-  exec < /dev/tty
-fi

.husky/pre-commit

@@ -1,10 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-. "$(dirname "$0")/common.sh"
-
-[ -n "$CI" ] && exit 0
-
-PATH="/usr/local/bin:$PATH"
-
-# Perform lint check on files in the staging area through .lintstagedrc configuration
-pnpm exec lint-staged

.nvmrc

@@ -1 +1 @@
-v24.12.0
+v22.20.0

CHANGELOG.en_US.md

@@ -1,27 +1,3 @@
-# 6.3.0 (2025-12-10)
-
-### ✔️ Refactor
-
-- Renamed "Overall Style" in system configuration to "Theme Mode" and "Navigation Mode" to "Menu Layout" to improve naming professionalism and clarity.
-- Migrated the deprecated `tseslint.config` configuration method of `typescript-eslint`.
-
-### 🎫 Feat
-
-- Added a color picker panel component.
-
-### 🐞 Bug fixes
-
-- Fixed an issue where the selected/activated state style of the navigation menu was displayed incorrectly when using `iconfont` icons.
-- Fixed a style issue with the column settings pop-up of the `RePureTableBar` and `ReVxeTableBar` components.
-
-### 🍏 Perf
-
-- Adapting the `ReDialog` component to the latest version of `el-dialog` with API changes and supplementary examples
-- Adapting the `ReDrawer` component to the latest version of `el-drawer` with API changes and supplementary examples
-- Adapting the `message` utility function to the latest version of `ElMessage` with API changes and supplementary examples
-- Importing the latest version of `element-plus` components
-- Optimizing the tab layout and style for Google Chrome mode
-
 # 6.2.0 (2025-10-16)
 
 ### 🎫 Features

CHANGELOG.md

@@ -1,27 +1,3 @@
-# 6.3.0 (2025-12-10)
-
-### ✔️ Refactor
-
-- Renamed "Overall Style" in system configuration to "Theme Mode" and "Navigation Mode" to "Menu Layout" to improve naming professionalism and clarity.
-- Migrated the deprecated `tseslint.config` configuration method of `typescript-eslint`.
-
-### 🎫 Feat
-
-- Added a color picker panel component.
-
-### 🐞 Bug fixes
-
-- Fixed an issue where the selected/activated state style of the navigation menu was displayed incorrectly when using `iconfont` icons.
-- Fixed a style issue with the column settings pop-up of the `RePureTableBar` and `ReVxeTableBar` components.
-
-### 🍏 Perf
-
-- Adapting the `ReDialog` component to the latest version of `el-dialog` with API changes and supplementary examples
-- Adapting the `ReDrawer` component to the latest version of `el-drawer` with API changes and supplementary examples
-- Adapting the `message` utility function to the latest version of `ElMessage` with API changes and supplementary examples
-- Importing the latest version of `element-plus` components
-- Optimizing the tab layout and style for Google Chrome mode
-
 # 6.2.0 (2025-10-16)
 
 ### 🎫 Features

CHANGELOG.zh_CN.md

@@ -1,32 +1,8 @@
-# 6.3.0 (2025-12-10)
-
-### ✔️ Refactor
-
-- 将系统配置中的“整体风格”更名为“主题模式”，“导航模式”更名为“菜单布局”，以提升命名的专业性与清晰度
-- 迁移`typescript-eslint`已弃用的`tseslint.config`配置方式
-
-### 🎫 Feat
-
-- 添加颜色选择器面板组件
-
-### 🐞 Bug fixes
-
-- 修复导航菜单在使用`iconfont`图标时，选中/激活状态的样式显示异常问题
-- 修复`RePureTableBar`和`ReVxeTableBar`组件的列设置弹窗样式问题
-
-### 🍏 Perf
-
-- `ReDialog`组件适配`el-dialog`最新版本的`API`变更以及补充相关示例
-- `ReDrawer`组件适配`el-drawer`最新版本的`API`变更以及补充相关示例
-- `message`工具函数适配`ElMessage`最新版本的`API`变更以及补充相关示例
-- 导入`element-plus`最新版本的新组件
-- 优化页签风格为谷歌模式下的布局和样式
-
 # 6.2.0 (2025-10-16)
 
 ### 🎫 Feat
 
-- 添加全屏`403`、`404`、`500`页面，全屏错误页面清晰且安全，提升用户体验
+-  添加全屏`403`、`404`、`500`页面，全屏错误页面清晰且安全，提升用户体验
 
 ### 🐞 Bug fixes
 
@@ -50,7 +26,7 @@
 
 ### 🐞 Bug fixes
 
-- 修复`ReSegmented`分段控制器组件在浅色和深色主题模式切换时的闪烁问题
+- 修复`ReSegmented`分段控制器组件在浅色和深色整体风格切换时的闪烁问题
 - 修复`resetRouter`未清空全部路由数据问题
 - 修复标签页-关闭左侧标签页关闭异常问题
 
@@ -255,8 +231,8 @@
 
 - 修复`windwos`下点击注册页面会出现滚动条问题
 - 修复`windows`下页面切换，内容区会出现滚动条问题
-- 修复`pure-table`带状态表格在深色主题模式下状态样式消失的问题
+- 修复`pure-table`带状态表格在深色整体风格下状态样式消失的问题
-- 修复系统配置中开启灰色模式和深色主题模式，刷新页面主题模式异常
+- 修复系统配置中开启灰色模式和深色整体风格，刷新页面整体风格异常
 
 ### 🍏 Perf
 
@@ -309,7 +285,7 @@
 - 内嵌`iframe`页支持设置`keepAlive`，保持页面状态
 - 优化导航，弹出的菜单超出内容区自适应且可滚动
 - 添加文件上传示例
-- 添加主题模式自适应操作系统浅色、深色、自动主题功能
+- 添加整体风格自适应操作系统浅色、深色、自动主题功能
 - 添加页脚
 - 支持多标签页打开已经登录的系统后无需再登录并添加内免登录功能（用户可选择免登录的天数）
 - 带来高级感的终端命令行
@@ -509,7 +485,7 @@
 - 修复菜单搜索功能弹框打开后搜索框未自动聚集的问题
 - 修复按 `ESC` 退出全屏后，工具栏按钮文案展示问题
 - 修复移动端通知栏 `tooltip` 点击穿透问题
-- 修复当左侧菜单收起后，切换到 `horizontal` 菜单布局时文字不展示的问题
+- 修复当左侧菜单收起后，切换到 `horizontal` 导航模式时文字不展示的问题
 - 修复导航 `tab` 关闭其他标签页无法重置状态问题
 - 修复 `getHistoryMode` 函数中环境变量未初始化带来的页面热更新报错
 - 修复导航 `tab` 过多导致关闭左侧标签页无法正常显示

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,21 +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",
-        rootFontSize: 16
-      }
-    }
   }
 ]);

index.html

@@ -1,84 +1,94 @@
 <!doctype html>
 <html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <meta name="renderer" content="webkit" />
-    <meta
-      name="viewport"
-      content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0"
-    />
-    <title>vue-pure-admin</title>
-    <link rel="icon" href="/favicon.ico" />
-  </head>
 
-  <body>
+<head>
-    <div id="app">
+  <meta charset="UTF-8" />
-      <style>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-        html,
+  <meta name="renderer" content="webkit" />
-        body,
+  <meta name="viewport"
-        #app {
+    content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=0" />
-          position: relative;
+  <title>vue-pure-admin</title>
-          display: flex;
+  <link rel="icon" href="/favicon.ico" />
-          align-items: center;
+  <script>
-          justify-content: center;
+    var _hmt = _hmt || [];
-          width: 100%;
+    (function () {
-          height: 100%;
+      var hm = document.createElement("script")
-          overflow: hidden;
+      hm.src = "https://hm.baidu.com/hm.js?d3824e75ef2bf6d851035f74ae1aec68"
+      var s = document.getElementsByTagName("script")[0]
+      s.parentNode.insertBefore(hm, s)
+    })();
+  </script>
+</head>
+
+<body>
+  <div id="app">
+    <style>
+      html,
+      body,
+      #app {
+        position: relative;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+      }
+
+      .loader,
+      .loader::before,
+      .loader::after {
+        width: 2.5em;
+        height: 2.5em;
+        border-radius: 50%;
+        animation: load-animation 1.8s infinite ease-in-out;
+        animation-fill-mode: both;
+      }
+
+      .loader {
+        position: relative;
+        top: 0;
+        margin: 80px auto;
+        font-size: 10px;
+        color: #406eeb;
+        text-indent: -9999em;
+        transform: translateZ(0);
+        transform: translate(-50%, 0);
+        animation-delay: -0.16s;
+      }
+
+      .loader::before,
+      .loader::after {
+        position: absolute;
+        top: 0;
+        content: "";
+      }
+
+      .loader::before {
+        left: -3.5em;
+        animation-delay: -0.32s;
+      }
+
+      .loader::after {
+        left: 3.5em;
+      }
+
+      @keyframes load-animation {
+
+        0%,
+        80%,
+        100% {
+          box-shadow: 0 2.5em 0 -1.3em;
         }
 
-        .loader,
+        40% {
-        .loader::before,
+          box-shadow: 0 2.5em 0 0;
-        .loader::after {
-          width: 2.5em;
-          height: 2.5em;
-          border-radius: 50%;
-          animation: load-animation 1.8s infinite ease-in-out;
-          animation-fill-mode: both;
         }
+      }
+    </style>
+    <div class="loader"></div>
+  </div>
+  <script type="module" src="/src/main.ts"></script>
+</body>
 
-        .loader {
+</html>
-          position: relative;
-          top: 0;
-          margin: 80px auto;
-          font-size: 10px;
-          color: #406eeb;
-          text-indent: -9999em;
-          transform: translateZ(0);
-          transform: translate(-50%, 0);
-          animation-delay: -0.16s;
-        }
-
-        .loader::before,
-        .loader::after {
-          position: absolute;
-          top: 0;
-          content: "";
-        }
-
-        .loader::before {
-          left: -3.5em;
-          animation-delay: -0.32s;
-        }
-
-        .loader::after {
-          left: 3.5em;
-        }
-
-        @keyframes load-animation {
-          0%,
-          80%,
-          100% {
-            box-shadow: 0 2.5em 0 -1.3em;
-          }
-
-          40% {
-            box-shadow: 0 2.5em 0 0;
-          }
-        }
-      </style>
-      <div class="loader"></div>
-    </div>
-    <script type="module" src="/src/main.ts"></script>
-  </body>
-</html>

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
@@ -238,19 +238,4 @@ login:
   purePassWordRuleReg: The password format should be any combination of 8-18 digits
   purePassWordSureReg: Please enter confirm password
   purePassWordDifferentReg: The two passwords do not match!
-  purePassWordUpdateReg: Password has been updated
+  purePassWordUpdateReg: Password has been updated
-  pureLoginExpired: Login expired, please login again
-tableBar:
-  pureList: List
-  pureLarge: Large
-  pureDefault: Default
-  pureSmall: Small
-  pureColumnSettings: ColumnSettings
-  pureCollapse: Collapse
-  pureExpand: Expand
-  pureRefresh: Refresh
-  pureDensity: Density
-  pureColumnDisplay: ColumnDisplay
-  pureReset: Reset
-  pureExitFullScreen: ExitFullScreen
-  pureFullScreen: FullScreen

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: 混合菜单，灵活多变
@@ -238,19 +238,4 @@ login:
   purePassWordRuleReg: 密码格式应为8-18位数字、字母、符号的任意两种组合
   purePassWordSureReg: 请输入确认密码
   purePassWordDifferentReg: 两次密码不一致!
-  purePassWordUpdateReg: 修改密码成功
+  purePassWordUpdateReg: 修改密码成功
-  pureLoginExpired: 登录已过期，请重新登录
-tableBar:
-  pureList: 列表
-  pureLarge: 宽松
-  pureDefault: 默认
-  pureSmall: 紧凑
-  pureColumnSettings: 列设置
-  pureCollapse: 折叠
-  pureExpand: 展开
-  pureRefresh: 刷新
-  pureDensity: 密度
-  pureColumnDisplay: 列展示
-  pureReset: 重置
-  pureExitFullScreen: 退出全屏
-  pureFullScreen: 全屏

mock/asyncRoutes.ts

@@ -326,8 +326,7 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: [
           systemManagementRouter,
           systemMonitorRouter,

mock/list.ts

@@ -6,8 +6,7 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: {
           list: [
             {

mock/login.ts

@@ -8,8 +8,7 @@ export default defineFakeRoute([
     response: ({ body }) => {
       if (body.username === "admin") {
         return {
-          code: 0,
+          success: true,
-          message: "操作成功",
           data: {
             avatar: "https://avatars.githubusercontent.com/u/44761321",
             username: "admin",
@@ -25,8 +24,7 @@ export default defineFakeRoute([
         };
       } else {
         return {
-          code: 0,
+          success: true,
-          message: "操作成功",
           data: {
             avatar: "https://avatars.githubusercontent.com/u/52823142",
             username: "common",

mock/map.ts

@@ -33,8 +33,7 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: mapList()
       };
     }

mock/mine.ts

@@ -8,8 +8,7 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: {
           avatar: "https://avatars.githubusercontent.com/u/44761321",
           username: "admin",
@@ -47,8 +46,7 @@ export default defineFakeRoute([
         }
       ];
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数

mock/refreshToken.ts

@@ -8,8 +8,7 @@ export default defineFakeRoute([
     response: ({ body }) => {
       if (body.refreshToken) {
         return {
-          code: 0,
+          success: true,
-          message: "操作成功",
           data: {
             accessToken: "eyJhbGciOiJIUzUxMiJ9.newAdmin",
             refreshToken: "eyJhbGciOiJIUzUxMiJ9.newAdminRefresh",
@@ -19,8 +18,7 @@ export default defineFakeRoute([
         };
       } else {
         return {
-          code: 10001,
+          success: false,
-          message: "请求参数缺失或格式不正确",
           data: {}
         };
       }

mock/system.ts

@@ -50,8 +50,7 @@ export default defineFakeRoute([
       if (body.phone) list = list.filter(item => item.phone === body.phone);
       if (body.deptId) list = list.filter(item => item.dept.id === body.deptId);
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -67,8 +66,7 @@ export default defineFakeRoute([
     method: "get",
     response: () => {
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: [
           { id: 1, name: "超级管理员" },
           { id: 2, name: "普通角色" }
@@ -84,21 +82,18 @@ export default defineFakeRoute([
       if (body.userId) {
         if (body.userId == 1) {
           return {
-            code: 0,
+            success: true,
-            message: "操作成功",
             data: [1]
           };
         } else if (body.userId == 2) {
           return {
-            code: 0,
+            success: true,
-            message: "操作成功",
             data: [2]
           };
         }
       } else {
         return {
-          code: 10001,
+          success: false,
-          message: "请求参数缺失或格式不正确",
           data: []
         };
       }
@@ -135,8 +130,7 @@ export default defineFakeRoute([
       );
       if (body.code) list = list.filter(item => item.code === body.code);
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -152,8 +146,7 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: [
           // 外部页面
           {
@@ -357,8 +350,7 @@ export default defineFakeRoute([
     response: ({ body }) => {
       if (body.id == 1) {
         return {
-          code: 0,
+          success: true,
-          message: "操作成功",
           data: [
             100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 200, 201,
             202, 203, 204, 205, 300, 301, 302, 303, 304, 400, 401, 402, 403,
@@ -367,8 +359,7 @@ export default defineFakeRoute([
         };
       } else if (body.id == 2) {
         return {
-          code: 0,
+          success: true,
-          message: "操作成功",
           data: [
             100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 404, 500,
             501, 502, 503
@@ -383,8 +374,7 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: [
           // 外部页面
           {
@@ -1265,8 +1255,7 @@ export default defineFakeRoute([
     method: "post",
     response: () => {
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: [
           {
             name: "杭州总公司",
@@ -1429,8 +1418,7 @@ export default defineFakeRoute([
       ];
       list = list.filter(item => item.username.includes(body?.username));
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1474,8 +1462,7 @@ export default defineFakeRoute([
         String(item.status).includes(String(body?.status))
       );
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1521,8 +1508,7 @@ export default defineFakeRoute([
         String(item.status).includes(String(body?.status))
       );
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1580,8 +1566,7 @@ export default defineFakeRoute([
       ];
       list = list.filter(item => item.module.includes(body?.module));
       return {
-        code: 0,
+        success: true,
-        message: "操作成功",
         data: {
           list,
           total: list.length, // 总条目数
@@ -1616,8 +1601,7 @@ export default defineFakeRoute([
             "Content-Length": 17019
           },
           responseBody: {
-            code: 0,
+            success: true,
-            message: "操作成功",
             data: [
               {
                 parentId: 0,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-pure-admin",
-  "version": "6.3.0",
+  "version": "6.2.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -54,126 +54,125 @@
     "@logicflow/extension": "^1.2.28",
     "@pureadmin/descriptions": "^1.2.1",
     "@pureadmin/table": "^3.3.0",
-    "@pureadmin/utils": "^2.6.3",
+    "@pureadmin/utils": "^2.6.2",
     "@vue-flow/background": "^1.3.2",
-    "@vue-flow/core": "^1.48.1",
+    "@vue-flow/core": "^1.47.0",
-    "@vueuse/core": "^14.1.0",
+    "@vueuse/core": "^13.9.0",
     "@vueuse/motion": "^3.0.3",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "@zxcvbn-ts/core": "^3.0.4",
     "animate.css": "^4.1.1",
-    "axios": "^1.13.2",
+    "axios": "^1.12.2",
     "china-area-data": "^5.0.1",
     "codemirror": "^5.65.20",
     "codemirror-editor-vue3": "^2.8.0",
     "cropperjs": "^1.6.2",
-    "dayjs": "^1.11.19",
+    "dayjs": "^1.11.18",
-    "deep-chat": "^2.4.1",
+    "deep-chat": "^2.2.2",
     "echarts": "^6.0.0",
-    "el-table-infinite-scroll": "^3.0.8",
+    "el-table-infinite-scroll": "^3.0.7",
-    "element-plus": "^2.13.1",
+    "element-plus": "^2.11.7",
     "highlight.js": "^11.11.1",
     "intro.js": "^7.2.0",
     "js-cookie": "^3.0.5",
-    "jsbarcode": "^3.12.3",
+    "jsbarcode": "^3.12.1",
     "localforage": "^1.10.0",
     "mint-filter": "^4.0.3",
     "mitt": "^3.0.1",
     "mqtt": "4.3.7",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
-    "pinia": "^3.0.4",
+    "pinia": "^3.0.3",
     "pinyin-pro": "^3.27.0",
-    "plus-pro-components": "^0.1.30",
+    "plus-pro-components": "^0.1.29",
     "qrcode": "^1.5.4",
-    "qs": "^6.14.1",
+    "qs": "^6.14.0",
     "responsive-storage": "^2.2.0",
     "sortablejs": "^1.15.6",
-    "swiper": "^12.0.3",
+    "swiper": "^12.0.2",
     "typeit": "^8.8.7",
     "v-contextmenu": "^3.2.0",
     "v3-infinite-loading": "^1.3.2",
     "vditor": "^3.11.2",
     "version-rocket": "^1.7.4",
-    "vue": "^3.5.26",
+    "vue": "^3.5.22",
-    "vue-i18n": "^11.2.8",
+    "vue-i18n": "^11.1.12",
-    "vue-json-pretty": "^2.6.0",
+    "vue-json-pretty": "^2.5.0",
     "vue-pdf-embed": "^2.1.3",
-    "vue-router": "^4.6.4",
+    "vue-router": "^4.5.1",
     "vue-tippy": "^6.7.1",
     "vue-types": "^6.0.0",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vue-waterfall-plugin-next": "^2.6.9",
-    "vue3-danmaku": "^1.6.7",
+    "vue3-danmaku": "^1.6.6",
     "vue3-puzzle-vcode": "^1.1.7",
     "vuedraggable": "^4.1.0",
     "vxe-table": "4.6.25",
-    "wavesurfer.js": "^7.12.1",
+    "wavesurfer.js": "^7.11.0",
     "xgplayer": "^3.0.23",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@commitlint/cli": "^20.3.1",
+    "@commitlint/cli": "^20.1.0",
-    "@commitlint/config-conventional": "^20.3.1",
+    "@commitlint/config-conventional": "^20.0.0",
-    "@commitlint/types": "^20.3.1",
+    "@commitlint/types": "^20.0.0",
-    "@eslint/js": "^9.39.2",
+    "@eslint/js": "^9.37.0",
-    "@faker-js/faker": "^10.2.0",
+    "@faker-js/faker": "^10.0.0",
-    "@iconify/json": "^2.2.428",
+    "@iconify/json": "^2.2.393",
     "@iconify/vue": "4.2.0",
-    "@intlify/unplugin-vue-i18n": "^11.0.3",
+    "@intlify/unplugin-vue-i18n": "^11.0.1",
-    "@tailwindcss/vite": "^4.1.18",
+    "@tailwindcss/vite": "^4.1.14",
-    "@types/codemirror": "^5.60.17",
+    "@types/codemirror": "^5.60.16",
     "@types/dagre": "^0.7.53",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.19.30",
+    "@types/node": "^20.19.19",
     "@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/sortablejs": "^1.15.9",
+    "@types/sortablejs": "^1.15.8",
-    "@vitejs/plugin-vue": "^6.0.3",
+    "@vitejs/plugin-vue": "^6.0.1",
-    "@vitejs/plugin-vue-jsx": "^5.1.3",
+    "@vitejs/plugin-vue-jsx": "^5.1.1",
     "boxen": "^8.0.1",
-    "code-inspector-plugin": "^1.3.4",
+    "code-inspector-plugin": "^1.2.10",
-    "cssnano": "^7.1.2",
+    "cssnano": "^7.1.1",
     "dagre": "^0.8.5",
-    "eslint": "^9.39.2",
+    "eslint": "^9.37.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-better-tailwindcss": "^4.0.1",
+    "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-prettier": "^5.5.5",
+    "eslint-plugin-vue": "^10.5.0",
-    "eslint-plugin-vue": "^10.6.2",
     "gradient-string": "^3.0.0",
     "husky": "^9.1.7",
-    "lint-staged": "^16.2.7",
+    "lint-staged": "^16.2.3",
     "postcss": "^8.5.6",
-    "postcss-html": "^1.8.1",
+    "postcss-html": "^1.8.0",
     "postcss-load-config": "^6.0.1",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.8.0",
+    "prettier": "^3.6.2",
-    "rimraf": "^6.1.2",
+    "rimraf": "^6.0.1",
-    "rollup-plugin-visualizer": "^6.0.5",
+    "rollup-plugin-visualizer": "^6.0.4",
-    "sass": "^1.97.2",
+    "sass": "^1.93.2",
-    "stylelint": "^17.0.0",
+    "stylelint": "^16.25.0",
-    "stylelint-config-recess-order": "^7.4.0",
+    "stylelint-config-recess-order": "^7.3.0",
     "stylelint-config-recommended-vue": "^1.6.1",
-    "stylelint-config-standard-scss": "^17.0.0",
+    "stylelint-config-standard-scss": "^14.0.0",
     "stylelint-prettier": "^5.0.3",
     "svgo": "^4.0.0",
-    "tailwindcss": "^4.1.18",
+    "tailwindcss": "^4.1.14",
     "typescript": "^5.9.3",
-    "typescript-eslint": "^8.53.0",
+    "typescript-eslint": "^8.46.0",
-    "unplugin-icons": "^23.0.1",
+    "unplugin-icons": "^22.4.2",
-    "vite": "^7.3.1",
+    "vite": "^7.1.9",
     "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": "^2.0.0",
+    "vite-plugin-router-warn": "^1.0.0",
     "vite-svg-loader": "^5.1.0",
     "vue-eslint-parser": "^10.2.0",
-    "vue-tsc": "^3.2.2"
+    "vue-tsc": "^3.1.1"
   },
   "engines": {
     "node": "^20.19.0 || >=22.13.0",
@@ -207,4 +206,4 @@
       "vue3-danmaku"
     ]
   }
-}
+}

public/platform-config.json

@@ -1,5 +1,5 @@
 {
-  "Version": "6.3.0",
+  "Version": "6.2.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/App.vue

@@ -7,9 +7,8 @@
 </template>
 
 <script lang="ts">
-import { useGlobal } from "@pureadmin/utils";
+import { defineComponent } from "vue";
 import { checkVersion } from "version-rocket";
-import { defineComponent, computed } from "vue";
 import { ElConfigProvider } from "element-plus";
 import { ReDialog } from "@/components/ReDialog";
 import { ReDrawer } from "@/components/ReDrawer";
@@ -17,6 +16,7 @@ import en from "element-plus/es/locale/lang/en";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 import plusEn from "plus-pro-components/es/locale/lang/en";
 import plusZhCn from "plus-pro-components/es/locale/lang/zh-cn";
+import { ElNotification } from "element-plus";
 
 export default defineComponent({
   name: "app",
@@ -25,16 +25,12 @@ export default defineComponent({
     ReDialog,
     ReDrawer
   },
-  setup() {
+  computed: {
-    const { $storage } = useGlobal<GlobalPropertiesApi>();
+    currentLocale() {
-    const currentLocale = computed(() => {
+      return this.$storage.locale?.locale === "zh"
-      return $storage.locale?.locale === "zh"
         ? { ...zhCn, ...plusZhCn }
         : { ...en, ...plusEn };
-    });
+    }
-    return {
-      currentLocale
-    };
   },
   beforeCreate() {
     const { version, name: title } = __APP_INFO__.pkg;
@@ -59,5 +55,31 @@ export default defineComponent({
       );
     }
   }
+  // mounted() {
+  //   ElNotification({
+  //     title: "平台最新活动与动态",
+  //     duration: 0,
+  //     customClass: "fullpage-notification",
+  //     // @ts-expect-error
+  //     style: { width: "260px" },
+  //     position: "bottom-right",
+  //     dangerouslyUseHTMLString: true,
+  //     message: `
+  //       <a target='_blank' class='block text-base text-center border mt-4 rounded hover:text-[red]!' href='https://pure-admin.cn/pages/service/#%E6%9C%80%E6%96%B0%E6%B4%BB%E5%8A%A8%E4%B8%8E%E5%8A%A8%E6%80%81'>
+  //       点我查看
+  //       </a>
+  //     `
+  //   });
+  // }
 });
 </script>
+
+<style>
+.fullpage-notification > .el-notification__group > .el-notification__closeBtn {
+  top: 15px;
+}
+.fullpage-notification > div > h2 {
+  color: red;
+  font-size: 18px;
+}
+</style>

src/api/list.ts

@@ -1,8 +1,7 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  code: number;
+  success: boolean;
-  message: string;
   data?: {
     /** 列表数据 */
     list: Array<any>;

src/api/mock.ts

@@ -1,8 +1,7 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  code: number;
+  success: boolean;
-  message: string;
   data: Array<any>;
 };
 
@@ -15,7 +14,7 @@ export const mapJson = (params?: object) => {
 export const formUpload = data => {
   return http.request<Result>(
     "post",
-    "https://pureadmin.free.beeceptor.com/images",
+    "https://run.mocky.io/v3/3aa761d7-b0b3-4a03-96b3-6168d4f7467b",
     { data },
     {
       headers: {

src/api/routes.ts

@@ -1,8 +1,7 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  code: number;
+  success: boolean;
-  message: string;
   data: Array<any>;
 };
 

src/api/system.ts

@@ -1,14 +1,12 @@
 import { http } from "@/utils/http";
 
 type Result = {
-  code: number;
+  success: boolean;
-  message: string;
   data?: Array<any>;
 };
 
 type ResultTable = {
-  code: number;
+  success: boolean;
-  message: string;
   data?: {
     /** 列表数据 */
     list: Array<any>;

src/api/user.ts

@@ -1,8 +1,7 @@
 import { http } from "@/utils/http";
 
 export type UserResult = {
-  code: number;
+  success: boolean;
-  message: string;
   data: {
     /** 头像 */
     avatar: string;
@@ -24,8 +23,7 @@ export type UserResult = {
 };
 
 export type RefreshTokenResult = {
-  code: number;
+  success: boolean;
-  message: string;
   data: {
     /** `token` */
     accessToken: string;
@@ -52,14 +50,12 @@ export type UserInfo = {
 };
 
 export type UserInfoResult = {
-  code: number;
+  success: boolean;
-  message: string;
   data: UserInfo;
 };
 
 type ResultTable = {
-  code: number;
+  success: boolean;
-  message: string;
   data?: {
     /** 列表数据 */
     list: Array<any>;

src/components/ReAnimateSelector/src/index.vue

@@ -23,15 +23,17 @@ const copyAnimatesList = cloneDeep(animatesList);
 const animateClass = computed(() => {
   return [
     "mt-1",
-    "flex-c",
+    "flex",
     "border",
-    "w-32.5",
+    "w-[130px]",
-    "h-25",
+    "h-[100px]",
+    "items-center",
     "cursor-pointer",
     "transition-all",
+    "justify-center",
     "border-[#e5e7eb]",
     "hover:text-primary",
-    "hover:duration-700"
+    "hover:duration-[700ms]"
   ];
 });
 
@@ -86,7 +88,7 @@ function onMouseleave() {
     @clear="onClear"
   >
     <template #empty>
-      <div class="w-70">
+      <div class="w-[280px]">
         <el-scrollbar
           noresize
           height="212px"

src/components/ReCropper/src/index.tsx

@@ -116,10 +116,11 @@ export default defineComponent({
 
     const iconClass = computed(() => {
       return [
-        "p-1.5",
+        "p-[6px]",
-        "size-7.5",
+        "h-[30px]",
-        "rounded-sm",
+        "w-[30px]",
         "outline-hidden",
+        "rounded-[4px]",
         "cursor-pointer",
         "hover:bg-[rgba(0,0,0,0.06)]"
       ];
@@ -251,7 +252,7 @@ export default defineComponent({
       },
       setup() {
         return () => (
-          <div class="flex flex-wrap w-15 justify-between">
+          <div class="flex flex-wrap w-[60px] justify-between">
             <ElUpload
               accept="image/*"
               show-file-list={false}

src/components/ReCropperPreview/src/index.vue

@@ -54,7 +54,7 @@ defineExpose({ hidePopover });
           </p>
         </div>
       </template>
-      <div class="flex-c flex-wrap text-center">
+      <div class="flex flex-wrap justify-center items-center text-center">
         <el-image
           v-if="cropperImg"
           :src="cropperImg"

src/components/ReDialog/index.vue

@@ -123,7 +123,10 @@ function handleClose(
       v-if="options?.fullscreenIcon || options?.headerRenderer"
       #header="{ close, titleId, titleClass }"
     >
-      <div v-if="options?.fullscreenIcon" class="flex-bc">
+      <div
+        v-if="options?.fullscreenIcon"
+        class="flex items-center justify-between"
+      >
         <span :id="titleId" :class="titleClass">{{ options?.title }}</span>
         <i
           v-if="!options?.fullscreen"

src/components/ReIcon/src/Select.vue

@@ -135,7 +135,9 @@ watch(
           @after-leave="onAfterLeave"
         >
           <template #reference>
-            <div class="w-10 h-8 cursor-pointer flex-c">
+            <div
+              class="w-[40px] h-[32px] cursor-pointer flex justify-center items-center"
+            >
               <IconifyIconOffline v-if="!icon" :icon="Search" />
               <IconifyIconOnline v-else :icon="inputValue" />
             </div>
@@ -161,7 +163,7 @@ watch(
                     v-for="(item, key) in pageList"
                     :key="key"
                     :title="item"
-                    class="icon-item p-2 cursor-pointer mr-2 mt-1 flex-c border border-[#e5e7eb]"
+                    class="icon-item p-2 cursor-pointer mr-2 mt-1 flex justify-center items-center border border-[#e5e7eb]"
                     :style="iconItemStyle(item)"
                     @click="onChangeIcon(item)"
                   >

src/components/ReMap/src/Amap.vue

@@ -92,16 +92,14 @@ onBeforeMount(() => {
 
       // 获取模拟车辆信息
       mapJson()
-        .then(({ code, data }) => {
+        .then(({ data }) => {
-          if (code === 0) {
+          const points: object = data.map(v => {
-            const points: object = data.map(v => {
+            return {
-              return {
+              lnglat: [v.lng, v.lat],
-                lnglat: [v.lng, v.lat],
+              ...v
-                ...v
+            };
-              };
+          });
-            });
+          if (MarkerCluster) MarkerCluster.setData(points);
-            if (MarkerCluster) MarkerCluster.setData(points);
-          }
         })
         .catch(err => {
           console.log("err:", err);

src/components/RePureTableBar/src/bar.tsx

@@ -1,5 +1,5 @@
 import Sortable from "sortablejs";
-import { $t, transformI18n } from "@/plugins/i18n";
+import { transformI18n } from "@/plugins/i18n";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import {
   type PropType,
@@ -30,7 +30,7 @@ const props = {
   /** 头部最左边的标题 */
   title: {
     type: String,
-    default: $t("tableBar.pureList")
+    default: "列表"
   },
   /** 对于树形表格，如果想启用展开和折叠功能，传入当前表格的ref即可 */
   tableRef: {
@@ -97,9 +97,9 @@ export default defineComponent({
       return [
         "flex",
         "justify-between",
-        "pt-0.75",
+        "pt-[3px]",
-        "px-2.75",
+        "px-[11px]",
-        "border-b",
+        "border-b-[1px]",
         "border-b-solid",
         "border-[#dcdfe6]",
         "dark:border-[#303030]"
@@ -169,19 +169,19 @@ export default defineComponent({
             style={getDropdownItemStyle.value("large")}
             onClick={() => (size.value = "large")}
           >
-            {transformI18n($t("tableBar.pureLarge"))}
+            宽松
           </el-dropdown-item>
           <el-dropdown-item
             style={getDropdownItemStyle.value("default")}
             onClick={() => (size.value = "default")}
           >
-            {transformI18n($t("tableBar.pureDefault"))}
+            默认
           </el-dropdown-item>
           <el-dropdown-item
             style={getDropdownItemStyle.value("small")}
             onClick={() => (size.value = "small")}
           >
-            {transformI18n($t("tableBar.pureSmall"))}
+            紧凑
           </el-dropdown-item>
         </el-dropdown-menu>
       )
@@ -244,10 +244,8 @@ export default defineComponent({
     const reference = {
       reference: () => (
         <SettingIcon
-          class={["w-4", iconClass.value]}
+          class={["w-[16px]", iconClass.value]}
-          v-tippy={rendTippyProps(
+          v-tippy={rendTippyProps("列设置")}
-            transformI18n($t("tableBar.pureColumnSettings"))
-          )}
         />
       )
     };
@@ -266,27 +264,25 @@ export default defineComponent({
               : "mt-2"
           ]}
         >
-          <div class="flex justify-between w-full h-15 p-4">
+          <div class="flex justify-between w-full h-[60px] p-4">
             {slots?.title ? (
               slots.title()
             ) : (
-              <p class="font-bold truncate">{transformI18n(props.title)}</p>
+              <p class="font-bold truncate">{props.title}</p>
             )}
-            <div class="flex-ac">
+            <div class="flex items-center justify-around">
               {slots?.buttons ? (
                 <div class="flex mr-4">{slots.buttons()}</div>
               ) : null}
               {props.tableRef?.size ? (
                 <>
                   <ExpandIcon
-                    class={["w-4", iconClass.value]}
+                    class={["w-[16px]", iconClass.value]}
                     style={{
                       transform: isExpandAll.value ? "none" : "rotate(-90deg)"
                     }}
                     v-tippy={rendTippyProps(
-                      isExpandAll.value
+                      isExpandAll.value ? "折叠" : "展开"
-                        ? transformI18n($t("tableBar.pureCollapse"))
-                        : transformI18n($t("tableBar.pureExpand"))
                     )}
                     onClick={() => onExpand()}
                   />
@@ -295,24 +291,20 @@ export default defineComponent({
               ) : null}
               <RefreshIcon
                 class={[
-                  "w-4",
+                  "w-[16px]",
                   iconClass.value,
                   loading.value ? "animate-spin" : ""
                 ]}
-                v-tippy={rendTippyProps(
+                v-tippy={rendTippyProps("刷新")}
-                  transformI18n($t("tableBar.pureRefresh"))
-                )}
                 onClick={() => onReFresh()}
               />
               <el-divider direction="vertical" />
               <el-dropdown
                 v-slots={dropdown}
                 trigger="click"
-                v-tippy={rendTippyProps(
+                v-tippy={rendTippyProps("密度")}
-                  transformI18n($t("tableBar.pureDensity"))
-                )}
               >
-                <CollapseIcon class={["w-4", iconClass.value]} />
+                <CollapseIcon class={["w-[16px]", iconClass.value]} />
               </el-dropdown>
               <el-divider direction="vertical" />
 
@@ -326,17 +318,17 @@ export default defineComponent({
                 <div class={[topClass.value]}>
                   <el-checkbox
                     class="-mr-1!"
-                    label={transformI18n($t("tableBar.pureColumnDisplay"))}
+                    label="列展示"
                     v-model={checkAll.value}
                     indeterminate={isIndeterminate.value}
                     onChange={value => handleCheckAllChange(value)}
                   />
                   <el-button type="primary" link onClick={() => onReset()}>
-                    {transformI18n($t("tableBar.pureReset"))}
+                    重置
                   </el-button>
                 </div>
 
-                <div class="pt-1.5 pl-2.75">
+                <div class="pt-[6px] pl-[11px]">
                   <el-scrollbar max-height="36vh">
                     <el-checkbox-group
                       ref={`GroupRef${unref(props.tableKey)}`}
@@ -353,7 +345,7 @@ export default defineComponent({
                             <div class="flex items-center">
                               <DragIcon
                                 class={[
-                                  "drag-btn w-4 mr-2",
+                                  "drag-btn w-[16px] mr-2",
                                   isFixedColumn(item)
                                     ? "cursor-no-drop!"
                                     : "cursor-grab!"
@@ -372,7 +364,7 @@ export default defineComponent({
                               >
                                 <span
                                   title={transformI18n(item)}
-                                  class="inline-block w-30 truncate hover:text-text_color_primary"
+                                  class="inline-block w-[120px] truncate hover:text-text_color_primary"
                                 >
                                   {transformI18n(item)}
                                 </span>
@@ -388,13 +380,9 @@ export default defineComponent({
               <el-divider direction="vertical" />
 
               <iconifyIconOffline
-                class={["w-4", iconClass.value]}
+                class={["w-[16px]", iconClass.value]}
                 icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
-                v-tippy={
+                v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
-                  isFullscreen.value
-                    ? transformI18n($t("tableBar.pureExitFullScreen"))
-                    : transformI18n($t("tableBar.pureFullScreen"))
-                }
                 onClick={() => onFullscreen()}
               />
             </div>

src/components/ReQrcode/src/index.tsx

@@ -240,7 +240,7 @@ export default defineComponent({
           )}
           {props.disabled && (
             <div
-              class="qrcode--disabled absolute top-0 left-0 flex-c size-full"
+              class="qrcode--disabled absolute top-0 left-0 flex w-full h-full items-center justify-center"
               onClick={disabledClick}
             >
               <div class="absolute top-[50%] left-[50%] font-bold">

src/components/ReSeamlessScroll/src/index.vue

@@ -5,10 +5,14 @@ import {
   ref,
   unref,
   nextTick,
-  computed,
+  computed
-  useTemplateRef
 } from "vue";
-import { tryOnMounted, tryOnUnmounted, useDebounceFn } from "@vueuse/core";
+import {
+  tryOnMounted,
+  tryOnUnmounted,
+  templateRef,
+  useDebounceFn
+} from "@vueuse/core";
 import * as utilsMethods from "./utils";
 const { animationFrame, copyObj } = utilsMethods;
 animationFrame();
@@ -58,14 +62,17 @@ if (props.classOption["key"] === undefined) {
   props.classOption["key"] = 0;
 }
 
-const wrap = useTemplateRef<HTMLElement | null>(
+const wrap = templateRef<HTMLElement | null>(
-  `wrap${props.classOption["key"]}`
+  `wrap${props.classOption["key"]}`,
+  null
 );
-const slotList = useTemplateRef<HTMLElement | null>(
+const slotList = templateRef<HTMLElement | null>(
-  `slotList${props.classOption["key"]}`
+  `slotList${props.classOption["key"]}`,
+  null
 );
-const realBox = useTemplateRef<HTMLElement | null>(
+const realBox = templateRef<HTMLElement | null>(
-  `realBox${props.classOption["key"]}`
+  `realBox${props.classOption["key"]}`,
+  null
 );
 
 const leftSwitchState = computed(() => {

src/components/ReVxeTableBar/src/bar.tsx

@@ -1,5 +1,5 @@
 import Sortable from "sortablejs";
-import { $t, transformI18n } from "@/plugins/i18n";
+import { transformI18n } from "@/plugins/i18n";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import { delay, cloneDeep, getKeyList } from "@pureadmin/utils";
 import {
@@ -24,7 +24,7 @@ const props = {
   /** 头部最左边的标题 */
   title: {
     type: String,
-    default: $t("tableBar.pureList")
+    default: "列表"
   },
   vxeTableRef: {
     type: Object as PropType<any>
@@ -90,9 +90,9 @@ export default defineComponent({
       return [
         "flex",
         "justify-between",
-        "pt-0.75",
+        "pt-[3px]",
-        "px-2.75",
+        "px-[11px]",
-        "border-b",
+        "border-b-[1px]",
         "border-b-solid",
         "border-[#dcdfe6]",
         "dark:border-[#303030]"
@@ -161,19 +161,19 @@ export default defineComponent({
             style={getDropdownItemStyle.value("medium")}
             onClick={() => changeSize("medium")}
           >
-            {transformI18n($t("tableBar.pureLarge"))}
+            宽松
           </el-dropdown-item>
           <el-dropdown-item
             style={getDropdownItemStyle.value("small")}
             onClick={() => changeSize("small")}
           >
-            {transformI18n($t("tableBar.pureDefault"))}
+            默认
           </el-dropdown-item>
           <el-dropdown-item
             style={getDropdownItemStyle.value("mini")}
             onClick={() => changeSize("mini")}
           >
-            {transformI18n($t("tableBar.pureSmall"))}
+            紧凑
           </el-dropdown-item>
         </el-dropdown-menu>
       )
@@ -237,10 +237,8 @@ export default defineComponent({
     const reference = {
       reference: () => (
         <SettingIcon
-          class={["w-4", iconClass.value]}
+          class={["w-[16px]", iconClass.value]}
-          v-tippy={rendTippyProps(
+          v-tippy={rendTippyProps("列设置")}
-            transformI18n($t("tableBar.pureColumnSettings"))
-          )}
         />
       )
     };
@@ -259,27 +257,25 @@ export default defineComponent({
               : "mt-2"
           ]}
         >
-          <div class="flex justify-between w-full h-15 p-4">
+          <div class="flex justify-between w-full h-[60px] p-4">
             {slots?.title ? (
               slots.title()
             ) : (
-              <p class="font-bold truncate">{transformI18n(props.title)}</p>
+              <p class="font-bold truncate">{props.title}</p>
             )}
-            <div class="flex-ac">
+            <div class="flex items-center justify-around">
               {slots?.buttons ? (
                 <div class="flex mr-4">{slots.buttons()}</div>
               ) : null}
               {props.tree ? (
                 <>
                   <ExpandIcon
-                    class={["w-4", iconClass.value]}
+                    class={["w-[16px]", iconClass.value]}
                     style={{
                       transform: isExpandAll.value ? "none" : "rotate(-90deg)"
                     }}
                     v-tippy={rendTippyProps(
-                      isExpandAll.value
+                      isExpandAll.value ? "折叠" : "展开"
-                        ? transformI18n($t("tableBar.pureCollapse"))
-                        : transformI18n($t("tableBar.pureExpand"))
                     )}
                     onClick={() => onExpand()}
                   />
@@ -288,24 +284,20 @@ export default defineComponent({
               ) : null}
               <RefreshIcon
                 class={[
-                  "w-4",
+                  "w-[16px]",
                   iconClass.value,
                   loading.value ? "animate-spin" : ""
                 ]}
-                v-tippy={rendTippyProps(
+                v-tippy={rendTippyProps("刷新")}
-                  transformI18n($t("tableBar.pureRefresh"))
-                )}
                 onClick={() => onReFresh()}
               />
               <el-divider direction="vertical" />
               <el-dropdown
                 v-slots={dropdown}
                 trigger="click"
-                v-tippy={rendTippyProps(
+                v-tippy={rendTippyProps("密度")}
-                  transformI18n($t("tableBar.pureDensity"))
-                )}
               >
-                <CollapseIcon class={["w-4", iconClass.value]} />
+                <CollapseIcon class={["w-[16px]", iconClass.value]} />
               </el-dropdown>
               <el-divider direction="vertical" />
 
@@ -319,17 +311,17 @@ export default defineComponent({
                 <div class={[topClass.value]}>
                   <el-checkbox
                     class="-mr-1!"
-                    label={transformI18n($t("tableBar.pureColumnDisplay"))}
+                    label="列展示"
                     v-model={checkAll.value}
                     indeterminate={isIndeterminate.value}
                     onChange={value => handleCheckAllChange(value)}
                   />
                   <el-button type="primary" link onClick={() => onReset()}>
-                    {transformI18n($t("tableBar.pureReset"))}
+                    重置
                   </el-button>
                 </div>
 
-                <div class="pt-1.5 pl-2.75">
+                <div class="pt-[6px] pl-[11px]">
                   <el-scrollbar max-height="36vh">
                     <el-checkbox-group
                       ref={`VxeGroupRef${unref(props.tableKey)}`}
@@ -346,7 +338,7 @@ export default defineComponent({
                             <div class="flex items-center">
                               <DragIcon
                                 class={[
-                                  "drag-btn w-4 mr-2",
+                                  "drag-btn w-[16px] mr-2",
                                   isFixedColumn(item)
                                     ? "cursor-no-drop!"
                                     : "cursor-grab!"
@@ -363,7 +355,7 @@ export default defineComponent({
                               >
                                 <span
                                   title={transformI18n(item)}
-                                  class="inline-block w-30 truncate hover:text-text_color_primary"
+                                  class="inline-block w-[120px] truncate hover:text-text_color_primary"
                                 >
                                   {transformI18n(item)}
                                 </span>
@@ -379,13 +371,9 @@ export default defineComponent({
               <el-divider direction="vertical" />
 
               <iconifyIconOffline
-                class={["w-4", iconClass.value]}
+                class={["w-[16px]", iconClass.value]}
                 icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
-                v-tippy={
+                v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
-                  isFullscreen.value
-                    ? transformI18n($t("tableBar.pureExitFullScreen"))
-                    : transformI18n($t("tableBar.pureFullScreen"))
-                }
                 onClick={() => onFullscreen()}
               />
             </div>

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

@@ -8,7 +8,7 @@ const TITLE = getConfig("Title");
   <footer
     class="layout-footer text-[rgba(0,0,0,0.6)] dark:text-[rgba(220,220,242,0.8)]"
   >
-    Copyright © 2020-present
+    Copyright © 2020-2025
     <a
       class="hover:text-primary!"
       href="https://github.com/pure-admin"
@@ -16,12 +16,23 @@ const TITLE = getConfig("Title");
     >
       &nbsp;{{ TITLE }}
     </a>
+    <!-- <div class="ml-8">
+      <span>赞助商：</span>
+      <a
+        class="hover:text-primary"
+        href="https://ai-tools.cn/resume/start"
+        target="_blank"
+      >
+        二猫 AI 简历
+      </a>
+    </div> -->
   </footer>
 </template>
 
 <style lang="scss" scoped>
 .layout-footer {
   display: flex;
+  flex-wrap: wrap;
   align-items: center;
   justify-content: center;
   width: 100%;

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

@@ -65,7 +65,7 @@ watch(
 </script>
 <template>
   <template v-for="[fullPath, Comp] in compList" :key="fullPath">
-    <div v-show="fullPath === currRoute.fullPath" class="size-full">
+    <div v-show="fullPath === currRoute.fullPath" class="w-full h-full">
       <slot
         :fullPath="fullPath"
         :Comp="Comp"
@@ -73,7 +73,7 @@ watch(
       />
     </div>
   </template>
-  <div v-show="!keep" class="size-full">
+  <div v-show="!keep" class="w-full h-full">
     <slot :Comp="normalComp" :fullPath="currRoute.fullPath" frameInfo />
   </div>
 </template>

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"
@@ -53,11 +53,9 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
       <LaySearch id="header-search" />
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
-        <div
+        <GlobalizationIcon
-          class="globalization-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
-        >
+        />
-          <IconifyIconOffline :icon="GlobalizationIcon" />
-        </div>
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
@@ -115,7 +113,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
         </template>
       </el-dropdown>
       <span
-        class="set-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
+        class="set-icon navbar-bg-hover"
         :title="t('buttons.pureOpenSystemSet')"
         @click="onPanel"
       >
@@ -174,7 +172,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
 }
 
 .translation {
-  :deep(.el-dropdown-menu__item) {
+  ::v-deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
   }
 
@@ -192,7 +190,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
 .logout {
   width: 120px;
 
-  :deep(.el-dropdown-menu__item) {
+  ::v-deep(.el-dropdown-menu__item) {
     display: inline-flex;
     flex-wrap: wrap;
     min-width: 100%;

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-notice/index.vue

@@ -3,12 +3,15 @@ import { useI18n } from "vue-i18n";
 import { ref, computed } from "vue";
 import { noticesData } from "./data";
 import NoticeList from "./components/NoticeList.vue";
-import BellIcon from "~icons/lucide/bell";
+import BellIcon from "~icons/ep/bell";
 
 const { t } = useI18n();
+const noticesNum = ref(0);
 const notices = ref(noticesData);
 const activeKey = ref(noticesData[0]?.key);
 
+notices.value.map(v => (noticesNum.value += v.list.length));
+
 const getLabel = computed(
   () => item =>
     t(item.name) + (item.list.length > 0 ? `(${item.list.length})` : "")
@@ -18,9 +21,14 @@ const getLabel = computed(
 <template>
   <el-dropdown trigger="click" placement="bottom-end">
     <span
-      :class="['dropdown-badge', 'navbar-bg-hover', 'select-none', 'mr-1.75']"
+      :class="[
+        'dropdown-badge',
+        'navbar-bg-hover',
+        'select-none',
+        Number(noticesNum) !== 0 && 'mr-[10px]'
+      ]"
     >
-      <el-badge is-dot>
+      <el-badge :value="Number(noticesNum) === 0 ? '' : noticesNum" :max="99">
         <span class="header-notice-icon">
           <IconifyIconOffline :icon="BellIcon" />
         </span>
@@ -57,34 +65,6 @@ const getLabel = computed(
 </template>
 
 <style lang="scss" scoped>
-/* ”铃铛“摇晃衰减动画 */
-@keyframes pure-bell-ring {
-  0%,
-  100% {
-    transform-origin: top;
-  }
-
-  15% {
-    transform: rotateZ(10deg);
-  }
-
-  30% {
-    transform: rotateZ(-10deg);
-  }
-
-  45% {
-    transform: rotateZ(5deg);
-  }
-
-  60% {
-    transform: rotateZ(-5deg);
-  }
-
-  75% {
-    transform: rotateZ(2deg);
-  }
-}
-
 .dropdown-badge {
   display: flex;
   align-items: center;
@@ -94,13 +74,7 @@ const getLabel = computed(
   cursor: pointer;
 
   .header-notice-icon {
-    font-size: 16px;
+    font-size: 18px;
-  }
-
-  &:hover {
-    .header-notice-icon svg {
-      animation: pure-bell-ring 1s both;
-    }
   }
 }
 

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

@@ -11,10 +11,13 @@ const show = ref<Boolean>(false);
 
 const iconClass = computed(() => {
   return [
-    "size-5.5",
+    "w-[22px]",
-    "flex-c",
+    "h-[22px]",
+    "flex",
+    "justify-center",
+    "items-center",
     "outline-hidden",
-    "rounded-sm",
+    "rounded-[4px]",
     "cursor-pointer",
     "transition-colors",
     "hover:bg-[#0000000f]",
@@ -48,7 +51,7 @@ onBeforeUnmount(() => {
     <div class="right-panel-background" />
     <div ref="target" class="right-panel bg-bg_color">
       <div
-        class="flex-bc py-3 px-5 border-0 border-l 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") }}
@@ -70,14 +73,12 @@ onBeforeUnmount(() => {
           />
         </span>
       </div>
-      <el-scrollbar
+      <el-scrollbar>
-        class="border-y border-l border-r-0 border-solid border-(--pure-border-color) h-[calc(100vh-104px)]!"
-      >
         <slot />
       </el-scrollbar>
 
       <div
-        class="flex justify-end p-3 border-0 border-l 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="{
@@ -98,6 +99,10 @@ onBeforeUnmount(() => {
 </template>
 
 <style lang="scss" scoped>
+:deep(.el-scrollbar) {
+  height: calc(100vh - 110px);
+}
+
 .right-panel-background {
   position: fixed;
   top: 0;
@@ -134,4 +139,11 @@ onBeforeUnmount(() => {
     transform: translate(0);
   }
 }
+
+.project-configuration {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 14px 20px;
+}
 </style>

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

@@ -34,12 +34,12 @@ function handleDelete(item) {
   <IconifyIconOffline
     v-show="item.type === 'history'"
     :icon="StarIcon"
-    class="size-4.5 mr-2 hover:text-[#d7d5d4]"
+    class="w-[18px] h-[18px] mr-2 hover:text-[#d7d5d4]"
     @click.stop="handleCollect(item)"
   />
   <IconifyIconOffline
     :icon="CloseIcon"
-    class="size-4.5 hover:text-[#d7d5d4] cursor-pointer"
+    class="w-[18px] h-[18px] hover:text-[#d7d5d4] cursor-pointer"
     @click.stop="handleDelete(item)"
   />
 </template>

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

@@ -297,7 +297,10 @@ onKeyStroke("ArrowDown", handleDown);
       @input="handleSearch"
     >
       <template #prefix>
-        <IconifyIconOffline :icon="SearchIcon" class="text-primary size-6" />
+        <IconifyIconOffline
+          :icon="SearchIcon"
+          class="text-primary w-[24px] h-[24px]"
+        />
       </template>
     </el-input>
     <div class="search-content">

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

@@ -11,7 +11,7 @@ function handleSearch() {
 <template>
   <div>
     <div
-      class="search-container w-10 h-12 flex-c cursor-pointer navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
+      class="search-container w-[40px] h-[48px] flex-c cursor-pointer navbar-bg-hover"
       @click="handleSearch"
     >
       <IconifyIconOffline icon="ri/search-line" />

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);
 }
 
 /** 默认灵动模式 */
@@ -189,30 +189,30 @@ const getThemeColor = computed(() => {
 });
 
 const pClass = computed(() => {
-  return ["mb-3!", "font-medium", "text-sm", "dark:text-white"];
+  return ["mb-[12px]!", "font-medium", "text-sm", "dark:text-white"];
 });
 
 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();
           }
@@ -345,8 +345,8 @@ onUnmounted(() => removeMatchMedia);
           @click="setLayoutThemeColor(item.themeColor)"
         >
           <el-icon
-            class="mt-px"
+            style="margin: 0.1em 0.1em 0 0"
-            :size="20"
+            :size="17"
             :color="getThemeColor(item.themeColor)"
           >
             <IconifyIconOffline :icon="Check" />
@@ -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
@@ -538,24 +538,17 @@ onUnmounted(() => removeMatchMedia);
 }
 
 .theme-color {
-  display: flex;
+  height: 20px;
-  gap: 8px;
-  margin-top: 8px;
 
   li {
-    position: relative;
+    float: left;
-    width: 21px;
+    height: 20px;
-    height: 21px;
+    margin-right: 8px;
     cursor: pointer;
     border-radius: 4px;
-    box-shadow: rgb(0 0 0 / 15%) 0 0 0 1px inset;
-    transition: all 0.2s ease;
 
-    &:hover {
+    &:nth-child(1) {
-      box-shadow:
+      border: 1px solid #ddd;
-        rgb(0 0 0 / 25%) 0 0 0 1px inset,
-        0 2px 4px rgb(0 0 0 / 15%);
-      transform: scale(1.1);
     }
   }
 }

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

@@ -83,11 +83,9 @@ onMounted(() => {
       <LaySearch id="header-search" />
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
-        <div
+        <GlobalizationIcon
-          class="globalization-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
-        >
+        />
-          <IconifyIconOffline :icon="GlobalizationIcon" />
-        </div>
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
@@ -143,7 +141,7 @@ onMounted(() => {
         </template>
       </el-dropdown>
       <span
-        class="set-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
+        class="set-icon navbar-bg-hover"
         :title="t('buttons.pureOpenSystemSet')"
         @click="onPanel"
       >
@@ -159,7 +157,7 @@ onMounted(() => {
 }
 
 .translation {
-  :deep(.el-dropdown-menu__item) {
+  ::v-deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
   }
 
@@ -177,7 +175,7 @@ onMounted(() => {
 .logout {
   width: 120px;
 
-  :deep(.el-dropdown-menu__item) {
+  ::v-deep(.el-dropdown-menu__item) {
     display: inline-flex;
     flex-wrap: wrap;
     min-width: 100%;

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

@@ -104,11 +104,9 @@ watch(
       <LaySearch id="header-search" />
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
-        <div
+        <GlobalizationIcon
-          class="globalization-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
+          class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
-        >
+        />
-          <IconifyIconOffline :icon="GlobalizationIcon" />
-        </div>
         <template #dropdown>
           <el-dropdown-menu class="translation">
             <el-dropdown-item
@@ -164,7 +162,7 @@ watch(
         </template>
       </el-dropdown>
       <span
-        class="set-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
+        class="set-icon navbar-bg-hover"
         :title="t('buttons.pureOpenSystemSet')"
         @click="onPanel"
       >
@@ -180,7 +178,7 @@ watch(
 }
 
 .translation {
-  :deep(.el-dropdown-menu__item) {
+  ::v-deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
   }
 
@@ -198,7 +196,7 @@ watch(
 .logout {
   width: 120px;
 
-  :deep(.el-dropdown-menu__item) {
+  ::v-deep(.el-dropdown-menu__item) {
     display: inline-flex;
     flex-wrap: wrap;
     min-width: 100%;

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

@@ -105,7 +105,7 @@ watch(
 </script>
 
 <template>
-  <el-breadcrumb class="leading-12.5! select-none" separator="/">
+  <el-breadcrumb class="leading-[50px]! select-none" separator="/">
     <transition-group name="breadcrumb">
       <el-breadcrumb-item
         v-for="item in levelList"

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

@@ -18,7 +18,7 @@ const { t } = useI18n();
 const { tooltipEffect } = useNav();
 
 const iconClass = computed(() => {
-  return ["size-4"];
+  return ["w-[16px]", "h-[16px]"];
 });
 
 const { $storage } = useGlobal<GlobalPropertiesApi>();

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

@@ -11,7 +11,10 @@ defineProps({
 </script>
 
 <template>
-  <div v-if="extraIcon" class="flex-c">
+  <div v-if="extraIcon" class="flex justify-center items-center">
-    <component :is="useRenderIcon(toRaw(extraIcon))" class="size-7.5" />
+    <component
+      :is="useRenderIcon(toRaw(extraIcon))"
+      class="w-[30px] h-[30px]"
+    />
   </div>
 </template>

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

@@ -24,10 +24,7 @@ watch(
 </script>
 
 <template>
-  <span
+  <span class="fullscreen-icon navbar-bg-hover" @click="toggle">
-    class="fullscreen-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
-    @click="toggle"
-  >
     <IconifyIconOffline :icon="screenIcon" />
   </span>
 </template>

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

@@ -71,7 +71,7 @@ const textClass = computed(() => {
     ((layout.value === "vertical" && item.parentId === null) ||
       (layout.value === "mix" && item.pathList.length === 2))
   ) {
-    return `${baseClass} min-w-13.5! text-center! px-3!`;
+    return `${baseClass} min-w-[54px]! text-center! px-3!`;
   }
   return baseClass;
 });
@@ -159,7 +159,7 @@ function resolvePath(routePath) {
             item?.pathList?.length === 2)
         "
         truncated
-        class="w-full! px-3! min-w-13.5! text-center! text-inherit!"
+        class="w-full! px-3! min-w-[54px]! text-center! text-inherit!"
       >
         {{ transformI18n(onlyOneChild.meta.title) }}
       </el-text>

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

@@ -21,11 +21,12 @@ const iconClass = computed(() => {
   return [
     "ml-4",
     "mb-1",
-    "size-4",
+    "w-[16px]",
+    "h-[16px]",
     "inline-block!",
     "align-middle",
     "cursor-pointer",
-    "duration-100"
+    "duration-[100ms]"
   ];
 });
 

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

@@ -1,5 +1,5 @@
 <template>
-  <svg class="size-full">
+  <svg class="w-full h-full">
     <defs>
       <symbol id="geometry-left" viewBox="0 0 214 36">
         <path d="M17 0h197v36H0v-2c4.5 0 9-3.5 9-8V8c0-4.5 3.5-8 8-8z" />

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

@@ -618,10 +618,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 +631,7 @@ onBeforeUnmount(() => {
             >
               <IconifyIconOffline :icon="Close" />
             </span>
+            <span class="chrome-tab-divider" />
           </div>
         </div>
       </div>

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/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/router/utils.ts

@@ -209,26 +209,18 @@ function initRouter() {
       });
     } else {
       return new Promise(resolve => {
-        getAsyncRoutes().then(({ code, data }) => {
+        getAsyncRoutes().then(({ data }) => {
-          if (code === 0) {
+          handleAsyncRoutes(cloneDeep(data));
-            handleAsyncRoutes(cloneDeep(data));
+          storageLocal().setItem(key, data);
-            storageLocal().setItem(key, data);
+          resolve(router);
-            resolve(router);
-          } else {
-            resolve(router);
-          }
         });
       });
     }
   } else {
     return new Promise(resolve => {
-      getAsyncRoutes().then(({ code, data }) => {
+      getAsyncRoutes().then(({ data }) => {
-        if (code === 0) {
+        handleAsyncRoutes(cloneDeep(data));
-          handleAsyncRoutes(cloneDeep(data));
+        resolve(router);
-          resolve(router);
-        } else {
-          resolve(router);
-        }
       });
     });
   }

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/user.ts

@@ -80,12 +80,8 @@ export const useUserStore = defineStore("pure-user", {
       return new Promise<UserResult>((resolve, reject) => {
         getLogin(data)
           .then(data => {
-            if (data.code === 0) {
+            if (data?.success) setToken(data.data);
-              setToken(data.data);
+            resolve(data);
-              resolve(data);
-            } else {
-              reject(data.message);
-            }
           })
           .catch(error => {
             reject(error);
@@ -107,11 +103,9 @@ export const useUserStore = defineStore("pure-user", {
       return new Promise<RefreshTokenResult>((resolve, reject) => {
         refreshTokenApi(data)
           .then(data => {
-            if (data.code === 0) {
+            if (data) {
               setToken(data.data);
               resolve(data);
-            } else {
-              reject(data.message);
             }
           })
           .catch(error => {

src/style/dark.scss

@@ -135,6 +135,17 @@ html.dark {
     }
   }
 
+  /* 系统配置面板 */
+  .right-panel-items {
+    .el-divider__text {
+      --el-bg-color: var(--el-bg-color);
+    }
+
+    .el-divider--horizontal {
+      border-top: none;
+    }
+  }
+
   /* 表单设计器 */
   .design-form {
     .el-main.config-content,

src/style/index.scss

@@ -35,18 +35,3 @@
 .html-weakness {
   filter: invert(80%);
 }
-
-/* 轻微缩小，再恢复原状的平滑缩放动画 */
-@keyframes pure-scale-bounce {
-  0% {
-    transform: scale(1);
-  }
-
-  50% {
-    transform: scale(0.9);
-  }
-
-  100% {
-    transform: scale(1);
-  }
-}

src/style/sidebar.scss

@@ -34,14 +34,12 @@
   }
 
   .set-icon,
-  .fullscreen-icon,
+  .fullscreen-icon {
-  .globalization-icon {
     display: flex;
     align-items: center;
     justify-content: center;
     width: 40px;
     height: 48px;
-    font-size: 16px;
     cursor: pointer;
   }
 
@@ -233,6 +231,7 @@
     .is-active.submenu-title-noDropdown.outer-most > * {
       z-index: 1;
       color: #fff;
+      background: transparent !important;
     }
 
     .is-active.submenu-title-noDropdown.outer-most::before {
@@ -451,7 +450,7 @@
       /* 搜索 */
       .search-container,
       /* 国际化 */
-      .globalization-icon,
+      .globalization,
       /* 全屏 */
       .fullscreen-icon,
       /* 消息通知 */
@@ -470,8 +469,12 @@
         color: var(--pure-theme-sub-menu-active-text);
       }
 
-      .globalization-icon {
+      .globalization {
+        width: 40px;
+        height: 48px;
+        padding: 11px;
         color: var(--pure-theme-sub-menu-active-text);
+        cursor: pointer;
         outline: none;
       }
 
@@ -628,7 +631,7 @@ body[layout="vertical"] {
   /* 搜索 */
   .search-container,
   /* 国际化 */
-  .globalization-icon,
+  .globalization,
   /* 全屏 */
   .fullscreen-icon,
   /* 消息通知 */

src/style/tailwind.css

@@ -42,9 +42,5 @@
 }
 
 @utility navbar-bg-hover {
-  @apply select-none dark:text-white dark:hover:bg-[#242424]!;
+  @apply dark:text-white dark:hover:bg-[#242424]!;
-}
-
-@utility animate-scale-bounce {
-  animation: pure-scale-bounce 0.3s ease-in-out;
 }

src/utils/http/index.ts

@@ -10,8 +10,6 @@ import type {
   PureHttpRequestConfig
 } from "./types.d";
 import { stringify } from "qs";
-import { message } from "@/utils/message";
-import { $t, transformI18n } from "@/plugins/i18n";
 import { getToken, formatToken } from "@/utils/auth";
 import { useUserStoreHook } from "@/store/modules/user";
 
@@ -92,13 +90,6 @@ class PureHttp {
                         PureHttp.requests.forEach(cb => cb(token));
                         PureHttp.requests = [];
                       })
-                      .catch(_err => {
-                        PureHttp.requests = [];
-                        useUserStoreHook().logOut();
-                        message(transformI18n($t("login.pureLoginExpired")), {
-                          type: "warning"
-                        });
-                      })
                       .finally(() => {
                         PureHttp.isRefreshing = false;
                       });

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/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/directives.vue

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

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/line-tree.vue

@@ -39,12 +39,12 @@ const dataProps = {
     </template>
 
     <el-row :gutter="24">
-      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" class="mb-5">
+      <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" class="mb-[20px]">
         <el-card shadow="never">
           <template #header>
             <div class="card-header">普通树结构</div>
           </template>
-          <div class="max-h-137.5 overflow-y-auto">
+          <div class="max-h-[550px] overflow-y-auto">
             <el-tree
               :data="menusData"
               :props="dataProps"
@@ -71,7 +71,7 @@ const dataProps = {
           <template #header>
             <div class="card-header">虚拟树结构</div>
           </template>
-          <div class="max-h-137.5 overflow-y-auto">
+          <div class="max-h-[550px] overflow-y-auto">
             <el-tree-v2
               :data="menusData"
               :props="dataProps"

src/views/able/pdf.vue

@@ -59,7 +59,7 @@ const onPrint = () => {
       class="h-[calc(100vh-295px)]"
       :element-loading-text="t('status.pureLoad')"
     >
-      <div class="flex-bc h-9">
+      <div class="flex justify-between items-center h-9">
         <div v-if="showAllPages" class="font-medium ml-1.25 text-xl">
           共{{ pageCount }}页
         </div>
@@ -74,7 +74,7 @@ const onPrint = () => {
             {{ currentPage }} / {{ pageCount }}
           </el-pagination>
         </div>
-        <div class="w-42.5 flex-bc">
+        <div class="w-[170px] flex-bc">
           <el-checkbox v-model="showAllPages" @change="showAllPagesChange">
             显示所有页面
           </el-checkbox>

src/views/able/print/index.vue

@@ -83,7 +83,7 @@ const tableData: User[] = [
         <span class="font-medium">打印功能（报表、图表、图片）</span>
         <el-select
           v-model="value"
-          class="w-25! mr-2"
+          class="w-[100px]! mr-2"
           placeholder="Select"
           size="small"
         >
@@ -131,7 +131,7 @@ const tableData: User[] = [
           border
           :data="tableData"
           :row-class-name="tableRowClassName"
-          class="el-table w-full mt-2.5"
+          class="el-table w-full mt-[10px]"
         >
           <el-table-column prop="date" label="Date" />
           <el-table-column prop="name" label="Name" />
@@ -160,7 +160,7 @@ const tableData: User[] = [
         }"
       >
         <p class="font-medium text-lg text-center">Echart</p>
-        <pieChart class="echart mt-2.5" />
+        <pieChart class="echart mt-[10px]" />
       </el-col>
 
       <el-col
@@ -186,7 +186,7 @@ const tableData: User[] = [
         <img
           src="https://pure-admin-utils.netlify.app/logo.png"
           alt="avatars"
-          class="img mt-2.5 m-auto"
+          class="img mt-[10px] m-auto"
         />
       </el-col>
     </el-row>

src/views/able/qrcode.vue

@@ -46,19 +46,19 @@ const disabledClick = () => {
       </template>
       <el-row :gutter="20" justify="space-between">
         <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
-          <el-card shadow="hover" class="mb-2.5 text-center">
+          <el-card shadow="hover" class="mb-[10px] text-center">
             <div class="font-bold">基础用法</div>
             <ReQrcode :text="qrcodeText" />
           </el-card>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
-          <el-card shadow="hover" class="mb-2.5 text-center">
+          <el-card shadow="hover" class="mb-[10px] text-center">
             <div class="font-bold">img标签</div>
             <ReQrcode :text="qrcodeText" tag="img" />
           </el-card>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
-          <el-card shadow="hover" class="mb-2.5 text-center">
+          <el-card shadow="hover" class="mb-[10px] text-center">
             <div class="font-bold">样式配置</div>
             <ReQrcode
               :text="qrcodeText"
@@ -72,19 +72,19 @@ const disabledClick = () => {
           </el-card>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
-          <el-card shadow="hover" class="mb-2.5 text-center">
+          <el-card shadow="hover" class="mb-[10px] text-center">
             <div class="font-bold">点击事件</div>
             <ReQrcode :text="qrcodeText" @click="codeClick" />
           </el-card>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
-          <el-card shadow="hover" class="mb-2.5 text-center">
+          <el-card shadow="hover" class="mb-[10px] text-center">
             <div class="font-bold">异步内容</div>
             <ReQrcode :text="asyncTitle" />
           </el-card>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
-          <el-card shadow="hover" class="mb-2.5 text-center">
+          <el-card shadow="hover" class="mb-[10px] text-center">
             <div class="font-bold">失效</div>
             <ReQrcode
               :text="qrcodeText"
@@ -94,7 +94,7 @@ const disabledClick = () => {
           </el-card>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
-          <el-card shadow="hover" class="mb-2.5 text-center">
+          <el-card shadow="hover" class="mb-[10px] text-center">
             <div class="font-bold">logo配置</div>
             <ReQrcode
               :text="qrcodeText"
@@ -103,7 +103,7 @@ const disabledClick = () => {
           </el-card>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
-          <el-card shadow="hover" class="mb-2.5 text-center">
+          <el-card shadow="hover" class="mb-[10px] text-center">
             <div class="font-bold">logo样式</div>
             <ReQrcode
               :text="qrcodeText"
@@ -118,7 +118,7 @@ const disabledClick = () => {
           </el-card>
         </el-col>
         <el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
-          <el-card shadow="hover" class="mb-2.5 text-center">
+          <el-card shadow="hover" class="mb-[10px] text-center">
             <div class="font-bold">大小配置</div>
             <ReQrcode :text="qrcodeText" :width="100" />
           </el-card>

src/views/able/ripple.vue

@@ -30,7 +30,7 @@ defineOptions({
       <el-button v-ripple type="warning">Warning</el-button>
       <el-button v-ripple type="danger">Danger</el-button>
     </el-space>
-    <el-card v-ripple class="mb-5 w-127.5 select-none" shadow="hover">
+    <el-card v-ripple class="mb-5 w-[510px] select-none" shadow="hover">
       卡片
     </el-card>
 

src/views/able/verify.vue

@@ -33,7 +33,7 @@ function onFail() {
         代码位置 src/views/able/verify.vue
       </el-link>
     </template>
-    <div class="bg-[rgba(15,23,42,0.2)] p-6 w-90">
+    <div class="bg-[rgba(15,23,42,0.2)] p-6 w-[360px]">
       <Vcode :show="isShow" type="inside" @fail="onFail" @success="onSuccess" />
     </div>
   </el-card>

src/views/able/video-frame/index.vue

@@ -158,20 +158,20 @@ onBeforeUnmount(() => {
         v-if="curImg"
         :src="curImg"
         :preview-src-list="Array.of(curImg)"
-        class="size-45 ml-2 rounded-md"
+        class="w-[180px] h-[180px] ml-2 rounded-[6px]"
       />
     </div>
     <div
       id="canvas-container"
       v-loading="loading"
       element-loading-text="温馨提示：可左右拖拽图片并单击选取所需的帧图片"
-      class="w-full h-50 overflow-hidden mt-6"
+      class="w-full h-[200px] overflow-hidden mt-6"
     />
   </el-card>
 </template>
 
 <style lang="scss" scoped>
-:deep(.el-upload-dragger) {
+::v-deep(.el-upload-dragger) {
   display: flex;
   align-items: center;
   height: 180px;

src/views/able/watermark.vue

@@ -126,7 +126,7 @@ onBeforeUnmount(() => {
       <el-button plain @click="clear">清除整页水印</el-button>
     </el-space>
 
-    <div ref="local" class="w-1/2 h-50 border border-sky-500 mt-4" />
+    <div ref="local" class="w-1/2 h-[200px] border border-sky-500 mt-4" />
 
     <el-space wrap class="mt-6">
       <el-button
@@ -194,6 +194,9 @@ onBeforeUnmount(() => {
       <el-button plain @click="clearLocal">清除局部水印</el-button>
     </el-space>
 
-    <div ref="preventLocal" class="w-1/2 h-50 border border-indigo-500 mt-4" />
+    <div
+      ref="preventLocal"
+      class="w-1/2 h-[200px] border border-indigo-500 mt-4"
+    />
   </el-card>
 </template>

src/views/able/wavesurfer/index.vue

@@ -103,7 +103,7 @@ onBeforeUnmount(() => {
     </template>
     <div
       v-loading="loading"
-      class="w-8/12 m-auto! mt-5!"
+      class="w-8/12 m-auto! mt-[20px]!"
       element-loading-background="transparent"
     >
       <div ref="wavesurferRef" />
@@ -112,7 +112,7 @@ onBeforeUnmount(() => {
         <h1 class="text-4xl mt-2!">{{ curTime }}</h1>
         <span class="text-[#81888f]">{{ totalTime }}</span>
       </div>
-      <div v-show="totalTime" class="flex mt-2 w-45 justify-around m-auto">
+      <div v-show="totalTime" class="flex mt-2 w-[180px] justify-around m-auto">
         <Rewind
           v-tippy="{
             content: '快退（可长按）',

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

@@ -37,7 +37,12 @@ function onClick(item) {
 </script>
 
 <template>
-  <div :class="['min-w-45', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']">
+  <div
+    :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">
       <div class="flex items-center">

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

@@ -32,7 +32,12 @@ function onChange(val, item) {
 </script>
 
 <template>
-  <div :class="['min-w-45', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']">
+  <div
+    :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">
       <div class="flex items-center">

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { reactive, ref } from "vue";
 import { formUpload } from "@/api/mock";
 import { message } from "@/utils/message";
-import { onMounted, reactive, ref } from "vue";
 import { type UserInfo, getMine } from "@/api/user";
 import type { FormInstance, FormRules } from "element-plus";
 import ReCropperPreview from "@/components/ReCropperPreview";
@@ -73,8 +73,8 @@ const handleSubmitImage = () => {
     files: new File([cropperBlob.value], "avatar")
   });
   formUpload(formData)
-    .then(({ code }) => {
+    .then(({ success, data }) => {
-      if (code === 0) {
+      if (success) {
         message("更新头像成功", { type: "success" });
         handleClose();
       } else {
@@ -98,16 +98,18 @@ const onSubmit = async (formEl: FormInstance) => {
   });
 };
 
-onMounted(async () => {
+getMine().then(res => {
-  const { code, data } = await getMine();
+  Object.assign(userInfos, res.data);
-  if (code === 0) {
-    Object.assign(userInfos, data);
-  }
 });
 </script>
 
 <template>
-  <div :class="['min-w-45', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']">
+  <div
+    :class="[
+      'min-w-[180px]',
+      deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
+    ]"
+  >
     <h3 class="my-8!">个人信息</h3>
     <el-form
       ref="userInfoFormRef"

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

@@ -55,13 +55,11 @@ const columns: TableColumnList = [
 
 async function onSearch() {
   loading.value = true;
-  const { code, data } = await getMineLogs();
+  const { data } = await getMineLogs();
-  if (code === 0) {
+  dataList.value = data.list;
-    dataList.value = data.list;
+  pagination.total = data.total;
-    pagination.total = data.total;
+  pagination.pageSize = data.pageSize;
-    pagination.pageSize = data.pageSize;
+  pagination.currentPage = data.currentPage;
-    pagination.currentPage = data.currentPage;
-  }
 
   setTimeout(() => {
     loading.value = false;
@@ -74,7 +72,12 @@ onMounted(() => {
 </script>
 
 <template>
-  <div :class="['min-w-45', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']">
+  <div
+    :class="[
+      'min-w-[180px]',
+      deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
+    ]"
+  >
     <h3 class="my-8!">安全日志</h3>
     <pure-table
       row-key="id"

src/views/account-settings/index.vue

@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { getMine } from "@/api/user";
 import { useRouter } from "vue-router";
+import { ref, onBeforeMount } from "vue";
 import { ReText } from "@/components/ReText";
 import Profile from "./components/Profile.vue";
-import { ref, onMounted, onBeforeMount } from "vue";
 import Preferences from "./components/Preferences.vue";
 import SecurityLog from "./components/SecurityLog.vue";
 import { useGlobal, deviceDetection } from "@pureadmin/utils";
@@ -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({
@@ -61,11 +61,8 @@ const panes = [
 ];
 const witchPane = ref("profile");
 
-onMounted(async () => {
+getMine().then(res => {
-  const { code, data } = await getMine();
+  userInfo.value = res.data;
-  if (code === 0) {
-    userInfo.value = data;
-  }
 });
 </script>
 
@@ -73,24 +70,24 @@ onMounted(async () => {
   <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
-          class="h-12.5! 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="h-[50px]! text-[var(--pure-theme-menu-text)] cursor-pointer text-sm transition-all duration-300 ease-in-out hover:scale-105 will-change-transform transform-gpu origin-center hover:text-base! hover:text-[var(--pure-theme-menu-title-hover)]!"
           @click="router.go(-1)"
         >
           <div
-            class="h-full flex items-center px-(--el-menu-base-level-padding)"
+            class="h-full flex items-center px-[var(--el-menu-base-level-padding)]"
           >
             <IconifyIconOffline :icon="leftLine" />
             <span class="ml-2">返回</span>
           </div>
         </div>
-        <div class="flex items-center ml-8 my-4">
+        <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-32.5">
+          <div class="ml-4 flex flex-col max-w-[130px]">
             <ReText class="font-bold self-baseline!">
               {{ userInfo.nickname }}
             </ReText>
@@ -128,7 +125,7 @@ onMounted(async () => {
       />
       <component
         :is="panes.find(item => item.key === witchPane).component"
-        :class="[!deviceDetection() && 'ml-30']"
+        :class="[!deviceDetection() && 'ml-[120px]']"
       />
     </el-main>
   </el-container>

src/views/components/animatecss.vue

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

src/views/components/cascader.vue

@@ -37,8 +37,8 @@ const handleChange = value => {
     </template>
     <el-row :gutter="24">
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
-        <div class="flex-c flex-col">
+        <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"
@@ -66,8 +66,8 @@ const handleChange = value => {
         </div>
       </el-col>
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
-        <div class="flex-c flex-col mt-3">
+        <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"
@@ -95,8 +95,8 @@ const handleChange = value => {
         </div>
       </el-col>
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
-        <div class="flex-c flex-col mt-3">
+        <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"
@@ -126,8 +126,8 @@ const handleChange = value => {
         </div>
       </el-col>
       <el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
-        <div class="flex-c flex-col mt-3">
+        <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/check-button.vue

@@ -221,7 +221,7 @@ watch(size, val =>
     <div>可控制间距的按钮样式</div>
     <el-slider
       v-model="spaceSize"
-      class="mb-2 w-75!"
+      class="mb-2 w-[300px]!"
       :show-tooltip="false"
       :disabled="size === 'disabled'"
     />

src/views/components/collapse.vue

@@ -61,7 +61,7 @@ const handleChange = (val: string[]) => {
     <el-collapse
       ref="collapseRef"
       v-model="activeNames"
-      class="w-90"
+      class="w-[360px]"
       :accordion="radio === 'accordion' ? true : false"
       @change="handleChange"
     >

src/views/components/date-picker.vue

@@ -164,7 +164,7 @@ watch(size, val =>
     <el-date-picker
       v-model="value"
       type="date"
-      class="w-40!"
+      class="w-[160px]!"
       placeholder="请选择"
       :disabled-date="disabledDate"
       :shortcuts="shortcuts"
@@ -180,7 +180,7 @@ watch(size, val =>
       <el-date-picker
         v-model="value1"
         type="week"
-        class="w-40!"
+        class="w-[160px]!"
         format="YYYY年第ww周"
         placeholder="选择某年中的某周"
         :size="dynamicSize"
@@ -189,7 +189,7 @@ watch(size, val =>
       <el-date-picker
         v-model="value2"
         type="month"
-        class="w-40!"
+        class="w-[160px]!"
         placeholder="选择某月"
         :size="dynamicSize"
         :disabled="size === 'disabled'"
@@ -197,7 +197,7 @@ watch(size, val =>
       <el-date-picker
         v-model="value3"
         type="year"
-        class="w-40!"
+        class="w-[160px]!"
         placeholder="选择某年"
         :size="dynamicSize"
         :disabled="size === 'disabled'"
@@ -205,7 +205,7 @@ watch(size, val =>
       <el-date-picker
         v-model="value4"
         type="dates"
-        class="w-40!"
+        class="w-[160px]!"
         placeholder="选择多个日期"
         :size="dynamicSize"
         :disabled="size === 'disabled'"
@@ -216,7 +216,7 @@ watch(size, val =>
     <el-date-picker
       v-model="value5"
       type="daterange"
-      class="w-60!"
+      class="w-[240px]!"
       unlink-panels
       range-separator="至"
       start-placeholder="开始时间"
@@ -261,7 +261,7 @@ watch(size, val =>
       <el-date-picker
         v-model="value7"
         type="date"
-        class="w-40!"
+        class="w-[160px]!"
         placeholder="请选择日期"
         format="YYYY/MM/DD"
         :value-format="dateFormat"
@@ -275,7 +275,7 @@ watch(size, val =>
     <el-date-picker
       v-model="value8"
       type="date"
-      class="w-40!"
+      class="w-[160px]!"
       placeholder="请选择日期"
       :prefix-icon="useRenderIcon('twemoji:spiral-calendar')"
       :size="dynamicSize"

src/views/components/datetime-picker.vue

@@ -190,7 +190,7 @@ watch(size, val =>
     <el-date-picker
       v-model="value"
       type="datetime"
-      class="w-50!"
+      class="w-[200px]!"
       placeholder="请选择日期时间"
       :shortcuts="shortcuts"
       :size="dynamicSize"
@@ -213,7 +213,7 @@ watch(size, val =>
       <el-date-picker
         v-model="value1"
         type="datetime"
-        class="w-50!"
+        class="w-[200px]!"
         placeholder="请选择日期时间"
         format="YYYY/MM/DD hh:mm:ss"
         :value-format="datetimeFormat"
@@ -241,7 +241,7 @@ watch(size, val =>
     <div class="mb-2 mt-4">
       弹出面板位置可控（如果弹出位置不足以完整展示面板会自动调整位置）
     </div>
-    <el-space wrap class="w-100">
+    <el-space wrap class="w-[400px]">
       <el-check-tag
         v-for="(tag, index) in checkTag"
         :key="index"

src/views/components/dialog/form.vue

@@ -28,14 +28,14 @@ const newFormInline = ref(props.formInline);
     <el-form-item label="姓名">
       <el-input
         v-model="newFormInline.user"
-        class="w-55!"
+        class="w-[220px]!"
         placeholder="请输入姓名"
       />
     </el-form-item>
     <el-form-item label="城市">
       <el-select
         v-model="newFormInline.region"
-        class="w-55!"
+        class="w-[220px]!"
         placeholder="请选择城市"
       >
         <el-option label="上海" value="上海" />

src/views/components/dialog/formPrimitive.vue

@@ -18,5 +18,5 @@ const data = useVModel(props, "data", emit);
 </script>
 
 <template>
-  <el-input v-model="data" class="w-55!" placeholder="请输入内容" />
+  <el-input v-model="data" class="w-[220px]!" placeholder="请输入内容" />
 </template>

src/views/components/drawer/form.vue

@@ -28,14 +28,14 @@ const newFormInline = ref(props.formInline);
     <el-form-item label="姓名">
       <el-input
         v-model="newFormInline.user"
-        class="w-55!"
+        class="w-[220px]!"
         placeholder="请输入姓名"
       />
     </el-form-item>
     <el-form-item label="城市">
       <el-select
         v-model="newFormInline.region"
-        class="w-55!"
+        class="w-[220px]!"
         placeholder="请选择城市"
       >
         <el-option label="上海" value="上海" />

src/views/components/drawer/formPrimitive.vue

@@ -18,5 +18,5 @@ const data = useVModel(props, "data", emit);
 </script>
 
 <template>
-  <el-input v-model="data" class="w-55!" placeholder="请输入内容" />
+  <el-input v-model="data" class="w-[220px]!" placeholder="请输入内容" />
 </template>