](http://godban.github.io/browsers-support-badges/) | [
](http://godban.github.io/browsers-support-badges/) | [
](http://godban.github.io/browsers-support-badges/) | [
](http://godban.github.io/browsers-support-badges/) | [
](http://godban.github.io/browsers-support-badges/) |
-| --- | --- | --- | --- | --- |
-| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
## OpenSource Author
diff --git a/README.md b/README.md
index b6a60667..f4707d7c 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,6 @@
> [!NOTE]
> `SoybeanAdmin` 快速上手系列视频已在 [Bilibili](https://www.bilibili.com/video/BV1YKdRYXELC) 上线 [点击这里](https://www.bilibili.com/video/BV1YKdRYXELC) 前往查看
-> [!WARNING]
-> `SoybeanAdmin` 正在计划开发 `V2` 版本，详情见[计划清单](https://github.com/soybeanjs/soybean-admin/issues/767)
-
## 简介
[`SoybeanAdmin`](https://github.com/soybeanjs/soybean-admin) 是一个清新优雅、高颜值且功能强大的后台管理模板，基于最新的前端技术栈，包括 Vue3, Vite7, TypeScript, Pinia 和 UnoCSS。它内置了丰富的主题配置和组件，代码规范严谨，实现了自动化的文件路由系统。此外，它还采用了基于 ApiFox 的在线Mock数据方案。`SoybeanAdmin` 为您提供了一站式的后台管理解决方案，无需额外配置，开箱即用。同样是一个快速学习前沿技术的最佳实践。
@@ -44,7 +41,6 @@
- **命令行工具**：内置高效的命令行工具，git提交、删除文件、发布等。
- **移动端适配**：完美支持移动端，实现自适应布局。
-
## 版本
- **NaiveUI 版本:**
@@ -68,13 +64,11 @@
- [Gitee 仓库](https://gitee.com/honghuangdc/soybean-admin/tree/legacy)
- [Gitcode 仓库](https://gitcode.com/soybeanjs/soybean-admin/tree/legacy)
-
## 文档
- [地址](https://docs.soybeanjs.cn)
- [旧版文档](https://legacy-docs.soybeanjs.cn)
-
## 合作事项
我们非常感谢大家对 [`SoybeanAdmin`](https://github.com/soybeanjs/soybean-admin) 的支持！为了进一步回馈社区，并助力企业和开发者实现个性化需求，我们现提供多种合作服务，期待与您携手共赢。
@@ -99,11 +93,10 @@
- **Email**: [soybeanjs@outlook.com](mailto:soybeanjs@outlook.com)
- **GitHub Issues**: 欢迎通过 [GitHub Issues](https://github.com/soybeanjs/soybean-admin/issues/new) 联系我们，进行初步的合作洽谈。
-- **商务合作微信**: honghuangdc
+- **商务合作微信**: honghuangdc
期待与您开展深入合作，共同推动 SoybeanAdmin 项目及其在更多领域的成功应用！
-
## 示例图片
@@ -118,7 +111,6 @@
-
## 使用
**环境准备**
@@ -145,6 +137,7 @@ git clone https://gitcode.com/soybeanjs/soybean-admin.git
```bash
pnpm i
```
+
> 由于本项目采用了 pnpm monorepo 的管理方式，因此请不要使用 npm 或 yarn 来安装依赖。
**启动项目**
@@ -179,29 +172,26 @@ pnpm build
更多周边生态请翻阅 [周边生态](https://docs.soybeanjs.cn/zh/awesome) 文档。
-
## 如何贡献
我们热烈欢迎并感谢所有形式的贡献。如果您有任何想法或建议，欢迎通过提交 [pull requests](https://github.com/soybeanjs/soybean-admin/pulls) 或创建 GitHub [issue](https://github.com/soybeanjs/soybean-admin/issues/new) 来分享。
## Git 提交规范
-本项目已内置 `commit` 命令，您可以通过执行 `pnpm commit` 来生成符合 [Conventional Commits]([conventionalcommits](https://www.conventionalcommits.org/)) 规范的提交信息。在提交PR时，请务必使用 `commit` 命令来创建提交信息，以确保信息的规范性。
-
+本项目已内置 `commit` 命令，您可以通过执行 `pnpm commit` 来生成符合 [Conventional Commits](<[conventionalcommits](https://www.conventionalcommits.org/)>) 规范的提交信息。在提交PR时，请务必使用 `commit` 命令来创建提交信息，以确保信息的规范性。
## 浏览器支持
推荐使用最新版的 Chrome 浏览器进行开发，以获得更好的体验。
| [](http://godban.github.io/browsers-support-badges/) | [](http://godban.github.io/browsers-support-badges/) | [](http://godban.github.io/browsers-support-badges/) | [](http://godban.github.io/browsers-support-badges/) | [](http://godban.github.io/browsers-support-badges/) |
-| --- | --- | --- | --- | --- |
-| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| not support | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
## 开源作者
[Soybean](https://github.com/honghuangdc)
-
## 贡献者
感谢以下贡献者的贡献。如果您想为本项目做出贡献，请参考 [如何贡献](#如何贡献)。
diff --git a/build/plugins/index.ts b/build/plugins/index.ts
index 1243fc2f..5cefcd5c 100644
--- a/build/plugins/index.ts
+++ b/build/plugins/index.ts
@@ -2,6 +2,7 @@ import type { PluginOption } from 'vite';
import vue from '@vitejs/plugin-vue';
import vueJsx from '@vitejs/plugin-vue-jsx';
import progress from 'vite-plugin-progress';
+import vueRootValidator from 'vite-plugin-vue-transition-root-validator';
import { setupElegantRouter } from './router';
import { setupUnocss } from './unocss';
import { setupUnplugin } from './unplugin';
@@ -17,7 +18,8 @@ export function setupVitePlugins(viteEnv: Env.ImportMeta, buildTime: string) {
setupUnocss(viteEnv),
...setupUnplugin(viteEnv),
progress(),
- setupHtmlPlugin(buildTime)
+ setupHtmlPlugin(buildTime),
+ vueRootValidator()
];
return plugins;
diff --git a/build/plugins/unocss.ts b/build/plugins/unocss.ts
index 06b41d37..fb250aff 100644
--- a/build/plugins/unocss.ts
+++ b/build/plugins/unocss.ts
@@ -1,7 +1,7 @@
import process from 'node:process';
import path from 'node:path';
-import unocss from '@unocss/vite';
-import presetIcons from '@unocss/preset-icons';
+import { presetIcons } from 'unocss';
+import unocss from 'unocss/vite';
import { FileSystemIconLoader } from '@iconify/utils/lib/loader/node-loaders';
export function setupUnocss(viteEnv: Env.ImportMeta) {
diff --git a/eslint.config.js b/eslint.config.js
index 00537e3f..c47fe5af 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,24 +1,12 @@
-import { defineConfig } from '@soybeanjs/eslint-config';
+import { defineConfig } from '@soybeanjs/eslint-config-vue';
-export default defineConfig(
- { vue: true, unocss: true },
- {
- rules: {
- 'vue/multi-word-component-names': [
- 'warn',
- {
- ignores: ['index', 'App', 'Register', '[id]', '[url]']
- }
- ],
- 'vue/component-name-in-template-casing': [
- 'warn',
- 'PascalCase',
- {
- registeredComponentsOnly: false,
- ignores: ['/^icon-/']
- }
- ],
- 'unocss/order-attributify': 'off'
+export default defineConfig({
+ 'vue/component-name-in-template-casing': [
+ 'warn',
+ 'PascalCase',
+ {
+ registeredComponentsOnly: false,
+ ignores: ['/^icon-/']
}
- }
-);
+ ]
+});
diff --git a/index.html b/index.html
index b04ac55c..0ec4a319 100644
--- a/index.html
+++ b/index.html
@@ -1,5 +1,5 @@
-
+
diff --git a/package.json b/package.json
index f4a45e15..e3e63796 100644
--- a/package.json
+++ b/package.json
@@ -1,35 +1,31 @@
{
"name": "soybean-admin",
- "type": "module",
- "version": "2.0.2",
+ "version": "2.1.0",
"description": "A fresh and elegant admin template, based on Vue3、Vite7、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite7、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
+ "keywords": [
+ "TypeScript",
+ "UnoCSS",
+ "Vite7",
+ "Vue3 admin ",
+ "ant-design-vue v4",
+ "naive-ui",
+ "naive-ui-admin",
+ "vue-admin-template"
+ ],
+ "homepage": "https://github.com/soybeanjs/soybean-admin",
+ "bugs": {
+ "url": "https://github.com/soybeanjs/soybean-admin/issues"
+ },
+ "license": "MIT",
"author": {
"name": "Soybean",
"email": "soybeanjs@outlook.com",
"url": "https://github.com/soybeanjs"
},
- "license": "MIT",
- "homepage": "https://github.com/soybeanjs/soybean-admin",
"repository": {
"url": "https://github.com/soybeanjs/soybean-admin.git"
},
- "bugs": {
- "url": "https://github.com/soybeanjs/soybean-admin/issues"
- },
- "keywords": [
- "Vue3 admin ",
- "vue-admin-template",
- "Vite7",
- "TypeScript",
- "naive-ui",
- "naive-ui-admin",
- "ant-design-vue v4",
- "UnoCSS"
- ],
- "engines": {
- "node": ">=20.19.0",
- "pnpm": ">=10.5.0"
- },
+ "type": "module",
"scripts": {
"build": "vite build --mode prod",
"build:test": "vite build --mode test",
@@ -38,8 +34,9 @@
"commit:zh": "sa git-commit -l=zh-cn",
"dev": "vite --mode test",
"dev:prod": "vite --mode prod",
+ "fmt": "oxfmt",
"gen-route": "sa gen-route",
- "lint": "eslint . --fix",
+ "lint": "oxlint --fix && eslint --fix .",
"prepare": "simple-git-hooks",
"preview": "vite preview",
"release": "sa release",
@@ -48,8 +45,8 @@
},
"dependencies": {
"@antv/data-set": "0.11.8",
- "@antv/g2": "5.4.7",
- "@antv/g6": "5.0.50",
+ "@antv/g2": "5.4.8",
+ "@antv/g6": "5.0.51",
"@better-scroll/core": "2.5.1",
"@iconify/vue": "5.0.0",
"@sa/alova": "workspace:*",
@@ -58,36 +55,36 @@
"@sa/hooks": "workspace:*",
"@sa/materials": "workspace:*",
"@sa/utils": "workspace:*",
- "@visactor/vchart": "2.0.11",
- "@visactor/vchart-theme": "1.12.2",
- "@visactor/vtable-editors": "1.22.8",
- "@visactor/vtable-gantt": "1.22.8",
- "@visactor/vue-vtable": "1.22.8",
- "@vueuse/components": "14.1.0",
- "@vueuse/core": "14.1.0",
+ "@visactor/vchart": "2.0.19",
+ "@visactor/vchart-theme": "1.12.3",
+ "@visactor/vtable-editors": "1.23.3",
+ "@visactor/vtable-gantt": "1.23.3",
+ "@visactor/vue-vtable": "1.23.3",
+ "@vueuse/components": "14.2.1",
+ "@vueuse/core": "14.2.1",
"clipboard": "2.0.11",
"dayjs": "1.11.19",
"defu": "6.1.4",
- "dhtmlx-gantt": "9.1.1",
- "dompurify": "3.3.1",
+ "dhtmlx-gantt": "9.1.2",
+ "dompurify": "3.3.2",
"echarts": "6.0.0",
- "jsbarcode": "3.12.1",
+ "jsbarcode": "3.12.3",
"json5": "2.2.3",
- "naive-ui": "2.43.2",
+ "naive-ui": "2.44.1",
"nprogress": "0.2.0",
"pinia": "3.0.4",
- "pinyin-pro": "3.27.0",
+ "pinyin-pro": "3.28.0",
"print-js": "1.6.0",
- "pro-naive-ui": "3.2.0",
- "swiper": "12.0.3",
- "tailwind-merge": "3.4.0",
+ "pro-naive-ui": "3.2.2",
+ "swiper": "12.1.2",
+ "tailwind-merge": "3.5.0",
"typeit": "8.8.7",
"vditor": "3.11.2",
- "vue": "3.5.26",
- "vue-draggable-plus": "0.6.0",
- "vue-i18n": "11.2.7",
- "vue-pdf-embed": "2.1.3",
- "vue-router": "4.6.4",
+ "vue": "3.5.29",
+ "vue-draggable-plus": "0.6.1",
+ "vue-i18n": "11.3.0",
+ "vue-pdf-embed": "2.1.4",
+ "vue-router": "5.0.3",
"wangeditor": "4.7.15",
"xgplayer": "3.0.23",
"xlsx": "0.18.5"
@@ -95,43 +92,43 @@
"devDependencies": {
"@amap/amap-jsapi-types": "0.0.15",
"@elegant-router/vue": "0.3.8",
- "@iconify/json": "2.2.417",
+ "@iconify/json": "2.2.447",
"@sa/scripts": "workspace:*",
"@sa/uno-preset": "workspace:*",
- "@soybeanjs/eslint-config": "1.7.4",
+ "@soybeanjs/eslint-config-vue": "^0.0.2",
"@types/bmapgl": "0.0.7",
- "@types/node": "25.0.3",
+ "@types/node": "25.3.5",
"@types/nprogress": "0.2.3",
- "@unocss/eslint-config": "66.5.10",
- "@unocss/preset-icons": "66.5.10",
- "@unocss/preset-uno": "66.5.10",
- "@unocss/transformer-directives": "66.5.10",
- "@unocss/transformer-variant-group": "66.5.10",
- "@unocss/vite": "66.5.10",
- "@vitejs/plugin-vue": "6.0.3",
- "@vitejs/plugin-vue-jsx": "5.1.2",
+ "@vitejs/plugin-vue": "6.0.4",
+ "@vitejs/plugin-vue-jsx": "5.1.4",
"consola": "3.4.2",
- "eslint": "9.39.2",
- "eslint-plugin-vue": "10.6.2",
+ "eslint": "10.0.3",
"kolorist": "1.8.0",
- "lint-staged": "16.2.7",
+ "oxfmt": "^0.36.0",
+ "oxlint": "^1.51.0",
"pro-naive-ui-resolver": "1.0.2",
- "sass": "1.97.1",
+ "sass": "1.97.3",
"simple-git-hooks": "2.13.1",
"tsx": "4.21.0",
"typescript": "5.9.3",
- "unplugin-icons": "22.5.0",
- "unplugin-vue-components": "30.0.0",
- "vite": "7.3.0",
+ "unocss": "^66.6.6",
+ "unplugin-icons": "23.0.1",
+ "unplugin-vue-components": "31.0.0",
+ "vite": "7.3.1",
"vite-plugin-progress": "0.0.7",
"vite-plugin-svg-icons": "2.0.1",
- "vite-plugin-vue-devtools": "8.0.5",
- "vue-eslint-parser": "10.2.0",
- "vue-tsc": "3.2.1"
+ "vite-plugin-vue-devtools": "8.0.7",
+ "vite-plugin-vue-transition-root-validator": "^0.1.0",
+ "vue-eslint-parser": "10.4.0",
+ "vue-tsc": "3.2.5"
},
"simple-git-hooks": {
"commit-msg": "pnpm sa git-commit-verify",
- "pre-commit": "pnpm typecheck && pnpm lint && git diff --exit-code"
+ "pre-commit": "pnpm typecheck && pnpm lint && pnpm fmt && git diff --exit-code"
+ },
+ "engines": {
+ "node": ">=20.19.0",
+ "pnpm": ">=10.5.0"
},
"website": "https://admin.soybeanjs.cn"
}
diff --git a/packages/alova/package.json b/packages/alova/package.json
index a4d74345..7e85578d 100644
--- a/packages/alova/package.json
+++ b/packages/alova/package.json
@@ -1,20 +1,22 @@
{
"name": "@sa/alova",
- "version": "2.0.2",
+ "version": "2.1.0",
+ "typesVersions": {
+ "*": {
+ "*": [
+ "./src/*"
+ ]
+ }
+ },
"exports": {
".": "./src/index.ts",
"./fetch": "./src/fetch.ts",
"./client": "./src/client.ts",
"./mock": "./src/mock.ts"
},
- "typesVersions": {
- "*": {
- "*": ["./src/*"]
- }
- },
"dependencies": {
- "@alova/mock": "2.0.18",
+ "@alova/mock": "2.0.19",
"@sa/utils": "workspace:*",
- "alova": "3.4.1"
+ "alova": "3.5.1"
}
}
diff --git a/packages/axios/package.json b/packages/axios/package.json
index 902101ea..62d4c710 100644
--- a/packages/axios/package.json
+++ b/packages/axios/package.json
@@ -1,21 +1,23 @@
{
"name": "@sa/axios",
- "version": "2.0.2",
+ "version": "2.1.0",
+ "typesVersions": {
+ "*": {
+ "*": [
+ "./src/*"
+ ]
+ }
+ },
"exports": {
".": "./src/index.ts"
},
- "typesVersions": {
- "*": {
- "*": ["./src/*"]
- }
- },
"dependencies": {
"@sa/utils": "workspace:*",
- "axios": "1.13.2",
+ "axios": "1.13.6",
"axios-retry": "4.5.0",
- "qs": "6.14.0"
+ "qs": "6.15.0"
},
"devDependencies": {
- "@types/qs": "6.14.0"
+ "@types/qs": "6.15.0"
}
}
diff --git a/packages/color/package.json b/packages/color/package.json
index 2668a42a..a7545612 100644
--- a/packages/color/package.json
+++ b/packages/color/package.json
@@ -1,14 +1,16 @@
{
"name": "@sa/color",
- "version": "2.0.2",
- "exports": {
- ".": "./src/index.ts"
- },
+ "version": "2.1.0",
"typesVersions": {
"*": {
- "*": ["./src/*"]
+ "*": [
+ "./src/*"
+ ]
}
},
+ "exports": {
+ ".": "./src/index.ts"
+ },
"dependencies": {
"@sa/utils": "workspace:*",
"colord": "2.9.3"
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
index 301ffdcf..271a5aa3 100644
--- a/packages/hooks/package.json
+++ b/packages/hooks/package.json
@@ -1,14 +1,16 @@
{
"name": "@sa/hooks",
- "version": "2.0.2",
- "exports": {
- ".": "./src/index.ts"
- },
+ "version": "2.1.0",
"typesVersions": {
"*": {
- "*": ["./src/*"]
+ "*": [
+ "./src/*"
+ ]
}
},
+ "exports": {
+ ".": "./src/index.ts"
+ },
"dependencies": {
"@sa/axios": "workspace:*",
"@sa/utils": "workspace:*"
diff --git a/packages/hooks/src/use-table.ts b/packages/hooks/src/use-table.ts
index 5b038525..3a119df3 100644
--- a/packages/hooks/src/use-table.ts
+++ b/packages/hooks/src/use-table.ts
@@ -23,6 +23,7 @@ export type TableColumnCheck = {
title: TableColumnCheckTitle;
checked: boolean;
visible: boolean;
+ fixed: 'left' | 'right' | 'unFixed';
};
export interface UseTableOptions