fix(hooks): 修复树表全部展开问题（临时）

Merge remote-tracking branch 'Soybean/v2.0' into v2.0
# Conflicts: # src/typings/components.d.ts
2025-09-24 07:49:47 +08:00 · 2025-08-19 11:00:19 +08:00 · 2025-08-14 18:14:31 +08:00 · 2025-08-14 18:12:03 +08:00 · 2025-08-14 17:41:57 +08:00 · 2025-08-13 15:54:15 +08:00
169 changed files with 3925 additions and 16573 deletions
--- a/.cursor/mcp.json
+++ b/.cursor/mcp.json
@ -16,7 +16,7 @@
    },
    "playwright": {
      "command": "npx",
-      "args": ["@playwright/mcp@latest"]
+      "args": ["@playwright/mcp@0.0.29"]
    },
    "mcp-server-time": {
      "command": "uvx",
@ -26,21 +26,14 @@
      "command": "npx",
      "args": ["-y", "mcp-shrimp-task-manager"],
      "env": {
-        "DATA_DIR": "D:/workspace/tools/mcp-shrimp-task-manager/data",
+        "DATA_DIR": "D:/workspace/mcp-shrimp-task-manager/data",
        "TEMPLATES_USE": "en",
-        "ENABLE_GUI": "true"
+        "ENABLE_GUI": "false"
      }
    },
    "mcp-deepwiki": {
      "command": "npx",
      "args": ["-y", "mcp-deepwiki@latest"]
-    },
-    "memory": {
-      "command": "npx",
-      "args": ["-y", "@modelcontextprotocol/server-memory"],
-      "env": {
-        "MEMORY_FILE_PATH": "D:/workspace/tools/server-memory/memory.json"
-      }
    }
  }
 }
--- a/.cursor/rules/riper-5.mdc
+++ b/.cursor/rules/riper-5.mdc
@ -1,6 +1,9 @@
 ---
+description:
+globs:
 alwaysApply: false
 ---
+
 **# RIPER-5 + 多维度思维 + 代理执行协议 (v4.9.1 - MCP工具驱动版)**

 **元指令：** 此协议旨在最大化你的战略规划与执行效率。你的核心任务是**指挥和利用MCP工具集**来驱动项目进展。严格遵守核心原则，利用 `mcp-shrimp-task-manager` 进行项目规划与追踪，使用 `deepwiki-mcp` 进行深度研究。主动管理 `/project_document` 作为知识库。**每轮主要响应后，调用 `mcp.feedback_enhanced` 进行交互或通知。**
@ -164,4 +167,5 @@ alwaysApply: false

 * **极致效率：** AI应最大限度地减少手动干预，让MCP工具处理所有可以自动化的工作。
 * **战略聚焦：** 将AI的“思考”集中在无法被工具替代的领域：战略决策、创新构想、复杂问题诊断 (`mcp.sequential_thinking`) 和最终质量把关。
+
 * **无缝集成：** 期望AI能流畅地在不同MCP工具之间传递信息，形成一个高度整合的自动化工作流。
--- a/.env.dev
+++ b/.env.dev
@ -15,8 +15,6 @@ VITE_APP_CLIENT_ID=e5cd7e4891bf95d1d19206ce24a7b32e

 # 接口加密功能开关(如需关闭 后端也必须对应关闭)
 VITE_APP_ENCRYPT=Y
-# AES 加密头标识
-VITE_HEADER_FLAG=encrypt-key
 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换
 VITE_APP_RSA_PUBLIC_KEY='MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
 # 接口响应解密 RSA 私钥与后端加密公钥对应 如更换需前后端一同更换
--- a/.env.prod
+++ b/.env.prod
@ -12,8 +12,6 @@ VITE_APP_CLIENT_ID=e5cd7e4891bf95d1d19206ce24a7b32e

 # 接口加密功能开关(如需关闭 后端也必须对应关闭)
 VITE_APP_ENCRYPT=Y
-# AES 加密头标识
-VITE_HEADER_FLAG=encrypt-key
 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换
 VITE_APP_RSA_PUBLIC_KEY='MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
 # 接口响应解密 RSA 私钥与后端加密公钥对应 如更换需前后端一同更换
--- a/.env.test
+++ b/.env.test
@ -12,8 +12,6 @@ VITE_APP_CLIENT_ID=e5cd7e4891bf95d1d19206ce24a7b32e

 # 接口加密功能开关(如需关闭 后端也必须对应关闭)
 VITE_APP_ENCRYPT=Y
-# AES 加密头标识
-VITE_HEADER_FLAG=encrypt-key
 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换
 VITE_APP_RSA_PUBLIC_KEY='MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
 # 接口响应解密 RSA 私钥与后端加密公钥对应 如更换需前后端一同更换
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -31,8 +31,7 @@
  "vue.server.hybridMode": true,
  "files.exclude": { "/docs": true },
  "search.exclude": {
-    "/docs": true,
-    "**/dist/**": true
+    "/docs": true
  },
  "cSpell.words": ["Axios", "tinymce"]
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,44 +1,5 @@
 # 更新日志

