diff --git a/.vscode/launch.json b/.vscode/launch.json index f6f291d5..be7c6f6e 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,7 +12,7 @@ "type": "node", "request": "launch", "name": "TS Debugger", - "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/tsx", + "runtimeExecutable": "tsx", "skipFiles": ["/**", "${workspaceFolder}/node_modules/**"], "program": "${file}" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b1a1a36..dd5684dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,40 @@ # Changelog +## [v1.1.3](https://github.com/soybeanjs/soybean-admin/compare/v1.1.2...v1.1.3) (2024-06-02) + +###    🐞 Bug Fixes + +- **components**: + - Fix the issue of search box popping up repeatedly due to carriage return  -  by @Azir-11 in https://github.com/soybeanjs/soybean-admin/issues/468 [(5bd96)](https://github.com/soybeanjs/soybean-admin/commit/5bd96b8) +- **projects**: + - fix click menu search. fixed #466, close #467  -  by @soybeanjs in https://github.com/soybeanjs/soybean-admin/issues/466 and https://github.com/soybeanjs/soybean-admin/issues/467 [(8efdb)](https://github.com/soybeanjs/soybean-admin/commit/8efdb10) + - fix reCacheRoute. fixed #464  -  by @soybeanjs in https://github.com/soybeanjs/soybean-admin/issues/464 [(59faf)](https://github.com/soybeanjs/soybean-admin/commit/59faf15) +- **styles**: + - fix FirstLevelMenu style. fixed #450  -  by @soybeanjs in https://github.com/soybeanjs/soybean-admin/issues/450 [(db64b)](https://github.com/soybeanjs/soybean-admin/commit/db64b0e) + - fix PinToggler style. fixed #451  -  by @soybeanjs in https://github.com/soybeanjs/soybean-admin/issues/451 [(42b12)](https://github.com/soybeanjs/soybean-admin/commit/42b121a) + +###    🛠 Optimizations + +- **components**: accuracy draggable area for TableColumnSetting with animation  -  by @orangelckc in https://github.com/soybeanjs/soybean-admin/issues/465 [(2aa85)](https://github.com/soybeanjs/soybean-admin/commit/2aa85c6) +- **projects**: unocss border shortcut  -  by @soybeanjs [(40d0f)](https://github.com/soybeanjs/soybean-admin/commit/40d0f8a) + +###    📖 Documentation + +- **projects**: update CHANGELOG  -  by @soybeanjs [(87b18)](https://github.com/soybeanjs/soybean-admin/commit/87b1838) + +###    🏡 Chore + +- **other**: + - correct spell mistake  -  by @orangelckc in https://github.com/soybeanjs/soybean-admin/issues/460 [(086ba)](https://github.com/soybeanjs/soybean-admin/commit/086bad4) + - correct spell mistake  -  by @Azir-11 in https://github.com/soybeanjs/soybean-admin/issues/462 [(f1850)](https://github.com/soybeanjs/soybean-admin/commit/f185041) +- **projects**: + - update vscode launch.json  -  by @soybeanjs [(4c1c7)](https://github.com/soybeanjs/soybean-admin/commit/4c1c7e6) + +###    ❤️ Contributors + +[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)  [![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)  [![orangelckc](https://github.com/orangelckc.png?size=48)](https://github.com/orangelckc)   + ## [v1.1.2](https://github.com/soybeanjs/soybean-admin/compare/v1.1.1...v1.1.2) (2024-05-24) ###    🐞 Bug Fixes diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 4d905f05..cd3d2da5 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -1,5 +1,86 @@ # 更新日志 +## [v1.1.3](https://github.com/soybeanjs/soybean-admin/compare/v1.1.2...v1.1.3) (2024-06-02) + +###    🐞 错误修复 + +- **组件**: + - 修复了由于回车导致搜索框反复弹出的问题  -  由 @Azir-11 在 https://github.com/soybeanjs/soybean-admin/issues/468 中修复 [(5bd96)](https://github.com/soybeanjs/soybean-admin/commit/5bd96b8) +- **项目**: + - 修复点击菜单搜索。修复了 #466，关闭 #467  -  由 @soybeanjs 在 https://github.com/soybeanjs/soybean-admin/issues/466 和 https://github.com/soybeanjs/soybean-admin/issues/467 中修复 [(8efdb)](https://github.com/soybeanjs/soybean-admin/commit/8efdb10) + - 修复 reCacheRoute。修复了 #464  -  由 @soybeanjs 在 https://github.com/soybeanjs/soybean-admin/issues/464 中修复 [(59faf)](https://github.com/soybeanjs/soybean-admin/commit/59faf15) +- **样式**: + - 修复 FirstLevelMenu 样式。修复了 #450  -  由 @soybeanjs 在 https://github.com/soybeanjs/soybean-admin/issues/450 中修复 [(db64b)](https://github.com/soybeanjs/soybean-admin/commit/db64b0e) + - 修复 PinToggler 样式。修复了 #451  -  由 @soybeanjs 在 https://github.com/soybeanjs/soybean-admin/issues/451 中修复 [(42b12)](https://github.com/soybeanjs/soybean-admin/commit/42b121a) + +###    🛠 优化 + +- **组件**: 提高 TableColumnSetting 的拖动区域精度，带有动画  -  由 @orangelckc 在 https://github.com/soybeanjs/soybean-admin/issues/465 中优化 [(2aa85)](https://github.com/soybeanjs/soybean-admin/commit/2aa85c6) +- **项目**: unocss 边框快捷方式  -  由 @soybeanjs 优化 [(40d0f)](https://github.com/soybeanjs/soybean-admin/commit/40d0f8a) + +###    📖 文档 + +- **项目**: 更新 CHANGELOG  -  由 @soybeanjs 更新 [(87b18)](https://github.com/soybeanjs/soybean-admin/commit/87b1838) + +###    🏡 杂项 + +- **其他**: + - 纠正拼写错误  -  由 @orangelckc 在 https://github.com/soybeanjs/soybean-admin/issues/460 中纠正 [(086ba)](https://github.com/soybeanjs/soybean-admin/commit/086bad4) + - 纠正拼写错误  -  由 @Azir-11 在 https://github.com/soybeanjs/soybean-admin/issues/462 中纠正 [(f1850)](https://github.com/soybeanjs/soybean-admin/commit/f185041) +- **项目**: + - 更新 vscode launch.json  -  由 @soybeanjs 更新 [(4c1c7)](https://github.com/soybeanjs/soybean-admin/commit/4c1c7e6) + +###    ❤️ 贡献者 + +[![soybeanjs](https://github.com/soybeanjs.png?size=48)](https://github.com/soybeanjs)  [![Azir-11](https://github.com/Azir-11.png?size=48)](https://github.com/Azir-11)  [![orangelckc](https://github.com/orangelckc.png?size=48)](https://github.com/orangelckc)   + +## [v1.1.2](https://github.com/soybeanjs/soybean-admin/compare/v1.1.1...v1.1.2) (2024-05-24) + +###    🐞 错误修复 + +- **项目**: + - 修复头部样式 & 修复点击全局标签时按钮高亮。修复了 #446  -  由 @honghuangdc 在 https://github.com/soybeanjs/soybean-admin/issues/446 [(64fc0)](https://github.com/soybeanjs/soybean-admin/commit/64fc099) + - 修复多标签页只渲染一次。修复了 #441  -  由 @honghuangdc 在 https://github.com/soybeanjs/soybean-admin/issues/441 [(e379d)](https://github.com/soybeanjs/soybean-admin/commit/e379d6c) + +###    🛠 优化 + +- **项目**: 优化代码  -  由 @honghuangdc [(bc8dc)](https://github.com/soybeanjs/soybean-admin/commit/bc8dc47) + +###    ❤️ 贡献者 + +[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)   + +## [v1.1.1](https://github.com/soybeanjs/soybean-admin/compare/v1.1.0...v1.1.1) (2024-05-20) + +###    🚀 功能 + +- **hooks**: 为 useEcharts 添加 setOptions  -  由 @honghuangdc 提交 [(e4d53)](https://github.com/soybeanjs/soybean-admin/commit/e4d53aa) + +###    🐞 修复错误 + +- **projects**: + - 修复 useRouter。修复了 #436  -  由 @honghuangdc 在 https://github.com/soybeanjs/soybean-admin/issues/436 提交 [(0774a)](https://github.com/soybeanjs/soybean-admin/commit/0774a51) + - 在动态路由模式下获取路由时添加错误处理。修复了 440  -  由 @honghuangdc 提交 [(57b4a)](https://github.com/soybeanjs/soybean-admin/commit/57b4a9d) +- **styles**: + - 修复 useTable 类型  -  由 @honghuangdc 提交 [(07124)](https://github.com/soybeanjs/soybean-admin/commit/071241f) + +###    📖 文档 + +- **projects**: + - 更新 CHANGELOG  -  由 @honghuangdc 提交 [(19783)](https://github.com/soybeanjs/soybean-admin/commit/1978397) + - 更新 README.md  -  由 @honghuangdc 提交 [(fa56e)](https://github.com/soybeanjs/soybean-admin/commit/fa56e9c) + - 更新 README.md  -  由 @honghuangdc 提交 [(419ea)](https://github.com/soybeanjs/soybean-admin/commit/419ea42) + +###    🏡 杂项 + +- **projects**: + - 更新依赖并修复 TS 错误  -  由 @honghuangdc 提交 [(4ea9c)](https://github.com/soybeanjs/soybean-admin/commit/4ea9c85) + - 更新 eslint-config 并修复代码  -  由 @honghuangdc 提交 [(68ea9)](https://github.com/soybeanjs/soybean-admin/commit/68ea974) + - 更新 @elegant-router/vue 并为 resolve route 添加错误处理。修复了 #442  -  由 @honghuangdc 在 https://github.com/soybeanjs/soybean-admin/issues/442 提交 [(24ff8)](https://github.com/soybeanjs/soybean-admin/commit/24ff852) + +###    ❤️ 贡献者 + +[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)   ## [v1.1.0](https://github.com/honghuangdc/soybean-admin/compare/v1.0.9...v1.1.0) (2024-05-07) diff --git a/package.json b/package.json index 65c254bb..23b400d7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "soybean-admin", "type": "module", - "version": "1.1.2", + "version": "1.1.3", "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。", "author": { "name": "Soybean", @@ -66,6 +66,7 @@ "pinia": "2.1.7", "print-js": "1.6.0", "swiper": "11.1.1", + "tailwind-merge": "^2.3.0", "vditor": "3.10.4", "vue": "3.4.27", "vue-draggable-plus": "0.4.1", diff --git a/packages/axios/package.json b/packages/axios/package.json index 5d9dc191..8f0d448e 100644 --- a/packages/axios/package.json +++ b/packages/axios/package.json @@ -1,6 +1,6 @@ { "name": "@sa/axios", - "version": "1.1.2", + "version": "1.1.3", "exports": { ".": "./src/index.ts" }, diff --git a/packages/color/package.json b/packages/color/package.json index 9ee6c51e..379a6974 100644 --- a/packages/color/package.json +++ b/packages/color/package.json @@ -1,6 +1,6 @@ { "name": "@sa/color", - "version": "1.1.2", + "version": "1.1.3", "exports": { ".": "./src/index.ts" }, diff --git a/packages/hooks/package.json b/packages/hooks/package.json index 720645b7..63e51678 100644 --- a/packages/hooks/package.json +++ b/packages/hooks/package.json @@ -1,6 +1,6 @@ { "name": "@sa/hooks", - "version": "1.1.2", + "version": "1.1.3", "exports": { ".": "./src/index.ts" }, diff --git a/packages/materials/package.json b/packages/materials/package.json index 7a7aa490..d50c4c02 100644 --- a/packages/materials/package.json +++ b/packages/materials/package.json @@ -1,6 +1,6 @@ { "name": "@sa/materials", - "version": "1.1.2", + "version": "1.1.3", "exports": { ".": "./src/index.ts" }, diff --git a/packages/materials/src/libs/page-tab/button-tab.vue b/packages/materials/src/libs/page-tab/button-tab.vue index bce4db53..0826e712 100644 --- a/packages/materials/src/libs/page-tab/button-tab.vue +++ b/packages/materials/src/libs/page-tab/button-tab.vue @@ -36,7 +36,7 @@ defineSlots(); - +
- - + + {{ item.title }}
diff --git a/src/components/custom/button-icon.vue b/src/components/custom/button-icon.vue index 3cf39e59..153953ae 100644 --- a/src/components/custom/button-icon.vue +++ b/src/components/custom/button-icon.vue @@ -1,7 +1,6 @@ diff --git a/src/layouts/modules/global-menu/first-level-menu.vue b/src/layouts/modules/global-menu/first-level-menu.vue index 290ec6da..fc089f79 100644 --- a/src/layouts/modules/global-menu/first-level-menu.vue +++ b/src/layouts/modules/global-menu/first-level-menu.vue @@ -68,7 +68,7 @@ function handleClickMixMenu(menu: App.Global.Menu) {

{{ label }}

diff --git a/src/layouts/modules/global-menu/vertical-mix-menu.vue b/src/layouts/modules/global-menu/vertical-mix-menu.vue index a3604bd7..0c0a9582 100644 --- a/src/layouts/modules/global-menu/vertical-mix-menu.vue +++ b/src/layouts/modules/global-menu/vertical-mix-menu.vue @@ -55,8 +55,8 @@ function handleResetActiveMenu() { :inverted="siderInverted" :style="{ width: showDrawer ? themeStore.sider.mixChildMenuWidth + 'px' : '0px' }" > -
-

{{ $t('system.title') }}

+
+

{{ $t('system.title') }}

{ + visible.value = false; resultOptions.value = []; keyword.value = ''; }, 200); @@ -112,7 +112,7 @@ registerShortcut();
- +