xinyin025/soybean-admin
1
0
Fork 0
mirror of https://github.com/soybeanjs/soybean-admin.git synced 2025-09-22 03:26:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore(projects): merge branch main into example

Browse Source
This commit is contained in:
Soybean 2024-06-13 23:30:33 +08:00
commit 4a8b9032cd
15 changed files with 459 additions and 362 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
CHANGELOG.md
View File

@ -1,6 +1,31 @@
# Changelog # Changelog
## [v1.2.3](https://github.com/soybeanjs/soybean-admin/compare/v1.2.2...v1.2.3) (2024-06-13)
###    🐞 Bug Fixes
- **projects**:
- fix mobile browser theme issue by adding color-scheme meta tag to index.html &nbsp;-&nbsp; by @KickCashew in https://github.com/soybeanjs/soybean-admin/issues/488 [<samp>(c2125)</samp>](https://github.com/soybeanjs/soybean-admin/commit/c212565)
- Fix secondary directory components is empty &nbsp;-&nbsp; by @paynezhuang in https://github.com/soybeanjs/soybean-admin/issues/491 [<samp>(aabb2)</samp>](https://github.com/soybeanjs/soybean-admin/commit/aabb2a4)
### &nbsp;&nbsp;&nbsp;📖 Documentation
- **projects**:
- Fixed the hyperlink pointing error &nbsp;-&nbsp; by **Azir** [<samp>(20a81)</samp>](https://github.com/soybeanjs/soybean-admin/commit/20a8127)
- update README &nbsp;-&nbsp; by @soybeanjs [<samp>(70261)</samp>](https://github.com/soybeanjs/soybean-admin/commit/7026126)
### &nbsp;&nbsp;&nbsp;🏡 Chore
- **deps**:
- update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(813d8)</samp>](https://github.com/soybeanjs/soybean-admin/commit/813d8ce)
- update deps &nbsp;-&nbsp; by @soybeanjs [<samp>(bf718)</samp>](https://github.com/soybeanjs/soybean-admin/commit/bf71837)
### &nbsp;&nbsp;&nbsp;❤️ Contributors
[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)&nbsp;&nbsp;[![paynezhuang](https://github.com/paynezhuang.png?size=48)](https://github.com/paynezhuang)&nbsp;&nbsp;[![KickCashew](https://github.com/KickCashew.png?size=48)](https://github.com/KickCashew)&nbsp;&nbsp;
[Azir](mailto:2075125282@qq.com)
## [v1.2.2](https://github.com/honghuangdc/soybean-admin/compare/v1.2.1...v1.2.2) (2024-06-12) ## [v1.2.2](https://github.com/honghuangdc/soybean-admin/compare/v1.2.1...v1.2.2) (2024-06-12)
### &nbsp;&nbsp;&nbsp;🚀 Features ### &nbsp;&nbsp;&nbsp;🚀 Features

6
README.md
View File

@ -157,10 +157,10 @@ Thanks the following people for their contributions. If you want to contribute t
<p>QQ Group</p> <p>QQ Group</p>
<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/qq-soybean-admin-2.jpg" style="width:200px" /> <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/qq-soybean-admin-2.jpg" style="width:200px" />
</div> </div>
<!-- <div> <div>
<p>WeChat Group</p> <p>WeChat Group</p>
<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-0402.jpg" style="width:200px" /> <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/picgo/soybean-admin-wechat-0620.jpg" style="width:200px" />
</div> --> </div>
<div> <div>
<p>Add the following WeChat to invite to the WeChat group</p> <p>Add the following WeChat to invite to the WeChat group</p>
<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-soybeanjs.jpg" style="width:200px" /> <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-soybeanjs.jpg" style="width:200px" />

8
README.zh_CN.md
View File

@ -1,7 +1,7 @@
<div align="center"> <div align="center">
<img src="./public/favicon.svg" width="160" /> <img src="./public/favicon.svg" width="160" />
<h1>SoybeanAdmin</h1> <h1>SoybeanAdmin</h1>
<span><a href="./README.zh_CN.md">English</a> | 中文</span> <span><a href="./README.md">English</a> | 中文</span>
</div> </div>
--- ---
@ -157,10 +157,10 @@ pnpm build
<p>QQ交流群</p> <p>QQ交流群</p>
<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/qq-soybean-admin-2.jpg" style="width:200px" /> <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/qq-soybean-admin-2.jpg" style="width:200px" />
</div> </div>
<!-- <div> <div>
<p>微信群</p> <p>微信群</p>
<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-0402.jpg" style="width:200px" /> <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/picgo/soybean-admin-wechat-0620.jpg" style="width:200px" />
</div> --> </div>
<div> <div>
<p>添加下面微信邀请进微信群</p> <p>添加下面微信邀请进微信群</p>
<img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-soybeanjs.jpg" style="width:200px" /> <img src="https://soybeanjs-1300612522.cos.ap-guangzhou.myqcloud.com/uPic/wechat-soybeanjs.jpg" style="width:200px" />

1
index.html
View File

@ -4,6 +4,7 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" href="/favicon.svg" /> <link rel="icon" href="/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="color-scheme" content="light dark" />
<title>%VITE_APP_TITLE%</title> <title>%VITE_APP_TITLE%</title>
</head> </head>
<body> <body>

32
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "soybean-admin", "name": "soybean-admin",
"type": "module", "type": "module",
"version": "1.2.2", "version": "1.2.3",
"description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。", "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。",
"author": { "author": {
"name": "Soybean", "name": "Soybean",
@ -55,7 +55,7 @@
"@sa/hooks": "workspace:*", "@sa/hooks": "workspace:*",
"@sa/materials": "workspace:*", "@sa/materials": "workspace:*",
"@sa/utils": "workspace:*", "@sa/utils": "workspace:*",
"@vueuse/core": "10.10.0", "@vueuse/core": "10.11.0",
"clipboard": "2.0.11", "clipboard": "2.0.11",
"dayjs": "1.11.11", "dayjs": "1.11.11",
"echarts": "5.5.0", "echarts": "5.5.0",
@ -66,19 +66,19 @@
"pinia": "2.1.7", "pinia": "2.1.7",
"print-js": "1.6.0", "print-js": "1.6.0",
"swiper": "11.1.1", "swiper": "11.1.1",
"tailwind-merge": "^2.3.0", "tailwind-merge": "2.3.0",
"vditor": "3.10.4", "vditor": "3.10.4",
"vue": "3.4.27", "vue": "3.4.27",
"vue-draggable-plus": "0.5.0", "vue-draggable-plus": "0.5.0",
"vue-i18n": "9.13.1", "vue-i18n": "9.13.1",
"vue-router": "4.3.2", "vue-router": "4.3.3",
"wangeditor": "4.7.15", "wangeditor": "4.7.15",
"xgplayer": "3.0.17" "xgplayer": "3.0.17"
}, },
"devDependencies": { "devDependencies": {
"@amap/amap-jsapi-types": "0.0.8", "@amap/amap-jsapi-types": "0.0.8",
"@elegant-router/vue": "0.3.7", "@elegant-router/vue": "0.3.7",
"@iconify/json": "2.2.217", "@iconify/json": "2.2.218",
"@sa/scripts": "workspace:*", "@sa/scripts": "workspace:*",
"@sa/uno-preset": "workspace:*", "@sa/uno-preset": "workspace:*",
"@soybeanjs/eslint-config": "1.3.6", "@soybeanjs/eslint-config": "1.3.6",
@ -86,29 +86,29 @@
"@types/lodash-es": "4.17.12", "@types/lodash-es": "4.17.12",
"@types/node": "20.14.2", "@types/node": "20.14.2",
"@types/nprogress": "0.2.3", "@types/nprogress": "0.2.3",
"@unocss/eslint-config": "0.60.4", "@unocss/eslint-config": "0.61.0",
"@unocss/preset-icons": "0.60.4", "@unocss/preset-icons": "0.61.0",
"@unocss/preset-uno": "0.60.4", "@unocss/preset-uno": "0.61.0",
"@unocss/transformer-directives": "0.60.4", "@unocss/transformer-directives": "0.61.0",
"@unocss/transformer-variant-group": "0.60.4", "@unocss/transformer-variant-group": "0.61.0",
"@unocss/vite": "0.60.4", "@unocss/vite": "0.61.0",
"@vitejs/plugin-vue": "5.0.5", "@vitejs/plugin-vue": "5.0.5",
"@vitejs/plugin-vue-jsx": "4.0.0", "@vitejs/plugin-vue-jsx": "4.0.0",
"eslint": "9.4.0", "eslint": "9.4.0",
"eslint-plugin-vue": "9.26.0", "eslint-plugin-vue": "9.26.0",
"lint-staged": "15.2.5", "lint-staged": "15.2.7",
"sass": "1.77.4", "sass": "1.77.5",
"simple-git-hooks": "2.11.1", "simple-git-hooks": "2.11.1",
"tsx": "4.12.0", "tsx": "4.15.4",
"typescript": "5.4.5", "typescript": "5.4.5",
"unplugin-icons": "0.19.0", "unplugin-icons": "0.19.0",
"unplugin-vue-components": "0.27.0", "unplugin-vue-components": "0.27.0",
"vite": "5.2.12", "vite": "5.3.0",
"vite-plugin-progress": "0.0.7", "vite-plugin-progress": "0.0.7",
"vite-plugin-svg-icons": "2.0.1", "vite-plugin-svg-icons": "2.0.1",
"vite-plugin-vue-devtools": "7.2.1", "vite-plugin-vue-devtools": "7.2.1",
"vue-eslint-parser": "9.4.3", "vue-eslint-parser": "9.4.3",
"vue-tsc": "2.0.19" "vue-tsc": "2.0.21"
}, },
"simple-git-hooks": { "simple-git-hooks": {
"commit-msg": "pnpm sa git-commit-verify", "commit-msg": "pnpm sa git-commit-verify",

2
packages/axios/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/axios", "name": "@sa/axios",
"version": "1.2.2", "version": "1.2.3",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

2
packages/color/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/color", "name": "@sa/color",
"version": "1.2.2", "version": "1.2.3",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

2
packages/hooks/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/hooks", "name": "@sa/hooks",
"version": "1.2.2", "version": "1.2.3",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

2
packages/materials/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/materials", "name": "@sa/materials",
"version": "1.2.2", "version": "1.2.3",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

2
packages/ofetch/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/fetch", "name": "@sa/fetch",
"version": "1.2.2", "version": "1.2.3",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

2
packages/scripts/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/scripts", "name": "@sa/scripts",
"version": "1.2.2", "version": "1.2.3",
"bin": { "bin": {
"sa": "./bin.ts" "sa": "./bin.ts"
}, },

2
packages/uno-preset/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/uno-preset", "name": "@sa/uno-preset",
"version": "1.2.2", "version": "1.2.3",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

2
packages/utils/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@sa/utils", "name": "@sa/utils",
"version": "1.2.2", "version": "1.2.3",
"exports": { "exports": {
".": "./src/index.ts" ".": "./src/index.ts"
}, },

731
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

2
src/views/manage/menu/modules/shared.ts
View File

@ -6,7 +6,7 @@ export function getLayoutAndPage(component?: string | null) {
let layout = ''; let layout = '';
let page = ''; let page = '';
const [layoutOrPage, pageItem] = component?.split(FIRST_LEVEL_ROUTE_COMPONENT_SPLIT) || []; const [layoutOrPage = '', pageItem = ''] = component?.split(FIRST_LEVEL_ROUTE_COMPONENT_SPLIT) || [];
layout = getLayout(layoutOrPage); layout = getLayout(layoutOrPage);
page = getPage(pageItem || layoutOrPage); page = getPage(pageItem || layoutOrPage);