-## [v1.1.3](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.1.2...v1.1.3) (2025-08-16)
-
-### &nbsp;&nbsp;&nbsp;🐞 Bug 修复
-
- **hooks**:
-  - 非安全环境下不使用流式下载 &nbsp;-&nbsp; by @m-xlsea [<samp>(f8983)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/f8983557)
-  - 修复oss下载时未转码问题 &nbsp;-&nbsp; by **AN** [<samp>(2d31d)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/2d31d7dc)
- **project**:
-  - 关闭多租户功能后仍然遍历租户列表导致控制台报错的问题 &nbsp;-&nbsp; by **wang_rui** [<samp>(b96c4)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/b96c46ba)
-  - 关闭多租户功能后仍然遍历租户列表导致控制台报错的问题 Merge pull request !25 from littleghost2016/dev &nbsp;-&nbsp; by **不寻俗** [<samp>(90276)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/9027632b)
- **projects**:
-  - 修复一级菜单隐藏失效问题 &nbsp;-&nbsp; by **AN** [<samp>(8fcc7)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8fcc70d7)
-  - 修复日期搜索条件清除问题 &nbsp;-&nbsp; by **AN** [<samp>(52318)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/52318c10)
-  - 修复登录过期事件监听未被重置 &nbsp;-&nbsp; by @m-xlsea [<samp>(71037)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/71037439)
-  - 修复用户新增时角色下拉包含超级管理员问题 &nbsp;-&nbsp; by **AN** [<samp>(a15b6)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/a15b683b)
-  - 修复用户导入功能无法更新问题 &nbsp;-&nbsp; by **AN** [<samp>(4e983)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/4e9839bd)
-  - Fix the icon size in the image preview toolbar &nbsp;-&nbsp; by @m-xlsea [<samp>(4539f)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/4539fe01)
-  - 修复新增用户未查询角色列表问题 &nbsp;-&nbsp; by **AN** [<samp>(d6ae8)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/d6ae85d2)
- **readme**:
-  - update GitHub stars and forks links for gitee &nbsp;-&nbsp; by @soybeanjs [<samp>(923eb)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/923eb98a)
-
-### &nbsp;&nbsp;&nbsp;💅 重构
-
- **menu**:
-  - 菜单管理中隐藏的菜单显示灰色 &nbsp;-&nbsp; by **NicholasLD** [<samp>(adca2)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/adca2e26)
-  - 菜单管理中隐藏的菜单显示灰色 Merge pull request !24 from NicholasLD/N/A &nbsp;-&nbsp; by **不寻俗** [<samp>(4eb77)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/4eb77eac)
- **projects**:
-  - 菜单列表新增禁用菜单样式 &nbsp;-&nbsp; by @m-xlsea [<samp>(e5383)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/e538355f)
-
-### &nbsp;&nbsp;&nbsp;🏡 杂项
-
- **other**: update the ESLint validation configuration to support more file types. &nbsp;-&nbsp; by **Azir-11** [<samp>(8d7f9)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/8d7f91dc)
- **readme**: remove DartNode sponsorship badge from README files &nbsp;-&nbsp; by @soybeanjs [<samp>(33ade)</samp>](https://gitee.com/xlsea/ruoyi-plus-soybean/commit/33ade539)
-
-### &nbsp;&nbsp;&nbsp;❤️ 贡献者
-
-[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![m-xlsea](https://github.com/m-xlsea.png?size=48)](https://github.com/m-xlsea)&nbsp;&nbsp;[![Elio-An](https://github.com/Elio-An.png?size=48)](https://gitee.com/elio-an)&nbsp;&nbsp;[![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)&nbsp;&nbsp;[![Azir-11](https://github.com/NicholasLD.png?size=48)](https://github.com/NicholasLD)&nbsp;&nbsp;
-[wang_rui](mailto:wrr1996@163.com)
-
 ## [v1.1.2](https://gitee.com/xlsea/ruoyi-plus-soybean/compare/v1.1.1...v1.1.2) (2025-07-24)

 ### &nbsp;&nbsp;&nbsp;🐞 Bug 修复
--- a/README.md
+++ b/README.md
@ -22,7 +22,7 @@

 # 📢 重要通知

-1.1.3 版本已经正式发布（工作流版本请切换 [flow](https://gitee.com/xlsea/ruoyi-plus-soybean/tree/flow/) 分支查看），但仍然建议：
+1.1.2 版本已经正式发布，工作流版本迎来首个版本（请切换 [flow](https://gitee.com/xlsea/ruoyi-plus-soybean/tree/flow/) 分支查看），但仍然建议：
 - 在生产环境使用前进行充分测试
 - 关注项目更新，及时获取最新版本
 - 积极反馈问题，帮助我们快速迭代
@ -40,11 +40,6 @@

 <p style="font-weight: bold; font-size: 24px;">后端需要替换代码生成模板与菜单 SQL，详细请看 <a href="#代码生成与菜单更新">代码生成与菜单更新</a></p>

-# 💎 友情链接
-
- [Snail Job Pro](https://pro.snailjob.opensnail.com/home) - 灵活，可靠和快速的分布式任务重试和分布式任务调度平台
- [AiZuDa - 爱组搭（飞龙工作流企业版）](https://naiveui.aizuda.com) - 像搭积木一样进行低代码甚至零代码快速构建应用
-
 ## 📋 项目概述

 RuoYi-Plus-Soybean 是一个现代化的企业级多租户管理系统，它结合了 RuoYi-Vue-Plus 的强大后端功能和 Soybean Admin 的现代化前端特性，为开发者提供了完整的企业管理解决方案。
--- a/build/config/proxy.ts
+++ b/build/config/proxy.ts
@ -1,4 +1,4 @@
-import type { ProxyOptions } from 'vite';
+import type { HttpProxy, ProxyOptions } from 'vite';
 import { bgRed, bgYellow, green, lightBlue } from 'kolorist';
 import { consola } from 'consola';
 import { createServiceConfig } from '../../src/utils/service';
@ -34,7 +34,7 @@ function createProxyItem(item: App.Service.ServiceConfigItem, enableLog: boolean
    target: item.baseURL,
    changeOrigin: true,
    ws: item.ws,
-    configure: (_proxy, options) => {
+    configure: (_proxy: HttpProxy.Server, options: ProxyOptions) => {
      _proxy.on('proxyReq', (_proxyReq, req, _res) => {
        if (!enableLog) return;

--- a/docs/java/VelocityUtils.java
+++ b/docs/java/VelocityUtils.java
@ -10,7 +10,6 @@ import org.apache.velocity.VelocityContext;
 import org.dromara.common.core.utils.DateUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.json.utils.JsonUtils;
-import org.dromara.common.mybatis.enums.DataBaseType;
 import org.dromara.common.mybatis.helper.DataBaseHelper;
 import org.dromara.generator.constant.GenConstants;
 import org.dromara.generator.domain.GenTable;
@ -59,7 +58,7 @@ public class VelocityUtils {
        velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
        velocityContext.put("ClassName", genTable.getClassName());
        velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
-        velocityContext.put("moduleName", StrUtil.toSymbolCase(genTable.getModuleName(), '-'));
+        velocityContext.put("moduleName", genTable.getModuleName());
        velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName()));
        velocityContext.put("businessName", genTable.getBusinessName());
        velocityContext.put("business_name", StrUtil.toUnderlineCase(genTable.getBusinessName()));
@ -125,12 +124,11 @@ public class VelocityUtils {
        templates.add("vm/java/serviceImpl.java.vm");
        templates.add("vm/java/controller.java.vm");
        templates.add("vm/xml/mapper.xml.vm");
-        DataBaseType dataBaseType = DataBaseHelper.getDataBaseType();
-        if (dataBaseType.isOracle()) {
+        if (DataBaseHelper.isOracle()) {
            templates.add("vm/sql/oracle/sql.vm");
-        } else if (dataBaseType.isPostgreSql()) {
+        } else if (DataBaseHelper.isPostgerSql()) {
            templates.add("vm/sql/postgres/sql.vm");
-        } else if (dataBaseType.isSqlServer()) {
+        } else if (DataBaseHelper.isSqlServer()) {
            templates.add("vm/sql/sqlserver/sql.vm");
        } else {
            templates.add("vm/sql/sql.vm");
@ -165,7 +163,7 @@ public class VelocityUtils {
        String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
        String mybatisPath = MYBATIS_PATH + "/" + moduleName;
        String soybeanPath = "soy";
-        String soybeanModuleName = StrUtil.toSymbolCase(moduleName, '-');
+
        if (template.contains("domain.java.vm")) {
            fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
        }
@ -188,17 +186,17 @@ public class VelocityUtils {
        } else if (template.contains("sql.vm")) {
            fileName = businessName + "Menu.sql";
        } else if (template.contains("index.vue.vm")) {
-            fileName = StringUtils.format("{}/views/{}/{}/index.vue", soybeanPath, soybeanModuleName, StrUtil.toSymbolCase(businessName, '-'));
+            fileName = StringUtils.format("{}/views/{}/{}/index.vue", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-'));
        } else if (template.contains("index-tree.vue.vm")) {
-            fileName = StringUtils.format("{}/views/{}/{}/index.vue", soybeanPath, soybeanModuleName, StrUtil.toSymbolCase(businessName, '-'));
+            fileName = StringUtils.format("{}/views/{}/{}/index.vue", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-'));
        } else if (template.contains("api.d.ts.vm")) {
-            fileName = StringUtils.format("{}/typings/api/{}.{}.api.d.ts", soybeanPath, soybeanModuleName, StrUtil.toSymbolCase(businessName, '-'));
+            fileName = StringUtils.format("{}/typings/api/{}.{}.api.d.ts", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-'));
        } else if (template.contains("api.ts.vm")) {
-            fileName = StringUtils.format("{}/service/api/{}/{}.ts", soybeanPath, soybeanModuleName, StrUtil.toSymbolCase(businessName, '-'));
+            fileName = StringUtils.format("{}/service/api/{}/{}.ts", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-'));
        } else if (template.contains("search.vue.vm")) {
-            fileName = StringUtils.format("{}/views/{}/{}/modules/{}-search.vue", soybeanPath, soybeanModuleName, StrUtil.toSymbolCase(businessName, '-'), StrUtil.toSymbolCase(businessName, '-'));
+            fileName = StringUtils.format("{}/views/{}/{}/modules/{}-search.vue", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-'), StrUtil.toSymbolCase(businessName, '-'));
        } else if (template.contains("operate-drawer.vue.vm")) {
-            fileName = StringUtils.format("{}/views/{}/{}/modules/{}-operate-drawer.vue", soybeanPath, soybeanModuleName, StrUtil.toSymbolCase(businessName, '-'), StrUtil.toSymbolCase(businessName, '-'));
+            fileName = StringUtils.format("{}/views/{}/{}/modules/{}-operate-drawer.vue", soybeanPath, moduleName, StrUtil.toSymbolCase(businessName, '-'), StrUtil.toSymbolCase(businessName, '-'));
        }
        return fileName;
    }
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "ruoyi-vue-plus",
  "type": "module",
-  "version": "1.1.3",
+  "version": "1.1.2",
  "description": "结合了 RuoYi-Vue-Plus 的强大后端功能和 Soybean Admin 的现代化前端特性，为开发者提供了完整的企业管理解决方案。",
  "author": {
    "name": "xlsea",
@ -66,11 +66,11 @@
    "@sa/tinymce": "workspace:*",
    "@sa/utils": "workspace:*",
    "@types/streamsaver": "^2.0.5",
-    "@vueuse/core": "13.8.0",
+    "@vueuse/core": "13.5.0",
    "clipboard": "2.0.11",
-    "dayjs": "1.11.14",
+    "dayjs": "1.11.13",
    "defu": "6.1.4",
-    "echarts": "6.0.0",
+    "echarts": "5.6.0",
    "highlight.js": "^11.11.1",
    "jsencrypt": "^3.3.2",
    "json5": "2.2.3",
@ -80,47 +80,46 @@
    "pinia": "3.0.3",
    "streamsaver": "^2.0.6",
    "tailwind-merge": "3.3.1",
-    "vue": "3.5.20",
+    "vue": "3.5.17",
    "vue-advanced-cropper": "^2.8.9",
    "vue-draggable-plus": "0.6.0",
-    "vue-i18n": "11.1.11",
-    "vue-router": "4.5.1",
-    "xlsx": "0.18.5"
+    "vue-i18n": "11.1.10",
+    "vue-router": "4.5.1"
  },
  "devDependencies": {
    "@elegant-router/vue": "0.3.8",
-    "@iconify/json": "2.2.378",
+    "@iconify/json": "2.2.359",
    "@sa/scripts": "workspace:*",
    "@sa/uno-preset": "workspace:*",
    "@soybeanjs/eslint-config": "1.7.1",
-    "@types/node": "24.3.0",
+    "@types/node": "24.0.15",
    "@types/nprogress": "0.2.3",
-    "@unocss/eslint-config": "66.4.2",
-    "@unocss/preset-icons": "66.4.2",
-    "@unocss/preset-uno": "66.4.2",
-    "@unocss/transformer-directives": "66.4.2",
-    "@unocss/transformer-variant-group": "66.4.2",
-    "@unocss/vite": "66.4.2",
-    "@vitejs/plugin-vue": "6.0.1",
-    "@vitejs/plugin-vue-jsx": "5.1.0",
+    "@unocss/eslint-config": "66.3.3",
+    "@unocss/preset-icons": "66.3.3",
+    "@unocss/preset-uno": "66.3.3",
+    "@unocss/transformer-directives": "66.3.3",
+    "@unocss/transformer-variant-group": "66.3.3",
+    "@unocss/vite": "66.3.3",
+    "@vitejs/plugin-vue": "6.0.0",
+    "@vitejs/plugin-vue-jsx": "5.0.1",
    "consola": "3.4.2",
-    "eslint": "9.34.0",
-    "eslint-plugin-vue": "10.4.0",
+    "eslint": "9.31.0",
+    "eslint-plugin-vue": "10.3.0",
    "kolorist": "1.8.0",
-    "sass": "1.91.0",
-    "simple-git-hooks": "2.13.1",
-    "tsx": "4.20.5",
-    "typescript": "5.9.2",
-    "unplugin-icons": "22.2.0",
-    "unplugin-vue-components": "29.0.0",
-    "vite": "7.1.3",
+    "sass": "1.89.2",
+    "simple-git-hooks": "2.13.0",
+    "tsx": "4.20.3",
+    "typescript": "5.8.3",
+    "unplugin-icons": "22.1.0",
+    "unplugin-vue-components": "28.8.0",
+    "vite": "7.0.5",
    "vite-plugin-monaco-editor": "^1.1.0",
    "vite-plugin-progress": "0.0.7",
    "vite-plugin-static-copy": "^3.1.0",
    "vite-plugin-svg-icons": "2.0.1",
-    "vite-plugin-vue-devtools": "8.0.1",
+    "vite-plugin-vue-devtools": "7.7.7",
    "vue-eslint-parser": "10.2.0",
-    "vue-tsc": "3.0.6"
+    "vue-tsc": "3.0.3"
  },
  "simple-git-hooks": {
    "commit-msg": "pnpm sa git-commit-verify",
--- a/packages/axios/package.json
+++ b/packages/axios/package.json
@ -11,7 +11,7 @@
  },
  "dependencies": {
    "@sa/utils": "workspace:*",
-    "axios": "1.11.0",
+    "axios": "1.10.0",
    "axios-retry": "4.5.0",
    "qs": "6.14.0"
  },
--- a/packages/axios/src/index.ts
+++ b/packages/axios/src/index.ts
@ -13,11 +13,12 @@ import type {
  ResponseType
 } from './type';

-function createCommonRequest<ResponseData = any>(
-  axiosConfig?: CreateAxiosDefaults,
-  options?: Partial<RequestOption<ResponseData>>
-) {
-  const opts = createDefaultOptions<ResponseData>(options);
+function createCommonRequest<
+  ResponseData,
+  ApiData = ResponseData,
+  State extends Record<string, unknown> = Record<string, unknown>
+>(axiosConfig?: CreateAxiosDefaults, options?: Partial<RequestOption<ResponseData, ApiData, State>>) {
+  const opts = createDefaultOptions<ResponseData, ApiData, State>(options);

  const axiosConf = createAxiosConfig(axiosConfig);
  const instance = axios.create(axiosConf);
@ -80,14 +81,6 @@ function createCommonRequest<ResponseData = any>(
    }
  );

-  function cancelRequest(requestId: string) {
-    const abortController = abortControllerMap.get(requestId);
-    if (abortController) {
-      abortController.abort();
-      abortControllerMap.delete(requestId);
-    }
-  }
-
  function cancelAllRequest() {
    abortControllerMap.forEach(abortController => {
      abortController.abort();
@ -98,7 +91,6 @@ function createCommonRequest<ResponseData = any>(
  return {
    instance,
    opts,
-    cancelRequest,
    cancelAllRequest
  };
 }
@ -109,27 +101,27 @@ function createCommonRequest<ResponseData = any>(
 * @param axiosConfig axios config
 * @param options request options
 */
-export function createRequest<ResponseData = any, State = Record<string, unknown>>(
+export function createRequest<ResponseData, ApiData, State extends Record<string, unknown>>(
  axiosConfig?: CreateAxiosDefaults,
-  options?: Partial<RequestOption<ResponseData>>
+  options?: Partial<RequestOption<ResponseData, ApiData, State>>
 ) {
-  const { instance, opts, cancelRequest, cancelAllRequest } = createCommonRequest<ResponseData>(axiosConfig, options);
+  const { instance, opts, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(axiosConfig, options);

-  const request: RequestInstance<State> = async function request<T = any, R extends ResponseType = 'json'>(
-    config: CustomAxiosRequestConfig
-  ) {
+  const request: RequestInstance<ApiData, State> = async function request<
+    T extends ApiData = ApiData,
+    R extends ResponseType = 'json'
+  >(config: CustomAxiosRequestConfig) {
    const response: AxiosResponse<ResponseData> = await instance(config);

    const responseType = response.config?.responseType || 'json';

    if (responseType === 'json') {
-      return opts.transformBackendResponse(response);
+      return opts.transform(response);
    }

    return response.data as MappedType<R, T>;
-  } as RequestInstance<State>;
+  } as RequestInstance<ApiData, State>;

-  request.cancelRequest = cancelRequest;
  request.cancelAllRequest = cancelAllRequest;
  request.state = {} as State;

@ -144,14 +136,14 @@ export function createRequest<ResponseData = any, State = Record<string, unknown
 * @param axiosConfig axios config
 * @param options request options
 */
-export function createFlatRequest<ResponseData = any, State = Record<string, unknown>>(
+export function createFlatRequest<ResponseData, ApiData, State extends Record<string, unknown>>(
  axiosConfig?: CreateAxiosDefaults,
-  options?: Partial<RequestOption<ResponseData>>
+  options?: Partial<RequestOption<ResponseData, ApiData, State>>
 ) {
-  const { instance, opts, cancelRequest, cancelAllRequest } = createCommonRequest<ResponseData>(axiosConfig, options);
+  const { instance, opts, cancelAllRequest } = createCommonRequest<ResponseData, ApiData, State>(axiosConfig, options);

-  const flatRequest: FlatRequestInstance<State, ResponseData> = async function flatRequest<
-    T = any,
+  const flatRequest: FlatRequestInstance<ResponseData, ApiData, State> = async function flatRequest<
+    T extends ApiData = ApiData,
    R extends ResponseType = 'json'
  >(config: CustomAxiosRequestConfig) {
    try {
@ -160,20 +152,21 @@ export function createFlatRequest<ResponseData = any, State = Record<string, unk
      const responseType = response.config?.responseType || 'json';

      if (responseType === 'json') {
-        const data = opts.transformBackendResponse(response);
+        const data = await opts.transform(response);

        return { data, error: null, response };
      }

-      return { data: response.data as MappedType<R, T>, error: null };
+      return { data: response.data as MappedType<R, T>, error: null, response };
    } catch (error) {
      return { data: null, error, response: (error as AxiosError<ResponseData>).response };
    }
-  } as FlatRequestInstance<State, ResponseData>;
+  } as FlatRequestInstance<ResponseData, ApiData, State>;

-  flatRequest.cancelRequest = cancelRequest;
  flatRequest.cancelAllRequest = cancelAllRequest;
-  flatRequest.state = {} as State;
+  flatRequest.state = {
+    ...opts.defaultState
+  } as State;

  return flatRequest;
 }
--- a/packages/axios/src/options.ts
+++ b/packages/axios/src/options.ts
@ -4,15 +4,27 @@ import { stringify } from 'qs';
 import { isHttpSuccess } from './shared';
 import type { RequestOption } from './type';

-export function createDefaultOptions<ResponseData = any>(options?: Partial<RequestOption<ResponseData>>) {
-  const opts: RequestOption<ResponseData> = {
+export function createDefaultOptions<
+  ResponseData,
+  ApiData = ResponseData,
+  State extends Record<string, unknown> = Record<string, unknown>
+>(options?: Partial<RequestOption<ResponseData, ApiData, State>>) {
+  const opts: RequestOption<ResponseData, ApiData, State> = {
+    defaultState: {} as State,
+    transform: async response => response.data as unknown as ApiData,
+    transformBackendResponse: async response => response.data as unknown as ApiData,
    onRequest: async config => config,
    isBackendSuccess: _response => true,
    onBackendFail: async () => {},
-    transformBackendResponse: async response => response.data,
    onError: async () => {}
  };

+  if (options?.transform) {
+    opts.transform = options.transform;
+  } else {
+    opts.transform = options?.transformBackendResponse || opts.transform;
+  }
+
  Object.assign(opts, options);

  return opts;
--- a/packages/axios/src/type.ts
+++ b/packages/axios/src/type.ts
@ -8,7 +8,30 @@ export type ContentType =
  | 'application/x-www-form-urlencoded'
  | 'application/octet-stream';

-export interface RequestOption<ResponseData = any> {
+export type ResponseTransform<Input = any, Output = any> = (input: Input) => Output | Promise<Output>;
+
+export interface RequestOption<
+  ResponseData,
+  ApiData = ResponseData,
+  State extends Record<string, unknown> = Record<string, unknown>
+> {
+  /**
+   * The default state
+   */
+  defaultState?: State;
+  /**
+   * transform the response data to the api data
+   *
+   * @param response Axios response
+   */
+  transform: ResponseTransform<AxiosResponse<ResponseData>, ApiData>;
+  /**
+   * transform the response data to the api data
+   *
+   * @deprecated use `transform` instead, will be removed in the next major version v3
+   * @param response Axios response
+   */
+  transformBackendResponse: ResponseTransform<AxiosResponse<ResponseData>, ApiData>;
  /**
   * The hook before request
   *
@ -35,12 +58,6 @@ export interface RequestOption<ResponseData = any> {
    response: AxiosResponse<ResponseData>,
    instance: AxiosInstance
  ) => Promise<AxiosResponse | null> | Promise<void>;
-  /**
-   * transform backend response when the responseType is json
-   *
-   * @param response Axios response
-   */
-  transformBackendResponse(response: AxiosResponse<ResponseData>): any | Promise<any>;
  /**
   * The hook to handle error
   *
@ -68,15 +85,7 @@ export type CustomAxiosRequestConfig<R extends ResponseType = 'json'> = Omit<Axi
  responseType?: R;
 };

-export interface RequestInstanceCommon<T> {
-  /**
-   * cancel the request by request id
-   *
-   * if the request provide abort controller sign from config, it will not collect in the abort controller map
-   *
-   * @param requestId
-   */
-  cancelRequest: (requestId: string) => void;
+export interface RequestInstanceCommon<State extends Record<string, unknown>> {
  /**
   * cancel all request
   *
@ -84,32 +93,35 @@ export interface RequestInstanceCommon<T> {
   */
  cancelAllRequest: () => void;
  /** you can set custom state in the request instance */
-  state: T;
+  state: State;
 }

 /** The request instance */
-export interface RequestInstance<S = Record<string, unknown>> extends RequestInstanceCommon<S> {
-  <T = any, R extends ResponseType = 'json'>(config: CustomAxiosRequestConfig<R>): Promise<MappedType<R, T>>;
+export interface RequestInstance<ApiData, State extends Record<string, unknown>> extends RequestInstanceCommon<State> {
+  <T extends ApiData = ApiData, R extends ResponseType = 'json'>(
+    config: CustomAxiosRequestConfig<R>
+  ): Promise<MappedType<R, T>>;
 }

-export type FlatResponseSuccessData<T = any, ResponseData = any> = {
-  data: T;
+export type FlatResponseSuccessData<ResponseData, ApiData> = {
+  data: ApiData;
  error: null;
  response: AxiosResponse<ResponseData>;
 };

-export type FlatResponseFailData<ResponseData = any> = {
+export type FlatResponseFailData<ResponseData> = {
  data: null;
  error: AxiosError<ResponseData>;
  response: AxiosResponse<ResponseData>;
 };

-export type FlatResponseData<T = any, ResponseData = any> =
-  | FlatResponseSuccessData<T, ResponseData>
+export type FlatResponseData<ResponseData, ApiData> =
+  | FlatResponseSuccessData<ResponseData, ApiData>
  | FlatResponseFailData<ResponseData>;

-export interface FlatRequestInstance<S = Record<string, unknown>, ResponseData = any> extends RequestInstanceCommon<S> {
-  <T = any, R extends ResponseType = 'json'>(
+export interface FlatRequestInstance<ResponseData, ApiData, State extends Record<string, unknown>>
+  extends RequestInstanceCommon<State> {
+  <T extends ApiData = ApiData, R extends ResponseType = 'json'>(
    config: CustomAxiosRequestConfig<R>
-  ): Promise<FlatResponseData<MappedType<R, T>, ResponseData>>;
+  ): Promise<FlatResponseData<ResponseData, MappedType<R, T>>>;
 }
--- a/packages/hooks/src/index.ts
+++ b/packages/hooks/src/index.ts
@ -3,9 +3,7 @@ import useLoading from './use-loading';
 import useCountDown from './use-count-down';
 import useContext from './use-context';
 import useSvgIconRender from './use-svg-icon-render';
-import useHookTable from './use-table';
+import useTable from './use-table';

-export { useBoolean, useLoading, useCountDown, useContext, useSvgIconRender, useHookTable };
-
-export * from './use-signal';
-export * from './use-table';
+export { useBoolean, useLoading, useCountDown, useContext, useSvgIconRender, useTable };
+export type * from './use-table';
--- a/packages/hooks/src/use-context.ts
+++ b/packages/hooks/src/use-context.ts
@ -1,5 +1,4 @@
 import { inject, provide } from 'vue';
-import type { InjectionKey } from 'vue';

 /**
 * Use context
@ -12,7 +11,7 @@ import type { InjectionKey } from 'vue';
 *   import { ref } from 'vue';
 *   import { useContext } from '@sa/hooks';
 *
- *   export const { setupStore, useStore } = useContext('demo', () => {
+ *   export const [provideDemoContext, useDemoContext] = useContext('demo', () => {
 *     const count = ref(0);
 *
 *     function increment() {
@ -35,10 +34,10 @@ import type { InjectionKey } from 'vue';
 *     <div>A</div>
 *   </template>
 *   <script setup lang="ts">
- *   import { setupStore } from './context';
+ *   import { provideDemoContext } from './context';
 *
- *   setupStore();
- *   // const { increment } = setupStore(); // also can control the store in the parent component
+ *   provideDemoContext();
+ *   // const { increment } = provideDemoContext(); // also can control the store in the parent component
 *   </script>
 *   ``` // B.vue
 *   ```vue
@ -46,9 +45,9 @@ import type { InjectionKey } from 'vue';
 *    <div>B</div>
 *   </template>
 *   <script setup lang="ts">
- *   import { useStore } from './context';
+ *   import { useDemoContext } from './context';
 *
- *   const { count, increment } = useStore();
+ *   const { count, increment } = useDemoContext();
 *   </script>
 *   ```;
 *
@ -57,40 +56,41 @@ import type { InjectionKey } from 'vue';
 * @param contextName Context name
 * @param fn Context function
 */
-export default function useContext<T extends (...args: any[]) => any>(contextName: string, fn: T) {
-  type Context = ReturnType<T>;
+export default function useContext<Arguments extends Array<any>, T>(
+  contextName: string,
+  composable: (...args: Arguments) => T
+) {
+  const key = Symbol(contextName);

-  const { useProvide, useInject: useStore } = createContext<Context>(contextName);
+  /**
+   * Injects the context value.
+   *
+   * @param consumerName - The name of the component that is consuming the context. If provided, the component must be
+   *   used within the context provider.
+   * @param defaultValue - The default value to return if the context is not provided.
+   * @returns The context value.
+   */
+  const useInject = <N extends string | null | undefined = undefined>(
+    consumerName?: N,
+    defaultValue?: T
+  ): N extends null | undefined ? T | null : T => {
+    const value = inject(key, defaultValue);

-  function setupStore(...args: Parameters<T>) {
-    const context: Context = fn(...args);
-    return useProvide(context);
-  }
+    if (consumerName && !value) {
+      throw new Error(`\`${consumerName}\` must be used within \`${contextName}\``);
+    }

-  return {
-    /** Setup store in the parent component */
-    setupStore,
-    /** Use store in the child component */
-    useStore
+    // @ts-expect-error - we want to return null if the value is undefined or null
+    return value || null;
  };
-}

-/** Create context */
-function createContext<T>(contextName: string) {
-  const injectKey: InjectionKey<T> = Symbol(contextName);
+  const useProvide = (...args: Arguments) => {
+    const value = composable(...args);

-  function useProvide(context: T) {
-    provide(injectKey, context);
+    provide(key, value);

-    return context;
-  }
-
-  function useInject() {
-    return inject(injectKey) as T;
-  }
-
-  return {
-    useProvide,
-    useInject
+    return value;
  };
+
+  return [useProvide, useInject] as const;
 }
--- a/packages/hooks/src/use-request.ts
+++ b/packages/hooks/src/use-request.ts
@ -6,31 +6,31 @@ import type {
  CreateAxiosDefaults,
  CustomAxiosRequestConfig,
  MappedType,
+  RequestInstanceCommon,
  RequestOption,
  ResponseType
 } from '@sa/axios';
 import useLoading from './use-loading';

-export type HookRequestInstanceResponseSuccessData<T = any> = {
-  data: Ref<T>;
+export type HookRequestInstanceResponseSuccessData<ApiData> = {
+  data: Ref<ApiData>;
  error: Ref<null>;
 };

-export type HookRequestInstanceResponseFailData<ResponseData = any> = {
+export type HookRequestInstanceResponseFailData<ResponseData> = {
  data: Ref<null>;
  error: Ref<AxiosError<ResponseData>>;
 };

-export type HookRequestInstanceResponseData<T = any, ResponseData = any> = {
+export type HookRequestInstanceResponseData<ResponseData, ApiData> = {
  loading: Ref<boolean>;
-} & (HookRequestInstanceResponseSuccessData<T> | HookRequestInstanceResponseFailData<ResponseData>);
+} & (HookRequestInstanceResponseSuccessData<ApiData> | HookRequestInstanceResponseFailData<ResponseData>);

-export interface HookRequestInstance<ResponseData = any> {
-  <T = any, R extends ResponseType = 'json'>(
+export interface HookRequestInstance<ResponseData, ApiData, State extends Record<string, unknown>>
+  extends RequestInstanceCommon<State> {
+  <T extends ApiData = ApiData, R extends ResponseType = 'json'>(
    config: CustomAxiosRequestConfig
-  ): HookRequestInstanceResponseData<MappedType<R, T>, ResponseData>;
-  cancelRequest: (requestId: string) => void;
-  cancelAllRequest: () => void;
+  ): HookRequestInstanceResponseData<ResponseData, MappedType<R, T>>;
 }

 /**
@ -39,25 +39,26 @@ export interface HookRequestInstance<ResponseData = any> {
 * @param axiosConfig
 * @param options
 */
-export default function createHookRequest<ResponseData = any>(
+export default function createHookRequest<ResponseData, ApiData, State extends Record<string, unknown>>(
  axiosConfig?: CreateAxiosDefaults,
-  options?: Partial<RequestOption<ResponseData>>
+  options?: Partial<RequestOption<ResponseData, ApiData, State>>
 ) {
-  const request = createFlatRequest<ResponseData>(axiosConfig, options);
+  const request = createFlatRequest<ResponseData, ApiData, State>(axiosConfig, options);

-  const hookRequest: HookRequestInstance<ResponseData> = function hookRequest<T = any, R extends ResponseType = 'json'>(
-    config: CustomAxiosRequestConfig
-  ) {
+  const hookRequest: HookRequestInstance<ResponseData, ApiData, State> = function hookRequest<
+    T extends ApiData = ApiData,
+    R extends ResponseType = 'json'
+  >(config: CustomAxiosRequestConfig) {
    const { loading, startLoading, endLoading } = useLoading();

-    const data = ref<MappedType<R, T> | null>(null) as Ref<MappedType<R, T>>;
-    const error = ref<AxiosError<ResponseData> | null>(null) as Ref<AxiosError<ResponseData> | null>;
+    const data = ref(null) as Ref<MappedType<R, T>>;
+    const error = ref(null) as Ref<AxiosError<ResponseData> | null>;

    startLoading();

    request(config).then(res => {
      if (res.data) {
-        data.value = res.data;
+        data.value = res.data as MappedType<R, T>;
      } else {
        error.value = res.error;
      }
@ -70,9 +71,8 @@ export default function createHookRequest<ResponseData = any>(
      data,
      error
    };
-  } as HookRequestInstance<ResponseData>;
+  } as HookRequestInstance<ResponseData, ApiData, State>;

-  hookRequest.cancelRequest = request.cancelRequest;
  hookRequest.cancelAllRequest = request.cancelAllRequest;

  return hookRequest;
--- a/packages/hooks/src/use-signal.ts
+++ b/packages/hooks/src/use-signal.ts
@ -1,144 +0,0 @@
-import { computed, ref, shallowRef, triggerRef } from 'vue';
-import type {
-  ComputedGetter,
-  DebuggerOptions,
-  Ref,
-  ShallowRef,
-  WritableComputedOptions,
-  WritableComputedRef
-} from 'vue';
-
-type Updater<T> = (value: T) => T;
-type Mutator<T> = (value: T) => void;
-
-/**
- * Signal is a reactive value that can be set, updated or mutated
- *
- * @example
- *   ```ts
- *   const count = useSignal(0);
- *
- *   // `watchEffect`
- *   watchEffect(() => {
- *   console.log(count());
- *   });
- *
- *   // watch
- *   watch(count, value => {
- *   console.log(value);
- *   });
- *
- *   // useComputed
- *   const double = useComputed(() => count() * 2);
- *   const writeableDouble = useComputed({
- *   get: () => count() * 2,
- *   set: value => count.set(value / 2)
- *   });
- *   ```
- */
-export interface Signal<T> {
-  (): Readonly<T>;
-  /**
-   * Set the value of the signal
-   *
-   * It recommend use `set` for primitive values
-   *
-   * @param value
-   */
-  set(value: T): void;
-  /**
-   * Update the value of the signal using an updater function
-   *
-   * It recommend use `update` for non-primitive values, only the first level of the object will be reactive.
-   *
-   * @param updater
-   */
-  update(updater: Updater<T>): void;
-  /**
-   * Mutate the value of the signal using a mutator function
-   *
-   * this action will call `triggerRef`, so the value will be tracked on `watchEffect`.
-   *
-   * It recommend use `mutate` for non-primitive values, all levels of the object will be reactive.
-   *
-   * @param mutator
-   */
-  mutate(mutator: Mutator<T>): void;
-  /**
-   * Get the reference of the signal
-   *
-   * Sometimes it can be useful to make `v-model` work with the signal
-   *
-   * ```vue
-   * <template>
-   *   <input v-model="model.count" />
-   * </template>;
-   *
-   * <script setup lang="ts">
-   *  const state = useSignal({ count: 0 }, { useRef: true });
-   *
-   *  const model = state.getRef();
-   * </script>
-   * ```
-   */
-  getRef(): Readonly<ShallowRef<Readonly<T>>>;
-}
-
-export interface ReadonlySignal<T> {
-  (): Readonly<T>;
-}
-
-export interface SignalOptions {
-  /**
-   * Whether to use `ref` to store the value
-   *
-   * @default false use `sharedRef` to store the value
-   */
-  useRef?: boolean;
-}
-
-export function useSignal<T>(initialValue: T, options?: SignalOptions): Signal<T> {
-  const { useRef } = options || {};
-
-  const state = useRef ? (ref(initialValue) as Ref<T>) : shallowRef(initialValue);
-
-  return createSignal(state);
-}
-
-export function useComputed<T>(getter: ComputedGetter<T>, debugOptions?: DebuggerOptions): ReadonlySignal<T>;
-export function useComputed<T>(options: WritableComputedOptions<T>, debugOptions?: DebuggerOptions): Signal<T>;
-export function useComputed<T>(
-  getterOrOptions: ComputedGetter<T> | WritableComputedOptions<T>,
-  debugOptions?: DebuggerOptions
-) {
-  const isGetter = typeof getterOrOptions === 'function';
-
-  const computedValue = computed(getterOrOptions as any, debugOptions);
-
-  if (isGetter) {
-    return () => computedValue.value as ReadonlySignal<T>;
-  }
-
-  return createSignal(computedValue);
-}
-
-function createSignal<T>(state: ShallowRef<T> | WritableComputedRef<T>): Signal<T> {
-  const signal = () => state.value;
-
-  signal.set = (value: T) => {
-    state.value = value;
-  };
-
-  signal.update = (updater: Updater<T>) => {
-    state.value = updater(state.value);
-  };
-
-  signal.mutate = (mutator: Mutator<T>) => {
-    mutator(state.value);
-    triggerRef(state);
-  };
-
-  signal.getRef = () => state as Readonly<ShallowRef<Readonly<T>>>;
-
-  return signal;
-}
--- a/packages/hooks/src/use-table.ts
+++ b/packages/hooks/src/use-table.ts
@ -1,12 +1,20 @@
-import { computed, reactive, ref } from 'vue';
+import { computed, ref } from 'vue';
 import type { Ref, VNodeChild } from 'vue';
-import { jsonClone } from '@sa/utils';
 import useBoolean from './use-boolean';
 import useLoading from './use-loading';

-export type MaybePromise<T> = T | Promise<T>;
+export interface PaginationData<T> {
+  data: T[];
+  pageNum: number;
+  pageSize: number;
+  total: number;
+}

-export type ApiFn = (args: any) => Promise<unknown>;
+type GetApiData<ApiData, Pagination extends boolean> = Pagination extends true ? PaginationData<ApiData> : ApiData[];
+
+type Transform<ResponseData, ApiData, Pagination extends boolean> = (
+  response: ResponseData
+) => GetApiData<ApiData, Pagination>;

 export type TableColumnCheckTitle = string | ((...args: any) => VNodeChild);

@ -14,74 +22,64 @@ export type TableColumnCheck = {
  key: string;
  title: TableColumnCheckTitle;
  checked: boolean;
+  visible: boolean;
 };

-export type TableDataWithIndex<T> = T & { index: number };
-
-export type TransformedData<T> = {
-  data: TableDataWithIndex<T>[];
-  total?: number;
-};
-
-export type Transformer<T, Response> = (response: Response) => TransformedData<T>;
-
-export type TableConfig<A extends ApiFn, T, C> = {
-  /** api function to get table data */
-  apiFn: A;
-  /** api params */
-  apiParams?: Parameters<A>[0];
-  /** transform api response to table data */
-  transformer: Transformer<T, Awaited<ReturnType<A>>>;
-  /** columns factory */
-  columns: () => C[];
+export interface UseTableOptions<ResponseData, ApiData, Column, Pagination extends boolean> {
+  /**
+   * api function to get table data
+   */
+  api: () => Promise<ResponseData>;
+  /**
+   * whether to enable pagination
+   */
+  pagination?: Pagination;
+  /**
+   * transform api response to table data
+   */
+  transform: Transform<ResponseData, ApiData, Pagination>;
+  /**
+   * columns factory
+   */
+  columns: () => Column[];
  /**
   * get column checks
-   *
-   * @param columns
   */
-  getColumnChecks: (columns: C[]) => TableColumnCheck[];
+  getColumnChecks: (columns: Column[]) => TableColumnCheck[];
  /**
   * get columns
-   *
-   * @param columns
   */
-  getColumns: (columns: C[], checks: TableColumnCheck[]) => C[];
+  getColumns: (columns: Column[], checks: TableColumnCheck[]) => Column[];
  /**
   * callback when response fetched
-   *
-   * @param transformed transformed data
   */
-  onFetched?: (transformed: TransformedData<T>) => MaybePromise<void>;
+  onFetched?: (data: GetApiData<ApiData, Pagination>) => void | Promise<void>;
  /**
   * whether to get data immediately
   *
   * @default true
   */
  immediate?: boolean;
-};
+}

-export default function useHookTable<A extends ApiFn, T, C>(config: TableConfig<A, T, C>) {
+export default function useTable<ResponseData, ApiData, Column, Pagination extends boolean>(
+  options: UseTableOptions<ResponseData, ApiData, Column, Pagination>
+) {
  const { loading, startLoading, endLoading } = useLoading();
  const { bool: empty, setBool: setEmpty } = useBoolean();

-  const { apiFn, apiParams, transformer, immediate = true, getColumnChecks, getColumns } = config;
+  const { api, pagination, transform, columns, getColumnChecks, getColumns, onFetched, immediate = true } = options;

-  const searchParams: NonNullable<Parameters<A>[0]> = reactive(jsonClone({ ...apiParams }));
+  const data = ref([]) as Ref<ApiData[]>;

-  const allColumns = ref(config.columns()) as Ref<C[]>;
+  const columnChecks = ref(getColumnChecks(columns())) as Ref<TableColumnCheck[]>;

-  const data: Ref<TableDataWithIndex<T>[]> = ref([]);
-
-  const columnChecks: Ref<TableColumnCheck[]> = ref(getColumnChecks(config.columns()));
-
-  const columns = computed(() => getColumns(allColumns.value, columnChecks.value));
+  const $columns = computed(() => getColumns(columns(), columnChecks.value));

  function reloadColumns() {
-    allColumns.value = config.columns();
-
    const checkMap = new Map(columnChecks.value.map(col => [col.key, col.checked]));

-    const defaultChecks = getColumnChecks(allColumns.value);
+    const defaultChecks = getColumnChecks(columns());

    columnChecks.value = defaultChecks.map(col => ({
      ...col,
@ -90,48 +88,21 @@ export default function useHookTable<A extends ApiFn, T, C>(config: TableConfig<
  }

  async function getData() {
-    startLoading();
+    try {
+      startLoading();

-    const formattedParams = formatSearchParams(searchParams);
+      const response = await api();

-    const response = await apiFn(formattedParams);
+      const transformed = transform(response);

-    const transformed = transformer(response as Awaited<ReturnType<A>>);
+      data.value = getTableData(transformed, pagination);

-    data.value = transformed.data;
+      setEmpty(data.value.length === 0);

-    setEmpty(transformed.data.length === 0);
-
-    await config.onFetched?.(transformed);
-
-    endLoading();
-  }
-
-  function formatSearchParams(params: Record<string, unknown>) {
-    const formattedParams: Record<string, unknown> = {};
-
-    Object.entries(params).forEach(([key, value]) => {
-      if (value !== null && value !== undefined) {
-        formattedParams[key] = value;
-      }
-    });
-
-    return formattedParams;
-  }
-
-  /**
-   * update search params
-   *
-   * @param params
-   */
-  function updateSearchParams(params: Partial<Parameters<A>[0]>) {
-    Object.assign(searchParams, params);
-  }
-
-  /** reset search params */
-  function resetSearchParams() {
-    Object.assign(searchParams, jsonClone(apiParams));
-    getData();
+      await onFetched?.(transformed);
+    } finally {
+      endLoading();
+    }
  }

  if (immediate) {
@ -142,12 +113,20 @@ export default function useHookTable<A extends ApiFn, T, C>(config: TableConfig<
    loading,
    empty,
    data,
-    columns,
+    columns: $columns,
    columnChecks,
    reloadColumns,
-    getData,
-    searchParams,
-    updateSearchParams,
-    resetSearchParams
+    getData
  };
 }
+
+function getTableData<ApiData, Pagination extends boolean>(
+  data: GetApiData<ApiData, Pagination>,
+  pagination?: Pagination
+) {
+  if (pagination) {
+    return (data as PaginationData<ApiData>).data;
+  }
+
+  return data as ApiData[];
+}
--- a/packages/materials/src/libs/admin-layout/index.vue
+++ b/packages/materials/src/libs/admin-layout/index.vue
@ -127,7 +127,6 @@ function handleClickMask() {
          :class="[
            style['layout-header'],
            commonClass,
-            headerClass,
            headerLeftGapClass,
            { 'absolute top-0 left-0 w-full': fixedHeaderAndTab }
          ]"
--- a/packages/materials/src/types/index.ts
+++ b/packages/materials/src/types/index.ts
@ -6,12 +6,6 @@ interface AdminLayoutHeaderConfig {
   * @default true
   */
  headerVisible?: boolean;
-  /**
-   * Header class
-   *
-   * @default ''
-   */
-  headerClass?: string;
  /**
   * Header height
   *
--- a/packages/ofetch/package.json
+++ b/packages/ofetch/package.json
@ -1,15 +0,0 @@
-{
-  "name": "@sa/fetch",
-  "version": "1.3.15",
-  "exports": {
-    ".": "./src/index.ts"
-  },
-  "typesVersions": {
-    "*": {
-      "*": ["./src/*"]
-    }
-  },
-  "dependencies": {
-    "ofetch": "1.4.1"
-  }
-}
--- a/packages/ofetch/src/index.ts
+++ b/packages/ofetch/src/index.ts
@ -1,10 +0,0 @@
-import { ofetch } from 'ofetch';
-import type { FetchOptions } from 'ofetch';
-
-export function createRequest(options: FetchOptions) {
-  const request = ofetch.create(options);
-
-  return request;
-}
-
-export default createRequest;
--- a/packages/ofetch/tsconfig.json
+++ b/packages/ofetch/tsconfig.json
@ -1,20 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ESNext",
-    "jsx": "preserve",
-    "lib": ["DOM", "ESNext"],
-    "baseUrl": ".",
-    "module": "ESNext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "types": ["node"],
-    "strict": true,
-    "strictNullChecks": true,
-    "noUnusedLocals": true,
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true
-  },
-  "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist"]
-}
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@ -14,14 +14,14 @@
  },
  "devDependencies": {
    "@soybeanjs/changelog": "0.3.24",
-    "bumpp": "10.2.3",
-    "c12": "3.2.0",
+    "bumpp": "10.2.0",
+    "c12": "3.1.0",
    "cac": "6.7.14",
    "consola": "3.4.2",
    "enquirer": "2.4.1",
    "execa": "9.6.0",
    "kolorist": "1.8.0",
-    "npm-check-updates": "18.0.3",
+    "npm-check-updates": "18.0.1",
    "rimraf": "6.0.1"
  }
 }
--- a/packages/tinymce/src/tinymce.vue
+++ b/packages/tinymce/src/tinymce.vue
@ -220,7 +220,7 @@ const events = computed(() => {
 <style lang="scss">
 .tox.tox-silver-sink.tox-tinymce-aux {
  /** 该样式默认为1300的zIndex  */
-  z-index: 2025 !important;
+  z-index: 2025;
 }

 .app-tinymce {
--- a/packages/utils/src/storage.ts
+++ b/packages/utils/src/storage.ts
@ -32,7 +32,8 @@ export function createStorage<T extends object>(type: StorageType, storagePrefix
          storageData = JSON.parse(json);
        } catch {}

-        if (storageData) {
+        // storageData may be `false` if it is boolean type
+        if (storageData !== null) {
          return storageData as T[K];
        }
      }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/App.vue
+++ b/src/App.vue
@ -4,7 +4,6 @@ import { NConfigProvider, darkTheme } from 'naive-ui';
 import type { WatermarkProps } from 'naive-ui';
 import { useAppStore } from './store/modules/app';
 import { useThemeStore } from './store/modules/theme';
-import { useAuthStore } from './store/modules/auth';
 import { naiveDateLocales, naiveLocales } from './locales/naive';

 defineOptions({
@ -13,7 +12,6 @@ defineOptions({

 const appStore = useAppStore();
 const themeStore = useThemeStore();
-const { userInfo } = useAuthStore();

 const naiveDarkTheme = computed(() => (themeStore.darkMode ? darkTheme : undefined));

@ -26,24 +24,19 @@ const naiveDateLocale = computed(() => {
 });

 const watermarkProps = computed<WatermarkProps>(() => {
-  const appTitle = import.meta.env.VITE_APP_TITLE || 'RuoYi-Vue-Plus';
-  const content =
-    themeStore.watermark.enableUserName && userInfo.user?.userName
-      ? `${userInfo.user?.nickName}@${appTitle} ${userInfo.user?.userName}`
-      : appTitle;
  return {
-    content,
+    content: themeStore.watermarkContent,
    cross: true,
    fullscreen: true,
    fontSize: 14,
-    fontColor: themeStore.darkMode ? 'rgba(200, 200, 200, 0.03)' : 'rgba(200, 200, 200, 0.2)',
    lineHeight: 14,
-    width: 200,
-    height: 300,
+    width: 384,
+    height: 384,
    xOffset: 12,
    yOffset: 60,
-    rotate: -18,
-    zIndex: 9999
+    rotate: -13,
+    zIndex: 9999,
+    fontColor: themeStore.darkMode ? 'rgba(200, 200, 200, 0.03)' : 'rgba(200, 200, 200, 0.2)'
  };
 });
 </script>
--- a/src/components/advanced/table-column-setting.vue
+++ b/src/components/advanced/table-column-setting.vue
@ -22,7 +22,12 @@ const columns = defineModel<NaiveUI.TableColumnCheck[]>('columns', {
      </NButton>
    </template>
    <VueDraggable v-model="columns" :animation="150" filter=".none_draggable">
-      <div v-for="item in columns" :key="item.key" class="h-36px flex-y-center rd-4px hover:(bg-primary bg-opacity-20)">
+      <div
+        v-for="item in columns"
+        :key="item.key"
+        class="h-36px flex-y-center rd-4px hover:(bg-primary bg-opacity-20)"
+        :class="{ hidden: !item.visible }"
+      >
        <icon-mdi-drag class="mr-8px h-full cursor-move text-icon" />
        <NCheckbox v-model:checked="item.checked" class="none_draggable flex-1">
          <template v-if="typeof item.title === 'function'">
--- a/src/components/common/icon-tooltip.vue
+++ b/src/components/common/icon-tooltip.vue
@ -0,0 +1,42 @@
+<script lang="ts" setup>
+import { computed, useSlots } from 'vue';
+import type { PopoverPlacement } from 'naive-ui';
+
+defineOptions({ name: 'IconTooltip' });
+
+interface Props {
+  icon?: string;
+  localIcon?: string;
+  desc?: string;
+  placement?: PopoverPlacement;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  icon: 'mdi-help-circle',
+  localIcon: '',
+  desc: '',
+  placement: 'top'
+});
+
+const slots = useSlots();
+const hasCustomTrigger = computed(() => Boolean(slots.trigger));
+
+if (!hasCustomTrigger.value && !props.icon && !props.localIcon) {
+  throw new Error('icon or localIcon is required when no custom trigger slot is provided');
+}
+</script>
+
+<template>
+  <NTooltip :placement="placement">
+    <template #trigger>
+      <slot name="trigger">
+        <div class="cursor-pointer">
+          <SvgIcon :icon="icon" :local-icon="localIcon" />
+        </div>
+      </slot>
+    </template>
+    <slot>
+      <span>{{ desc }}</span>
+    </slot>
+  </NTooltip>
+</template>
--- a/src/components/custom/dict-tag.vue
+++ b/src/components/custom/dict-tag.vue
@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { computed, useAttrs } from 'vue';
 import type { TagProps } from 'naive-ui';
-import { jsonClone } from '@sa/utils';
 import { useDict } from '@/hooks/business/dict';
 import { isNotNull } from '@/utils/common';
 import { $t } from '@/locales';
@ -29,7 +28,7 @@ const { transformDictData } = useDict(props.dictCode, props.immediate);

 const dictTagData = computed<Api.System.DictData[]>(() => {
  if (props.dictData) {
-    const dictData = jsonClone(props.dictData);
+    const dictData = props.dictData;
    if (dictData.dictLabel?.startsWith(`dict.${dictData.dictType}.`)) {
      dictData.dictLabel = $t(dictData.dictLabel as App.I18n.I18nKey);
    }
--- a/src/components/custom/json-preview.vue
+++ b/src/components/custom/json-preview.vue
@ -2,7 +2,6 @@
 import { computed } from 'vue';
 import hljs from 'highlight.js/lib/core';
 import json from 'highlight.js/lib/languages/json';
-import { twMerge } from 'tailwind-merge';

 hljs.registerLanguage('json', json);

@ -11,19 +10,15 @@ defineOptions({
 });

 interface Props {
-  class?: string;
  code?: string;
  showLineNumbers?: boolean;
 }

 const props = withDefaults(defineProps<Props>(), {
-  class: '',
  code: '',
  showLineNumbers: false
 });

-const DEFAULT_CLASS = 'max-h-500px';
-
 /** 格式化JSON数据 */
 const jsonData = computed<string>(() => {
  if (!props.code) return '';
@ -38,9 +33,9 @@ const jsonData = computed<string>(() => {
 </script>

 <template>
-  <NScrollbar :class="twMerge(DEFAULT_CLASS, props.class)">
-    <NCode :code="jsonData" :hljs="hljs" language="json" :show-line-numbers="showLineNumbers" :word-wrap="true" />
-  </NScrollbar>
+  <div class="json-preview">
+    <NCode :code="jsonData" :hljs="hljs" language="json" :show-line-numbers="showLineNumbers" />
+  </div>
 </template>

 <style lang="scss">
@ -49,4 +44,18 @@ html[class='dark'] {
    background-color: #7c7777;
  }
 }
+.json-preview {
+  width: 100%;
+  max-height: 500px;
+  overflow-y: auto;
+  @include scrollbar();
+  .empty-data {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+    color: #999;
+    font-size: 14px;
+  }
+}
 </style>
--- a/src/components/custom/wave-bg.vue
+++ b/src/components/custom/wave-bg.vue
@ -1,524 +1,61 @@
-<!-- Copyright By https://github.com/Daymychen/art-design-pro/blob/main/src/components/core/views/login/LoginLeftView.vue -->
 <script lang="ts" setup>
-import { useThemeStore } from '@/store/modules/theme';
+import { computed } from 'vue';
+import { getPaletteColorByNumber } from '@sa/color';

 defineOptions({ name: 'WaveBg' });

-const themeStore = useThemeStore();
-
-function toggleThemeScheme() {
-  if (themeStore.darkMode) {
-    themeStore.setThemeScheme('light');
-    return;
-  }
-  themeStore.setThemeScheme('dark');
+interface Props {
+  /** Theme color */
+  themeColor: string;
 }
+
+const props = defineProps<Props>();
+
+const lightColor = computed(() => getPaletteColorByNumber(props.themeColor, 200));
+const darkColor = computed(() => getPaletteColorByNumber(props.themeColor, 500));
 </script>

 <template>
-  <div class="wave-bg">
-    <!-- 几何装饰元素 -->
-    <div class="geometric-decorations">
-      <!-- 基础几何形状 -->
-      <div class="geo-element circle-outline animate-fade-in-up animate-delay-0s"></div>
-      <div class="geo-element square-rotated animate-fade-in-left animate-delay-0s"></div>
-      <div class="geo-element circle-small animate-fade-in-up animate-delay-0.3s"></div>
-
-      <div class="geo-element square-bottom-right animate-fade-in-right animate-delay-0s"></div>
-
-      <!-- 背景泡泡 -->
-      <div class="geo-element bg-bubble animate-scale-in animate-delay-0.5s"></div>
-
-      <!-- 太阳/月亮 -->
-      <div
-        class="geo-element circle-top-right animate-fade-in-down animate-delay-0.5s"
-        @click="toggleThemeScheme"
-      ></div>
-
-      <!-- 装饰点 -->
-      <div class="geo-element dot dot-top-left animate-bounce-in animate-delay-0s"></div>
-      <div class="geo-element dot dot-top-right animate-bounce-in animate-delay-0s"></div>
-      <div class="geo-element dot dot-center-right animate-bounce-in animate-delay-0s"></div>
-
-      <!-- 叠加方块组 -->
-      <div class="squares-group">
-        <i class="geo-element square square-blue animate-fade-in-left-rotated-blue animate-delay-0.2s"></i>
-        <i class="geo-element square square-pink animate-fade-in-left-rotated-pink animate-delay-0.4s"></i>
-        <i class="geo-element square square-purple animate-fade-in-left-no-rotation animate-delay-0.6s"></i>
-      </div>
+  <div class="absolute-lt z-1 size-full overflow-hidden">
+    <div class="absolute -right-300px -top-900px lt-sm:(-right-100px -top-1170px)">
+      <svg height="1337" width="1337">
+        <defs>
+          <path
+            id="path-1"
+            opacity="1"
+            fill-rule="evenodd"
+            d="M1337,668.5 C1337,1037.455193874239 1037.455193874239,1337 668.5,1337 C523.6725684305388,1337 337,1236 370.50000000000006,1094 C434.03835568300906,824.6732385973953 6.906089672974592e-14,892.6277623047779 0,668.5000000000001 C0,299.5448061257611 299.5448061257609,1.1368683772161603e-13 668.4999999999999,0 C1037.455193874239,0 1337,299.544806125761 1337,668.5Z"
+          />
+          <linearGradient id="linearGradient-2" x1="0.79" y1="0.62" x2="0.21" y2="0.86">
+            <stop offset="0" :stop-color="lightColor" stop-opacity="1" />
+            <stop offset="1" :stop-color="darkColor" stop-opacity="1" />
+          </linearGradient>
+        </defs>
+        <g opacity="1">
+          <use xlink:href="#path-1" fill="url(#linearGradient-2)" fill-opacity="1" />
+        </g>
+      </svg>
+    </div>
+    <div class="absolute -bottom-400px -left-200px lt-sm:(-bottom-760px -left-100px)">
+      <svg height="896" width="967.8852157128662">
+        <defs>
+          <path
+            id="path-2"
+            opacity="1"
+            fill-rule="evenodd"
+            d="M896,448 C1142.6325445712241,465.5747656464056 695.2579309733121,896 448,896 C200.74206902668806,896 5.684341886080802e-14,695.2579309733121 0,448.0000000000001 C0,200.74206902668806 200.74206902668791,5.684341886080802e-14 447.99999999999994,0 C695.2579309733121,0 475,418 896,448Z"
+          />
+          <linearGradient id="linearGradient-3" x1="0.5" y1="0" x2="0.5" y2="1">
+            <stop offset="0" :stop-color="darkColor" stop-opacity="1" />
+            <stop offset="1" :stop-color="lightColor" stop-opacity="1" />
+          </linearGradient>
+        </defs>
+        <g opacity="1">
+          <use xlink:href="#path-2" fill="url(#linearGradient-3)" fill-opacity="1" />
+        </g>
+      </svg>
    </div>
  </div>
 </template>

-<style lang="scss" scoped>
-// 颜色变量定义
-$primary-light-7: rgb(var(--primary-50-color));
-$primary-light-8: rgb(var(--primary-100-color));
-$primary-light-9: rgb(var(--primary-200-color));
-$primary-base: rgb(var(--primary-color));
-$main-bg: rgb(var(--primary-50-color));
-
-// 混合颜色函数
-$bg-mix-light-9: color-mix(in srgb, $primary-light-9 100%, $main-bg);
-$bg-mix-light-8: color-mix(in srgb, $primary-light-8 80%, $main-bg);
-$bg-mix-light-7: color-mix(in srgb, $primary-light-7 80%, $main-bg);
-
-.wave-bg {
-  .geometric-decorations {
-    .geo-element {
-      position: absolute;
-      opacity: 0;
-      animation-fill-mode: forwards;
-      animation-duration: 0.8s;
-      animation-timing-function: cubic-bezier(0.25, 0.46, 0.45, 0.94);
-    }
-
-    // 动画 mixin
-    @mixin fadeAnimation($direction: '', $rotation: 0deg) {
-      from {
-        opacity: 0;
-
-        @if $direction == 'up' {
-          transform: translateY(30px) rotate($rotation);
-        } @else if $direction == 'down' {
-          transform: translateY(-30px) rotate($rotation);
-        } @else if $direction == 'left' {
-          transform: translateX(-30px) rotate($rotation);
-        } @else if $direction == 'right' {
-          transform: translateX(30px) rotate($rotation);
-        }
-      }
-
-      to {
-        opacity: 1;
-
-        @if $direction == 'up' or $direction == 'down' {
-          transform: translateY(0) rotate($rotation);
-        } @else {
-          transform: translateX(0) rotate($rotation);
-        }
-      }
-    }
-
-    // 动画定义
-    @keyframes fadeInUp {
-      @include fadeAnimation('up');
-    }
-
-    @keyframes fadeInDown {
-      @include fadeAnimation('down');
-    }
-
-    @keyframes fadeInLeft {
-      @include fadeAnimation('left');
-    }
-
-    @keyframes fadeInLeftRotated {
-      @include fadeAnimation('left', -25deg);
-    }
-
-    @keyframes fadeInRight {
-      @include fadeAnimation('right');
-    }
-
-    @keyframes fadeInRightRotated {
-      @include fadeAnimation('right', 45deg);
-    }
-
-    @keyframes fadeInLeftRotatedBlue {
-      @include fadeAnimation('left', -10deg);
-    }
-
-    @keyframes fadeInLeftRotatedPink {
-      @include fadeAnimation('left', 10deg);
-    }
-
-    @keyframes fadeInLeftNoRotation {
-      @include fadeAnimation('left');
-    }
-
-    @keyframes scaleIn {
-      from {
-        opacity: 0;
-        transform: scale(0.8);
-      }
-
-      to {
-        opacity: 1;
-        transform: scale(1);
-      }
-    }
-
-    @keyframes bounceIn {
-      0% {
-        opacity: 0;
-        transform: scale(0.3);
-      }
-
-      50% {
-        opacity: 1;
-        transform: scale(1.05);
-      }
-
-      70% {
-        transform: scale(0.9);
-      }
-
-      100% {
-        opacity: 1;
-        transform: scale(1);
-      }
-    }
-
-    @keyframes lineGrow {
-      from {
-        opacity: 0;
-      }
-
-      to {
-        opacity: 1;
-      }
-    }
-
-    @keyframes slideInLeft {
-      from {
-        opacity: 0;
-        transform: translateX(-30px);
-      }
-
-      to {
-        opacity: 1;
-        transform: translateX(0);
-      }
-    }
-
-    // 动画类
-    .animate-fade-in-up {
-      animation-name: fadeInUp;
-    }
-
-    .animate-fade-in-down {
-      animation-name: fadeInDown;
-    }
-
-    .animate-fade-in-left {
-      animation-name: fadeInLeft;
-    }
-
-    .animate-fade-in-right {
-      animation-name: fadeInRight;
-    }
-
-    .animate-scale-in {
-      animation-name: scaleIn;
-      animation-duration: 1.2s;
-    }
-
-    .animate-bounce-in {
-      animation-name: bounceIn;
-      animation-duration: 0.6s;
-    }
-
-    .animate-fade-in-left-rotated-blue {
-      animation-name: fadeInLeftRotatedBlue;
-    }
-
-    .animate-fade-in-left-rotated-pink {
-      animation-name: fadeInLeftRotatedPink;
-    }
-
-    .animate-fade-in-left-no-rotation {
-      animation-name: fadeInLeftNoRotation;
-    }
-
-    // 基础几何形状
-    .circle-outline {
-      top: 10%;
-      left: 25%;
-      width: 42px;
-      height: 42px;
-      border: 2px solid $primary-light-8;
-      border-radius: 50%;
-    }
-
-    .square-rotated {
-      top: 50%;
-      left: 16%;
-      width: 60px;
-      height: 60px;
-      background-color: $bg-mix-light-8;
-
-      &.animate-fade-in-left {
-        animation-name: fadeInLeftRotated;
-      }
-    }
-
-    .circle-small {
-      bottom: 26%;
-      left: 30%;
-      width: 18px;
-      height: 18px;
-      background-color: $primary-light-8;
-      border-radius: 50%;
-    }
-
-    // 太阳/月亮效果
-    .circle-top-right {
-      top: 3%;
-      right: 3%;
-      z-index: 100;
-      width: 50px;
-      height: 50px;
-      cursor: pointer;
-      background: $bg-mix-light-7;
-      border-radius: 50%;
-      transition: all 0.3s;
-
-      &::after {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: 100%;
-        height: 100%;
-        content: '';
-        background: linear-gradient(to right, #fcbb04, #fffc00);
-        border-radius: 50%;
-        opacity: 0;
-        transition: all 0.5s;
-        transform: translate(-50%, -50%);
-      }
-
-      &:hover {
-        box-shadow: 0 0 36px #fffc00;
-
-        &::after {
-          opacity: 1;
-        }
-      }
-    }
-
-    .square-bottom-right {
-      right: 10%;
-      bottom: 10%;
-      width: 50px;
-      height: 50px;
-      background-color: $primary-light-8;
-
-      &.animate-fade-in-right {
-        animation-name: fadeInRightRotated;
-      }
-    }
-
-    // 背景泡泡
-    .bg-bubble {
-      top: -120px;
-      right: -120px;
-      width: 360px;
-      height: 360px;
-      background-color: $bg-mix-light-8;
-      border-radius: 50%;
-    }
-
-    // 装饰点
-    .dot {
-      width: 14px;
-      height: 14px;
-      background-color: $primary-light-7;
-      border-radius: 50%;
-
-      &.dot-top-left {
-        top: 140px;
-        left: 100px;
-      }
-
-      &.dot-top-right {
-        top: 140px;
-        right: 120px;
-      }
-
-      &.dot-center-right {
-        top: 46%;
-        right: 22%;
-        background-color: $primary-light-8;
-      }
-    }
-
-    // 叠加方块组
-    .squares-group {
-      position: absolute;
-      bottom: 18px;
-      left: 20px;
-      width: 140px;
-      height: 140px;
-      pointer-events: none;
-
-      .square {
-        position: absolute;
-        display: block;
-        border-radius: 8px;
-        box-shadow: 0 8px 24px rgb(64 87 167 / 12%);
-
-        &.square-blue {
-          top: 12px;
-          left: 30px;
-          z-index: 2;
-          width: 50px;
-          height: 50px;
-          background-color: rgb(from $primary-base r g b / 30%);
-        }
-
-        &.square-pink {
-          top: 30px;
-          left: 48px;
-          z-index: 1;
-          width: 70px;
-          height: 70px;
-          background-color: rgb(from $primary-base r g b / 15%);
-        }
-
-        &.square-purple {
-          top: 66px;
-          left: 86px;
-          z-index: 3;
-          width: 32px;
-          height: 32px;
-          background-color: rgb(from $primary-base r g b / 45%);
-        }
-      }
-
-      // 装饰线条
-      &::after {
-        position: absolute;
-        top: 86px;
-        left: 72px;
-        width: 80px;
-        height: 1px;
-        content: '';
-        background: linear-gradient(90deg, var(--el-color-primary-light-6), transparent);
-        opacity: 0;
-        transform: rotate(50deg);
-        animation: lineGrow 0.8s cubic-bezier(0.25, 0.46, 0.45, 0.94) forwards;
-        animation-delay: 1.2s;
-      }
-    }
-  }
-
-  @media only screen and (max-width: 1600px) {
-    width: 60vw;
-
-    .text-wrap {
-      bottom: 40px;
-    }
-  }
-
-  @media only screen and (max-width: 1280px) {
-    width: auto;
-    height: auto;
-    padding: 0;
-    // 隐藏背景和其他内容，只保留 logo
-    background: transparent;
-
-    .left-img,
-    .text-wrap,
-    .geometric-decorations {
-      display: none;
-    }
-
-    .logo {
-      position: fixed;
-      top: 15px;
-      left: 25px;
-      z-index: 1000;
-    }
-  }
-}
-
-// 暗色主题
-.dark .wave-bg {
-  background-color: color-mix(in srgb, $primary-light-9 60%, #070707);
-
-  @media only screen and (max-width: 1280px) {
-    background: transparent;
-  }
-
-  .geometric-decorations {
-    // 月亮效果
-    .circle-top-right {
-      background-color: $bg-mix-light-8;
-      box-shadow: 0 0 25px #333 inset;
-      transition: all 0.3s ease-in-out 0.1s;
-      rotate: -48deg;
-
-      &::before {
-        position: absolute;
-        top: 0;
-        left: 15px;
-        width: 50px;
-        height: 50px;
-        content: '';
-        background-color: $bg-mix-light-9;
-        border-radius: 50%;
-        transition: all 0.3s ease-in-out;
-      }
-
-      &:hover {
-        background-color: transparent;
-        box-shadow: 0 40px 25px #ddd inset;
-
-        &::before {
-          left: 18px;
-        }
-
-        &::after {
-          opacity: 0;
-        }
-      }
-    }
-
-    .bg-bubble {
-      background-color: $bg-mix-light-9;
-    }
-
-    // 其他元素颜色调整
-    .square-rotated {
-      background-color: $bg-mix-light-9;
-    }
-
-    .circle-small,
-    .dot {
-      background-color: $primary-light-8;
-    }
-
-    .square-bottom-right {
-      background-color: $primary-light-9;
-    }
-
-    .dot.dot-top-right {
-      background-color: $primary-light-8;
-    }
-  }
-
-  // 方块组暗色调整
-  .squares-group {
-    .square {
-      box-shadow: none;
-
-      &.square-blue {
-        background-color: rgb(from $primary-base r g b / 18%);
-      }
-
-      &.square-pink {
-        background-color: rgb(from $primary-base r g b / 10%);
-      }
-
-      &.square-purple {
-        background-color: rgb(from $primary-base r g b / 20%);
-      }
-    }
-
-    &::after {
-      background: linear-gradient(90deg, $primary-light-8, transparent);
-    }
-  }
-}
-</style>
+<style scoped></style>
--- a/src/constants/app.ts
+++ b/src/constants/app.ts
@ -5,9 +5,9 @@ export const GLOBAL_HEADER_MENU_ID = '__GLOBAL_HEADER_MENU__';
 export const GLOBAL_SIDER_MENU_ID = '__GLOBAL_SIDER_MENU__';

 export const themeSchemaRecord: Record<UnionKey.ThemeScheme, App.I18n.I18nKey> = {
-  light: 'theme.themeSchema.light',
-  dark: 'theme.themeSchema.dark',
-  auto: 'theme.themeSchema.auto'
+  light: 'theme.appearance.themeSchema.light',
+  dark: 'theme.appearance.themeSchema.dark',
+  auto: 'theme.appearance.themeSchema.auto'
 };

 export const themeSchemaOptions = transformRecordToOption(themeSchemaRecord);
@ -21,49 +21,61 @@ export const loginModuleRecord: Record<UnionKey.LoginModule, App.I18n.I18nKey> =
 };

 export const themeLayoutModeRecord: Record<UnionKey.ThemeLayoutMode, App.I18n.I18nKey> = {
-  vertical: 'theme.layoutMode.vertical',
-  'vertical-mix': 'theme.layoutMode.vertical-mix',
-  horizontal: 'theme.layoutMode.horizontal',
-  'horizontal-mix': 'theme.layoutMode.horizontal-mix'
+  vertical: 'theme.layout.layoutMode.vertical',
+  'vertical-mix': 'theme.layout.layoutMode.vertical-mix',
+  'vertical-hybrid-header-first': 'theme.layout.layoutMode.vertical-hybrid-header-first',
+  horizontal: 'theme.layout.layoutMode.horizontal',
+  'top-hybrid-sidebar-first': 'theme.layout.layoutMode.top-hybrid-sidebar-first',
+  'top-hybrid-header-first': 'theme.layout.layoutMode.top-hybrid-header-first'
 };

 export const themeLayoutModeOptions = transformRecordToOption(themeLayoutModeRecord);

 export const themeScrollModeRecord: Record<UnionKey.ThemeScrollMode, App.I18n.I18nKey> = {
-  wrapper: 'theme.scrollMode.wrapper',
-  content: 'theme.scrollMode.content'
+  wrapper: 'theme.layout.content.scrollMode.wrapper',
+  content: 'theme.layout.content.scrollMode.content'
 };

 export const themeScrollModeOptions = transformRecordToOption(themeScrollModeRecord);

 export const themeTabModeRecord: Record<UnionKey.ThemeTabMode, App.I18n.I18nKey> = {
-  chrome: 'theme.tab.mode.chrome',
-  button: 'theme.tab.mode.button'
+  chrome: 'theme.layout.tab.mode.chrome',
+  button: 'theme.layout.tab.mode.button'
 };

 export const themeTabModeOptions = transformRecordToOption(themeTabModeRecord);

 export const themePageAnimationModeRecord: Record<UnionKey.ThemePageAnimateMode, App.I18n.I18nKey> = {
-  'fade-slide': 'theme.page.mode.fade-slide',
-  fade: 'theme.page.mode.fade',
-  'fade-bottom': 'theme.page.mode.fade-bottom',
-  'fade-scale': 'theme.page.mode.fade-scale',
-  'zoom-fade': 'theme.page.mode.zoom-fade',
-  'zoom-out': 'theme.page.mode.zoom-out',
-  none: 'theme.page.mode.none'
+  'fade-slide': 'theme.layout.content.page.mode.fade-slide',
+  fade: 'theme.layout.content.page.mode.fade',
+  'fade-bottom': 'theme.layout.content.page.mode.fade-bottom',
+  'fade-scale': 'theme.layout.content.page.mode.fade-scale',
+  'zoom-fade': 'theme.layout.content.page.mode.zoom-fade',
+  'zoom-out': 'theme.layout.content.page.mode.zoom-out',
+  none: 'theme.layout.content.page.mode.none'
 };

 export const themePageAnimationModeOptions = transformRecordToOption(themePageAnimationModeRecord);

 export const resetCacheStrategyRecord: Record<UnionKey.ResetCacheStrategy, App.I18n.I18nKey> = {
-  close: 'theme.resetCacheStrategy.close',
-  refresh: 'theme.resetCacheStrategy.refresh'
+  close: 'theme.layout.resetCacheStrategy.close',
+  refresh: 'theme.layout.resetCacheStrategy.refresh'
 };

 export const resetCacheStrategyOptions = transformRecordToOption(resetCacheStrategyRecord);

 export const DARK_CLASS = 'dark';

+export const watermarkTimeFormatOptions = [
+  { label: 'YYYY-MM-DD HH:mm', value: 'YYYY-MM-DD HH:mm' },
+  { label: 'YYYY-MM-DD HH:mm:ss', value: 'YYYY-MM-DD HH:mm:ss' },
+  { label: 'YYYY/MM/DD HH:mm', value: 'YYYY/MM/DD HH:mm' },
+  { label: 'YYYY/MM/DD HH:mm:ss', value: 'YYYY/MM/DD HH:mm:ss' },
+  { label: 'HH:mm', value: 'HH:mm' },
+  { label: 'HH:mm:ss', value: 'HH:mm:ss' },
+  { label: 'MM-DD HH:mm', value: 'MM-DD HH:mm' }
+];
+
 export const themeTableSizeRecord: Record<UnionKey.ThemeTableSize, App.I18n.I18nKey> = {
  small: 'theme.table.size.small',
  medium: 'theme.table.size.medium',
--- a/src/enum/index.ts
+++ b/src/enum/index.ts
@ -4,6 +4,5 @@ export enum SetupStoreId {
  Auth = 'auth-store',
  Route = 'route-store',
  Tab = 'tab-store',
-  Notice = 'notice-store',
-  Dict = 'dict-store'
+  Notice = 'notice-store'
 }
--- a/src/hooks/business/download.ts
+++ b/src/hooks/business/download.ts
@ -113,10 +113,6 @@ export function useDownload() {

      const response = await fetch(fullUrl, requestOptions);

-      if (response.status !== 200) {
-        throw new Error(errorCodeRecord.default);
-      }
-
      await handleResponse(response);

      const rawHeader = response.headers.get('Download-Filename');
--- a/src/hooks/common/echarts.ts
+++ b/src/hooks/common/echarts.ts
@ -1,4 +1,4 @@
-import { computed, effectScope, nextTick, onScopeDispose, ref, watch } from 'vue';
+import { computed, effectScope, nextTick, onScopeDispose, shallowRef, watch } from 'vue';
 import { useElementSize } from '@vueuse/core';
 import * as echarts from 'echarts/core';
 import { BarChart, GaugeChart, LineChart, PictorialBarChart, PieChart, RadarChart, ScatterChart } from 'echarts/charts';
@ -86,11 +86,11 @@ export function useEcharts<T extends ECOption>(optionsFactory: () => T, hooks: C
  const themeStore = useThemeStore();
  const darkMode = computed(() => themeStore.darkMode);

-  const domRef = ref<HTMLElement | null>(null);
+  const domRef = shallowRef<HTMLElement | null>(null);
  const initialSize = { width: 0, height: 0 };
  const { width, height } = useElementSize(domRef, initialSize);

-  let chart: echarts.ECharts | null = null;
+  const chart = shallowRef<echarts.ECharts | null>(null);
  const chartOptions: T = optionsFactory();

  const {
@ -111,18 +111,9 @@ export function useEcharts<T extends ECOption>(optionsFactory: () => T, hooks: C
    onDestroy
  } = hooks;

-  /**
-   * whether can render chart
-   *
-   * when domRef is ready and initialSize is valid
-   */
-  function canRender() {
-    return domRef.value && initialSize.width > 0 && initialSize.height > 0;
-  }
-
  /** is chart rendered */
  function isRendered() {
-    return Boolean(domRef.value && chart);
+    return Boolean(domRef.value && chart.value);
  }

  /**
@ -131,59 +122,59 @@ export function useEcharts<T extends ECOption>(optionsFactory: () => T, hooks: C
   * @param callback callback function
   */
  async function updateOptions(callback: (opts: T, optsFactory: () => T) => ECOption = () => chartOptions) {
-    if (!isRendered()) return;
-
    const updatedOpts = callback(chartOptions, optionsFactory);

    Object.assign(chartOptions, updatedOpts);

+    await nextTick();
+
+    if (!isRendered()) return;
+
    if (isRendered()) {
-      chart?.clear();
+      chart.value?.clear();
    }

-    chart?.setOption({ ...updatedOpts, backgroundColor: 'transparent' });
+    chart.value?.setOption({ ...updatedOpts, backgroundColor: 'transparent' });

-    await onUpdated?.(chart!);
+    await onUpdated?.(chart.value!);
  }

  function setOptions(options: T) {
-    chart?.setOption(options);
+    chart.value?.setOption(options);
  }

  /** render chart */
  async function render() {
-    if (!isRendered()) {
-      const chartTheme = darkMode.value ? 'dark' : 'light';
+    if (isRendered()) return;

-      await nextTick();
+    const chartTheme = darkMode.value ? 'dark' : 'light';

-      chart = echarts.init(domRef.value, chartTheme);
+    chart.value = echarts.init(domRef.value, chartTheme);

-      chart.setOption({ ...chartOptions, backgroundColor: 'transparent' });
+    chart.value?.setOption({ ...chartOptions, backgroundColor: 'transparent' });

-      await onRender?.(chart);
-    }
+    await onRender?.(chart.value!);
  }

  /** resize chart */
  function resize() {
-    chart?.resize();
+    chart.value?.resize();
  }

  /** destroy chart */
  async function destroy() {
-    if (!chart) return;
+    if (!chart.value) return;

-    await onDestroy?.(chart);
-    chart?.dispose();
-    chart = null;
+    await onDestroy?.(chart.value);
+    chart.value?.dispose();
+    chart.value = null;
  }

  /** change chart theme */
  async function changeTheme() {
    await destroy();
    await render();
-    await onUpdated?.(chart!);
+    await onUpdated?.(chart.value!);
  }

  /**
@ -196,30 +187,29 @@ export function useEcharts<T extends ECOption>(optionsFactory: () => T, hooks: C
    initialSize.width = w;
    initialSize.height = h;

-    // size is abnormal, destroy chart
-    if (!canRender()) {
-      await destroy();
-
-      return;
-    }
-
    // resize chart
    if (isRendered()) {
      resize();
+
+      return;
    }

    // render chart
    await render();

-    if (chart) {
-      await onUpdated?.(chart);
+    if (chart.value) {
+      await onUpdated?.(chart.value);
    }
  }

  scope.run(() => {
-    watch([width, height], ([newWidth, newHeight]) => {
-      renderChartBySize(newWidth, newHeight);
-    });
+    watch(
+      [width, height],
+      ([newWidth, newHeight]) => {
+        renderChartBySize(newWidth, newHeight);
+      },
+      { flush: 'post' }
+    );

    watch(darkMode, () => {
      changeTheme();
@ -233,6 +223,7 @@ export function useEcharts<T extends ECOption>(optionsFactory: () => T, hooks: C

  return {
    domRef,
+    chart,
    updateOptions,
    setOptions
  };
--- a/src/hooks/common/table.ts
+++ b/src/hooks/common/table.ts
@ -1,195 +1,55 @@
-import { computed, effectScope, onScopeDispose, reactive, ref, watch } from 'vue';
+import { computed, effectScope, onScopeDispose, reactive, ref, shallowRef, watch } from 'vue';
 import type { Ref } from 'vue';
 import type { PaginationProps } from 'naive-ui';
+import { useBoolean, useTable } from '@sa/hooks';
+import type { PaginationData, TableColumnCheck, UseTableOptions } from '@sa/hooks';
+import type { FlatResponseData } from '@sa/axios';
 import { jsonClone } from '@sa/utils';
-import { useBoolean, useHookTable } from '@sa/hooks';
 import { useAppStore } from '@/store/modules/app';
 import { $t } from '@/locales';

-type TableData = NaiveUI.TableData;
-type GetTableData<A extends NaiveUI.TableApiFn> = NaiveUI.GetTableData<A>;
-type TableColumn<T> = NaiveUI.TableColumn<T>;
+export type UseNaiveTableOptions<ResponseData, ApiData, Pagination extends boolean> = Omit<
+  UseTableOptions<ResponseData, ApiData, NaiveUI.TableColumn<ApiData>, Pagination>,
+  'pagination' | 'getColumnChecks' | 'getColumns'
+> & {
+  /**
+   * get column visible
+   *
+   * @param column
+   *
+   * @default true
+   *
+   * @returns true if the column is visible, false otherwise
+   */
+  getColumnVisible?: (column: NaiveUI.TableColumn<ApiData>) => boolean;
+};

-export function useTable<A extends NaiveUI.TableApiFn>(config: NaiveUI.NaiveTableConfig<A>) {
+const SELECTION_KEY = '__selection__';
+
+const EXPAND_KEY = '__expand__';
+
+export function useNaiveTable<ResponseData, ApiData>(options: UseNaiveTableOptions<ResponseData, ApiData, false>) {
  const scope = effectScope();
  const appStore = useAppStore();

-  const isMobile = computed(() => appStore.isMobile);
-
-  const { apiFn, apiParams, immediate, showTotal = true } = config;
-
-  const SELECTION_KEY = '__selection__';
-
-  const EXPAND_KEY = '__expand__';
-
-  const {
-    loading,
-    empty,
-    data,
-    columns,
-    columnChecks,
-    reloadColumns,
-    getData,
-    searchParams,
-    updateSearchParams,
-    resetSearchParams
-  } = useHookTable<A, GetTableData<A>, TableColumn<NaiveUI.TableDataWithIndex<GetTableData<A>>>>({
-    apiFn,
-    apiParams,
-    columns: config.columns,
-    transformer: res => {
-      const { rows: records = [], total = 0 } = res.data || {};
-
-      const current = searchParams.pageNum as number;
-      const size = (searchParams.pageSize || 0) as number;
-
-      // Ensure that the size is greater than 0, If it is less than 0, it will cause paging calculation errors.
-      const pageSize = size <= 0 ? 10 : size;
-
-      const recordsWithIndex = records.map((item, index) => {
-        return {
-          ...item,
-          index: (current - 1) * pageSize + index + 1
-        };
-      });
-
-      return {
-        data: recordsWithIndex,
-        pageNum: current,
-        pageSize,
-        total
-      };
-    },
-    getColumnChecks: cols => {
-      const checks: NaiveUI.TableColumnCheck[] = [];
-
-      cols.forEach(column => {
-        if (isTableColumnHasKey(column)) {
-          checks.push({
-            key: column.key as string,
-            title: column.title!,
-            checked: true
-          });
-        } else if (column.type === 'selection') {
-          checks.push({
-            key: SELECTION_KEY,
-            title: $t('common.check'),
-            checked: true
-          });
-        } else if (column.type === 'expand') {
-          checks.push({
-            key: EXPAND_KEY,
-            title: $t('common.expandColumn'),
-            checked: true
-          });
-        }
-      });
-
-      return checks;
-    },
-    getColumns: (cols, checks) => {
-      const columnMap = new Map<string, TableColumn<GetTableData<A>>>();
-
-      cols.forEach(column => {
-        if (isTableColumnHasKey(column)) {
-          columnMap.set(column.key as string, column);
-        } else if (column.type === 'selection') {
-          columnMap.set(SELECTION_KEY, column);
-        } else if (column.type === 'expand') {
-          columnMap.set(EXPAND_KEY, column);
-        }
-      });
-
-      const filteredColumns = checks
-        .filter(item => item.checked)
-        .map(check => columnMap.get(check.key) as TableColumn<GetTableData<A>>);
-
-      return filteredColumns;
-    },
-    onFetched: async transformed => {
-      const { total } = transformed;
-
-      updatePagination({
-        page: searchParams.pageNum,
-        pageSize: searchParams.pageSize,
-        itemCount: total
-      });
-    },
-    immediate
+  const result = useTable<ResponseData, ApiData, NaiveUI.TableColumn<ApiData>, false>({
+    ...options,
+    getColumnChecks: cols => getColumnChecks(cols, options.getColumnVisible),
+    getColumns
  });

-  const pagination: PaginationProps = reactive({
-    page: 1,
-    pageSize: 10,
-    showSizePicker: true,
-    itemCount: 0,
-    pageSizes: [10, 15, 20, 25, 30],
-    onUpdatePage: async (page: number) => {
-      pagination.page = page;
-
-      updateSearchParams({
-        pageNum: page,
-        pageSize: pagination.pageSize!
-      });
-
-      getData();
-    },
-    onUpdatePageSize: async (pageSize: number) => {
-      pagination.pageSize = pageSize;
-      pagination.page = 1;
-
-      updateSearchParams({
-        pageNum: pagination.page,
-        pageSize
-      });
-
-      getData();
-    },
-    ...(showTotal
-      ? {
-          prefix: page => $t('datatable.itemCount', { total: page.itemCount })
-        }
-      : {})
+  // calculate the total width of the table this is used for horizontal scrolling
+  const scrollX = computed(() => {
+    return result.columns.value.reduce((acc, column) => {
+      return acc + Number(column.width ?? column.minWidth ?? 120);
+    }, 0);
  });

-  // this is for mobile, if the system does not support mobile, you can use `pagination` directly
-  const mobilePagination = computed(() => {
-    const p: PaginationProps = {
-      ...pagination,
-      pageSlot: isMobile.value ? 3 : 9,
-      prefix: !isMobile.value && showTotal ? pagination.prefix : undefined
-    };
-
-    return p;
-  });
-
-  function updatePagination(update: Partial<PaginationProps>) {
-    Object.assign(pagination, update);
-  }
-
-  /**
-   * get data by page number
-   *
-   * @param pageNum the page number. default is 1
-   */
-  async function getDataByPage(pageNum: number = 1) {
-    updatePagination({
-      page: pageNum
-    });
-
-    updateSearchParams({
-      pageNum,
-      pageSize: pagination.pageSize!
-    });
-
-    await getData();
-  }
-
  scope.run(() => {
    watch(
      () => appStore.locale,
      () => {
-        reloadColumns();
+        result.reloadColumns();
      }
    );
  });
@ -199,27 +59,126 @@ export function useTable<A extends NaiveUI.TableApiFn>(config: NaiveUI.NaiveTabl
  });

  return {
-    loading,
-    empty,
-    data,
-    columns,
-    columnChecks,
-    reloadColumns,
-    pagination,
-    mobilePagination,
-    updatePagination,
-    getData,
-    getDataByPage,
-    searchParams,
-    updateSearchParams,
-    resetSearchParams
+    ...result,
+    scrollX
  };
 }

-export function useTableOperate<T extends TableData = TableData>(data: Ref<T[]>, getData: () => Promise<void>) {
+type PaginationParams = Pick<PaginationProps, 'page' | 'pageSize'>;
+
+type UseNaivePaginatedTableOptions<ResponseData, ApiData> = UseNaiveTableOptions<ResponseData, ApiData, true> & {
+  paginationProps?: Omit<PaginationProps, 'page' | 'pageSize' | 'itemCount'>;
+  /**
+   * whether to show the total count of the table
+   *
+   * @default true
+   */
+  showTotal?: boolean;
+  onPaginationParamsChange?: (params: PaginationParams) => void | Promise<void>;
+};
+
+export function useNaivePaginatedTable<ResponseData, ApiData>(
+  options: UseNaivePaginatedTableOptions<ResponseData, ApiData>
+) {
+  const scope = effectScope();
+  const appStore = useAppStore();
+
+  const isMobile = computed(() => appStore.isMobile);
+
+  const showTotal = computed(() => options.showTotal ?? true);
+
+  const pagination = reactive({
+    page: 1,
+    pageSize: 10,
+    itemCount: 0,
+    showSizePicker: true,
+    pageSizes: [10, 15, 20, 25, 30],
+    prefix: showTotal.value ? page => $t('datatable.itemCount', { total: page.itemCount }) : undefined,
+    onUpdatePage(page) {
+      pagination.page = page;
+    },
+    onUpdatePageSize(pageSize) {
+      pagination.pageSize = pageSize;
+      pagination.page = 1;
+    },
+    ...options.paginationProps
+  }) as PaginationProps;
+
+  // this is for mobile, if the system does not support mobile, you can use `pagination` directly
+  const mobilePagination = computed(() => {
+    const p: PaginationProps = {
+      ...pagination,
+      pageSlot: isMobile.value ? 3 : 9,
+      prefix: !isMobile.value && showTotal.value ? pagination.prefix : undefined
+    };
+
+    return p;
+  });
+
+  const paginationParams = computed(() => {
+    const { page, pageSize } = pagination;
+
+    return {
+      page,
+      pageSize
+    };
+  });
+
+  const result = useTable<ResponseData, ApiData, NaiveUI.TableColumn<ApiData>, true>({
+    ...options,
+    pagination: true,
+    getColumnChecks: cols => getColumnChecks(cols, options.getColumnVisible),
+    getColumns,
+    onFetched: data => {
+      pagination.itemCount = data.total;
+    }
+  });
+
+  async function getDataByPage(page: number = 1) {
+    if (page !== pagination.page) {
+      pagination.page = page;
+
+      return;
+    }
+
+    await result.getData();
+  }
+
+  scope.run(() => {
+    watch(
+      () => appStore.locale,
+      () => {
+        result.reloadColumns();
+      }
+    );
+
+    watch(paginationParams, async newVal => {
+      await options.onPaginationParamsChange?.(newVal);
+
+      await result.getData();
+    });
+  });
+
+  onScopeDispose(() => {
+    scope.stop();
+  });
+
+  return {
+    ...result,
+    getDataByPage,
+    pagination,
+    mobilePagination
+  };
+}
+
+export function useTableOperate<TableData>(
+  data: Ref<TableData[]>,
+  idKey: keyof TableData,
+  getData: () => Promise<void>
+) {
  const { bool: drawerVisible, setTrue: openDrawer, setFalse: closeDrawer } = useBoolean();

-  const operateType = ref<NaiveUI.TableOperateType>('add');
+  const operateType = shallowRef<NaiveUI.TableOperateType>('add');

  function handleAdd() {
    operateType.value = 'add';
@ -227,18 +186,18 @@ export function useTableOperate<T extends TableData = TableData>(data: Ref<T[]>,
  }

  /** the editing row data */
-  const editingData: Ref<T | null> = ref(null);
+  const editingData = shallowRef<TableData | null>(null);

-  function handleEdit(field: keyof T, id: CommonType.IdType) {
+  function handleEdit(id: TableData[keyof TableData]) {
    operateType.value = 'edit';
-    const findItem = data.value.find(item => item[field] === id) || null;
+    const findItem = data.value.find(item => item[idKey] === id) || null;
    editingData.value = jsonClone(findItem);

    openDrawer();
  }

  /** the checked row keys of table */
-  const checkedRowKeys = ref<CommonType.IdType[]>([]);
+  const checkedRowKeys = shallowRef<string[]>([]);

  /** the hook after the batch delete operation is completed */
  async function onBatchDeleted() {
@ -270,6 +229,285 @@ export function useTableOperate<T extends TableData = TableData>(data: Ref<T[]>,
  };
 }

-function isTableColumnHasKey<T>(column: TableColumn<T>): column is NaiveUI.TableColumnWithKey<T> {
+export function defaultTransform<ApiData>(
+  response: FlatResponseData<any, Api.Common.PaginatingQueryRecord<ApiData>>
+): PaginationData<ApiData> {
+  const { data, error } = response;
+
+  if (error) {
+    return {
+      data: [],
+      pageNum: 1,
+      pageSize: 10,
+      total: 0
+    };
+  }
+
+  const { rows: records, pageSize: current, pageNum: size, total } = data;
+
+  return {
+    data: records,
+    pageNum: current,
+    pageSize: size,
+    total
+  };
+}
+
+type UseNaiveTreeTableOptions<ResponseData, ApiData> = UseNaiveTableOptions<ResponseData, ApiData, false> & {
+  keyField: keyof ApiData;
+  defaultExpandAll?: boolean;
+};
+
+export function useNaiveTreeTable<ResponseData, ApiData>(options: UseNaiveTreeTableOptions<ResponseData, ApiData>) {
+  const scope = effectScope();
+  const appStore = useAppStore();
+  const rows: Ref<ApiData[]> = ref([]);
+
+  const result = useTable<ResponseData, ApiData, NaiveUI.TableColumn<ApiData>, false>({
+    ...options,
+    pagination: false,
+    getColumnChecks: cols => getColumnChecks(cols, options.getColumnVisible),
+    getColumns,
+    onFetched: transformData => {
+      const data: ApiData[] = [];
+
+      const collect = (nodes: any[]) => {
+        nodes.forEach(node => {
+          data.push(node);
+          if (node?.children?.length) {
+            collect(node.children);
+          }
+        });
+      };
+
+      collect(transformData);
+      rows.value = data;
+    }
+  });
+
+  const { keyField = 'id', defaultExpandAll = false } = options;
+
+  const expandedRowKeys = ref<ApiData[keyof ApiData][]>([]);
+  const { bool: isCollapse, toggle: toggleCollapse } = useBoolean(defaultExpandAll);
+
+  /** expand all nodes */
+  function expandAll() {
+    toggleCollapse();
+    expandedRowKeys.value = rows.value.map(item => item[keyField as keyof ApiData]);
+  }
+
+  /** collapse all nodes */
+  function collapseAll() {
+    toggleCollapse();
+    expandedRowKeys.value = [];
+  }
+
+  scope.run(() => {
+    watch(
+      () => appStore.locale,
+      () => {
+        result.reloadColumns();
+      }
+    );
+  });
+
+  onScopeDispose(() => {
+    scope.stop();
+  });
+
+  return {
+    ...result,
+    rows,
+    isCollapse,
+    expandedRowKeys,
+    expandAll,
+    collapseAll
+  };
+}
+
+export function useTreeTableOperate<ApiData>(data: Ref<ApiData[]>, idKey: keyof ApiData, getData: () => Promise<void>) {
+  const { bool: drawerVisible, setTrue: openDrawer, setFalse: closeDrawer } = useBoolean();
+
+  const operateType = shallowRef<NaiveUI.TableOperateType>('add');
+
+  function handleAdd() {
+    operateType.value = 'add';
+    openDrawer();
+  }
+
+  /** the editing row data */
+  const editingData = shallowRef<ApiData | null>(null);
+
+  function handleEdit(id: ApiData[keyof ApiData]) {
+    operateType.value = 'edit';
+    const findItem = data.value.find(item => item[idKey] === id) || null;
+    editingData.value = jsonClone(findItem);
+
+    openDrawer();
+  }
+
+  /** the checked row keys of table */
+  const checkedRowKeys = shallowRef<string[]>([]);
+
+  /** the hook after the batch delete operation is completed */
+  async function onBatchDeleted() {
+    window.$message?.success($t('common.deleteSuccess'));
+
+    checkedRowKeys.value = [];
+
+    await getData();
+  }
+
+  /** the hook after the delete operation is completed */
+  async function onDeleted() {
+    window.$message?.success($t('common.deleteSuccess'));
+
+    await getData();
+  }
+
+  return {
+    drawerVisible,
+    openDrawer,
+    closeDrawer,
+    operateType,
+    handleAdd,
+    editingData,
+    handleEdit,
+    checkedRowKeys,
+    onBatchDeleted,
+    onDeleted
+  };
+}
+
+type TreeTableOptions<ApiData> = {
+  /** id field name */
+  idField?: keyof ApiData;
+  /** parent id field name */
+  parentIdField?: keyof ApiData;
+  /** children field name */
+  childrenField?: keyof ApiData;
+  /** filter function */
+  filterFn?: (node: ApiData) => boolean;
+};
+
+export function treeTransform<ApiData>(
+  response: FlatResponseData<any, ApiData[]>,
+  options: TreeTableOptions<ApiData>
+): ApiData[] {
+  const { data, error } = response;
+
+  if (error || !data.length) {
+    return [];
+  }
+
+  const { idField = 'id', parentIdField = 'parentId', childrenField = 'children', filterFn = () => true } = options;
+
+  // 使用 Map 替代普通对象，提高性能
+  const childrenMap = new Map<ApiData[keyof ApiData], ApiData[]>();
+  const nodeMap = new Map<ApiData[keyof ApiData], ApiData>();
+  const tree: ApiData[] = [];
+
+  // 第一遍遍历：构建节点映射
+  for (const item of data) {
+    const id = item[idField as keyof ApiData];
+    const parentId = item[parentIdField as keyof ApiData];
+
+    nodeMap.set(id, item);
+
+    if (!childrenMap.has(parentId)) {
+      childrenMap.set(parentId, []);
+    }
+    // 应用过滤函数
+    if (filterFn(item)) {
+      childrenMap.get(parentId)!.push(item);
+    }
+  }
+
+  // 第二遍遍历：找出根节点
+  for (const item of data) {
+    const parentId = item[parentIdField as keyof ApiData];
+    if (!nodeMap.has(parentId) && filterFn(item)) {
+      tree.push(item);
+    }
+  }
+
+  // 递归构建树形结构
+  const buildTree = (node: ApiData) => {
+    const id = node[idField as keyof ApiData];
+    const children = childrenMap.get(id);
+
+    if (children?.length) {
+      // 使用类型断言确保类型安全
+      (node as any)[childrenField] = children;
+      for (const child of children) {
+        buildTree(child);
+      }
+    } else {
+      // 如果没有子节点，设置为 undefined
+      (node as any)[childrenField] = undefined;
+    }
+  };
+
+  // 从根节点开始构建树
+  for (const root of tree) {
+    buildTree(root);
+  }
+
+  return tree;
+}
+
+function getColumnChecks<Column extends NaiveUI.TableColumn<any>>(
+  cols: Column[],
+  getColumnVisible?: (column: Column) => boolean
+) {
+  const checks: TableColumnCheck[] = [];
+
+  cols.forEach(column => {
+    if (isTableColumnHasKey(column)) {
+      checks.push({
+        key: column.key as string,
+        title: column.title!,
+        checked: true,
+        visible: getColumnVisible?.(column) ?? true
+      });
+    } else if (column.type === 'selection') {
+      checks.push({
+        key: SELECTION_KEY,
+        title: $t('common.check'),
+        checked: true,
+        visible: getColumnVisible?.(column) ?? false
+      });
+    } else if (column.type === 'expand') {
+      checks.push({
+        key: EXPAND_KEY,
+        title: $t('common.expandColumn'),
+        checked: true,
+        visible: getColumnVisible?.(column) ?? false
+      });
+    }
+  });
+
+  return checks;
+}
+
+function getColumns<Column extends NaiveUI.TableColumn<any>>(cols: Column[], checks: TableColumnCheck[]) {
+  const columnMap = new Map<string, Column>();
+
+  cols.forEach(column => {
+    if (isTableColumnHasKey(column)) {
+      columnMap.set(column.key as string, column);
+    } else if (column.type === 'selection') {
+      columnMap.set(SELECTION_KEY, column);
+    } else if (column.type === 'expand') {
+      columnMap.set(EXPAND_KEY, column);
+    }
+  });
+
+  const filteredColumns = checks.filter(item => item.checked).map(check => columnMap.get(check.key) as Column);
+
+  return filteredColumns;
+}
+
+export function isTableColumnHasKey<T>(column: NaiveUI.TableColumn<T>): column is NaiveUI.TableColumnWithKey<T> {
  return Boolean((column as NaiveUI.TableColumnWithKey<T>).key);
 }
--- a/src/hooks/common/tree-table.ts
+++ b/src/hooks/common/tree-table.ts
@ -1,237 +0,0 @@
-import { effectScope, onScopeDispose, ref, watch } from 'vue';
-import type { Ref } from 'vue';
-import { jsonClone } from '@sa/utils';
-import { useBoolean, useHookTable } from '@sa/hooks';
-import { useAppStore } from '@/store/modules/app';
-import { handleTree } from '@/utils/common';
-import { $t } from '@/locales';
-
-type TableData = NaiveUI.TableData;
-type GetTableData<A extends NaiveUI.TreeTableApiFn> = NaiveUI.GetTreeTableData<A>;
-type TableColumn<T> = NaiveUI.TableColumn<T>;
-
-export function useTreeTable<A extends NaiveUI.TreeTableApiFn>(
-  config: NaiveUI.NaiveTreeTableConfig<A> & CommonType.TreeConfig & { defaultExpandAll?: boolean }
-) {
-  const scope = effectScope();
-  const appStore = useAppStore();
-
-  const {
-    apiFn,
-    apiParams,
-    immediate,
-    idField,
-    parentIdField = 'parentId',
-    childrenField = 'children',
-    defaultExpandAll = false
-  } = config;
-
-  const SELECTION_KEY = '__selection__';
-  const EXPAND_KEY = '__expand__';
-
-  const expandedRowKeys = ref<CommonType.IdType[]>([]);
-
-  const {
-    loading,
-    empty,
-    data,
-    columns,
-    columnChecks,
-    reloadColumns,
-    getData,
-    searchParams,
-    updateSearchParams,
-    resetSearchParams
-  } = useHookTable<A, GetTableData<A>, TableColumn<NaiveUI.TableDataWithIndex<GetTableData<A>>>>({
-    apiFn,
-    apiParams,
-    columns: config.columns,
-    transformer: res => {
-      const records = res.data || [];
-      if (!records.length) return { data: [] };
-
-      const treeData = handleTree(records, {
-        idField,
-        parentIdField,
-        childrenField
-      });
-
-      // if defaultExpandAll is true, expand all nodes
-      expandedRowKeys.value = defaultExpandAll
-        ? records.map(item => item[idField])
-        : records.filter(item => item[parentIdField] === 0).map(item => item[idField]) || [];
-
-      return { data: treeData };
-    },
-    getColumnChecks: cols => {
-      const checks: NaiveUI.TableColumnCheck[] = [];
-
-      cols.forEach(column => {
-        if (isTableColumnHasKey(column)) {
-          checks.push({
-            key: column.key as string,
-            title: column.title as string,
-            checked: true
-          });
-        } else if (column.type === 'selection') {
-          checks.push({
-            key: SELECTION_KEY,
-            title: $t('common.check'),
-            checked: true
-          });
-        } else if (column.type === 'expand') {
-          checks.push({
-            key: EXPAND_KEY,
-            title: $t('common.expandColumn'),
-            checked: true
-          });
-        }
-      });
-
-      return checks;
-    },
-    getColumns: (cols, checks) => {
-      const columnMap = new Map<string, TableColumn<GetTableData<A>>>();
-
-      cols.forEach(column => {
-        if (isTableColumnHasKey(column)) {
-          columnMap.set(column.key as string, column);
-        } else if (column.type === 'selection') {
-          columnMap.set(SELECTION_KEY, column);
-        } else if (column.type === 'expand') {
-          columnMap.set(EXPAND_KEY, column);
-        }
-      });
-
-      const filteredColumns = checks
-        .filter(item => item.checked)
-        .map(check => columnMap.get(check.key) as TableColumn<GetTableData<A>>);
-
-      return filteredColumns;
-    },
-    immediate
-  });
-
-  /** 收集所有节点的key */
-  function collectAllNodeKeys(treeNodes: any[]): CommonType.IdType[] {
-    const keys: CommonType.IdType[] = [];
-
-    const collect = (nodes: any[]) => {
-      nodes.forEach(node => {
-        keys.push(node[idField]);
-        if (node[childrenField]?.length) {
-          collect(node[childrenField]);
-        }
-      });
-    };
-
-    collect(treeNodes);
-    return keys;
-  }
-
-  const { bool: isCollapse, toggle: toggleCollapse } = useBoolean(defaultExpandAll);
-
-  /** expand all nodes */
-  function expandAll() {
-    toggleCollapse();
-    expandedRowKeys.value = collectAllNodeKeys(data.value);
-  }
-
-  /** collapse all nodes */
-  function collapseAll() {
-    toggleCollapse();
-    expandedRowKeys.value = [];
-  }
-
-  scope.run(() => {
-    watch(
-      () => appStore.locale,
-      () => {
-        reloadColumns();
-      }
-    );
-  });
-
-  onScopeDispose(() => {
-    scope.stop();
-  });
-
-  return {
-    loading,
-    empty,
-    data,
-    columns,
-    columnChecks,
-    reloadColumns,
-    getData,
-    searchParams,
-    updateSearchParams,
-    resetSearchParams,
-    expandedRowKeys,
-    isCollapse,
-    expandAll,
-    collapseAll
-  };
-}
-
-export function useTreeTableOperate<T extends TableData = TableData>(_: Ref<T[]>, getData: () => Promise<void>) {
-  const { bool: drawerVisible, setTrue: openDrawer, setFalse: closeDrawer } = useBoolean();
-
-  const operateType = ref<NaiveUI.TableOperateType>('add');
-
-  function handleAdd() {
-    operateType.value = 'add';
-    openDrawer();
-  }
-
-  /** the editing row data */
-  const editingData: Ref<T | null> = ref(null);
-
-  function handleEdit(row: T) {
-    operateType.value = 'edit';
-    editingData.value = jsonClone(row);
-
-    openDrawer();
-  }
-
-  /** the checked row keys of table */
-  const checkedRowKeys = ref<CommonType.IdType[]>([]);
-
-  function clearCheckedRowKeys() {
-    checkedRowKeys.value = [];
-  }
-
-  /** the hook after the batch delete operation is completed */
-  async function onBatchDeleted() {
-    window.$message?.success($t('common.deleteSuccess'));
-
-    checkedRowKeys.value = [];
-
-    await getData();
-  }
-
-  /** the hook after the delete operation is completed */
-  async function onDeleted() {
-    window.$message?.success($t('common.deleteSuccess'));
-
-    await getData();
-  }
-
-  return {
-    drawerVisible,
-    openDrawer,
-    closeDrawer,
-    operateType,
-    handleAdd,
-    editingData,
-    handleEdit,
-    checkedRowKeys,
-    onBatchDeleted,
-    onDeleted,
-    clearCheckedRowKeys
-  };
-}
-
-function isTableColumnHasKey<T>(column: TableColumn<T>): column is NaiveUI.TableColumnWithKey<T> {
-  return Boolean((column as NaiveUI.TableColumnWithKey<T>).key);
-}
--- a/src/layouts/base-layout/index.vue
+++ b/src/layouts/base-layout/index.vue
@ -12,7 +12,7 @@ import GlobalTab from '../modules/global-tab/index.vue';
 import GlobalContent from '../modules/global-content/index.vue';
 import GlobalFooter from '../modules/global-footer/index.vue';
 import ThemeDrawer from '../modules/theme-drawer/index.vue';
-import { setupMixMenuContext } from '../context';
+import { provideMixMenuContext } from '../modules/global-menu/context';

 defineOptions({
  name: 'BaseLayout'
@ -20,7 +20,7 @@ defineOptions({

 const appStore = useAppStore();
 const themeStore = useThemeStore();
-const { childLevelMenus, isActiveFirstLevelMenuHasChildren } = setupMixMenuContext();
+const { childLevelMenus, isActiveFirstLevelMenuHasChildren } = provideMixMenuContext();

 const GlobalMenu = defineAsyncComponent(() => import('../modules/global-menu/index.vue'));

@ -31,7 +31,7 @@ const layoutMode = computed(() => {
 });

 const headerProps = computed(() => {
-  const { mode, reverseHorizontalMix } = themeStore.layout;
+  const { mode } = themeStore.layout;

  const headerPropsConfig: Record<UnionKey.ThemeLayoutMode, App.Global.HeaderProps> = {
    vertical: {
@ -44,15 +44,25 @@ const headerProps = computed(() => {
      showMenu: false,
      showMenuToggler: false
    },
+    'vertical-hybrid-header-first': {
+      showLogo: !isActiveFirstLevelMenuHasChildren.value,
+      showMenu: true,
+      showMenuToggler: false
+    },
    horizontal: {
      showLogo: true,
      showMenu: true,
      showMenuToggler: false
    },
-    'horizontal-mix': {
+    'top-hybrid-sidebar-first': {
      showLogo: true,
      showMenu: true,
-      showMenuToggler: reverseHorizontalMix && isActiveFirstLevelMenuHasChildren.value
+      showMenuToggler: false
+    },
+    'top-hybrid-header-first': {
+      showLogo: true,
+      showMenu: true,
+      showMenuToggler: isActiveFirstLevelMenuHasChildren.value
    }
  };

@ -63,44 +73,56 @@ const siderVisible = computed(() => themeStore.layout.mode !== 'horizontal');

 const isVerticalMix = computed(() => themeStore.layout.mode === 'vertical-mix');

-const isHorizontalMix = computed(() => themeStore.layout.mode === 'horizontal-mix');
+const isVerticalHybridHeaderFirst = computed(() => themeStore.layout.mode === 'vertical-hybrid-header-first');
+
+const isTopHybridSidebarFirst = computed(() => themeStore.layout.mode === 'top-hybrid-sidebar-first');
+
+const isTopHybridHeaderFirst = computed(() => themeStore.layout.mode === 'top-hybrid-header-first');

 const siderWidth = computed(() => getSiderWidth());

 const siderCollapsedWidth = computed(() => getSiderCollapsedWidth());

-function getSiderWidth() {
-  const { reverseHorizontalMix } = themeStore.layout;
-  const { width, mixWidth, mixChildMenuWidth } = themeStore.sider;
+function getSiderAndCollapsedWidth(isCollapsed: boolean) {
+  const {
+    mixChildMenuWidth,
+    collapsedWidth,
+    width: themeWidth,
+    mixCollapsedWidth,
+    mixWidth: themeMixWidth
+  } = themeStore.sider;

-  if (isHorizontalMix.value && reverseHorizontalMix) {
+  const width = isCollapsed ? collapsedWidth : themeWidth;
+  const mixWidth = isCollapsed ? mixCollapsedWidth : themeMixWidth;
+
+  if (isTopHybridHeaderFirst.value) {
    return isActiveFirstLevelMenuHasChildren.value ? width : 0;
  }

-  let w = isVerticalMix.value || isHorizontalMix.value ? mixWidth : width;
-
-  if (isVerticalMix.value && appStore.mixSiderFixed && childLevelMenus.value.length) {
-    w += mixChildMenuWidth;
+  if (isVerticalHybridHeaderFirst.value && !isActiveFirstLevelMenuHasChildren.value) {
+    return 0;
  }

-  return w;
+  const isMixMode = isVerticalMix.value || isTopHybridSidebarFirst.value || isVerticalHybridHeaderFirst.value;
+  let finalWidth = isMixMode ? mixWidth : width;
+
+  if (isVerticalMix.value && appStore.mixSiderFixed && childLevelMenus.value.length) {
+    finalWidth += mixChildMenuWidth;
+  }
+
+  if (isVerticalHybridHeaderFirst.value && appStore.mixSiderFixed && childLevelMenus.value.length) {
+    finalWidth += mixChildMenuWidth;
+  }
+
+  return finalWidth;
+}
+
+function getSiderWidth() {
+  return getSiderAndCollapsedWidth(false);
 }

 function getSiderCollapsedWidth() {
-  const { reverseHorizontalMix } = themeStore.layout;
-  const { collapsedWidth, mixCollapsedWidth, mixChildMenuWidth } = themeStore.sider;
-
-  if (isHorizontalMix.value && reverseHorizontalMix) {
-    return isActiveFirstLevelMenuHasChildren.value ? collapsedWidth : 0;
-  }
-
-  let w = isVerticalMix.value || isHorizontalMix.value ? mixCollapsedWidth : collapsedWidth;
-
-  if (isVerticalMix.value && appStore.mixSiderFixed && childLevelMenus.value.length) {
-    w += mixChildMenuWidth;
-  }
-
-  return w;
+  return getSiderAndCollapsedWidth(true);
 }

 onMounted(() => {
--- a/src/layouts/context/index.ts
+++ b/src/layouts/context/index.ts
@ -1,83 +0,0 @@
-import { computed, ref, watch } from 'vue';
-import { useRoute } from 'vue-router';
-import { useContext } from '@sa/hooks';
-import { useRouteStore } from '@/store/modules/route';
-
-export const { setupStore: setupMixMenuContext, useStore: useMixMenuContext } = useContext('mix-menu', useMixMenu);
-
-function useMixMenu() {
-  const route = useRoute();
-  const routeStore = useRouteStore();
-  const { selectedKey } = useMenu();
-
-  const activeFirstLevelMenuKey = ref('');
-
-  function setActiveFirstLevelMenuKey(key: string) {
-    activeFirstLevelMenuKey.value = key;
-  }
-
-  function getActiveFirstLevelMenuKey() {
-    const [firstLevelRouteName] = selectedKey.value.split('_');
-
-    setActiveFirstLevelMenuKey(firstLevelRouteName);
-  }
-
-  const allMenus = computed<App.Global.Menu[]>(() => routeStore.menus);
-
-  const firstLevelMenus = computed<App.Global.Menu[]>(() =>
-    routeStore.menus.map(menu => {
-      const { children: _, ...rest } = menu;
-
-      return rest;
-    })
-  );
-
-  const childLevelMenus = computed<App.Global.Menu[]>(
-    () => routeStore.menus.find(menu => menu.key === activeFirstLevelMenuKey.value)?.children || []
-  );
-
-  const isActiveFirstLevelMenuHasChildren = computed(() => {
-    if (!activeFirstLevelMenuKey.value) {
-      return false;
-    }
-
-    const findItem = allMenus.value.find(item => item.key === activeFirstLevelMenuKey.value);
-
-    return Boolean(findItem?.children?.length);
-  });
-
-  watch(
-    () => route.name,
-    () => {
-      getActiveFirstLevelMenuKey();
-    },
-    { immediate: true }
-  );
-
-  return {
-    allMenus,
-    firstLevelMenus,
-    childLevelMenus,
-    isActiveFirstLevelMenuHasChildren,
-    activeFirstLevelMenuKey,
-    setActiveFirstLevelMenuKey,
-    getActiveFirstLevelMenuKey
-  };
-}
-
-export function useMenu() {
-  const route = useRoute();
-
-  const selectedKey = computed(() => {
-    const { hideInMenu, activeMenu } = route.meta;
-    const name = route.name as string;
-
-    const routeName = (hideInMenu ? activeMenu : name) || name;
-
-    return routeName;
-  });
-
-  return {
-    selectedKey
-  };
-}
--- a/src/layouts/modules/global-header/components/message-button.vue
+++ b/src/layouts/modules/global-header/components/message-button.vue
@ -33,7 +33,7 @@ const toGitee = () => {
            </NBadge>
          </NButton>
        </template>
-        {{ $t('page.home.message') }}
+        消息
      </NTooltip>
    </template>
    <NCard
--- a/src/layouts/modules/global-menu/components/first-level-menu.vue
+++ b/src/layouts/modules/global-menu/components/first-level-menu.vue
@ -3,6 +3,7 @@ import { computed } from 'vue';
 import { createReusableTemplate } from '@vueuse/core';
 import { SimpleScrollbar } from '@sa/materials';
 import { transformColorWithOpacity } from '@sa/color';
+import type { RouteKey } from '@elegant-router/types';

 defineOptions({
  name: 'FirstLevelMenu'
@ -20,7 +21,7 @@ interface Props {
 const props = defineProps<Props>();

 interface Emits {
-  (e: 'select', menu: App.Global.Menu): boolean;
+  (e: 'select', menuKey: RouteKey): boolean;
  (e: 'toggleSiderCollapse'): void;
 }

@ -47,8 +48,8 @@ const selectedBgColor = computed(() => {
  return darkMode ? dark : light;
 });

-function handleClickMixMenu(menu: App.Global.Menu) {
-  emit('select', menu);
+function handleClickMixMenu(menuKey: RouteKey) {
+  emit('select', menuKey);
 }

 function toggleSiderCollapse() {
@ -88,7 +89,7 @@ function toggleSiderCollapse() {
        :icon="menu.icon"
        :active="menu.key === activeMenuKey"
        :is-mini="siderCollapse"
-        @click="handleClickMixMenu(menu)"
+        @click="handleClickMixMenu(menu.routeKey)"
      />
    </SimpleScrollbar>
    <MenuToggler
--- a/src/layouts/modules/global-menu/context/index.ts
+++ b/src/layouts/modules/global-menu/context/index.ts
@ -0,0 +1,143 @@
+import { computed, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import { useContext } from '@sa/hooks';
+import type { RouteKey } from '@elegant-router/types';
+import { useRouteStore } from '@/store/modules/route';
+import { useRouterPush } from '@/hooks/common/router';
+
+export const [provideMixMenuContext, useMixMenuContext] = useContext('MixMenu', useMixMenu);
+
+function useMixMenu() {
+  const route = useRoute();
+  const routeStore = useRouteStore();
+  const { selectedKey } = useMenu();
+  const { routerPushByKeyWithMetaQuery } = useRouterPush();
+
+  const allMenus = computed<App.Global.Menu[]>(() => routeStore.menus);
+
+  const firstLevelMenus = computed<App.Global.Menu[]>(() =>
+    routeStore.menus.map(menu => {
+      const { children: _, ...rest } = menu;
+
+      return rest;
+    })
+  );
+
+  const activeFirstLevelMenuKey = ref('');
+
+  function setActiveFirstLevelMenuKey(key: string) {
+    activeFirstLevelMenuKey.value = key;
+  }
+
+  function getActiveFirstLevelMenuKey() {
+    const [firstLevelRouteName] = selectedKey.value.split('_');
+
+    setActiveFirstLevelMenuKey(firstLevelRouteName);
+  }
+
+  const isActiveFirstLevelMenuHasChildren = computed(() => {
+    if (!activeFirstLevelMenuKey.value) {
+      return false;
+    }
+
+    const findItem = allMenus.value.find(item => item.key === activeFirstLevelMenuKey.value);
+
+    return Boolean(findItem?.children?.length);
+  });
+
+  function handleSelectFirstLevelMenu(key: RouteKey) {
+    setActiveFirstLevelMenuKey(key);
+
+    if (!isActiveFirstLevelMenuHasChildren.value) {
+      routerPushByKeyWithMetaQuery(key);
+    }
+  }
+
+  const secondLevelMenus = computed<App.Global.Menu[]>(
+    () => allMenus.value.find(menu => menu.key === activeFirstLevelMenuKey.value)?.children || []
+  );
+
+  const activeSecondLevelMenuKey = ref('');
+
+  function setActiveSecondLevelMenuKey(key: string) {
+    activeSecondLevelMenuKey.value = key;
+  }
+
+  function getActiveSecondLevelMenuKey() {
+    const keys = selectedKey.value.split('_');
+
+    if (keys.length < 2) {
+      setActiveSecondLevelMenuKey('');
+      return;
+    }
+
+    const [firstLevelRouteName, level2SuffixName] = keys;
+
+    const secondLevelRouteName = `${firstLevelRouteName}_${level2SuffixName}`;
+
+    setActiveSecondLevelMenuKey(secondLevelRouteName);
+  }
+
+  const isActiveSecondLevelMenuHasChildren = computed(() => {
+    if (!activeSecondLevelMenuKey.value) {
+      return false;
+    }
+
+    const findItem = secondLevelMenus.value.find(item => item.key === activeSecondLevelMenuKey.value);
+
+    return Boolean(findItem?.children?.length);
+  });
+
+  function handleSelectSecondLevelMenu(key: RouteKey) {
+    setActiveSecondLevelMenuKey(key);
+
+    if (!isActiveSecondLevelMenuHasChildren.value) {
+      routerPushByKeyWithMetaQuery(key);
+    }
+  }
+
+  const childLevelMenus = computed<App.Global.Menu[]>(
+    () => secondLevelMenus.value.find(menu => menu.key === activeSecondLevelMenuKey.value)?.children || []
+  );
+
+  watch(
+    () => route.name,
+    () => {
+      getActiveFirstLevelMenuKey();
+    },
+    { immediate: true }
+  );
+
+  return {
+    firstLevelMenus,
+    activeFirstLevelMenuKey,
+    setActiveFirstLevelMenuKey,
+    isActiveFirstLevelMenuHasChildren,
+    handleSelectFirstLevelMenu,
+    getActiveFirstLevelMenuKey,
+    secondLevelMenus,
+    activeSecondLevelMenuKey,
+    setActiveSecondLevelMenuKey,
+    isActiveSecondLevelMenuHasChildren,
+    handleSelectSecondLevelMenu,
+    getActiveSecondLevelMenuKey,
+    childLevelMenus
+  };
+}
+
+export function useMenu() {
+  const route = useRoute();
+
+  const selectedKey = computed(() => {
+    const { hideInMenu, activeMenu } = route.meta;
+    const name = route.name as string;
+
+    const routeName = (hideInMenu ? activeMenu : name) || name;
+
+    return routeName;
+  });
+
+  return {
+    selectedKey
+  };
+}
--- a/src/layouts/modules/global-menu/index.vue
+++ b/src/layouts/modules/global-menu/index.vue
@ -5,9 +5,10 @@ import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
 import VerticalMenu from './modules/vertical-menu.vue';
 import VerticalMixMenu from './modules/vertical-mix-menu.vue';
+import VerticalHybridHeaderFirst from './modules/vertical-hybrid-header-first.vue';
 import HorizontalMenu from './modules/horizontal-menu.vue';
-import HorizontalMixMenu from './modules/horizontal-mix-menu.vue';
-import ReversedHorizontalMixMenu from './modules/reversed-horizontal-mix-menu.vue';
+import TopHybridSidebarFirst from './modules/top-hybrid-sidebar-first.vue';
+import TopHybridHeaderFirst from './modules/top-hybrid-header-first.vue';

 defineOptions({
  name: 'GlobalMenu'
@ -20,8 +21,10 @@ const activeMenu = computed(() => {
  const menuMap: Record<UnionKey.ThemeLayoutMode, Component> = {
    vertical: VerticalMenu,
    'vertical-mix': VerticalMixMenu,
+    'vertical-hybrid-header-first': VerticalHybridHeaderFirst,
    horizontal: HorizontalMenu,
-    'horizontal-mix': themeStore.layout.reverseHorizontalMix ? ReversedHorizontalMixMenu : HorizontalMixMenu
+    'top-hybrid-sidebar-first': TopHybridSidebarFirst,
+    'top-hybrid-header-first': TopHybridHeaderFirst
  };

  return menuMap[themeStore.layout.mode];
--- a/src/layouts/modules/global-menu/modules/horizontal-menu.vue
+++ b/src/layouts/modules/global-menu/modules/horizontal-menu.vue
@ -2,7 +2,7 @@
 import { GLOBAL_HEADER_MENU_ID } from '@/constants/app';
 import { useRouteStore } from '@/store/modules/route';
 import { useRouterPush } from '@/hooks/common/router';
-import { useMenu } from '../../../context';
+import { useMenu } from '../context';

 defineOptions({
  name: 'HorizontalMenu'
--- a/src/layouts/modules/global-menu/modules/reversed-horizontal-mix-menu.vue
+++ b/src/layouts/modules/global-menu/modules/reversed-horizontal-mix-menu.vue
@ -1,17 +1,16 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
-import type { RouteKey } from '@elegant-router/types';
 import { SimpleScrollbar } from '@sa/materials';
 import { GLOBAL_HEADER_MENU_ID, GLOBAL_SIDER_MENU_ID } from '@/constants/app';
 import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
 import { useRouteStore } from '@/store/modules/route';
 import { useRouterPush } from '@/hooks/common/router';
-import { useMenu, useMixMenuContext } from '../../../context';
+import { useMenu, useMixMenuContext } from '../context';

 defineOptions({
-  name: 'ReversedHorizontalMixMenu'
+  name: 'TopHybridHeaderFirst'
 });

 const route = useRoute();
@ -19,23 +18,10 @@ const appStore = useAppStore();
 const themeStore = useThemeStore();
 const routeStore = useRouteStore();
 const { routerPushByKeyWithMetaQuery } = useRouterPush();
-const {
-  firstLevelMenus,
-  childLevelMenus,
-  activeFirstLevelMenuKey,
-  setActiveFirstLevelMenuKey,
-  isActiveFirstLevelMenuHasChildren
-} = useMixMenuContext();
+const { firstLevelMenus, secondLevelMenus, activeFirstLevelMenuKey, handleSelectFirstLevelMenu } =
+  useMixMenuContext('TopHybridHeaderFirst');
 const { selectedKey } = useMenu();

-function handleSelectMixMenu(key: RouteKey) {
-  setActiveFirstLevelMenuKey(key);
-
-  if (!isActiveFirstLevelMenuHasChildren.value) {
-    routerPushByKeyWithMetaQuery(key);
-  }
-}
-
 const expandedKeys = ref<string[]>([]);

 function updateExpandedKeys() {
@ -63,7 +49,7 @@ watch(
      :options="firstLevelMenus"
      :indent="18"
      responsive
-      @update:value="handleSelectMixMenu"
+      @update:value="handleSelectFirstLevelMenu"
    />
  </Teleport>
  <Teleport :to="`#${GLOBAL_SIDER_MENU_ID}`">
@ -75,7 +61,7 @@ watch(
        :collapsed="appStore.siderCollapse"
        :collapsed-width="themeStore.sider.collapsedWidth"
        :collapsed-icon-size="22"
-        :options="childLevelMenus"
+        :options="secondLevelMenus"
        :indent="18"
        @update:value="routerPushByKeyWithMetaQuery"
      />
--- a/src/layouts/modules/global-menu/modules/top-hybrid-sidebar-first.vue
+++ b/src/layouts/modules/global-menu/modules/top-hybrid-sidebar-first.vue
@ -4,25 +4,18 @@ import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
 import { useRouterPush } from '@/hooks/common/router';
 import FirstLevelMenu from '../components/first-level-menu.vue';
-import { useMenu, useMixMenuContext } from '../../../context';
+import { useMenu, useMixMenuContext } from '../context';

 defineOptions({
-  name: 'HorizontalMixMenu'
+  name: 'TopHybridSidebarFirst'
 });

 const appStore = useAppStore();
 const themeStore = useThemeStore();
 const { routerPushByKeyWithMetaQuery } = useRouterPush();
-const { allMenus, childLevelMenus, activeFirstLevelMenuKey, setActiveFirstLevelMenuKey } = useMixMenuContext();
+const { firstLevelMenus, secondLevelMenus, activeFirstLevelMenuKey, handleSelectFirstLevelMenu } =
+  useMixMenuContext('TopHybridSidebarFirst');
 const { selectedKey } = useMenu();
-
-function handleSelectMixMenu(menu: App.Global.Menu) {
-  setActiveFirstLevelMenuKey(menu.key);
-
-  if (!menu.children?.length) {
-    routerPushByKeyWithMetaQuery(menu.routeKey);
-  }
-}
 </script>

 <template>
@ -30,22 +23,24 @@ function handleSelectMixMenu(menu: App.Global.Menu) {
    <NMenu
      mode="horizontal"
      :value="selectedKey"
-      :options="childLevelMenus"
+      :options="secondLevelMenus"
      :indent="18"
      responsive
      @update:value="routerPushByKeyWithMetaQuery"
    />
  </Teleport>
  <Teleport :to="`#${GLOBAL_SIDER_MENU_ID}`">
-    <FirstLevelMenu
-      :menus="allMenus"
-      :active-menu-key="activeFirstLevelMenuKey"
-      :sider-collapse="appStore.siderCollapse"
-      :dark-mode="themeStore.darkMode"
-      :theme-color="themeStore.themeColor"
-      @select="handleSelectMixMenu"
-      @toggle-sider-collapse="appStore.toggleSiderCollapse"
-    />
+    <div class="h-full pt-2">
+      <FirstLevelMenu
+        :menus="firstLevelMenus"
+        :active-menu-key="activeFirstLevelMenuKey"
+        :sider-collapse="appStore.siderCollapse"
+        :dark-mode="themeStore.darkMode"
+        :theme-color="themeStore.themeColor"
+        @select="handleSelectFirstLevelMenu"
+        @toggle-sider-collapse="appStore.toggleSiderCollapse"
+      />
+    </div>
  </Teleport>
 </template>

--- a/src/layouts/modules/global-menu/modules/vertical-hybrid-header-first.vue
+++ b/src/layouts/modules/global-menu/modules/vertical-hybrid-header-first.vue
@ -0,0 +1,149 @@
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import type { RouteKey } from '@elegant-router/types';
+import { SimpleScrollbar } from '@sa/materials';
+import { useBoolean } from '@sa/hooks';
+import { GLOBAL_HEADER_MENU_ID, GLOBAL_SIDER_MENU_ID } from '@/constants/app';
+import { useAppStore } from '@/store/modules/app';
+import { useThemeStore } from '@/store/modules/theme';
+import { useRouteStore } from '@/store/modules/route';
+import { useRouterPush } from '@/hooks/common/router';
+import { useMenu, useMixMenuContext } from '../context';
+import FirstLevelMenu from '../components/first-level-menu.vue';
+import GlobalLogo from '../../global-logo/index.vue';
+
+defineOptions({
+  name: 'VerticalHybridHeaderFirst'
+});
+
+const route = useRoute();
+const appStore = useAppStore();
+const themeStore = useThemeStore();
+const routeStore = useRouteStore();
+const { routerPushByKeyWithMetaQuery } = useRouterPush();
+const { bool: drawerVisible, setBool: setDrawerVisible } = useBoolean();
+const {
+  firstLevelMenus,
+  activeFirstLevelMenuKey,
+  handleSelectFirstLevelMenu,
+  getActiveFirstLevelMenuKey,
+  secondLevelMenus,
+  activeSecondLevelMenuKey,
+  isActiveSecondLevelMenuHasChildren,
+  handleSelectSecondLevelMenu,
+  getActiveSecondLevelMenuKey,
+  childLevelMenus
+} = useMixMenuContext('VerticalHybridHeaderFirst');
+const { selectedKey } = useMenu();
+
+const inverted = computed(() => !themeStore.darkMode && themeStore.sider.inverted);
+
+const hasChildMenus = computed(() => childLevelMenus.value.length > 0);
+
+const showDrawer = computed(() => hasChildMenus.value && (drawerVisible.value || appStore.mixSiderFixed));
+
+function handleSelectMixMenu(key: RouteKey) {
+  handleSelectSecondLevelMenu(key);
+
+  if (isActiveSecondLevelMenuHasChildren.value) {
+    setDrawerVisible(true);
+  }
+}
+
+function handleSelectMenu(key: RouteKey) {
+  handleSelectFirstLevelMenu(key);
+
+  if (secondLevelMenus.value.length > 0) {
+    handleSelectMixMenu(secondLevelMenus.value[0].routeKey);
+  }
+}
+
+function handleResetActiveMenu() {
+  setDrawerVisible(false);
+
+  if (!appStore.mixSiderFixed) {
+    getActiveFirstLevelMenuKey();
+    getActiveSecondLevelMenuKey();
+  }
+}
+
+const expandedKeys = ref<string[]>([]);
+
+function updateExpandedKeys() {
+  if (appStore.siderCollapse || !selectedKey.value) {
+    expandedKeys.value = [];
+    return;
+  }
+  expandedKeys.value = routeStore.getSelectedMenuKeyPath(selectedKey.value);
+}
+
+watch(
+  () => route.name,
+  () => {
+    updateExpandedKeys();
+  },
+  { immediate: true }
+);
+</script>
+
+<template>
+  <Teleport :to="`#${GLOBAL_HEADER_MENU_ID}`">
+    <NMenu
+      mode="horizontal"
+      :value="activeFirstLevelMenuKey"
+      :options="firstLevelMenus"
+      :indent="18"
+      responsive
+      @update:value="handleSelectMenu"
+    />
+  </Teleport>
+  <Teleport :to="`#${GLOBAL_SIDER_MENU_ID}`">
+    <div class="h-full flex" @mouseleave="handleResetActiveMenu">
+      <FirstLevelMenu
+        :menus="secondLevelMenus"
+        :active-menu-key="activeSecondLevelMenuKey"
+        :inverted="inverted"
+        :sider-collapse="appStore.siderCollapse"
+        :dark-mode="themeStore.darkMode"
+        :theme-color="themeStore.themeColor"
+        @select="handleSelectMixMenu"
+        @toggle-sider-collapse="appStore.toggleSiderCollapse"
+      >
+        <GlobalLogo :show-title="false" :style="{ height: themeStore.header.height + 'px' }" />
+      </FirstLevelMenu>
+      <div
+        class="relative h-full transition-width-300"
+        :style="{ width: appStore.mixSiderFixed && hasChildMenus ? themeStore.sider.mixChildMenuWidth + 'px' : '0px' }"
+      >
+        <DarkModeContainer
+          class="absolute-lt h-full flex-col-stretch nowrap-hidden shadow-sm transition-all-300"
+          :inverted="inverted"
+          :style="{ width: showDrawer ? themeStore.sider.mixChildMenuWidth + 'px' : '0px' }"
+        >
+          <header class="flex-y-center justify-between px-12px" :style="{ height: themeStore.header.height + 'px' }">
+            <h2 class="text-16px text-primary font-bold">{{ $t('system.title') }}</h2>
+            <PinToggler
+              :pin="appStore.mixSiderFixed"
+              :class="{ 'text-white:88 !hover:text-white': inverted }"
+              @click="appStore.toggleMixSiderFixed"
+            />
+          </header>
+          <SimpleScrollbar>
+            <NMenu
+              v-model:expanded-keys="expandedKeys"
+              mode="vertical"
+              :value="selectedKey"
+              :options="childLevelMenus"
+              :inverted="inverted"
+              :indent="18"
+              @update:value="routerPushByKeyWithMetaQuery"
+            />
+          </SimpleScrollbar>
+        </DarkModeContainer>
+      </div>
+    </div>
+  </Teleport>
+</template>
+
+<style scoped></style>
--- a/src/layouts/modules/global-menu/modules/vertical-menu.vue
+++ b/src/layouts/modules/global-menu/modules/vertical-menu.vue
@ -7,7 +7,7 @@ import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
 import { useRouteStore } from '@/store/modules/route';
 import { useRouterPush } from '@/hooks/common/router';
-import { useMenu } from '../../../context';
+import { useMenu } from '../context';

 defineOptions({
  name: 'VerticalMenu'
--- a/src/layouts/modules/global-menu/modules/vertical-mix-menu.vue
+++ b/src/layouts/modules/global-menu/modules/vertical-mix-menu.vue
@ -3,13 +3,14 @@ import { computed, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { SimpleScrollbar } from '@sa/materials';
 import { useBoolean } from '@sa/hooks';
+import type { RouteKey } from '@elegant-router/types';
 import { GLOBAL_SIDER_MENU_ID } from '@/constants/app';
 import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
 import { useRouteStore } from '@/store/modules/route';
 import { useRouterPush } from '@/hooks/common/router';
 import { $t } from '@/locales';
-import { useMenu, useMixMenuContext } from '../../../context';
+import { useMenu, useMixMenuContext } from '../context';
 import FirstLevelMenu from '../components/first-level-menu.vue';
 import GlobalLogo from '../../global-logo/index.vue';

@ -24,28 +25,26 @@ const routeStore = useRouteStore();
 const { routerPushByKeyWithMetaQuery } = useRouterPush();
 const { bool: drawerVisible, setBool: setDrawerVisible } = useBoolean();
 const {
-  allMenus,
-  childLevelMenus,
+  firstLevelMenus,
+  secondLevelMenus,
  activeFirstLevelMenuKey,
-  setActiveFirstLevelMenuKey,
-  getActiveFirstLevelMenuKey
-  //
-} = useMixMenuContext();
+  isActiveFirstLevelMenuHasChildren,
+  getActiveFirstLevelMenuKey,
+  handleSelectFirstLevelMenu
+} = useMixMenuContext('VerticalMixMenu');
 const { selectedKey } = useMenu();

 const inverted = computed(() => !themeStore.darkMode && themeStore.sider.inverted);

-const hasChildMenus = computed(() => childLevelMenus.value.length > 0);
+const hasChildMenus = computed(() => secondLevelMenus.value.length > 0);

 const showDrawer = computed(() => hasChildMenus.value && (drawerVisible.value || appStore.mixSiderFixed));

-function handleSelectMixMenu(menu: App.Global.Menu) {
-  setActiveFirstLevelMenuKey(menu.key);
+function handleSelectMenu(key: RouteKey) {
+  handleSelectFirstLevelMenu(key);

-  if (menu.children?.length) {
+  if (isActiveFirstLevelMenuHasChildren.value) {
    setDrawerVisible(true);
-  } else {
-    routerPushByKeyWithMetaQuery(menu.routeKey);
  }
 }

@ -80,13 +79,13 @@ watch(
  <Teleport :to="`#${GLOBAL_SIDER_MENU_ID}`">
    <div class="h-full flex" @mouseleave="handleResetActiveMenu">
      <FirstLevelMenu
-        :menus="allMenus"
+        :menus="firstLevelMenus"
        :active-menu-key="activeFirstLevelMenuKey"
        :inverted="inverted"
        :sider-collapse="appStore.siderCollapse"
        :dark-mode="themeStore.darkMode"
        :theme-color="themeStore.themeColor"
-        @select="handleSelectMixMenu"
+        @select="handleSelectMenu"
        @toggle-sider-collapse="appStore.toggleSiderCollapse"
      >
        <GlobalLogo :show-title="false" :style="{ height: themeStore.header.height + 'px' }" />
@ -113,7 +112,7 @@ watch(
              v-model:expanded-keys="expandedKeys"
              mode="vertical"
              :value="selectedKey"
-              :options="childLevelMenus"
+              :options="secondLevelMenus"
              :inverted="inverted"
              :indent="18"
              @update:value="routerPushByKeyWithMetaQuery"
--- a/src/layouts/modules/global-sider/index.vue
+++ b/src/layouts/modules/global-sider/index.vue
@ -12,10 +12,13 @@ defineOptions({
 const appStore = useAppStore();
 const themeStore = useThemeStore();

-const isVerticalMix = computed(() => themeStore.layout.mode === 'vertical-mix');
-const isHorizontalMix = computed(() => themeStore.layout.mode === 'horizontal-mix');
-const darkMenu = computed(() => !themeStore.darkMode && !isHorizontalMix.value && themeStore.sider.inverted);
-const showLogo = computed(() => !isVerticalMix.value && !isHorizontalMix.value);
+const isTopHybridSidebarFirst = computed(() => themeStore.layout.mode === 'top-hybrid-sidebar-first');
+const isTopHybridHeaderFirst = computed(() => themeStore.layout.mode === 'top-hybrid-header-first');
+const darkMenu = computed(
+  () =>
+    !themeStore.darkMode && !isTopHybridSidebarFirst.value && !isTopHybridHeaderFirst.value && themeStore.sider.inverted
+);
+const showLogo = computed(() => themeStore.layout.mode === 'vertical');
 const menuWrapperClass = computed(() => (showLogo.value ? 'flex-1-hidden' : 'h-full'));
 </script>

--- a/src/layouts/modules/theme-drawer/components/layout-mode-card.vue
+++ b/src/layouts/modules/theme-drawer/components/layout-mode-card.vue
@ -27,7 +27,6 @@ type LayoutConfig = Record<
  UnionKey.ThemeLayoutMode,
  {
    placement: PopoverPlacement;
-    headerClass: string;
    menuClass: string;
    mainClass: string;
  }
@ -36,25 +35,31 @@ type LayoutConfig = Record<
 const layoutConfig: LayoutConfig = {
  vertical: {
    placement: 'bottom',
-    headerClass: '',
    menuClass: 'w-1/3 h-full',
    mainClass: 'w-2/3 h-3/4'
  },
  'vertical-mix': {
    placement: 'bottom',
-    headerClass: '',
+    menuClass: 'w-1/4 h-full',
+    mainClass: 'w-2/3 h-3/4'
+  },
+  'vertical-hybrid-header-first': {
+    placement: 'bottom',
    menuClass: 'w-1/4 h-full',
    mainClass: 'w-2/3 h-3/4'
  },
  horizontal: {
    placement: 'bottom',
-    headerClass: '',
    menuClass: 'w-full h-1/4',
    mainClass: 'w-full h-3/4'
  },
-  'horizontal-mix': {
+  'top-hybrid-sidebar-first': {
+    placement: 'bottom',
+    menuClass: 'w-full h-1/4',
+    mainClass: 'w-2/3 h-3/4'
+  },
+  'top-hybrid-header-first': {
    placement: 'bottom',
-    headerClass: '',
    menuClass: 'w-full h-1/4',
    mainClass: 'w-2/3 h-3/4'
  }
@ -68,25 +73,27 @@ function handleChangeMode(mode: UnionKey.ThemeLayoutMode) {
 </script>

 <template>
-  <div class="flex-center flex-wrap gap-x-32px gap-y-16px">
+  <div class="grid grid-cols-2 gap-x-16px gap-y-12px md:grid-cols-3">
    <div
      v-for="(item, key) in layoutConfig"
      :key="key"
-      class="flex cursor-pointer border-2px rounded-6px hover:border-primary"
-      :class="[mode === key ? 'border-primary' : 'border-transparent']"
+      class="flex-col-center cursor-pointer"
      @click="handleChangeMode(key)"
    >
-      <NTooltip :placement="item.placement">
+      <IconTooltip :placement="item.placement">
        <template #trigger>
          <div
-            class="h-64px w-96px gap-6px rd-4px p-6px shadow dark:shadow-coolGray-5"
-            :class="[key.includes('vertical') ? 'flex' : 'flex-col']"
+            class="h-64px w-96px gap-6px rd-4px p-6px shadow ring-2 ring-transparent transition-all hover:ring-primary"
+            :class="{ '!ring-primary': mode === key }"
          >
-            <slot :name="key"></slot>
+            <div class="h-full w-full gap-1" :class="[key.includes('vertical') ? 'flex' : 'flex-col']">
+              <slot :name="key"></slot>
+            </div>
          </div>
        </template>
-        {{ $t(themeLayoutModeRecord[key]) }}
-      </NTooltip>
+        {{ $t(`theme.layout.layoutMode.${key}_detail`) }}
+      </IconTooltip>
+      <p class="mt-8px text-12px">{{ $t(themeLayoutModeRecord[key]) }}</p>
    </div>
  </div>
 </template>
--- a/src/layouts/modules/theme-drawer/components/setting-item.vue
+++ b/src/layouts/modules/theme-drawer/components/setting-item.vue
@ -13,7 +13,7 @@ defineProps<Props>();

 <template>
  <div class="w-full flex-y-center justify-between">
-    <div>
+    <div class="flex-y-center">
      <span class="pr-8px text-base-text">{{ label }}</span>
      <slot name="suffix"></slot>
    </div>
--- a/src/layouts/modules/theme-drawer/index.vue
+++ b/src/layouts/modules/theme-drawer/index.vue
@ -1,28 +1,48 @@
 <script setup lang="ts">
+import { computed, ref } from 'vue';
 import { useAppStore } from '@/store/modules/app';
 import { $t } from '@/locales';
-import DarkMode from './modules/dark-mode.vue';
-import LayoutMode from './modules/layout-mode.vue';
-import ThemeColor from './modules/theme-color.vue';
-import PageFun from './modules/page-fun.vue';
+import AppearanceSettings from './modules/appearance/index.vue';
+import LayoutSettings from './modules/layout/index.vue';
+import GeneralSettings from './modules/general/index.vue';
 import ConfigOperation from './modules/config-operation.vue';
-import TableProps from './modules/table-props.vue';

 defineOptions({
  name: 'ThemeDrawer'
 });

 const appStore = useAppStore();
+const activeTab = ref('appearance');
+
+const drawerWidth = computed(() => {
+  const width = 400;
+
+  // On mobile devices, use 90% of viewport width with a maximum of 400px
+  if (appStore.isMobile) {
+    return `min(90vw, ${width}px)`;
+  }
+
+  return width;
+});
 </script>

 <template>
-  <NDrawer v-model:show="appStore.themeDrawerVisible" display-directive="show" :width="360">
+  <NDrawer v-model:show="appStore.themeDrawerVisible" display-directive="show" :width="drawerWidth">
    <NDrawerContent :title="$t('theme.themeDrawerTitle')" :native-scrollbar="false" closable>
-      <DarkMode />
-      <LayoutMode />
-      <ThemeColor />
-      <PageFun />
-      <TableProps />
+      <NTabs v-model:value="activeTab" type="segment" size="medium" class="mb-16px">
+        <NTab name="appearance" :tab="$t('theme.tabs.appearance')"></NTab>
+        <NTab name="layout" :tab="$t('theme.tabs.layout')"></NTab>
+        <NTab name="general" :tab="$t('theme.tabs.general')"></NTab>
+      </NTabs>
+
+      <div class="min-h-400px">
+        <KeepAlive>
+          <AppearanceSettings v-if="activeTab === 'appearance'" />
+          <LayoutSettings v-else-if="activeTab === 'layout'" />
+          <GeneralSettings v-else-if="activeTab === 'general'" />
+        </KeepAlive>
+      </div>
+
      <template #footer>
        <ConfigOperation />
      </template>
@ -30,4 +50,14 @@ const appStore = useAppStore();
  </NDrawer>
 </template>

-<style scoped></style>
+<style scoped>
+:deep(.n-tab) {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+:deep(.n-tab-pane) {
+  padding: 0;
+}
+</style>
--- a/src/layouts/modules/theme-drawer/modules/appearance/index.vue
+++ b/src/layouts/modules/theme-drawer/modules/appearance/index.vue
@ -0,0 +1,17 @@
+<script setup lang="ts">
+import ThemeSchema from './modules/theme-schema.vue';
+import ThemeColor from './modules/theme-color.vue';
+
+defineOptions({
+  name: 'AppearanceSettings'
+});
+</script>
+
+<template>
+  <div class="flex-col-stretch gap-16px">
+    <ThemeSchema />
+    <ThemeColor />
+  </div>
+</template>
+
+<style scoped></style>
--- a/src/layouts/modules/theme-drawer/modules/appearance/modules/theme-color.vue
+++ b/src/layouts/modules/theme-drawer/modules/appearance/modules/theme-color.vue
@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useThemeStore } from '@/store/modules/theme';
 import { $t } from '@/locales';
-import SettingItem from '../components/setting-item.vue';
+import SettingItem from '../../../components/setting-item.vue';

 defineOptions({
  name: 'ThemeColor'
@ -34,33 +34,38 @@ const swatches: string[] = [
 </script>

 <template>
-  <NDivider>{{ $t('theme.themeColor.title') }}</NDivider>
+  <NDivider>{{ $t('theme.appearance.themeColor.title') }}</NDivider>
  <div class="flex-col-stretch gap-12px">
-    <NTooltip placement="top-start">
-      <template #trigger>
-        <SettingItem key="recommend-color" :label="$t('theme.recommendColor')">
-          <NSwitch v-model:value="themeStore.recommendColor" />
-        </SettingItem>
+    <SettingItem key="recommend-color" :label="$t('theme.appearance.recommendColor')">
+      <template #suffix>
+        <IconTooltip>
+          <p>
+            <span class="pr-12px">{{ $t('theme.appearance.recommendColorDesc') }}</span>
+            <br />
+            <NButton
+              text
+              tag="a"
+              href="https://uicolors.app/create"
+              target="_blank"
+              rel="noopener noreferrer"
+              class="text-gray"
+            >
+              https://uicolors.app/create
+            </NButton>
+          </p>
+        </IconTooltip>
      </template>
-      <p>
-        <span class="pr-12px">{{ $t('theme.recommendColorDesc') }}</span>
-        <br />
-        <NButton
-          text
-          tag="a"
-          href="https://uicolors.app/create"
-          target="_blank"
-          rel="noopener noreferrer"
-          class="text-gray"
-        >
-          https://uicolors.app/create
-        </NButton>
-      </p>
-    </NTooltip>
-    <SettingItem v-for="(_, key) in themeStore.themeColors" :key="key" :label="$t(`theme.themeColor.${key}`)">
+      <NSwitch v-model:value="themeStore.recommendColor" />
+    </SettingItem>
+
+    <SettingItem
+      v-for="(_, key) in themeStore.themeColors"
+      :key="key"
+      :label="$t(`theme.appearance.themeColor.${key}`)"
+    >
      <template v-if="key === 'info'" #suffix>
        <NCheckbox v-model:checked="themeStore.isInfoFollowPrimary">
-          {{ $t('theme.themeColor.followPrimary') }}
+          {{ $t('theme.appearance.themeColor.followPrimary') }}
        </NCheckbox>
      </template>
      <NColorPicker
--- a/src/layouts/modules/theme-drawer/modules/appearance/modules/theme-schema.vue
+++ b/src/layouts/modules/theme-drawer/modules/appearance/modules/theme-schema.vue
@ -3,10 +3,10 @@ import { computed } from 'vue';
 import { themeSchemaRecord } from '@/constants/app';
 import { useThemeStore } from '@/store/modules/theme';
 import { $t } from '@/locales';
-import SettingItem from '../components/setting-item.vue';
+import SettingItem from '../../../components/setting-item.vue';

 defineOptions({
-  name: 'DarkMode'
+  name: 'ThemeSchema'
 });

 const themeStore = useThemeStore();
@ -33,7 +33,7 @@ const showSiderInverted = computed(() => !themeStore.darkMode && themeStore.layo
 </script>

 <template>
-  <NDivider>{{ $t('theme.themeSchema.title') }}</NDivider>
+  <NDivider>{{ $t('theme.appearance.themeSchema.title') }}</NDivider>
  <div class="flex-col-stretch gap-16px">
    <div class="i-flex-center">
      <NTabs
@ -50,14 +50,14 @@ const showSiderInverted = computed(() => !themeStore.darkMode && themeStore.layo
      </NTabs>
    </div>
    <Transition name="sider-inverted">
-      <SettingItem v-if="showSiderInverted" :label="$t('theme.sider.inverted')">
+      <SettingItem v-if="showSiderInverted" :label="$t('theme.layout.sider.inverted')">
        <NSwitch v-model:value="themeStore.sider.inverted" />
      </SettingItem>
    </Transition>
-    <SettingItem :label="$t('theme.grayscale')">
+    <SettingItem :label="$t('theme.appearance.grayscale')">
      <NSwitch :value="themeStore.grayscale" @update:value="handleGrayscaleChange" />
    </SettingItem>
-    <SettingItem :label="$t('theme.colourWeakness')">
+    <SettingItem :label="$t('theme.appearance.colourWeakness')">
      <NSwitch :value="themeStore.colourWeakness" @update:value="handleColourWeaknessChange" />
    </SettingItem>
  </div>
--- a/src/layouts/modules/theme-drawer/modules/general/index.vue
+++ b/src/layouts/modules/theme-drawer/modules/general/index.vue
@ -0,0 +1,17 @@
+<script setup lang="ts">
+import GlobalSettings from './modules/global-settings.vue';
+import WatermarkSettings from './modules/watermark-settings.vue';
+
+defineOptions({
+  name: 'GeneralSettings'
+});
+</script>
+
+<template>
+  <div class="flex-col-stretch gap-16px">
+    <GlobalSettings />
+    <WatermarkSettings />
+  </div>
+</template>
+
+<style scoped></style>
--- a/src/layouts/modules/theme-drawer/modules/general/modules/global-settings.vue
+++ b/src/layouts/modules/theme-drawer/modules/general/modules/global-settings.vue
@ -0,0 +1,39 @@
+<script setup lang="ts">
+import { useThemeStore } from '@/store/modules/theme';
+import { $t } from '@/locales';
+import SettingItem from '../../../components/setting-item.vue';
+
+defineOptions({
+  name: 'GlobalSettings'
+});
+
+const themeStore = useThemeStore();
+</script>
+
+<template>
+  <NDivider>{{ $t('theme.general.title') }}</NDivider>
+  <SettingItem :label="$t('theme.general.multilingual.visible')">
+    <NSwitch v-model:value="themeStore.header.multilingual.visible" />
+  </SettingItem>
+
+  <SettingItem :label="$t('theme.general.globalSearch.visible')">
+    <NSwitch v-model:value="themeStore.header.globalSearch.visible" />
+  </SettingItem>
+</template>
+
+<style scoped>
+.setting-list-move,
+.setting-list-enter-active,
+.setting-list-leave-active {
+  --uno: transition-all-300;
+}
+
+.setting-list-enter-from,
+.setting-list-leave-to {
+  --uno: opacity-0 -translate-x-30px;
+}
+
+.setting-list-leave-active {
+  --uno: absolute;
+}
+</style>
--- a/src/layouts/modules/theme-drawer/modules/general/modules/watermark-settings.vue
+++ b/src/layouts/modules/theme-drawer/modules/general/modules/watermark-settings.vue
@ -0,0 +1,66 @@
+<script setup lang="ts">
+import { watermarkTimeFormatOptions } from '@/constants/app';
+import { useThemeStore } from '@/store/modules/theme';
+import { $t } from '@/locales';
+import SettingItem from '../../../components/setting-item.vue';
+
+defineOptions({
+  name: 'WatermarkSettings'
+});
+
+const themeStore = useThemeStore();
+</script>
+
+<template>
+  <NDivider>{{ $t('theme.general.watermark.title') }}</NDivider>
+  <TransitionGroup tag="div" name="setting-list" class="flex-col-stretch gap-12px">
+    <SettingItem key="1" :label="$t('theme.general.watermark.visible')">
+      <NSwitch v-model:value="themeStore.watermark.visible" />
+    </SettingItem>
+    <SettingItem v-if="themeStore.watermark.visible" key="2" :label="$t('theme.general.watermark.enableUserName')">
+      <NSwitch :value="themeStore.watermark.enableUserName" @update:value="themeStore.setWatermarkEnableUserName" />
+    </SettingItem>
+    <SettingItem v-if="themeStore.watermark.visible" key="3" :label="$t('theme.general.watermark.enableTime')">
+      <NSwitch :value="themeStore.watermark.enableTime" @update:value="themeStore.setWatermarkEnableTime" />
+    </SettingItem>
+    <SettingItem
+      v-if="themeStore.watermark.visible && themeStore.watermark.enableTime"
+      key="4"
+      :label="$t('theme.general.watermark.timeFormat')"
+    >
+      <NSelect
+        v-model:value="themeStore.watermark.timeFormat"
+        :options="watermarkTimeFormatOptions"
+        size="small"
+        class="w-210px"
+      />
+    </SettingItem>
+    <SettingItem key="5" :label="$t('theme.general.watermark.text')">
+      <NInput
+        v-model:value="themeStore.watermark.text"
+        autosize
+        type="text"
+        size="small"
+        class="w-120px"
+        placeholder="SoybeanAdmin"
+      />
+    </SettingItem>
+  </TransitionGroup>
+</template>
+
+<style scoped>
+.setting-list-move,
+.setting-list-enter-active,
+.setting-list-leave-active {
+  --uno: transition-all-300;
+}
+
+.setting-list-enter-from,
+.setting-list-leave-to {
+  --uno: opacity-0 -translate-x-30px;
+}
+
+.setting-list-leave-active {
+  --uno: absolute;
+}
+</style>
--- a/src/layouts/modules/theme-drawer/modules/layout/index.vue
+++ b/src/layouts/modules/theme-drawer/modules/layout/index.vue
@ -0,0 +1,31 @@
+<script setup lang="ts">
+import { useThemeStore } from '@/store/modules/theme';
+import LayoutMode from './modules/layout-mode.vue';
+import TabSettings from './modules/tab-settings.vue';
+import HeaderSettings from './modules/header-settings.vue';
+import SiderSettings from './modules/sider-settings.vue';
+import FooterSettings from './modules/footer-settings.vue';
+import ContentSettings from './modules/content-settings.vue';
+import TableSettings from './modules/table-settings.vue';
+
+defineOptions({
+  name: 'LayoutSettings'
+});
+
+const themeStore = useThemeStore();
+</script>
+
+<template>
+  <div class="flex-col-stretch gap-16px">
+    <LayoutMode />
+    <TabSettings />
+    <HeaderSettings />
+    <!-- The top menu mode does not have a sidebar -->
+    <SiderSettings v-if="themeStore.layout.mode !== 'horizontal'" />
+    <FooterSettings />
+    <ContentSettings />
+    <TableSettings />
+  </div>
+</template>
+
+<style scoped></style>
--- a/src/layouts/modules/theme-drawer/modules/layout/modules/content-settings.vue
+++ b/src/layouts/modules/theme-drawer/modules/layout/modules/content-settings.vue
@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { themePageAnimationModeOptions, themeScrollModeOptions } from '@/constants/app';
+import { useThemeStore } from '@/store/modules/theme';
+import { translateOptions } from '@/utils/common';
+import { $t } from '@/locales';
+import SettingItem from '../../../components/setting-item.vue';
+
+defineOptions({
+  name: 'ContentSettings'
+});
+
+const themeStore = useThemeStore();
+
+const isWrapperScrollMode = computed(() => themeStore.layout.scrollMode === 'wrapper');
+</script>
+
+<template>
+  <NDivider>{{ $t('theme.layout.content.title') }}</NDivider>
+  <TransitionGroup tag="div" name="setting-list" class="flex-col-stretch gap-12px">
+    <SettingItem key="1" :label="$t('theme.layout.content.scrollMode.title')">
+      <template #suffix>
+        <IconTooltip :desc="$t('theme.layout.content.scrollMode.tip')" />
+      </template>
+      <NSelect
+        v-model:value="themeStore.layout.scrollMode"
+        :options="translateOptions(themeScrollModeOptions)"
+        size="small"
+        class="w-120px"
+      />
+    </SettingItem>
+    <SettingItem key="2" :label="$t('theme.layout.content.page.animate')">
+      <NSwitch v-model:value="themeStore.page.animate" />
+    </SettingItem>
+    <SettingItem v-if="themeStore.page.animate" key="3" :label="$t('theme.layout.content.page.mode.title')">
+      <NSelect
+        v-model:value="themeStore.page.animateMode"
+        :options="translateOptions(themePageAnimationModeOptions)"
+        size="small"
+        class="w-120px"
+      />
+    </SettingItem>
+    <SettingItem v-if="isWrapperScrollMode" key="4" :label="$t('theme.layout.content.fixedHeaderAndTab')">
+      <NSwitch v-model:value="themeStore.fixedHeaderAndTab" />
+    </SettingItem>
+  </TransitionGroup>
+</template>
+
+<style scoped>
+.setting-list-move,
+.setting-list-enter-active,
+.setting-list-leave-active {
+  --uno: transition-all-300;
+}
+
+.setting-list-enter-from,
+.setting-list-leave-to {
+  --uno: opacity-0 -translate-x-30px;
+}
+
+.setting-list-leave-active {
+  --uno: absolute;
+}
+</style>
--- a/src/layouts/modules/theme-drawer/modules/layout/modules/footer-settings.vue
+++ b/src/layouts/modules/theme-drawer/modules/layout/modules/footer-settings.vue
@ -0,0 +1,61 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { useThemeStore } from '@/store/modules/theme';
+import { $t } from '@/locales';
+import SettingItem from '../../../components/setting-item.vue';
+
+defineOptions({
+  name: 'FooterSettings'
+});
+
+const themeStore = useThemeStore();
+
+const layoutMode = computed(() => themeStore.layout.mode);
+const isWrapperScrollMode = computed(() => themeStore.layout.scrollMode === 'wrapper');
+const isMixHorizontalMode = computed(() =>
+  ['top-hybrid-sidebar-first', 'top-hybrid-header-first'].includes(layoutMode.value)
+);
+</script>
+
+<template>
+  <NDivider>{{ $t('theme.layout.footer.title') }}</NDivider>
+  <TransitionGroup tag="div" name="setting-list" class="flex-col-stretch gap-12px">
+    <SettingItem key="1" :label="$t('theme.layout.footer.visible')">
+      <NSwitch v-model:value="themeStore.footer.visible" />
+    </SettingItem>
+    <SettingItem
+      v-if="themeStore.footer.visible && isWrapperScrollMode"
+      key="2"
+      :label="$t('theme.layout.footer.fixed')"
+    >
+      <NSwitch v-model:value="themeStore.footer.fixed" />
+    </SettingItem>
+    <SettingItem v-if="themeStore.footer.visible" key="3" :label="$t('theme.layout.footer.height')">
+      <NInputNumber v-model:value="themeStore.footer.height" size="small" :step="1" class="w-120px" />
+    </SettingItem>
+    <SettingItem
+      v-if="themeStore.footer.visible && isMixHorizontalMode"
+      key="4"
+      :label="$t('theme.layout.footer.right')"
+    >
+      <NSwitch v-model:value="themeStore.footer.right" />
+    </SettingItem>
+  </TransitionGroup>
+</template>
+
+<style scoped>
+.setting-list-move,
+.setting-list-enter-active,
+.setting-list-leave-active {
+  --uno: transition-all-300;
+}
+
+.setting-list-enter-from,
+.setting-list-leave-to {
+  --uno: opacity-0 -translate-x-30px;
+}
+
+.setting-list-leave-active {
+  --uno: absolute;
+}
+</style>
--- a/src/layouts/modules/theme-drawer/modules/layout/modules/header-settings.vue
+++ b/src/layouts/modules/theme-drawer/modules/layout/modules/header-settings.vue
@ -0,0 +1,47 @@
+<script setup lang="ts">
+import { useThemeStore } from '@/store/modules/theme';
+import { $t } from '@/locales';
+import SettingItem from '../../../components/setting-item.vue';
+
+defineOptions({
+  name: 'HeaderSettings'
+});
+
+const themeStore = useThemeStore();
+</script>
+
+<template>
+  <NDivider>{{ $t('theme.layout.header.title') }}</NDivider>
+  <TransitionGroup tag="div" name="setting-list" class="flex-col-stretch gap-12px">
+    <SettingItem key="1" :label="$t('theme.layout.header.height')">
+      <NInputNumber v-model:value="themeStore.header.height" size="small" :step="1" class="w-120px" />
+    </SettingItem>
+    <SettingItem key="2" :label="$t('theme.layout.header.breadcrumb.visible')">
+      <NSwitch v-model:value="themeStore.header.breadcrumb.visible" />
+    </SettingItem>
+    <SettingItem
+      v-if="themeStore.header.breadcrumb.visible"
+      key="3"
+      :label="$t('theme.layout.header.breadcrumb.showIcon')"
+    >
+      <NSwitch v-model:value="themeStore.header.breadcrumb.showIcon" />
+    </SettingItem>
+  </TransitionGroup>
+</template>
+
+<style scoped>
+.setting-list-move,
+.setting-list-enter-active,
+.setting-list-leave-active {
+  --uno: transition-all-300;
+}
+
+.setting-list-enter-from,
+.setting-list-leave-to {
+  --uno: opacity-0 -translate-x-30px;
+}
+
+.setting-list-leave-active {
+  --uno: absolute;
+}
+</style>
--- a/src/layouts/modules/theme-drawer/modules/layout/modules/layout-mode.vue
+++ b/src/layouts/modules/theme-drawer/modules/layout/modules/layout-mode.vue
@ -2,8 +2,7 @@
 import { useAppStore } from '@/store/modules/app';
 import { useThemeStore } from '@/store/modules/theme';
 import { $t } from '@/locales';
-import LayoutModeCard from '../components/layout-mode-card.vue';
-import SettingItem from '../components/setting-item.vue';
+import LayoutModeCard from '../../../components/layout-mode-card.vue';

 defineOptions({
  name: 'LayoutMode'
@ -11,56 +10,60 @@ defineOptions({

 const appStore = useAppStore();
 const themeStore = useThemeStore();
-
-function handleReverseHorizontalMixChange(value: boolean) {
-  themeStore.setLayoutReverseHorizontalMix(value);
-}
 </script>

 <template>
-  <NDivider>{{ $t('theme.layoutMode.title') }}</NDivider>
+  <NDivider>{{ $t('theme.layout.layoutMode.title') }}</NDivider>
  <LayoutModeCard v-model:mode="themeStore.layout.mode" :disabled="appStore.isMobile">
    <template #vertical>
-      <div class="layout-sider h-full w-18px"></div>
+      <div class="layout-sider h-full w-18px !bg-primary"></div>
      <div class="vertical-wrapper">
-        <div class="layout-header"></div>
+        <div class="layout-header bg-primary-200"></div>
        <div class="layout-main"></div>
      </div>
    </template>
    <template #vertical-mix>
-      <div class="layout-sider h-full w-8px"></div>
-      <div class="layout-sider h-full w-16px"></div>
+      <div class="layout-sider h-full w-8px !bg-primary"></div>
+      <div class="layout-sider h-full w-16px !bg-primary-300"></div>
      <div class="vertical-wrapper">
-        <div class="layout-header"></div>
+        <div class="layout-header bg-primary-200"></div>
+        <div class="layout-main"></div>
+      </div>
+    </template>
+    <template #vertical-hybrid-header-first>
+      <div class="layout-sider h-full w-8px !bg-primary"></div>
+      <div class="layout-sider h-full w-16px !bg-primary-300"></div>
+      <div class="vertical-wrapper">
+        <div class="layout-header bg-primary"></div>
        <div class="layout-main"></div>
      </div>
    </template>
    <template #horizontal>
-      <div class="layout-header"></div>
+      <div class="layout-header !bg-primary"></div>
      <div class="horizontal-wrapper">
        <div class="layout-main"></div>
      </div>
    </template>
-    <template #horizontal-mix>
-      <div class="layout-header"></div>
+    <template #top-hybrid-sidebar-first>
+      <div class="layout-header !bg-primary-300"></div>
+      <div class="horizontal-wrapper">
+        <div class="layout-sider w-18px !bg-primary"></div>
+        <div class="layout-main"></div>
+      </div>
+    </template>
+    <template #top-hybrid-header-first>
+      <div class="layout-header bg-primary"></div>
      <div class="horizontal-wrapper">
        <div class="layout-sider w-18px"></div>
        <div class="layout-main"></div>
      </div>
    </template>
  </LayoutModeCard>
-  <SettingItem
-    v-if="themeStore.layout.mode === 'horizontal-mix'"
-    :label="$t('theme.layoutMode.reverseHorizontalMix')"
-    class="mt-16px"
-  >
-    <NSwitch :value="themeStore.layout.reverseHorizontalMix" @update:value="handleReverseHorizontalMixChange" />
-  </SettingItem>
 </template>

 <style scoped>
 .layout-header {
-  --uno: h-16px bg-primary rd-4px;
+  --uno: h-16px rd-4px;
 }

 .layout-sider {
--- a/src/layouts/modules/theme-drawer/modules/layout/modules/sider-settings.vue
+++ b/src/layouts/modules/theme-drawer/modules/layout/modules/sider-settings.vue
@ -0,0 +1,53 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { useThemeStore } from '@/store/modules/theme';
+import { $t } from '@/locales';
+import SettingItem from '../../../components/setting-item.vue';
+
+defineOptions({
+  name: 'SiderSettings'
+});
+
+const themeStore = useThemeStore();
+
+const layoutMode = computed(() => themeStore.layout.mode);
+const isMixLayoutMode = computed(() => layoutMode.value.includes('mix') || layoutMode.value.includes('hybrid'));
+</script>
+
+<template>
+  <NDivider>{{ $t('theme.layout.sider.title') }}</NDivider>
+  <TransitionGroup tag="div" name="setting-list" class="flex-col-stretch gap-12px">
+    <SettingItem v-if="layoutMode === 'vertical'" key="1" :label="$t('theme.layout.sider.width')">
+      <NInputNumber v-model:value="themeStore.sider.width" size="small" :step="1" class="w-120px" />
+    </SettingItem>
+    <SettingItem v-if="layoutMode === 'vertical'" key="2" :label="$t('theme.layout.sider.collapsedWidth')">
+      <NInputNumber v-model:value="themeStore.sider.collapsedWidth" size="small" :step="1" class="w-120px" />
+    </SettingItem>
+    <SettingItem v-if="isMixLayoutMode" key="3" :label="$t('theme.layout.sider.mixWidth')">
+      <NInputNumber v-model:value="themeStore.sider.mixWidth" size="small" :step="1" class="w-120px" />
+    </SettingItem>
+    <SettingItem v-if="isMixLayoutMode" key="4" :label="$t('theme.layout.sider.mixCollapsedWidth')">
+      <NInputNumber v-model:value="themeStore.sider.mixCollapsedWidth" size="small" :step="1" class="w-120px" />
+    </SettingItem>
+    <SettingItem v-if="layoutMode === 'vertical-mix'" key="5" :label="$t('theme.layout.sider.mixChildMenuWidth')">
+      <NInputNumber v-model:value="themeStore.sider.mixChildMenuWidth" size="small" :step="1" class="w-120px" />
+    </SettingItem>
+  </TransitionGroup>
+</template>
+
+<style scoped>
+.setting-list-move,
+.setting-list-enter-active,
+.setting-list-leave-active {
+  --uno: transition-all-300;
+}
+
+.setting-list-enter-from,
+.setting-list-leave-to {
+  --uno: opacity-0 -translate-x-30px;
+}
+
+.setting-list-leave-active {
+  --uno: absolute;
+}
+</style>
--- a/src/layouts/modules/theme-drawer/modules/layout/modules/tab-settings.vue
+++ b/src/layouts/modules/theme-drawer/modules/layout/modules/tab-settings.vue
@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { resetCacheStrategyOptions, themeTabModeOptions } from '@/constants/app';
+import { useThemeStore } from '@/store/modules/theme';
+import { translateOptions } from '@/utils/common';
+import { $t } from '@/locales';
+import SettingItem from '../../../components/setting-item.vue';
+
+defineOptions({
+  name: 'TabSettings'
+});
+
+const themeStore = useThemeStore();
+</script>
+
+<template>
+  <NDivider>{{ $t('theme.layout.tab.title') }}</NDivider>
+  <TransitionGroup tag="div" name="setting-list" class="flex-col-stretch gap-12px">
+    <SettingItem key="0" :label="$t('theme.layout.resetCacheStrategy.title')">
+      <NSelect
+        v-model:value="themeStore.resetCacheStrategy"
+        :options="translateOptions(resetCacheStrategyOptions)"
+        size="small"
+        class="w-120px"
+      />
+    </SettingItem>
+    <SettingItem key="1" :label="$t('theme.layout.tab.visible')">
+      <NSwitch v-model:value="themeStore.tab.visible" />
+    </SettingItem>
+    <SettingItem v-if="themeStore.tab.visible" key="2" :label="$t('theme.layout.tab.cache')">
+      <template #suffix>
+        <IconTooltip :desc="$t('theme.layout.tab.cacheTip')" />
+      </template>
+      <NSwitch v-model:value="themeStore.tab.cache" />
+    </SettingItem>
+    <SettingItem v-if="themeStore.tab.visible" key="3" :label="$t('theme.layout.tab.height')">
+      <NInputNumber v-model:value="themeStore.tab.height" size="small" :step="1" class="w-120px" />
+    </SettingItem>
+    <SettingItem v-if="themeStore.tab.visible" key="4" :label="$t('theme.layout.tab.mode.title')">
+      <NSelect
+        v-model:value="themeStore.tab.mode"
+        :options="translateOptions(themeTabModeOptions)"
+        size="small"
+        class="w-120px"
+      />
+    </SettingItem>
+  </TransitionGroup>
+</template>
+
+<style scoped>
+.setting-list-move,
+.setting-list-enter-active,
+.setting-list-leave-active {
+  --uno: transition-all-300;
+}
+
+.setting-list-enter-from,
+.setting-list-leave-to {
+  --uno: opacity-0 -translate-x-30px;
+}
+
+.setting-list-leave-active {
+  --uno: absolute;
+}
+</style>
--- a/src/layouts/modules/theme-drawer/modules/layout/modules/table-settings.vue
+++ b/src/layouts/modules/theme-drawer/modules/layout/modules/table-settings.vue
@ -0,0 +1,44 @@
+<script setup lang="ts">
+import { themeTableSizeOptions } from '@/constants/app';
+import { useThemeStore } from '@/store/modules/theme';
+import { translateOptions } from '@/utils/common';
+import { $t } from '@/locales';
+import SettingItem from '../../../components/setting-item.vue';
+
+defineOptions({
+  name: 'TableProps'
+});
+
+const themeStore = useThemeStore();
+</script>
+
+<template>
+  <NDivider>{{ $t('theme.tablePropsTitle') }}</NDivider>
+  <TransitionGroup tag="div" name="setting-list" class="flex-col-stretch gap-12px">
+    <SettingItem key="0" :label="$t('theme.table.size.title')">
+      <NSelect
+        v-model:value="themeStore.table.size"
+        :options="translateOptions(themeTableSizeOptions)"
+        size="small"
+        class="w-120px"
+      />
+    </SettingItem>
+    <SettingItem key="1" :label="$t('theme.table.bordered')">
+      <NSwitch v-model:value="themeStore.table.bordered" />
+    </SettingItem>
+    <SettingItem key="2" :label="$t('theme.table.bottomBordered')">
+      <NSwitch v-model:value="themeStore.table.bottomBordered" />
+    </SettingItem>
+    <SettingItem key="3" :label="$t('theme.table.singleColumn')">
+      <NSwitch v-model:value="themeStore.table.singleColumn" :checked-value="false" :unchecked-value="true" />
+    </SettingItem>
+    <SettingItem key="4" :label="$t('theme.table.singleLine')">
+      <NSwitch v-model:value="themeStore.table.singleLine" :checked-value="false" :unchecked-value="true" />
+    </SettingItem>
+    <SettingItem key="5" :label="$t('theme.table.striped')">
+      <NSwitch v-model:value="themeStore.table.striped" />
+    </SettingItem>
+  </TransitionGroup>
+</template>
+
+<style scoped></style>
--- a/src/layouts/modules/theme-drawer/modules/page-fun.vue
+++ b/src/layouts/modules/theme-drawer/modules/page-fun.vue
@ -1,157 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue';
-import {
-  resetCacheStrategyOptions,
-  themePageAnimationModeOptions,
-  themeScrollModeOptions,
-  themeTabModeOptions
-} from '@/constants/app';
-import { useThemeStore } from '@/store/modules/theme';
-import { translateOptions } from '@/utils/common';
-import { $t } from '@/locales';
-import SettingItem from '../components/setting-item.vue';
-
-defineOptions({
-  name: 'PageFun'
-});
-
-const themeStore = useThemeStore();
-
-const layoutMode = computed(() => themeStore.layout.mode);
-
-const isMixLayoutMode = computed(() => layoutMode.value.includes('mix'));
-
-const isWrapperScrollMode = computed(() => themeStore.layout.scrollMode === 'wrapper');
-</script>
-
-<template>
-  <NDivider>{{ $t('theme.pageFunTitle') }}</NDivider>
-  <TransitionGroup tag="div" name="setting-list" class="flex-col-stretch gap-12px">
-    <SettingItem key="0" :label="$t('theme.resetCacheStrategy.title')">
-      <NSelect
-        v-model:value="themeStore.resetCacheStrategy"
-        :options="translateOptions(resetCacheStrategyOptions)"
-        size="small"
-        class="w-120px"
-      />
-    </SettingItem>
-    <SettingItem key="1" :label="$t('theme.scrollMode.title')">
-      <NSelect
-        v-model:value="themeStore.layout.scrollMode"
-        :options="translateOptions(themeScrollModeOptions)"
-        size="small"
-        class="w-120px"
-      />
-    </SettingItem>
-    <SettingItem key="1-1" :label="$t('theme.page.animate')">
-      <NSwitch v-model:value="themeStore.page.animate" />
-    </SettingItem>
-    <SettingItem v-if="themeStore.page.animate" key="1-2" :label="$t('theme.page.mode.title')">
-      <NSelect
-        v-model:value="themeStore.page.animateMode"
-        :options="translateOptions(themePageAnimationModeOptions)"
-        size="small"
-        class="w-120px"
-      />
-    </SettingItem>
-    <SettingItem v-if="isWrapperScrollMode" key="2" :label="$t('theme.fixedHeaderAndTab')">
-      <NSwitch v-model:value="themeStore.fixedHeaderAndTab" />
-    </SettingItem>
-    <SettingItem key="3" :label="$t('theme.header.height')">
-      <NInputNumber v-model:value="themeStore.header.height" size="small" :step="1" class="w-120px" />
-    </SettingItem>
-    <SettingItem key="4" :label="$t('theme.header.breadcrumb.visible')">
-      <NSwitch v-model:value="themeStore.header.breadcrumb.visible" />
-    </SettingItem>
-    <SettingItem v-if="themeStore.header.breadcrumb.visible" key="4-1" :label="$t('theme.header.breadcrumb.showIcon')">
-      <NSwitch v-model:value="themeStore.header.breadcrumb.showIcon" />
-    </SettingItem>
-    <SettingItem key="5" :label="$t('theme.tab.visible')">
-      <NSwitch v-model:value="themeStore.tab.visible" />
-    </SettingItem>
-    <SettingItem v-if="themeStore.tab.visible" key="5-1" :label="$t('theme.tab.cache')">
-      <NSwitch v-model:value="themeStore.tab.cache" />
-    </SettingItem>
-    <SettingItem v-if="themeStore.tab.visible" key="5-2" :label="$t('theme.tab.height')">
-      <NInputNumber v-model:value="themeStore.tab.height" size="small" :step="1" class="w-120px" />
-    </SettingItem>
-    <SettingItem v-if="themeStore.tab.visible" key="5-3" :label="$t('theme.tab.mode.title')">
-      <NSelect
-        v-model:value="themeStore.tab.mode"
-        :options="translateOptions(themeTabModeOptions)"
-        size="small"
-        class="w-120px"
-      />
-    </SettingItem>
-    <SettingItem v-if="layoutMode === 'vertical'" key="6-1" :label="$t('theme.sider.width')">
-      <NInputNumber v-model:value="themeStore.sider.width" size="small" :step="1" class="w-120px" />
-    </SettingItem>
-    <SettingItem v-if="layoutMode === 'vertical'" key="6-2" :label="$t('theme.sider.collapsedWidth')">
-      <NInputNumber v-model:value="themeStore.sider.collapsedWidth" size="small" :step="1" class="w-120px" />
-    </SettingItem>
-    <SettingItem v-if="isMixLayoutMode" key="6-3" :label="$t('theme.sider.mixWidth')">
-      <NInputNumber v-model:value="themeStore.sider.mixWidth" size="small" :step="1" class="w-120px" />
-    </SettingItem>
-    <SettingItem v-if="isMixLayoutMode" key="6-4" :label="$t('theme.sider.mixCollapsedWidth')">
-      <NInputNumber v-model:value="themeStore.sider.mixCollapsedWidth" size="small" :step="1" class="w-120px" />
-    </SettingItem>
-    <SettingItem v-if="layoutMode === 'vertical-mix'" key="6-5" :label="$t('theme.sider.mixChildMenuWidth')">
-      <NInputNumber v-model:value="themeStore.sider.mixChildMenuWidth" size="small" :step="1" class="w-120px" />
-    </SettingItem>
-    <SettingItem key="7" :label="$t('theme.footer.visible')">
-      <NSwitch v-model:value="themeStore.footer.visible" />
-    </SettingItem>
-    <SettingItem v-if="themeStore.footer.visible && isWrapperScrollMode" key="7-1" :label="$t('theme.footer.fixed')">
-      <NSwitch v-model:value="themeStore.footer.fixed" />
-    </SettingItem>
-    <SettingItem v-if="themeStore.footer.visible" key="7-2" :label="$t('theme.footer.height')">
-      <NInputNumber v-model:value="themeStore.footer.height" size="small" :step="1" class="w-120px" />
-    </SettingItem>
-    <SettingItem
-      v-if="themeStore.footer.visible && layoutMode === 'horizontal-mix'"
-      key="7-3"
-      :label="$t('theme.footer.right')"
-    >
-      <NSwitch v-model:value="themeStore.footer.right" />
-    </SettingItem>
-    <SettingItem key="8" :label="$t('theme.watermark.visible')">
-      <NSwitch v-model:value="themeStore.watermark.visible" />
-    </SettingItem>
-    <SettingItem v-if="themeStore.watermark.visible" key="8-1" :label="$t('theme.watermark.enableUserName')">
-      <NSwitch v-model:value="themeStore.watermark.enableUserName" />
-    </SettingItem>
-    <SettingItem v-if="themeStore.watermark.visible" key="8-2" :label="$t('theme.watermark.text')">
-      <NInput
-        v-model:value="themeStore.watermark.text"
-        autosize
-        type="text"
-        size="small"
-        class="w-120px"
-        placeholder="SoybeanAdmin"
-      />
-    </SettingItem>
-    <SettingItem key="9" :label="$t('theme.header.multilingual.visible')">
-      <NSwitch v-model:value="themeStore.header.multilingual.visible" />
-    </SettingItem>
-    <SettingItem key="10" :label="$t('theme.header.globalSearch.visible')">
-      <NSwitch v-model:value="themeStore.header.globalSearch.visible" />
-    </SettingItem>
-  </TransitionGroup>
-</template>
-
-<style scoped>
-.setting-list-move,
-.setting-list-enter-active,
-.setting-list-leave-active {
-  --uno: transition-all-300;
-}
-
-.setting-list-enter-from,
-.setting-list-leave-to {
-  --uno: opacity-0 -translate-x-30px;
-}
-
-.setting-list-leave-active {
-  --uno: absolute;
-}
-</style>
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@ -82,93 +82,142 @@ const local: App.I18n.Schema = {
    tokenExpired: 'The requested token has expired'
  },
  theme: {
-    themeSchema: {
-      title: 'Theme Schema',
-      light: 'Light',
-      dark: 'Dark',
-      auto: 'Follow System'
+    themeDrawerTitle: 'Theme Configuration',
+    tabs: {
+      appearance: 'Appearance',
+      layout: 'Layout',
+      general: 'General'
    },
-    grayscale: 'Grayscale',
-    colourWeakness: 'Colour Weakness',
-    layoutMode: {
-      title: 'Layout Mode',
-      vertical: 'Vertical Menu Mode',
-      horizontal: 'Horizontal Menu Mode',
-      'vertical-mix': 'Vertical Mix Menu Mode',
-      'horizontal-mix': 'Horizontal Mix menu Mode',
-      reverseHorizontalMix: 'Reverse first level menus and child level menus position'
+    appearance: {
+      themeSchema: {
+        title: 'Theme Schema',
+        light: 'Light',
+        dark: 'Dark',
+        auto: 'Follow System'
+      },
+      grayscale: 'Grayscale',
+      colourWeakness: 'Colour Weakness',
+      themeColor: {
+        title: 'Theme Color',
+        primary: 'Primary',
+        info: 'Info',
+        success: 'Success',
+        warning: 'Warning',
+        error: 'Error',
+        followPrimary: 'Follow Primary'
+      },
+      recommendColor: 'Apply Recommended Color Algorithm',
+      recommendColorDesc: 'The recommended color algorithm refers to'
    },
-    recommendColor: 'Apply Recommended Color Algorithm',
-    recommendColorDesc: 'The recommended color algorithm refers to',
-    themeColor: {
-      title: 'Theme Color',
-      primary: 'Primary',
-      info: 'Info',
-      success: 'Success',
-      warning: 'Warning',
-      error: 'Error',
-      followPrimary: 'Follow Primary'
-    },
-    scrollMode: {
-      title: 'Scroll Mode',
-      wrapper: 'Wrapper',
-      content: 'Content'
-    },
-    page: {
-      animate: 'Page Animate',
-      mode: {
-        title: 'Page Animate Mode',
-        fade: 'Fade',
-        'fade-slide': 'Slide',
-        'fade-bottom': 'Fade Zoom',
-        'fade-scale': 'Fade Scale',
-        'zoom-fade': 'Zoom Fade',
-        'zoom-out': 'Zoom Out',
-        none: 'None'
+    layout: {
+      layoutMode: {
+        title: 'Layout Mode',
+        vertical: 'Vertical Mode',
+        horizontal: 'Horizontal Mode',
+        'vertical-mix': 'Vertical Mix Mode',
+        'vertical-hybrid-header-first': 'Left Hybrid Header-First',
+        'top-hybrid-sidebar-first': 'Top-Hybrid Sidebar-First',
+        'top-hybrid-header-first': 'Top-Hybrid Header-First',
+        vertical_detail: 'Vertical menu layout, with the menu on the left and content on the right.',
+        'vertical-mix_detail':
+          'Vertical mix-menu layout, with the primary menu on the dark left side and the secondary menu on the lighter left side.',
+        'vertical-hybrid-header-first_detail':
+          'Left hybrid layout, with the primary menu at the top, the secondary menu on the dark left side, and the tertiary menu on the lighter left side.',
+        horizontal_detail: 'Horizontal menu layout, with the menu at the top and content below.',
+        'top-hybrid-sidebar-first_detail':
+          'Top hybrid layout, with the primary menu on the left and the secondary menu at the top.',
+        'top-hybrid-header-first_detail':
+          'Top hybrid layout, with the primary menu at the top and the secondary menu on the left.'
+      },
+      tab: {
+        title: 'Tab Settings',
+        visible: 'Tab Visible',
+        cache: 'Tag Bar Info Cache',
+        cacheTip: 'One-click to open/close global keepalive',
+        height: 'Tab Height',
+        mode: {
+          title: 'Tab Mode',
+          chrome: 'Chrome',
+          button: 'Button'
+        }
+      },
+      header: {
+        title: 'Header Settings',
+        height: 'Header Height',
+        breadcrumb: {
+          visible: 'Breadcrumb Visible',
+          showIcon: 'Breadcrumb Icon Visible'
+        }
+      },
+      sider: {
+        title: 'Sider Settings',
+        inverted: 'Dark Sider',
+        width: 'Sider Width',
+        collapsedWidth: 'Sider Collapsed Width',
+        mixWidth: 'Mix Sider Width',
+        mixCollapsedWidth: 'Mix Sider Collapse Width',
+        mixChildMenuWidth: 'Mix Child Menu Width'
+      },
+      footer: {
+        title: 'Footer Settings',
+        visible: 'Footer Visible',
+        fixed: 'Fixed Footer',
+        height: 'Footer Height',
+        right: 'Right Footer'
+      },
+      content: {
+        title: 'Content Area Settings',
+        scrollMode: {
+          title: 'Scroll Mode',
+          tip: 'The theme scroll only scrolls the main part, the outer scroll can carry the header and footer together',
+          wrapper: 'Wrapper',
+          content: 'Content'
+        },
+        page: {
+          animate: 'Page Animate',
+          mode: {
+            title: 'Page Animate Mode',
+            fade: 'Fade',
+            'fade-slide': 'Slide',
+            'fade-bottom': 'Fade Zoom',
+            'fade-scale': 'Fade Scale',
+            'zoom-fade': 'Zoom Fade',
+            'zoom-out': 'Zoom Out',
+            none: 'None'
+          }
+        },
+        fixedHeaderAndTab: 'Fixed Header And Tab'
+      },
+      resetCacheStrategy: {
+        title: 'Reset Cache Strategy',
+        close: 'Close Page',
+        refresh: 'Refresh Page'
      }
    },
-    fixedHeaderAndTab: 'Fixed Header And Tab',
-    header: {
-      height: 'Header Height',
-      breadcrumb: {
-        visible: 'Breadcrumb Visible',
-        showIcon: 'Breadcrumb Icon Visible'
+    general: {
+      title: 'General Settings',
+      watermark: {
+        title: 'Watermark Settings',
+        visible: 'Watermark Full Screen Visible',
+        text: 'Custom Watermark Text',
+        enableUserName: 'Enable User Name Watermark',
+        enableTime: 'Show Current Time',
+        timeFormat: 'Time Format'
      },
      multilingual: {
+        title: 'Multilingual Settings',
        visible: 'Display multilingual button'
      },
      globalSearch: {
+        title: 'Global Search Settings',
        visible: 'Display GlobalSearch button'
      }
    },
-    tab: {
-      visible: 'Tab Visible',
-      cache: 'Tag Bar Info Cache',
-      height: 'Tab Height',
-      mode: {
-        title: 'Tab Mode',
-        chrome: 'Chrome',
-        button: 'Button'
-      }
-    },
-    sider: {
-      inverted: 'Dark Sider',
-      width: 'Sider Width',
-      collapsedWidth: 'Sider Collapsed Width',
-      mixWidth: 'Mix Sider Width',
-      mixCollapsedWidth: 'Mix Sider Collapse Width',
-      mixChildMenuWidth: 'Mix Child Menu Width'
-    },
-    footer: {
-      visible: 'Footer Visible',
-      fixed: 'Fixed Footer',
-      height: 'Footer Height',
-      right: 'Right Footer'
-    },
-    watermark: {
-      visible: 'Watermark Full Screen Visible',
-      text: 'Watermark Text',
-      enableUserName: 'Enable User Name Watermark'
+    configOperation: {
+      copyConfig: 'Copy Config',
+      copySuccessMsg: 'Copy Success, Please replace the variable "themeSettings" in "src/theme/settings.ts"',
+      resetConfig: 'Reset Config',
+      resetSuccessMsg: 'Reset Success'
    },
    tablePropsTitle: 'Table Props',
    table: {
@ -183,19 +232,6 @@ const local: App.I18n.Schema = {
      singleColumn: 'Single Column',
      singleLine: 'Single Line',
      striped: 'Striped'
-    },
-    themeDrawerTitle: 'Theme Configuration',
-    pageFunTitle: 'Page Function',
-    resetCacheStrategy: {
-      title: 'Reset Cache Strategy',
-      close: 'Close Page',
-      refresh: 'Refresh Page'
-    },
-    configOperation: {
-      copyConfig: 'Copy Config',
-      copySuccessMsg: 'Copy Success, Please replace the variable "themeSettings" in "src/theme/settings.ts"',
-      resetConfig: 'Reset Config',
-      resetSuccessMsg: 'Reset Success'
    }
  },
  route: {
@ -205,29 +241,10 @@ const local: App.I18n.Schema = {
    500: 'Server Error',
    'iframe-page': 'Iframe',
    home: 'Home',
-    system: 'System Management',
-    system_menu: 'Menu Management',
-    tool: 'System Tools',
-    tool_gen: 'Code Generation',
-    system_user: 'User Management',
-    system_dict: 'Dict Management',
-    system_tenant: 'Tenant Management',
-    'system_tenant-package': 'Tenant Package Management',
-    system_config: 'Config Management',
-    system_dept: 'Dept Management',
-    system_post: 'Post Management',
-    monitor: 'Monitor Management',
-    monitor_logininfor: 'Login Log',
-    monitor_operlog: 'Operate Log',
-    system_client: 'Client Management',
-    system_notice: 'Notice Management',
+    monitor: 'Monitor',
    'social-callback': 'Social Callback',
-    system_oss: 'File Management',
-    'system_oss-config': 'OSS Config',
    monitor_cache: 'Cache Monitor',
-    monitor_online: 'Online User',
    'user-center': 'User Center',
-    system_role: 'Role Management',
    demo: 'Demo',
    demo_demo: 'Demo Table',
    demo_tree: 'Demo Tree',
@ -328,8 +345,6 @@ const local: App.I18n.Schema = {
  page: {
    login: {
      common: {
-        title: 'Modern enterprise-level multi-tenant management system',
-        subTitle: 'Provides developers with a complete enterprise management solution',
        loginOrRegister: 'Login / Register',
        register: 'Register',
        userNamePlaceholder: 'Please enter user name',
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@ -82,93 +82,139 @@ const local: App.I18n.Schema = {
    tokenExpired: 'token已过期'
  },
  theme: {
-    themeSchema: {
-      title: '主题模式',
-      light: '亮色模式',
-      dark: '暗黑模式',
-      auto: '跟随系统'
+    themeDrawerTitle: '主题配置',
+    tabs: {
+      appearance: '外观',
+      layout: '布局',
+      general: '通用'
    },
-    grayscale: '灰色模式',
-    colourWeakness: '色弱模式',
-    layoutMode: {
-      title: '布局模式',
-      vertical: '左侧菜单模式',
-      'vertical-mix': '左侧菜单混合模式',
-      horizontal: '顶部菜单模式',
-      'horizontal-mix': '顶部菜单混合模式',
-      reverseHorizontalMix: '一级菜单与子级菜单位置反转'
+    appearance: {
+      themeSchema: {
+        title: '主题模式',
+        light: '亮色模式',
+        dark: '暗黑模式',
+        auto: '跟随系统'
+      },
+      grayscale: '灰色模式',
+      colourWeakness: '色弱模式',
+      themeColor: {
+        title: '主题颜色',
+        primary: '主色',
+        info: '信息色',
+        success: '成功色',
+        warning: '警告色',
+        error: '错误色',
+        followPrimary: '跟随主色'
+      },
+      recommendColor: '应用推荐算法的颜色',
+      recommendColorDesc: '推荐颜色的算法参照'
    },
-    recommendColor: '应用推荐算法的颜色',
-    recommendColorDesc: '推荐颜色的算法参照',
-    themeColor: {
-      title: '主题颜色',
-      primary: '主色',
-      info: '信息色',
-      success: '成功色',
-      warning: '警告色',
-      error: '错误色',
-      followPrimary: '跟随主色'
-    },
-    scrollMode: {
-      title: '滚动模式',
-      wrapper: '外层滚动',
-      content: '主体滚动'
-    },
-    page: {
-      animate: '页面切换动画',
-      mode: {
-        title: '页面切换动画类型',
-        'fade-slide': '滑动',
-        fade: '淡入淡出',
-        'fade-bottom': '底部消退',
-        'fade-scale': '缩放消退',
-        'zoom-fade': '渐变',
-        'zoom-out': '闪现',
-        none: '无'
+    layout: {
+      layoutMode: {
+        title: '布局模式',
+        vertical: '左侧菜单模式',
+        'vertical-mix': '左侧菜单混合模式',
+        'vertical-hybrid-header-first': '左侧混合-顶部优先',
+        horizontal: '顶部菜单模式',
+        'top-hybrid-sidebar-first': '顶部混合-侧边优先',
+        'top-hybrid-header-first': '顶部混合-顶部优先',
+        vertical_detail: '左侧菜单布局，菜单在左，内容在右。',
+        'vertical-mix_detail': '左侧双菜单布局，一级菜单在左侧深色区域，二级菜单在左侧浅色区域。',
+        'vertical-hybrid-header-first_detail':
+          '左侧混合布局，一级菜单在顶部，二级菜单在左侧深色区域，三级菜单在左侧浅色区域。',
+        horizontal_detail: '顶部菜单布局，菜单在顶部，内容在下方。',
+        'top-hybrid-sidebar-first_detail': '顶部混合布局，一级菜单在左侧，二级菜单在顶部。',
+        'top-hybrid-header-first_detail': '顶部混合布局，一级菜单在顶部，二级菜单在左侧。'
+      },
+      tab: {
+        title: '标签栏设置',
+        visible: '显示标签栏',
+        cache: '标签栏信息缓存',
+        cacheTip: '一键开启/关闭全局 keepalive',
+        height: '标签栏高度',
+        mode: {
+          title: '标签栏风格',
+          chrome: '谷歌风格',
+          button: '按钮风格'
+        }
+      },
+      header: {
+        title: '头部设置',
+        height: '头部高度',
+        breadcrumb: {
+          visible: '显示面包屑',
+          showIcon: '显示面包屑图标'
+        }
+      },
+      sider: {
+        title: '侧边栏设置',
+        inverted: '深色侧边栏',
+        width: '侧边栏宽度',
+        collapsedWidth: '侧边栏折叠宽度',
+        mixWidth: '混合布局侧边栏宽度',
+        mixCollapsedWidth: '混合布局侧边栏折叠宽度',
+        mixChildMenuWidth: '混合布局子菜单宽度'
+      },
+      footer: {
+        title: '底部设置',
+        visible: '显示底部',
+        fixed: '固定底部',
+        height: '底部高度',
+        right: '底部局右'
+      },
+      content: {
+        title: '内容区域设置',
+        scrollMode: {
+          title: '滚动模式',
+          tip: '主题滚动仅 main 部分滚动，外层滚动可携带头部底部一起滚动',
+          wrapper: '外层滚动',
+          content: '主体滚动'
+        },
+        page: {
+          animate: '页面切换动画',
+          mode: {
+            title: '页面切换动画类型',
+            'fade-slide': '滑动',
+            fade: '淡入淡出',
+            'fade-bottom': '底部消退',
+            'fade-scale': '缩放消退',
+            'zoom-fade': '渐变',
+            'zoom-out': '闪现',
+            none: '无'
+          }
+        },
+        fixedHeaderAndTab: '固定头部和标签栏'
+      },
+      resetCacheStrategy: {
+        title: '重置缓存策略',
+        close: '关闭页面',
+        refresh: '刷新页面'
      }
    },
-    fixedHeaderAndTab: '固定头部和标签栏',
-    header: {
-      height: '头部高度',
-      breadcrumb: {
-        visible: '显示面包屑',
-        showIcon: '显示面包屑图标'
+    general: {
+      title: '通用设置',
+      watermark: {
+        title: '水印设置',
+        visible: '显示全屏水印',
+        text: '自定义水印文本',
+        enableUserName: '启用用户名水印',
+        enableTime: '显示当前时间',
+        timeFormat: '时间格式'
      },
      multilingual: {
+        title: '多语言设置',
        visible: '显示多语言按钮'
      },
      globalSearch: {
+        title: '全局搜索设置',
        visible: '显示全局搜索按钮'
      }
    },
-    tab: {
-      visible: '显示标签栏',
-      cache: '标签栏信息缓存',
-      height: '标签栏高度',
-      mode: {
-        title: '标签栏风格',
-        chrome: '谷歌风格',
-        button: '按钮风格'
-      }
-    },
-    sider: {
-      inverted: '深色侧边栏',
-      width: '侧边栏宽度',
-      collapsedWidth: '侧边栏折叠宽度',
-      mixWidth: '混合布局侧边栏宽度',
-      mixCollapsedWidth: '混合布局侧边栏折叠宽度',
-      mixChildMenuWidth: '混合布局子菜单宽度'
-    },
-    footer: {
-      visible: '显示底部',
-      fixed: '固定底部',
-      height: '底部高度',
-      right: '底部局右'
-    },
-    watermark: {
-      visible: '显示全屏水印',
-      text: '水印文本',
-      enableUserName: '启用用户名水印'
+    configOperation: {
+      copyConfig: '复制配置',
+      copySuccessMsg: '复制成功，请替换 src/theme/settings.ts 中的变量 themeSettings',
+      resetConfig: '重置配置',
+      resetSuccessMsg: '重置成功'
    },
    tablePropsTitle: '表格配置',
    table: {
@ -183,19 +229,6 @@ const local: App.I18n.Schema = {
      singleColumn: '设定行的分割线',
      singleLine: '设定列的分割线',
      striped: '斑马线条纹'
-    },
-    themeDrawerTitle: '主题配置',
-    pageFunTitle: '页面功能',
-    resetCacheStrategy: {
-      title: '重置缓存策略',
-      close: '关闭页面',
-      refresh: '刷新页面'
-    },
-    configOperation: {
-      copyConfig: '复制配置',
-      copySuccessMsg: '复制成功，请替换 src/theme/settings.ts 中的变量 themeSettings',
-      resetConfig: '重置配置',
-      resetSuccessMsg: '重置成功'
    }
  },
  route: {
@ -205,29 +238,10 @@ const local: App.I18n.Schema = {
    500: '服务器错误',
    'iframe-page': '外链页面',
    home: '首页',
-    system: '系统管理',
-    system_menu: '菜单管理',
-    tool: '系统工具',
-    tool_gen: '代码生成',
-    system_user: '用户管理',
-    system_dict: '字典管理',
-    system_tenant: '租户管理',
-    'system_tenant-package': '租户套餐',
-    system_config: '参数设置',
-    system_dept: '部门管理',
-    system_post: '岗位管理',
    monitor: '系统监控',
-    monitor_logininfor: '登录日志',
-    monitor_operlog: '操作日志',
-    system_client: '客户端管理',
-    system_notice: '通知公告',
    'social-callback': '单点登录回调',
-    system_oss: '文件管理',
-    'system_oss-config': 'OSS 配置',
    monitor_cache: '缓存监控',
-    monitor_online: '在线用户',
    'user-center': '个人中心',
-    system_role: '角色管理',
    demo: '测试',
    demo_demo: '测试单表',
    demo_tree: '测试树表',
@ -328,8 +342,6 @@ const local: App.I18n.Schema = {
  page: {
    login: {
      common: {
-        title: '现代化的企业级多租户管理系统',
-        subTitle: '为开发者提供了完整的企业管理解决方案',
        loginOrRegister: '登录 / 注册',
        register: '注册',
        userNamePlaceholder: '请输入用户名',
--- a/src/router/elegant/imports.ts
+++ b/src/router/elegant/imports.ts
@ -26,21 +26,4 @@ export const views: Record<LastLevelRouteKey, RouteComponent | (() => Promise<Ro
  demo_tree: () => import("@/views/demo/tree/index.vue"),
  home: () => import("@/views/home/index.vue"),
  monitor_cache: () => import("@/views/monitor/cache/index.vue"),
-  monitor_logininfor: () => import("@/views/monitor/logininfor/index.vue"),
-  monitor_online: () => import("@/views/monitor/online/index.vue"),
-  monitor_operlog: () => import("@/views/monitor/operlog/index.vue"),
-  system_client: () => import("@/views/system/client/index.vue"),
-  system_config: () => import("@/views/system/config/index.vue"),
-  system_dept: () => import("@/views/system/dept/index.vue"),
-  system_dict: () => import("@/views/system/dict/index.vue"),
-  system_menu: () => import("@/views/system/menu/index.vue"),
-  system_notice: () => import("@/views/system/notice/index.vue"),
-  "system_oss-config": () => import("@/views/system/oss-config/index.vue"),
-  system_oss: () => import("@/views/system/oss/index.vue"),
-  system_post: () => import("@/views/system/post/index.vue"),
-  system_role: () => import("@/views/system/role/index.vue"),
-  "system_tenant-package": () => import("@/views/system/tenant-package/index.vue"),
-  system_tenant: () => import("@/views/system/tenant/index.vue"),
-  system_user: () => import("@/views/system/user/index.vue"),
-  tool_gen: () => import("@/views/tool/gen/index.vue"),
 };
--- a/src/router/elegant/routes.ts
+++ b/src/router/elegant/routes.ts
@ -121,33 +121,6 @@ export const generatedRoutes: GeneratedRoute[] = [
          title: 'monitor_cache',
          i18nKey: 'route.monitor_cache'
        }
-      },
-      {
-        name: 'monitor_logininfor',
-        path: '/monitor/logininfor',
-        component: 'view.monitor_logininfor',
-        meta: {
-          title: 'monitor_logininfor',
-          i18nKey: 'route.monitor_logininfor'
-        }
-      },
-      {
-        name: 'monitor_online',
-        path: '/monitor/online',
-        component: 'view.monitor_online',
-        meta: {
-          title: 'monitor_online',
-          i18nKey: 'route.monitor_online'
-        }
-      },
-      {
-        name: 'monitor_operlog',
-        path: '/monitor/operlog',
-        component: 'view.monitor_operlog',
-        meta: {
-          title: 'monitor_operlog',
-          i18nKey: 'route.monitor_operlog'
-        }
      }
    ]
  },
@ -162,165 +135,6 @@ export const generatedRoutes: GeneratedRoute[] = [
      hideInMenu: true
    }
  },
-  {
-    name: 'system',
-    path: '/system',
-    component: 'layout.base',
-    meta: {
-      title: 'system',
-      i18nKey: 'route.system',
-      localIcon: 'menu-system',
-      order: 1
-    },
-    children: [
-      {
-        name: 'system_client',
-        path: '/system/client',
-        component: 'view.system_client',
-        meta: {
-          title: 'system_client',
-          i18nKey: 'route.system_client'
-        }
-      },
-      {
-        name: 'system_config',
-        path: '/system/config',
-        component: 'view.system_config',
-        meta: {
-          title: 'system_config',
-          i18nKey: 'route.system_config'
-        }
-      },
-      {
-        name: 'system_dept',
-        path: '/system/dept',
-        component: 'view.system_dept',
-        meta: {
-          title: 'system_dept',
-          i18nKey: 'route.system_dept'
-        }
-      },
-      {
-        name: 'system_dict',
-        path: '/system/dict',
-        component: 'view.system_dict',
-        meta: {
-          title: 'system_dict',
-          i18nKey: 'route.system_dict'
-        }
-      },
-      {
-        name: 'system_menu',
-        path: '/system/menu',
-        component: 'view.system_menu',
-        meta: {
-          title: 'system_menu',
-          i18nKey: 'route.system_menu',
-          localIcon: 'menu-tree-table',
-          order: 3
-        }
-      },
-      {
-        name: 'system_notice',
-        path: '/system/notice',
-        component: 'view.system_notice',
-        meta: {
-          title: 'system_notice',
-          i18nKey: 'route.system_notice'
-        }
-      },
-      {
-        name: 'system_oss',
-        path: '/system/oss',
-        component: 'view.system_oss',
-        meta: {
-          title: 'system_oss',
-          i18nKey: 'route.system_oss'
-        }
-      },
-      {
-        name: 'system_oss-config',
-        path: '/system/oss-config',
-        component: 'view.system_oss-config',
-        meta: {
-          title: 'system_oss-config',
-          i18nKey: 'route.system_oss-config',
-          constant: true,
-          hideInMenu: true,
-          icon: 'hugeicons:configuration-01'
-        }
-      },
-      {
-        name: 'system_post',
-        path: '/system/post',
-        component: 'view.system_post',
-        meta: {
-          title: 'system_post',
-          i18nKey: 'route.system_post'
-        }
-      },
-      {
-        name: 'system_role',
-        path: '/system/role',
-        component: 'view.system_role',
-        meta: {
-          title: 'system_role',
-          i18nKey: 'route.system_role'
-        }
-      },
-      {
-        name: 'system_tenant',
-        path: '/system/tenant',
-        component: 'view.system_tenant',
-        meta: {
-          title: 'system_tenant',
-          i18nKey: 'route.system_tenant'
-        }
-      },
-      {
-        name: 'system_tenant-package',
-        path: '/system/tenant-package',
-        component: 'view.system_tenant-package',
-        meta: {
-          title: 'system_tenant-package',
-          i18nKey: 'route.system_tenant-package'
-        }
-      },
-      {
-        name: 'system_user',
-        path: '/system/user',
-        component: 'view.system_user',
-        meta: {
-          title: 'system_user',
-          i18nKey: 'route.system_user'
-        }
-      }
-    ]
-  },
-  {
-    name: 'tool',
-    path: '/tool',
-    component: 'layout.base',
-    meta: {
-      title: 'tool',
-      i18nKey: 'route.tool',
-      localIcon: 'menu-tool',
-      order: 4
-    },
-    children: [
-      {
-        name: 'tool_gen',
-        path: '/tool/gen',
-        component: 'view.tool_gen',
-        meta: {
-          title: 'tool_gen',
-          i18nKey: 'route.tool_gen',
-          localIcon: 'menu-code',
-          order: 2
-        }
-      }
-    ]
-  },
  {
    name: 'user-center',
    path: '/user-center',
--- a/src/router/elegant/transform.ts
+++ b/src/router/elegant/transform.ts
@ -178,26 +178,7 @@ const routeMap: RouteMap = {
  "login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?",
  "monitor": "/monitor",
  "monitor_cache": "/monitor/cache",
-  "monitor_logininfor": "/monitor/logininfor",
-  "monitor_online": "/monitor/online",
-  "monitor_operlog": "/monitor/operlog",
  "social-callback": "/social-callback",
-  "system": "/system",
-  "system_client": "/system/client",
-  "system_config": "/system/config",
-  "system_dept": "/system/dept",
-  "system_dict": "/system/dict",
-  "system_menu": "/system/menu",
-  "system_notice": "/system/notice",
-  "system_oss": "/system/oss",
-  "system_oss-config": "/system/oss-config",
-  "system_post": "/system/post",
-  "system_role": "/system/role",
-  "system_tenant": "/system/tenant",
-  "system_tenant-package": "/system/tenant-package",
-  "system_user": "/system/user",
-  "tool": "/tool",
-  "tool_gen": "/tool/gen",
  "user-center": "/user-center"
 };

--- a/src/service/api/system/post.ts
+++ b/src/service/api/system/post.ts
@ -43,10 +43,3 @@ export function fetchGetPostSelect(deptId?: CommonType.IdType, postIds?: CommonT
    params: { postIds, deptId }
  });
 }
-/** 获取部门选择框列表 */
-export function fetchGetPostDeptSelect() {
-  return request<Api.Common.CommonTreeRecord>({
-    url: '/system/post/deptTree',
-    method: 'get'
-  });
-}
--- a/src/service/request/index.ts
+++ b/src/service/request/index.ts
@ -8,11 +8,11 @@ import { decrypt, encrypt } from '@/utils/jsencrypt';
 import { getAuthorization, handleExpiredRequest, showErrorMsg } from './shared';
 import type { RequestInstanceState } from './type';

-const encryptHeader = import.meta.env.VITE_HEADER_FLAG || 'encrypt-key';
+const encryptHeader = 'encrypt-key';
 const isHttpProxy = import.meta.env.DEV && import.meta.env.VITE_HTTP_PROXY === 'Y';
 const { baseURL } = getServiceBaseURL(import.meta.env, isHttpProxy);

-export const request = createFlatRequest<App.Service.Response, RequestInstanceState>(
+export const request = createFlatRequest(
  {
    baseURL,
    'axios-retry': {
@ -20,6 +20,39 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
    }
  },
  {
+    defaultState: {
+      errMsgStack: [],
+      refreshTokenPromise: null
+    } as RequestInstanceState,
+    transform(response: AxiosResponse<App.Service.Response<any>>) {
+      if (import.meta.env.VITE_APP_ENCRYPT === 'Y') {
+        // 加密后的 AES 秘钥
+        const keyStr = response.headers[encryptHeader];
+        // 加密
+        if (keyStr && keyStr !== '') {
+          const data = String(response.data);
+          // 请求体 AES 解密
+          const base64Str = decrypt(keyStr);
+          // base64 解码 得到请求头的 AES 秘钥
+          const aesKey = decryptBase64(base64Str.toString());
+          // aesKey 解码 data
+          const decryptData = decryptWithAes(data, aesKey);
+          // 将结果 (得到的是 JSON 字符串) 转为 JSON
+          response.data = JSON.parse(decryptData);
+        }
+      }
+
+      // 二进制数据则直接返回
+      if (response.request.responseType === 'blob' || response.request.responseType === 'arraybuffer') {
+        return response.data;
+      }
+
+      if (response.data.rows) {
+        return response.data;
+      }
+
+      return response.data.data;
+    },
    async onRequest(config) {
      const isToken = config.headers?.isToken === false;
      // set token
@ -48,14 +81,6 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt
    isBackendSuccess(response) {
      // when the backend response code is "0000"(default), it means the request is success
      // to change this logic by yourself, you can modify the `VITE_SERVICE_SUCCESS_CODE` in `.env` file
-      if (import.meta.env.VITE_APP_ENCRYPT === 'Y' && response.headers[encryptHeader]) {
-        const keyStr = response.headers[encryptHeader];
-        const data = String(response.data);
-        const base64Str = decrypt(keyStr);
-        const aesKey = decryptBase64(base64Str.toString());
-        const decryptData = decryptWithAes(data, aesKey);
-        response.data = JSON.parse(decryptData);
-      }
      return String(response.data.code) === import.meta.env.VITE_SERVICE_SUCCESS_CODE;
    },
    async onBackendFail(response, instance) {
@ -132,18 +157,6 @@ export const request = createFlatRequest<App.Service.Response, RequestInstanceSt

      return null;
    },
-    transformBackendResponse(response) {
-      // 二进制数据则直接返回
-      if (response.request.responseType === 'blob' || response.request.responseType === 'arraybuffer') {
-        return response.data;
-      }
-
-      if (response.data.rows) {
-        return response.data;
-      }
-
-      return response.data.data;
-    },
    onError(error) {
      // when the request is fail, you can show error message

--- a/src/service/request/shared.ts
+++ b/src/service/request/shared.ts
@ -27,14 +27,14 @@ async function handleRefreshToken() {
 }

 export async function handleExpiredRequest(state: RequestInstanceState) {
-  if (!state.refreshTokenFn) {
-    state.refreshTokenFn = handleRefreshToken();
+  if (!state.refreshTokenPromise) {
+    state.refreshTokenPromise = handleRefreshToken();
  }

-  const success = await state.refreshTokenFn;
+  const success = await state.refreshTokenPromise;

  setTimeout(() => {
-    state.refreshTokenFn = null;
+    state.refreshTokenPromise = null;
  }, 1000);

  return success;
--- a/src/service/request/type.ts
+++ b/src/service/request/type.ts
@ -1,6 +1,7 @@
 export interface RequestInstanceState {
-  /** whether the request is refreshing token */
-  refreshTokenFn: Promise<boolean> | null;
+  /** the promise of refreshing token */
+  refreshTokenPromise: Promise<boolean> | null;
  /** the request error message stack */
  errMsgStack: string[];
+  [key: string]: unknown;
 }
--- a/src/store/modules/auth/index.ts
+++ b/src/store/modules/auth/index.ts
@ -8,7 +8,6 @@ import { localStg } from '@/utils/storage';
 import { SetupStoreId } from '@/enum';
 import { useRouteStore } from '../route';
 import { useTabStore } from '../tab';
-import useNoticeStore from '../notice';
 import { clearAuthStorage, getToken } from './shared';

 export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
@ -16,7 +15,6 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
  const authStore = useAuthStore();
  const routeStore = useRouteStore();
  const tabStore = useTabStore();
-  const noticeStore = useNoticeStore();
  const { toLogin, redirectFromLogin } = useRouterPush(false);
  const { loading: loginLoading, startLoading, endLoading } = useLoading();

@ -50,7 +48,6 @@ export const useAuthStore = defineStore(SetupStoreId.Auth, () => {
      await toLogin();
    }

-    noticeStore.clearNotice();
    tabStore.cacheTabs();
    routeStore.resetStore();
  }
--- a/src/store/modules/dict/index.ts
+++ b/src/store/modules/dict/index.ts
@ -1,9 +1,8 @@
 import { ref } from 'vue';
 import { defineStore } from 'pinia';
 import { $t } from '@/locales';
-import { SetupStoreId } from '@/enum';

-export const useDictStore = defineStore(SetupStoreId.Dict, () => {
+export const useDictStore = defineStore('dict', () => {
  const dictData = ref<{ [key: string]: Api.System.DictData[] }>({});

  const getDict = (key: string) => {
--- a/src/store/modules/route/index.ts
+++ b/src/store/modules/route/index.ts
@ -127,7 +127,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
    }
    // @ts-expect-error no hidden field
    route.meta.hideInMenu = route.hidden;
-    if (route.meta.hideInMenu && parent && !route.meta.activeMenu) {
+    if (route.meta.hideInMenu && parent) {
      // @ts-expect-error parent.name is activeMenu type
      route.meta.activeMenu = parent.name;
    }
@ -389,7 +389,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => {
  }

  async function onRouteSwitchWhenLoggedIn() {
-    // await authStore.initUserInfo();
+    // some global init logic when logged in and switch route
  }

  async function onRouteSwitchWhenNotLoggedIn() {
--- a/src/store/modules/theme/index.ts
+++ b/src/store/modules/theme/index.ts
@ -1,10 +1,11 @@
 import { computed, effectScope, onScopeDispose, ref, toRefs, watch } from 'vue';
 import type { Ref } from 'vue';
-import { useEventListener, usePreferredColorScheme } from '@vueuse/core';
+import { useDateFormat, useEventListener, useNow, usePreferredColorScheme } from '@vueuse/core';
 import { defineStore } from 'pinia';
 import { getPaletteColorByNumber } from '@sa/color';
 import { localStg } from '@/utils/storage';
 import { SetupStoreId } from '@/enum';
+import { useAuthStore } from '../auth';
 import {
  addThemeVarsToGlobal,
  createThemeToken,
@ -18,10 +19,14 @@ import {
 export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
  const scope = effectScope();
  const osTheme = usePreferredColorScheme();
+  const authStore = useAuthStore();

  /** Theme settings */
  const settings: Ref<App.Theme.ThemeSetting> = ref(initThemeSettings());

+  /** Watermark time instance with controls */
+  const { now: watermarkTime, pause: pauseWatermarkTime, resume: resumeWatermarkTime } = useNow({ controls: true });
+
  /** Dark mode */
  const darkMode = computed(() => {
    if (settings.value.themeScheme === 'auto') {
@ -57,6 +62,29 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
   */
  const settingsJson = computed(() => JSON.stringify(settings.value));

+  /** Watermark time date formatter */
+  const formattedWatermarkTime = computed(() => {
+    const { watermark } = settings.value;
+    const date = useDateFormat(watermarkTime, watermark.timeFormat);
+    return date.value;
+  });
+
+  /** Watermark content */
+  const watermarkContent = computed(() => {
+    const { watermark } = settings.value;
+    let content = watermark.text;
+
+    if (watermark.enableUserName && authStore.userInfo.user?.userName) {
+      content = `${authStore.userInfo.user.userName}@${content}`;
+    }
+
+    if (watermark.enableTime) {
+      content = `${content} ${formattedWatermarkTime.value}`;
+    }
+
+    return content;
+  });
+
  /** Reset store */
  function resetStore() {
    const themeStore = useThemeStore();
@ -144,13 +172,43 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
    );
    addThemeVarsToGlobal(themeTokens, darkThemeTokens);
  }
+
  /**
-   * Set layout reverse horizontal mix
+   * Set watermark enable user name
   *
-   * @param reverse Reverse horizontal mix
+   * @param enable Whether to enable user name watermark
   */
-  function setLayoutReverseHorizontalMix(reverse: boolean) {
-    settings.value.layout.reverseHorizontalMix = reverse;
+  function setWatermarkEnableUserName(enable: boolean) {
+    settings.value.watermark.enableUserName = enable;
+
+    if (enable) {
+      // settings.value.watermark.enableTime = false;
+    }
+  }
+
+  /**
+   * Set watermark enable time
+   *
+   * @param enable Whether to enable time watermark
+   */
+  function setWatermarkEnableTime(enable: boolean) {
+    settings.value.watermark.enableTime = enable;
+
+    if (enable) {
+      // settings.value.watermark.enableUserName = false;
+    }
+  }
+
+  /** Only run timer when watermark is visible and time display is enabled */
+  function updateWatermarkTimer() {
+    const { watermark } = settings.value;
+    const shouldRunTimer = watermark.visible && watermark.enableTime;
+
+    if (shouldRunTimer) {
+      resumeWatermarkTime();
+    } else {
+      pauseWatermarkTime();
+    }
  }

  /** Cache theme settings */
@ -196,6 +254,15 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
      },
      { immediate: true }
    );
+
+    // watch watermark settings to control timer
+    watch(
+      () => [settings.value.watermark.visible, settings.value.watermark.enableTime],
+      () => {
+        updateWatermarkTimer();
+      },
+      { immediate: true }
+    );
  });

  /** On scope dispose */
@ -209,6 +276,7 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
    themeColors,
    naiveTheme,
    settingsJson,
+    watermarkContent,
    setGrayscale,
    setColourWeakness,
    resetStore,
@ -216,6 +284,7 @@ export const useThemeStore = defineStore(SetupStoreId.Theme, () => {
    toggleThemeScheme,
    updateThemeColors,
    setThemeLayout,
-    setLayoutReverseHorizontalMix
+    setWatermarkEnableUserName,
+    setWatermarkEnableTime
  };
 });
--- a/src/styles/css/global.css
+++ b/src/styles/css/global.css
@ -6,7 +6,6 @@ html,
 body,
 #app {
  height: 100%;
-  font-family: inherit;
 }

 html {
--- a/src/theme/settings.ts
+++ b/src/theme/settings.ts
@ -15,8 +15,7 @@ export const themeSettings: App.Theme.ThemeSetting = {
  resetCacheStrategy: 'close',
  layout: {
    mode: 'vertical',
-    scrollMode: 'content',
-    reverseHorizontalMix: false
+    scrollMode: 'content'
  },
  page: {
    animate: true,
@ -44,7 +43,7 @@ export const themeSettings: App.Theme.ThemeSetting = {
  fixedHeaderAndTab: true,
  sider: {
    inverted: false,
-    width: 230,
+    width: 220,
    collapsedWidth: 64,
    mixWidth: 90,
    mixCollapsedWidth: 64,
@ -58,8 +57,10 @@ export const themeSettings: App.Theme.ThemeSetting = {
  },
  watermark: {
    visible: import.meta.env.VITE_WATERMARK === 'Y',
-    text: 'RuoYi-Vue-Plus',
-    enableUserName: false
+    text: 'RuoYi-Plus-Soybean',
+    enableUserName: true,
+    enableTime: false,
+    timeFormat: 'YYYY-MM-DD HH:mm'
  },
  table: {
    bordered: true,
--- a/src/typings/api/api.d.ts
+++ b/src/typings/api/api.d.ts
@ -85,131 +85,4 @@ declare namespace Api {
      children: CommonTreeRecord[];
    }[];
  }
-
-  /**
-   * namespace Auth
-   *
-   * backend api module: "auth"
-   */
-  namespace Auth {
-    /** base login form */
-    interface LoginForm {
-      /** 客户端 ID */
-      clientId?: string;
-      /** 授权类型 */
-      grantType?: string;
-      /** 租户ID */
-      tenantId?: string;
-      /** 验证码 */
-      code?: string;
-      /** 唯一标识 */
-      uuid?: string;
-    }
-
-    /** password login form */
-    interface PwdLoginForm extends LoginForm {
-      /** 用户名 */
-      username?: string;
-      /** 密码 */
-      password?: string;
-    }
-
-    /** social login form */
-    interface SocialLoginForm extends LoginForm {
-      /** 授权码 */
-      socialCode?: string;
-      /** 授权状态 */
-      socialState?: string;
-      /** 来源 */
-      source?: string;
-    }
-
-    /** register form */
-    interface RegisterForm extends LoginForm {
-      /** 用户名 */
-      username?: string;
-      /** 密码 */
-      password?: string;
-      /** 确认密码 */
-      confirmPassword?: string;
-      /** 用户类型 */
-      userType?: string;
-    }
-
-    /** login token data */
-    interface LoginToken {
-      /** 授权令牌 */
-      access_token?: string;
-      /** 应用id */
-      client_id?: string;
-      /** 授权令牌 access_token 的有效期 */
-      expire_in?: number;
-      /** 用户 openid */
-      openid?: string;
-      /** 刷新令牌 refresh_token 的有效期 */
-      refresh_expire_in?: number;
-      /** 刷新令牌 */
-      refresh_token?: string;
-      /** 令牌权限 */
-      scope?: string;
-    }
-
-    /** userinfo */
-    interface UserInfo {
-      /** 用户信息 */
-      user?: Api.System.User & {
-        /** 所属角色 */
-        roles: Api.System.Role[];
-      };
-      /** 角色列表 */
-      roles: string[];
-      /** 菜单权限 */
-      permissions: string[];
-    }
-
-    /** tenant */
-    interface Tenant {
-      /** 企业名称 */
-      companyName: string;
-      /** 域名 */
-      domain: string;
-      /** 租户编号 */
-      tenantId: string;
-    }
-
-    /** login tenant */
-    interface LoginTenant {
-      /** 租户开关 */
-      tenantEnabled: boolean;
-      /** 租户列表 */
-      voList: Tenant[];
-    }
-
-    interface CaptchaCode {
-      /** 是否开启验证码 */
-      captchaEnabled: boolean;
-      /** 唯一标识 */
-      uuid?: string;
-      /** 验证码图片 */
-      img?: string;
-    }
-  }
-
-  /**
-   * namespace Route
-   *
-   * backend api module: "route"
-   */
-  namespace Route {
-    type ElegantConstRoute = import('@elegant-router/types').ElegantConstRoute;
-
-    interface MenuRoute extends ElegantConstRoute {
-      id: string;
-    }
-
-    interface UserRoute {
-      routes: MenuRoute[];
-      home: import('@elegant-router/types').LastLevelRouteKey;
-    }
-  }
 }
--- a/src/typings/api/auth.d.ts
+++ b/src/typings/api/auth.d.ts
@ -0,0 +1,110 @@
+declare namespace Api {
+  /**
+   * namespace Auth
+   *
+   * backend api module: "auth"
+   */
+  namespace Auth {
+    /** base login form */
+    interface LoginForm {
+      /** 客户端 ID */
+      clientId?: string;
+      /** 授权类型 */
+      grantType?: string;
+      /** 租户ID */
+      tenantId?: string;
+      /** 验证码 */
+      code?: string;
+      /** 唯一标识 */
+      uuid?: string;
+    }
+
+    /** password login form */
+    interface PwdLoginForm extends LoginForm {
+      /** 用户名 */
+      username?: string;
+      /** 密码 */
+      password?: string;
+    }
+
+    /** social login form */
+    interface SocialLoginForm extends LoginForm {
+      /** 授权码 */
+      socialCode?: string;
+      /** 授权状态 */
+      socialState?: string;
+      /** 来源 */
+      source?: string;
+    }
+
+    /** register form */
+    interface RegisterForm extends LoginForm {
+      /** 用户名 */
+      username?: string;
+      /** 密码 */
+      password?: string;
+      /** 确认密码 */
+      confirmPassword?: string;
+      /** 用户类型 */
+      userType?: string;
+    }
+
+    /** login token data */
+    interface LoginToken {
+      /** 授权令牌 */
+      access_token?: string;
+      /** 应用id */
+      client_id?: string;
+      /** 授权令牌 access_token 的有效期 */
+      expire_in?: number;
+      /** 用户 openid */
+      openid?: string;
+      /** 刷新令牌 refresh_token 的有效期 */
+      refresh_expire_in?: number;
+      /** 刷新令牌 */
+      refresh_token?: string;
+      /** 令牌权限 */
+      scope?: string;
+    }
+
+    /** userinfo */
+    interface UserInfo {
+      /** 用户信息 */
+      user?: Api.System.User & {
+        /** 所属角色 */
+        roles: Api.System.Role[];
+      };
+      /** 角色列表 */
+      roles: string[];
+      /** 菜单权限 */
+      permissions: string[];
+    }
+
+    /** tenant */
+    interface Tenant {
+      /** 企业名称 */
+      companyName: string;
+      /** 域名 */
+      domain: string;
+      /** 租户编号 */
+      tenantId: string;
+    }
+
+    /** login tenant */
+    interface LoginTenant {
+      /** 租户开关 */
+      tenantEnabled: boolean;
+      /** 租户列表 */
+      voList: Tenant[];
+    }
+
+    interface CaptchaCode {
+      /** 是否开启验证码 */
+      captchaEnabled: boolean;
+      /** 唯一标识 */
+      uuid?: string;
+      /** 验证码图片 */
+      img?: string;
+    }
+  }
+}
--- a/src/typings/api/route.d.ts
+++ b/src/typings/api/route.d.ts
@ -0,0 +1,19 @@
+declare namespace Api {
+  /**
+   * namespace Route
+   *
+   * backend api module: "route"
+   */
+  namespace Route {
+    type ElegantConstRoute = import('@elegant-router/types').ElegantConstRoute;
+
+    interface MenuRoute extends ElegantConstRoute {
+      id: string;
+    }
+
+    interface UserRoute {
+      routes: MenuRoute[];
+      home: import('@elegant-router/types').LastLevelRouteKey;
+    }
+  }
+}
--- a/src/typings/app.d.ts
+++ b/src/typings/app.d.ts
@ -28,12 +28,6 @@ declare namespace App {
        mode: UnionKey.ThemeLayoutMode;
        /** Scroll mode */
        scrollMode: UnionKey.ThemeScrollMode;
-        /**
-         * Whether to reverse the horizontal mix
-         *
-         * if true, the vertical child level menus in left and horizontal first level menus in top
-         */
-        reverseHorizontalMix: boolean;
      };
      /** Page */
      page: {
@ -88,11 +82,14 @@ declare namespace App {
        width: number;
        /** Collapsed sider width */
        collapsedWidth: number;
-        /** Sider width when the layout is 'vertical-mix' or 'horizontal-mix' */
+        /** Sider width when the layout is 'vertical-mix', 'top-hybrid-sidebar-first', or 'top-hybrid-header-first' */
        mixWidth: number;
-        /** Collapsed sider width when the layout is 'vertical-mix' or 'horizontal-mix' */
+        /**
+         * Collapsed sider width when the layout is 'vertical-mix', 'top-hybrid-sidebar-first', or
+         * 'top-hybrid-header-first'
+         */
        mixCollapsedWidth: number;
-        /** Child menu width when the layout is 'vertical-mix' or 'horizontal-mix' */
+        /** Child menu width when the layout is 'vertical-mix', 'top-hybrid-sidebar-first', or 'top-hybrid-header-first' */
        mixChildMenuWidth: number;
      };
      /** Footer */
@ -103,7 +100,10 @@ declare namespace App {
        fixed: boolean;
        /** Footer height */
        height: number;
-        /** Whether float the footer to the right when the layout is 'horizontal-mix' */
+        /**
+         * Whether float the footer to the right when the layout is 'top-hybrid-sidebar-first' or
+         * 'top-hybrid-header-first'
+         */
        right: boolean;
      };
      /** Watermark */
@ -114,6 +114,10 @@ declare namespace App {
        text: string;
        /** Whether to use user name as watermark text */
        enableUserName: boolean;
+        /** Whether to use current time as watermark text */
+        enableTime: boolean;
+        /** Time format for watermark text */
+        timeFormat: string;
      };
      table: {
        /** Whether to show the table border */
@ -397,59 +401,94 @@ declare namespace App {
        tokenExpired: string;
      };
      theme: {
-        themeSchema: { title: string } & Record<UnionKey.ThemeScheme, string>;
-        grayscale: string;
-        colourWeakness: string;
-        layoutMode: { title: string; reverseHorizontalMix: string } & Record<UnionKey.ThemeLayoutMode, string>;
-        recommendColor: string;
-        recommendColorDesc: string;
-        themeColor: {
-          title: string;
-          followPrimary: string;
-        } & Theme.ThemeColor;
-        scrollMode: { title: string } & Record<UnionKey.ThemeScrollMode, string>;
-        page: {
-          animate: string;
-          mode: { title: string } & Record<UnionKey.ThemePageAnimateMode, string>;
+        themeDrawerTitle: string;
+        tabs: {
+          appearance: string;
+          layout: string;
+          general: string;
        };
-        fixedHeaderAndTab: string;
-        header: {
-          height: string;
-          breadcrumb: {
+        appearance: {
+          themeSchema: { title: string } & Record<UnionKey.ThemeScheme, string>;
+          grayscale: string;
+          colourWeakness: string;
+          themeColor: {
+            title: string;
+            followPrimary: string;
+          } & Theme.ThemeColor;
+          recommendColor: string;
+          recommendColorDesc: string;
+        };
+        layout: {
+          layoutMode: { title: string } & Record<UnionKey.ThemeLayoutMode, string> & {
+              [K in `${UnionKey.ThemeLayoutMode}_detail`]: string;
+            };
+          tab: {
+            title: string;
            visible: string;
-            showIcon: string;
+            cache: string;
+            cacheTip: string;
+            height: string;
+            mode: { title: string } & Record<UnionKey.ThemeTabMode, string>;
+          };
+          header: {
+            title: string;
+            height: string;
+            breadcrumb: {
+              visible: string;
+              showIcon: string;
+            };
+          };
+          sider: {
+            title: string;
+            inverted: string;
+            width: string;
+            collapsedWidth: string;
+            mixWidth: string;
+            mixCollapsedWidth: string;
+            mixChildMenuWidth: string;
+          };
+          footer: {
+            title: string;
+            visible: string;
+            fixed: string;
+            height: string;
+            right: string;
+          };
+          content: {
+            title: string;
+            scrollMode: { title: string; tip: string } & Record<UnionKey.ThemeScrollMode, string>;
+            page: {
+              animate: string;
+              mode: { title: string } & Record<UnionKey.ThemePageAnimateMode, string>;
+            };
+            fixedHeaderAndTab: string;
+          };
+          resetCacheStrategy: { title: string } & Record<UnionKey.ResetCacheStrategy, string>;
+        };
+        general: {
+          title: string;
+          watermark: {
+            title: string;
+            visible: string;
+            text: string;
+            enableUserName: string;
+            enableTime: string;
+            timeFormat: string;
          };
          multilingual: {
+            title: string;
            visible: string;
          };
          globalSearch: {
+            title: string;
            visible: string;
          };
        };
-        tab: {
-          visible: string;
-          cache: string;
-          height: string;
-          mode: { title: string } & Record<UnionKey.ThemeTabMode, string>;
-        };
-        sider: {
-          inverted: string;
-          width: string;
-          collapsedWidth: string;
-          mixWidth: string;
-          mixCollapsedWidth: string;
-          mixChildMenuWidth: string;
-        };
-        footer: {
-          visible: string;
-          fixed: string;
-          height: string;
-          right: string;
-        };
-        watermark: {
-          visible: string;
-          text: string;
-          enableUserName: string;
+        configOperation: {
+          copyConfig: string;
+          copySuccessMsg: string;
+          resetConfig: string;
+          resetSuccessMsg: string;
        };
        tablePropsTitle: string;
        table: {
@ -460,15 +499,6 @@ declare namespace App {
          singleLine: string;
          striped: string;
        };
-        themeDrawerTitle: string;
-        pageFunTitle: string;
-        resetCacheStrategy: { title: string } & Record<UnionKey.ResetCacheStrategy, string>;
-        configOperation: {
-          copyConfig: string;
-          copySuccessMsg: string;
-          resetConfig: string;
-          resetSuccessMsg: string;
-        };
      };
      route: Record<I18nRouteKey, string>;
      menu: Record<string, string>;
@ -487,8 +517,6 @@ declare namespace App {
        };
        login: {
          common: {
-            title: string;
-            subTitle: string;
            loginOrRegister: string;
            register: string;
            userNamePlaceholder: string;
--- a/src/typings/components.d.ts
+++ b/src/typings/components.d.ts
@ -27,10 +27,8 @@ declare module 'vue' {
    IconAntDesignEnterOutlined: typeof import('~icons/ant-design/enter-outlined')['default']
    IconAntDesignReloadOutlined: typeof import('~icons/ant-design/reload-outlined')['default']
    IconAntDesignSettingOutlined: typeof import('~icons/ant-design/setting-outlined')['default']
-    IconEpCopyDocument: typeof import('~icons/ep/copy-document')['default']
    IconGridiconsFullscreen: typeof import('~icons/gridicons/fullscreen')['default']
    IconGridiconsFullscreenExit: typeof import('~icons/gridicons/fullscreen-exit')['default']
-    'IconHugeicons:configuration01': typeof import('~icons/hugeicons/configuration01')['default']
    IconIcRoundRefresh: typeof import('~icons/ic/round-refresh')['default']
    IconIcRoundSearch: typeof import('~icons/ic/round-search')['default']
    IconLocalBanner: typeof import('~icons/local/banner')['default']
@ -38,14 +36,7 @@ declare module 'vue' {
    'IconMaterialSymbols:add': typeof import('~icons/material-symbols/add')['default']
    'IconMaterialSymbols:deleteOutline': typeof import('~icons/material-symbols/delete-outline')['default']
    'IconMaterialSymbols:downloadRounded': typeof import('~icons/material-symbols/download-rounded')['default']
-    'IconMaterialSymbols:imageOutline': typeof import('~icons/material-symbols/image-outline')['default']
    'IconMaterialSymbols:refreshRounded': typeof import('~icons/material-symbols/refresh-rounded')['default']
-    'IconMaterialSymbols:syncOutline': typeof import('~icons/material-symbols/sync-outline')['default']
-    'IconMaterialSymbols:uploadRounded': typeof import('~icons/material-symbols/upload-rounded')['default']
-    'IconMaterialSymbols:warningOutlineRounded': typeof import('~icons/material-symbols/warning-outline-rounded')['default']
-    IconMaterialSymbolsAddRounded: typeof import('~icons/material-symbols/add-rounded')['default']
-    IconMaterialSymbolsDeleteOutline: typeof import('~icons/material-symbols/delete-outline')['default']
-    IconMaterialSymbolsDriveFileRenameOutlineOutline: typeof import('~icons/material-symbols/drive-file-rename-outline-outline')['default']
    'IconMdi:github': typeof import('~icons/mdi/github')['default']
    IconMdiArrowDownThin: typeof import('~icons/mdi/arrow-down-thin')['default']
    IconMdiArrowUpThin: typeof import('~icons/mdi/arrow-up-thin')['default']
@ -55,6 +46,7 @@ declare module 'vue' {
    'IconQuill:collapse': typeof import('~icons/quill/collapse')['default']
    'IconQuill:expand': typeof import('~icons/quill/expand')['default']
    'IconSimpleIcons:gitee': typeof import('~icons/simple-icons/gitee')['default']
+    IconTooltip: typeof import('./../components/common/icon-tooltip.vue')['default']
    IconUilSearch: typeof import('~icons/uil/search')['default']
    JsonPreview: typeof import('./../components/custom/json-preview.vue')['default']
    LangSwitch: typeof import('./../components/common/lang-switch.vue')['default']
@ -72,20 +64,15 @@ declare module 'vue' {
    NButton: typeof import('naive-ui')['NButton']
    NCard: typeof import('naive-ui')['NCard']
    NCheckbox: typeof import('naive-ui')['NCheckbox']
-    NCode: typeof import('naive-ui')['NCode']
    NCollapse: typeof import('naive-ui')['NCollapse']
    NCollapseItem: typeof import('naive-ui')['NCollapseItem']
    NColorPicker: typeof import('naive-ui')['NColorPicker']
    NDataTable: typeof import('naive-ui')['NDataTable']
-    NDatePicker: typeof import('naive-ui')['NDatePicker']
-    NDescriptions: typeof import('naive-ui')['NDescriptions']
-    NDescriptionsItem: typeof import('naive-ui')['NDescriptionsItem']
    NDialogProvider: typeof import('naive-ui')['NDialogProvider']
    NDivider: typeof import('naive-ui')['NDivider']
    NDrawer: typeof import('naive-ui')['NDrawer']
    NDrawerContent: typeof import('naive-ui')['NDrawerContent']
    NDropdown: typeof import('naive-ui')['NDropdown']
-    NDynamicInput: typeof import('naive-ui')['NDynamicInput']
    NEllipsis: typeof import('naive-ui')['NEllipsis']
    NEmpty: typeof import('naive-ui')['NEmpty']
    NForm: typeof import('naive-ui')['NForm']
@ -93,14 +80,9 @@ declare module 'vue' {
    NFormItemGi: typeof import('naive-ui')['NFormItemGi']
    NGi: typeof import('naive-ui')['NGi']
    NGrid: typeof import('naive-ui')['NGrid']
-    NGridItem: typeof import('naive-ui')['NGridItem']
    NInput: typeof import('naive-ui')['NInput']
    NInputGroup: typeof import('naive-ui')['NInputGroup']
-    NInputGroupLabel: typeof import('naive-ui')['NInputGroupLabel']
    NInputNumber: typeof import('naive-ui')['NInputNumber']
-    NLayout: typeof import('naive-ui')['NLayout']
-    NLayoutContent: typeof import('naive-ui')['NLayoutContent']
-    NLayoutSider: typeof import('naive-ui')['NLayoutSider']
    NList: typeof import('naive-ui')['NList']
    NListItem: typeof import('naive-ui')['NListItem']
    NLoadingBarProvider: typeof import('naive-ui')['NLoadingBarProvider']
@ -111,9 +93,6 @@ declare module 'vue' {
    NP: typeof import('naive-ui')['NP']
    NPopconfirm: typeof import('naive-ui')['NPopconfirm']
    NPopover: typeof import('naive-ui')['NPopover']
-    NRadio: typeof import('naive-ui')['NRadio']
-    NRadioButton: typeof import('naive-ui')['NRadioButton']
-    NRadioGroup: typeof import('naive-ui')['NRadioGroup']
    NScrollbar: typeof import('naive-ui')['NScrollbar']
    NSelect: typeof import('naive-ui')['NSelect']
    NSpace: typeof import('naive-ui')['NSpace']
@ -121,13 +100,11 @@ declare module 'vue' {
    NStatistic: typeof import('naive-ui')['NStatistic']
    NSwitch: typeof import('naive-ui')['NSwitch']
    NTab: typeof import('naive-ui')['NTab']
-    NTabPane: typeof import('naive-ui')['NTabPane']
    NTabs: typeof import('naive-ui')['NTabs']
    NTag: typeof import('naive-ui')['NTag']
    NText: typeof import('naive-ui')['NText']
    NThing: typeof import('naive-ui')['NThing']
    NTooltip: typeof import('naive-ui')['NTooltip']
-    NTree: typeof import('naive-ui')['NTree']
    NTreeSelect: typeof import('naive-ui')['NTreeSelect']
    NUpload: typeof import('naive-ui')['NUpload']
    NUploadDragger: typeof import('naive-ui')['NUploadDragger']
--- a/src/typings/elegant-router.d.ts
+++ b/src/typings/elegant-router.d.ts
@ -32,26 +32,7 @@ declare module "@elegant-router/types" {
    "login": "/login/:module(pwd-login|code-login|register|reset-pwd|bind-wechat)?";
    "monitor": "/monitor";
    "monitor_cache": "/monitor/cache";
-    "monitor_logininfor": "/monitor/logininfor";
-    "monitor_online": "/monitor/online";
-    "monitor_operlog": "/monitor/operlog";
    "social-callback": "/social-callback";
-    "system": "/system";
-    "system_client": "/system/client";
-    "system_config": "/system/config";
-    "system_dept": "/system/dept";
-    "system_dict": "/system/dict";
-    "system_menu": "/system/menu";
-    "system_notice": "/system/notice";
-    "system_oss": "/system/oss";
-    "system_oss-config": "/system/oss-config";
-    "system_post": "/system/post";
-    "system_role": "/system/role";
-    "system_tenant": "/system/tenant";
-    "system_tenant-package": "/system/tenant-package";
-    "system_user": "/system/user";
-    "tool": "/tool";
-    "tool_gen": "/tool/gen";
    "user-center": "/user-center";
  };

@ -97,8 +78,6 @@ declare module "@elegant-router/types" {
    | "login"
    | "monitor"
    | "social-callback"
-    | "system"
-    | "tool"
    | "user-center"
  >;

@ -128,23 +107,6 @@ declare module "@elegant-router/types" {
    | "demo_tree"
    | "home"
    | "monitor_cache"
-    | "monitor_logininfor"
-    | "monitor_online"
-    | "monitor_operlog"
-    | "system_client"
-    | "system_config"
-    | "system_dept"
-    | "system_dict"
-    | "system_menu"
-    | "system_notice"
-    | "system_oss-config"
-    | "system_oss"
-    | "system_post"
-    | "system_role"
-    | "system_tenant-package"
-    | "system_tenant"
-    | "system_user"
-    | "tool_gen"
  >;

  /**
--- a/src/typings/naive-ui.d.ts
+++ b/src/typings/naive-ui.d.ts
@ -6,32 +6,14 @@ declare namespace NaiveUI {
  type DataTableExpandColumn<T> = import('naive-ui').DataTableExpandColumn<T>;
  type DataTableSelectionColumn<T> = import('naive-ui').DataTableSelectionColumn<T>;
  type TableColumnGroup<T> = import('naive-ui/es/data-table/src/interface').TableColumnGroup<T>;
-  type PaginationProps = import('naive-ui').PaginationProps;
  type TableColumnCheck = import('@sa/hooks').TableColumnCheck;
-  type TableDataWithIndex<T> = import('@sa/hooks').TableDataWithIndex<T>;
-  type FlatResponseData<T> = import('@sa/axios').FlatResponseData<T>;

-  /**
-   * the custom column key
-   *
-   * if you want to add a custom column, you should add a key to this type
-   */
-  type CustomColumnKey = 'operate';
-
-  type SetTableColumnKey<C, T> = Omit<C, 'key'> & { key: keyof T | CustomColumnKey };
-
-  type TableData = Api.Common.CommonRecord<object>;
+  type SetTableColumnKey<C, T> = Omit<C, 'key'> & { key: keyof T | (string & {}) };

  type TableColumnWithKey<T> = SetTableColumnKey<DataTableBaseColumn<T>, T> | SetTableColumnKey<TableColumnGroup<T>, T>;

  type TableColumn<T> = TableColumnWithKey<T> | DataTableSelectionColumn<T> | DataTableExpandColumn<T>;

-  type TableApiFn<T = any, R = Api.Common.CommonSearchParams> = (
-    params: R
-  ) => Promise<FlatResponseData<Api.Common.PaginatingQueryRecord<T>>>;
-
-  type TreeTableApiFn<T = any, R = Record<string, any>> = (params: R) => Promise<FlatResponseData<T[]>>;
-
  /**
   * the type of table operation
   *
@ -39,27 +21,4 @@ declare namespace NaiveUI {
   * - edit: edit table item
   */
  type TableOperateType = 'add' | 'edit';
-
-  type GetTableData<A extends TableApiFn> = A extends TableApiFn<infer T> ? T : never;
-
-  type GetTreeTableData<A extends TreeTableApiFn> = A extends TreeTableApiFn<infer T> ? T : never;
-
-  type NaiveTableConfig<A extends TableApiFn> = Pick<
-    import('@sa/hooks').TableConfig<A, GetTableData<A>, TableColumn<TableDataWithIndex<GetTableData<A>>>>,
-    'apiFn' | 'apiParams' | 'columns' | 'immediate'
-  > & {
-    /**
-     * whether to display the total items count
-     *
-     * @default false
-     */
-    showTotal?: boolean;
-  };
-
-  type NaiveTreeTableConfig<A extends TreeTableApiFn> = Pick<
-    import('@sa/hooks').TableConfig<A, GetTreeTableData<A>, TableColumn<TableDataWithIndex<GetTreeTableData<A>>>>,
-    'apiFn' | 'apiParams' | 'columns' | 'immediate'
-  >;
-
-  type CodeMirrorLang = 'js' | 'json';
 }
--- a/src/typings/union-key.d.ts
+++ b/src/typings/union-key.d.ts
@ -28,9 +28,16 @@ declare namespace UnionKey {
   * - vertical: the vertical menu in left
   * - horizontal: the horizontal menu in top
   * - vertical-mix: two vertical mixed menus in left
-   * - horizontal-mix: the vertical first level menus in left and horizontal child level menus in top
+   * - top-hybrid-sidebar-first: the vertical first level menus in left and horizontal child level menus in top
+   * - top-hybrid-header-first: the horizontal first level menus in top and vertical child level menus in left
   */
-  type ThemeLayoutMode = 'vertical' | 'horizontal' | 'vertical-mix' | 'horizontal-mix';
+  type ThemeLayoutMode =
+    | 'vertical'
+    | 'horizontal'
+    | 'vertical-mix'
+    | 'vertical-hybrid-header-first'
+    | 'top-hybrid-sidebar-first'
+    | 'top-hybrid-header-first';

  /**
   * The scroll mode when content overflow
--- a/src/typings/vite-env.d.ts
+++ b/src/typings/vite-env.d.ts
@ -114,7 +114,6 @@ declare namespace Env {
    readonly VITE_DEVTOOLS_LAUNCH_EDITOR?: import('vite-plugin-vue-devtools').VitePluginVueDevToolsOptions['launchEditor'];
    readonly VITE_APP_CLIENT_ID?: string;
    readonly VITE_APP_ENCRYPT?: CommonType.YesOrNo;
-    readonly VITE_HEADER_FLAG?: string;
    readonly VITE_APP_RSA_PUBLIC_KEY?: string;
    readonly VITE_APP_RSA_PRIVATE_KEY?: string;
    readonly VITE_APP_WEBSOCKET: CommonType.YesOrNo;
--- a/src/utils/export.ts
+++ b/src/utils/export.ts
@ -1,71 +0,0 @@
-import { utils, writeFile } from 'xlsx';
-import { isNotNull } from '@/utils/common';
-import { $t } from '@/locales';
-
-export interface ExportExcelProps<T> {
-  columns: NaiveUI.TableColumn<NaiveUI.TableDataWithIndex<T>>[];
-  data: NaiveUI.TableDataWithIndex<T>[];
-  filename: string;
-  ignoreKeys?: (keyof NaiveUI.TableDataWithIndex<T> | NaiveUI.CustomColumnKey)[];
-  dicts?: Record<keyof NaiveUI.TableDataWithIndex<T>, string>;
-}
-
-export function exportExcel<T>({
-  columns,
-  data,
-  filename,
-  dicts,
-  ignoreKeys = ['index', 'operate']
-}: ExportExcelProps<T>) {
-  const exportColumns = columns.filter(col => isTableColumnHasKey(col) && !ignoreKeys?.includes(col.key));
-
-  const excelList = data.map(item => exportColumns.map(col => getTableValue(col, item, dicts)));
-
-  const titleList = exportColumns.map(col => (isTableColumnHasTitle(col) && col.title) || null);
-
-  excelList.unshift(titleList);
-
-  const workBook = utils.book_new();
-
-  const workSheet = utils.aoa_to_sheet(excelList);
-
-  workSheet['!cols'] = exportColumns.map(item => ({
-    width: Math.round(Number(item.width) / 10 || 20)
-  }));
-
-  utils.book_append_sheet(workBook, workSheet, filename);
-
-  writeFile(workBook, `${filename}.xlsx`);
-}
-
-function getTableValue<T>(
-  col: NaiveUI.TableColumn<NaiveUI.TableDataWithIndex<T>>,
-  item: NaiveUI.TableDataWithIndex<T>,
-  dicts?: Record<keyof NaiveUI.TableDataWithIndex<T>, string>
-) {
-  if (!isTableColumnHasKey(col)) {
-    return null;
-  }
-
-  const { key } = col;
-
-  if (key === 'operate') {
-    return null;
-  }
-
-  if (isNotNull(dicts?.[key]) && isNotNull(item[key])) {
-    return $t(item[key] as App.I18n.I18nKey);
-  }
-
-  return item[key];
-}
-
-function isTableColumnHasKey<T>(column: NaiveUI.TableColumn<T>): column is NaiveUI.TableColumnWithKey<T> {
-  return Boolean((column as NaiveUI.TableColumnWithKey<T>).key);
-}
-
-function isTableColumnHasTitle<T>(column: NaiveUI.TableColumn<T>): column is NaiveUI.TableColumnWithKey<T> & {
-  title: string;
-} {
-  return Boolean((column as NaiveUI.TableColumnWithKey<T>).title);
-}
--- a/src/utils/sse.ts
+++ b/src/utils/sse.ts
@ -1,7 +1,6 @@
 import { watch } from 'vue';
 import { useEventSource } from '@vueuse/core';
 import useNoticeStore from '@/store/modules/notice';
-import { $t } from '@/locales';
 import { localStg } from './storage';

 // 初始化
@ -35,14 +34,9 @@ export const initSSE = (url: any) => {
      read: false,
      time: new Date().toLocaleString()
    });
-    let content = data.value;
-    const noticeType = content.match(/\[dict\.(.*?)\]/)?.[1];
-    if (noticeType) {
-      content = content.replace(`dict.${noticeType}`, $t(`dict.${noticeType}` as App.I18n.I18nKey));
-    }
    window.$notification?.create({
      title: '消息',
-      content,
+      content: data.value,
      type: 'success',
      duration: 3000
    });
--- a/src/views/_builtin/login/index.vue
+++ b/src/views/_builtin/login/index.vue
@ -39,69 +39,46 @@ const activeModule = computed(() => moduleMap[props.module || 'pwd-login']);
 </script>

 <template>
-  <div class="scroll box-border size-full flex">
-    <div class="relative box-border hidden h-full w-65vw overflow-hidden bg-primary-50 xl:block dark:bg-primary-900">
-      <div class="relative z-100 flex items-center pl-30px pt-30px">
-        <SystemLogo class="text-32px text-primary" />
-        <h3 class="ml-10px text-20px font-400">{{ $t('system.title') }}</h3>
+  <div class="relative min-h-screen w-full flex flex-wrap">
+    <div class="hidden min-h-screen w-50% bg-primary-100 lg:block dark:bg-primary-800">
+      <div class="size-full flex-center">
+        <img class="w-60% sm:w-80%" :src="loginBackground" />
      </div>
-      <div class="absolute inset-x-0 inset-b-10.5% inset-t-0 z-10 m-auto w-40%">
-        <img class="size-full" :src="loginBackground" />
-      </div>
-      <div class="absolute bottom-80px w-full text-center">
-        <h1 class="text-24px font-400">{{ $t('page.login.common.title') }}</h1>
-        <p class="mt-8px text-14px color-gray-500">{{ $t('page.login.common.subTitle') }}</p>
-      </div>
-      <WaveBg />
    </div>
-    <div class="relative h-full flex-1 xl:m-auto sm:!w-full">
-      <header class="flex-y-center justify-between px-30px pt-30px xl:justify-end">
-        <div class="relative z-100 block flex items-center xl:hidden">
-          <SystemLogo class="text-32px text-primary" />
-          <h3 class="ml-10px text-20px font-400">{{ $t('system.title') }}</h3>
-        </div>
-        <div class="flex items-center justify-end">
-          <ThemeSchemaSwitch
-            :theme-schema="themeStore.themeScheme"
-            :show-tooltip="false"
-            class="text-20px lt-sm:text-18px"
-            @switch="themeStore.toggleThemeScheme"
-          />
-          <LangSwitch
-            v-if="themeStore.header.multilingual.visible"
-            :lang="appStore.locale"
-            :lang-options="appStore.localeOptions"
-            :show-tooltip="false"
-            class="text-20px lt-sm:text-18px"
-            @change-lang="appStore.changeLocale"
-          />
-        </div>
-      </header>
-      <main
-        class="m-auto mt-10% h-630px max-w-450px w-full rounded-5px bg-cover px-24px xl:absolute xl:inset-0 lg:mt-15% xl:mt-auto"
-      >
-        <Transition :name="themeStore.page.animateMode" mode="out-in" appear>
-          <component :is="activeModule.component" />
-        </Transition>
-      </main>
+    <div class="w-full flex-col-center px-24px py-32px lg:w-50%">
+      <div class="mx-auto max-w-464px w-full">
+        <header class="flex-y-center justify-between">
+          <div class="flex-y-center gap-16px">
+            <SystemLogo class="text-30px text-primary sm:text-42px" />
+            <h3 class="text-24px text-primary font-500 sm:text-32px">{{ $t('system.title') }}</h3>
+          </div>
+          <div class="flex-y-center">
+            <ThemeSchemaSwitch
+              :theme-schema="themeStore.themeScheme"
+              :show-tooltip="false"
+              class="text-20px lt-sm:text-18px"
+              @switch="themeStore.toggleThemeScheme"
+            />
+            <LangSwitch
+              v-if="themeStore.header.multilingual.visible"
+              :lang="appStore.locale"
+              :lang-options="appStore.localeOptions"
+              :show-tooltip="false"
+              class="text-20px lt-sm:text-18px"
+              @change-lang="appStore.changeLocale"
+            />
+          </div>
+        </header>
+        <main class="pt-24px">
+          <div>
+            <Transition :name="themeStore.page.animateMode" mode="out-in" appear>
+              <component :is="activeModule.component" />
+            </Transition>
+          </div>
+        </main>
+      </div>
    </div>
  </div>
 </template>

-<style scoped>
-.scroll {
-  overflow: auto;
-}
-
-.scroll::-webkit-scrollbar {
-  display: none;
-}
-
-.scroll {
-  -ms-overflow-style: none;
-}
-
-.scroll {
-  scrollbar-width: none;
-}
-</style>
+<style scoped></style>
--- a/src/views/_builtin/login/modules/code-login.vue
+++ b/src/views/_builtin/login/modules/code-login.vue
@ -40,10 +40,6 @@ async function handleSubmit() {
 </script>

 <template>
-  <div class="mb-5px text-32px text-black font-600 sm:text-30px dark:text-white">
-    {{ $t('page.login.codeLogin.title') }}
-  </div>
-  <div class="pb-18px text-16px text-#858585">请输入您的手机号，我们将发送验证码到您的手机</div>
  <NForm ref="formRef" :model="model" :rules="rules" size="large" :show-label="false" @keyup.enter="handleSubmit">
    <NFormItem path="phone">
      <NInput v-model:value="model.phone" :placeholder="$t('page.login.common.phonePlaceholder')" />
@ -56,32 +52,15 @@ async function handleSubmit() {
        </NButton>
      </div>
    </NFormItem>
-    <NSpace vertical :size="20" class="w-full">
-      <NButton type="primary" size="large" block @click="handleSubmit">
-        {{ $t('page.login.codeLogin.title') }}
+    <NSpace vertical :size="18" class="w-full">
+      <NButton type="primary" size="large" round block @click="handleSubmit">
+        {{ $t('common.confirm') }}
      </NButton>
-      <NButton size="large" block @click="toggleLoginModule('pwd-login')">
+      <NButton size="large" round block @click="toggleLoginModule('pwd-login')">
        {{ $t('page.login.common.back') }}
      </NButton>
    </NSpace>
  </NForm>
 </template>

-<style scoped>
-:deep(.n-base-selection),
-:deep(.n-input) {
-  --n-height: 42px !important;
-  --n-font-size: 16px !important;
-  --n-border-radius: 8px !important;
-}
-
-:deep(.n-base-selection-label) {
-  padding: 0 6px !important;
-}
-
-:deep(.n-button) {
-  --n-height: 42px !important;
-  --n-font-size: 18px !important;
-  --n-border-radius: 8px !important;
-}
-</style>
+<style scoped></style>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xlsea	2504498eb5	fix(hooks): 修复树表全部展开问题（临时）	2025-08-19 11:00:19 +08:00
xlsea	5581a4a59f	Merge remote-tracking branch 'Soybean/v2.0' into v2.0 # Conflicts: # src/typings/components.d.ts	2025-08-14 18:14:31 +08:00
xlsea	7c83ce7937	Merge branch 'dev' into v2.0 # Conflicts: # src/views/system/user/modules/user-import-modal.vue	2025-08-14 18:12:03 +08:00
NicholasLD	d73111116a	refactor(menu): optimize the margin on the menu	2025-08-14 17:41:57 +08:00
Azir-11	29a2a5c66a	feat(projects): add prompt information for scrolling mode and tab bar caching.	2025-08-13 15:54:15 +08:00
Azir-11	4005763c00	feat(components): replace NTooltip with IconTooltip and optimize the layout of related components.	2025-08-13 15:54:15 +08:00
Azir-11	a55b4dc073	feat(components): add the IconTooltip component.	2025-08-13 15:54:15 +08:00
Azir-11	be8f915a0c	chore(other): update the ESLint validation configuration to support more file types.	2025-08-13 15:54:15 +08:00
Cell	358e129765	feat(hooks): add scrollX computation for total table width in useNaiveTable	2025-08-11 10:42:17 +08:00
xlsea	2af57caf44	Merge branch 'dev' into v2.0 # Conflicts: # src/views/system/user/modules/user-import-modal.vue # src/views/system/user/modules/user-operate-drawer.vue	2025-08-08 17:21:41 +08:00
xlsea	4699654fc1	feat(hooks): 完成表格 Hooks 改造	2025-07-31 17:08:06 +08:00
xlsea	01116c9ffa	Merge remote-tracking branch 'Soybean/v2.0' into v2.0	2025-07-31 14:53:35 +08:00
Cell	9ea56c9b82	fix(packages): fix the parsing logic for stored data to ensure correct return of boolean values	2025-07-31 11:24:42 +08:00
Soybean	87adc35f2e	refactor(hooks): remove useSignal hook and update exports	2025-07-20 00:31:03 +08:00
Soybean	ee4341457a	refactor(hooks): streamline column visibility handling in useTable and table components	2025-07-20 00:30:16 +08:00
Soybean	8a7cd5934b	fix(hooks): correct chart rendering logic in useEcharts	2025-07-19 20:09:20 +08:00
Soybean	c962f7b2c5	chore(deps): update deps	2025-07-19 19:45:49 +08:00
Soybean	8cc5177cda	refactor(hooks)!: refactor useTable and enhance type definitions	2025-07-19 19:43:58 +08:00
Soybean	3a343eea33	optimize(projects): optimize api type file	2025-07-19 18:25:59 +08:00
Soybean	f83eefbc3e	refactor(request): unify response transformation methods and deprecate transformBackendResponse	2025-07-19 12:04:00 +08:00
Soybean	936b834e62	optimize(hooks): optimize useEcharts	2025-07-19 02:53:46 +08:00
Soybean	c965140b87	refactor(hooks): optimize useContext and update useMixMenuContext	2025-07-19 02:40:25 +08:00
Soybean	32b8f99071	fix(table): add type annotations for records in useTable hook	2025-07-19 02:28:05 +08:00
Soybean	abaaa4a068	optimize(packages): remove ofetch package	2025-07-19 02:27:54 +08:00
Soybean	b4e125300e	refactor(request)!: remove cancelRequest method and related logic from request instances	2025-07-19 02:24:14 +08:00
Soybean	50a5cba088	optimize(request): enhance request options and response handling with generic types	2025-07-19 02:17:50 +08:00
wenyuan	d6c8142bb4	refactor(projects): remove unnecessary logic in onRouteSwitchWhenLoggedIn	2025-07-15 22:04:18 +08:00
Soybean	8146858b96	optimize(projects): optimize theme drawer width	2025-07-14 00:48:17 +08:00
wenyuan	8b8a2083bb	optimize(projects): improve robustness of second-level menu key logic	2025-07-14 00:48:16 +08:00
wenyuan	6207292d81	typo(projects): update description of vertical-hybrid-header-first layout mode	2025-07-14 00:48:16 +08:00
wenyuan	b4e5c6d990	feat(projects): add 'vertical-hybrid-header-first' layout mode	2025-07-14 00:48:16 +08:00
Azir	b6ac3106ce	feat(projects)!: optimize layout mode, split horizontal mix component into two layouts, and rename the component.	2025-07-14 00:48:16 +08:00
Azir	d37ce04606	refactor(types): move Auth and Route namespaces to separate files and clean up api.d.ts	2025-07-14 00:48:16 +08:00
wenyuan	8439a60070	optimize(projects): improve theme drawer responsive width for mobile devices	2025-07-14 00:48:16 +08:00
wenyuan	f238fcbd47	feat(projects): Add current time display option for watermark (#772 ) * feat(projects): Add current time display option for watermark * perf(projects): add watermark timer controls	2025-07-14 00:48:16 +08:00
Azir	8ba71a0857	feat(projects): refactor theme drawer with tabbed layout for better UX.	2025-07-14 00:48:16 +08:00