diff --git a/CHANGELOG.md b/CHANGELOG.md index b36dbf8d..0d42c3df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,31 @@ # Changelog +## [v1.1.0-beta.2](https://github.com/honghuangdc/soybean-admin/compare/v1.1.0-beta.1...v1.1.0-beta.2) (2024-05-07) + +###    🚀 Features + +- **projects**: useTable adds expand to display  -  by **paynezhuang** [(0a90d)](https://github.com/honghuangdc/soybean-admin/commit/0a90dd3) + +###    🐞 Bug Fixes + +- **projects**: + - fix manage_menu modal style  -  by @honghuangdc [(60f3b)](https://github.com/honghuangdc/soybean-admin/commit/60f3b14) + - fix menu data when role is changed. fixed #391  -  by @honghuangdc in https://github.com/honghuangdc/soybean-admin/issues/391 [(3b47b)](https://github.com/honghuangdc/soybean-admin/commit/3b47b5a) + +###    🛠 Optimizations + +- **projects**: remove deprecated code  -  by @honghuangdc [(72ccb)](https://github.com/honghuangdc/soybean-admin/commit/72ccb6b) + +###    📖 Documentation + +- **projects**: add CHANGELOG.zh_CN.md  -  by @honghuangdc [(18b3f)](https://github.com/honghuangdc/soybean-admin/commit/18b3f05) + +###    ❤️ Contributors + +[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)   +[paynezhuang](mailto:paynezhuang@gmail.com) + ## [v1.1.0-beta.1](https://github.com/soybeanjs/soybean-admin/compare/v1.0.9...v1.1.0-beta.1) (2024-05-07) ###    🚀 Features diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index b8c3a84b..3fbeec6e 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -1,5 +1,30 @@ # 更新日志 +## [v1.1.0-beta.2](https://github.com/honghuangdc/soybean-admin/compare/v1.1.0-beta.1...v1.1.0-beta.2) (2024-05-07) + +###    🚀 特性 + +- **项目**: useTable添加展开以显示  -  由 **paynezhuang** [(0a90d)](https://github.com/honghuangdc/soybean-admin/commit/0a90dd3) 提供 + +###    🐞 修复的错误 + +- **项目**: + - 修复 manage_menu 模态样式  -  由 @honghuangdc [(60f3b)](https://github.com/honghuangdc/soybean-admin/commit/60f3b14) 提供 + - 当角色改变时修复菜单数据。修复了 #391  -  由 @honghuangdc 在 https://github.com/honghuangdc/soybean-admin/issues/391 [(3b47b)](https://github.com/honghuangdc/soybean-admin/commit/3b47b5a) 提供 + +###    🛠 优化 + +- **项目**: 删除废弃的代码  -  由 @honghuangdc [(72ccb)](https://github.com/honghuangdc/soybean-admin/commit/72ccb6b) 提供 + +###    📖 文档 + +- **项目**: 添加 CHANGELOG.zh_CN.md  -  由 @honghuangdc [(18b3f)](https://github.com/honghuangdc/soybean-admin/commit/18b3f05) 提供 + +###    ❤️ 贡献者 + +[![honghuangdc](https://github.com/honghuangdc.png?size=48)](https://github.com/honghuangdc)   +[paynezhuang](mailto:paynezhuang@gmail.com) + ## [v1.1.0-beta.1](https://github.com/soybeanjs/soybean-admin/compare/v1.0.9...v1.1.0-beta.1) (2024-05-07) diff --git a/package.json b/package.json index 5f227d27..6b26d7ed 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "soybean-admin", "type": "module", - "version": "1.1.0-beta.1", + "version": "1.1.0-beta.2", "description": "A fresh and elegant admin template, based on Vue3、Vite3、TypeScript、NaiveUI and UnoCSS. 一个基于Vue3、Vite3、TypeScript、NaiveUI and UnoCSS的清新优雅的中后台模版。", "author": { "name": "Soybean", diff --git a/packages/axios/package.json b/packages/axios/package.json index 47f743b6..1f228d27 100644 --- a/packages/axios/package.json +++ b/packages/axios/package.json @@ -1,6 +1,6 @@ { "name": "@sa/axios", - "version": "1.1.0-beta.1", + "version": "1.1.0-beta.2", "exports": { ".": "./src/index.ts" }, diff --git a/packages/color/package.json b/packages/color/package.json index e7ac0e41..6ad519d2 100644 --- a/packages/color/package.json +++ b/packages/color/package.json @@ -1,6 +1,6 @@ { "name": "@sa/color", - "version": "1.1.0-beta.1", + "version": "1.1.0-beta.2", "exports": { ".": "./src/index.ts" }, diff --git a/packages/hooks/package.json b/packages/hooks/package.json index b4b67638..2cad719f 100644 --- a/packages/hooks/package.json +++ b/packages/hooks/package.json @@ -1,6 +1,6 @@ { "name": "@sa/hooks", - "version": "1.1.0-beta.1", + "version": "1.1.0-beta.2", "exports": { ".": "./src/index.ts" }, diff --git a/packages/materials/package.json b/packages/materials/package.json index 7918fae1..a0074fed 100644 --- a/packages/materials/package.json +++ b/packages/materials/package.json @@ -1,6 +1,6 @@ { "name": "@sa/materials", - "version": "1.1.0-beta.1", + "version": "1.1.0-beta.2", "exports": { ".": "./src/index.ts" }, diff --git a/packages/ofetch/package.json b/packages/ofetch/package.json index 3191868c..0e882ef8 100644 --- a/packages/ofetch/package.json +++ b/packages/ofetch/package.json @@ -1,6 +1,6 @@ { "name": "@sa/fetch", - "version": "1.1.0-beta.1", + "version": "1.1.0-beta.2", "exports": { ".": "./src/index.ts" }, diff --git a/packages/scripts/package.json b/packages/scripts/package.json index a186c750..39aba5a2 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -1,6 +1,6 @@ { "name": "@sa/scripts", - "version": "1.1.0-beta.1", + "version": "1.1.0-beta.2", "bin": { "sa": "./bin.ts" }, diff --git a/packages/uno-preset/package.json b/packages/uno-preset/package.json index d91aa796..1e4eec42 100644 --- a/packages/uno-preset/package.json +++ b/packages/uno-preset/package.json @@ -1,6 +1,6 @@ { "name": "@sa/uno-preset", - "version": "1.1.0-beta.1", + "version": "1.1.0-beta.2", "exports": { ".": "./src/index.ts" }, diff --git a/packages/utils/package.json b/packages/utils/package.json index c20c643d..e9d235d1 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@sa/utils", - "version": "1.1.0-beta.1", + "version": "1.1.0-beta.2", "exports": { ".": "./src/index.ts" }, diff --git a/src/hooks/common/table.ts b/src/hooks/common/table.ts index 1a1cc13c..5ac0e5e6 100644 --- a/src/hooks/common/table.ts +++ b/src/hooks/common/table.ts @@ -20,6 +20,8 @@ export function useTable(config: NaiveUI.NaiveTabl const SELECTION_KEY = '__selection__'; + const EXPAND_KEY = '__expand__'; + const { loading, empty, @@ -68,6 +70,12 @@ export function useTable(config: NaiveUI.NaiveTabl title: $t('common.check'), checked: true }); + } else if (column.type === 'expand') { + checks.push({ + key: EXPAND_KEY, + title: $t('common.expandColumn'), + checked: true + }); } }); @@ -81,6 +89,8 @@ export function useTable(config: NaiveUI.NaiveTabl 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); } }); diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index 0f7ece9a..3398599c 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -11,6 +11,7 @@ const local: App.I18n.Schema = { cancel: 'Cancel', close: 'Close', check: 'Check', + expandColumn: 'Expand Column', columnSetting: 'Column Setting', config: 'Config', confirm: 'Confirm', @@ -179,7 +180,8 @@ const local: App.I18n.Schema = { exception_500: '500', 'plugins-example': 'Plugin-Example', 'plugins-example_charts': 'Charts', - 'plugins-example_charts_echarts': 'ECharts' + 'plugins-example_charts_echarts': 'ECharts', + 'plugins-example_copy': 'copy' }, page: { login: { diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 02609fb3..7ddee6ed 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -11,6 +11,7 @@ const local: App.I18n.Schema = { cancel: '取消', close: '关闭', check: '勾选', + expandColumn: '展开列', columnSetting: '列设置', config: '配置', confirm: '确认', @@ -179,7 +180,8 @@ const local: App.I18n.Schema = { exception_500: '500', 'plugins-example': '插件示例', 'plugins-example_charts': '图表', - 'plugins-example_charts_echarts': 'ECharts' + 'plugins-example_charts_echarts': 'ECharts', + 'plugins-example_copy': '剪贴板' }, page: { login: { diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts index 2fca326d..b4e4e7b2 100644 --- a/src/router/elegant/imports.ts +++ b/src/router/elegant/imports.ts @@ -37,5 +37,6 @@ export const views: Record Promise import("@/views/multi-menu/first_child/index.vue"), "multi-menu_second_child_home": () => import("@/views/multi-menu/second_child_home/index.vue"), "plugins-example_charts_echarts": () => import("@/views/plugins-example/charts_echarts/index.vue"), + "plugins-example_copy": () => import("@/views/plugins-example/copy/index.vue"), "user-center": () => import("@/views/user-center/index.vue"), }; diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index e1e1e0f7..6fcd056c 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -362,6 +362,15 @@ export const generatedRoutes: GeneratedRoute[] = [ } } ] + }, + { + name: 'plugins-example_copy', + path: '/plugins-example/copy', + component: 'view.plugins-example_copy', + meta: { + title: 'plugins-example_copy', + i18nKey: 'route.plugins-example_copy' + } } ] }, diff --git a/src/router/elegant/transform.ts b/src/router/elegant/transform.ts index 0ec8c581..307c304c 100644 --- a/src/router/elegant/transform.ts +++ b/src/router/elegant/transform.ts @@ -186,6 +186,7 @@ const routeMap: RouteMap = { "plugins-example": "/plugins-example", "plugins-example_charts": "/plugins-example/charts", "plugins-example_charts_echarts": "/plugins-example/charts/echarts", + "plugins-example_copy": "/plugins-example/copy", "user-center": "/user-center" }; diff --git a/src/store/modules/route/index.ts b/src/store/modules/route/index.ts index a65e7ad5..4de30a36 100644 --- a/src/store/modules/route/index.ts +++ b/src/store/modules/route/index.ts @@ -56,7 +56,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => { const constantRoutes = shallowRef([]); function addConstantRoutes(routes: ElegantConstRoute[]) { - const constantRoutesMap = new Map(constantRoutes.value.map(route => [route.name, route])); + const constantRoutesMap = new Map([]); routes.forEach(route => { constantRoutesMap.set(route.name, route); @@ -69,7 +69,7 @@ export const useRouteStore = defineStore(SetupStoreId.Route, () => { const authRoutes = shallowRef([]); function addAuthRoutes(routes: ElegantConstRoute[]) { - const authRoutesMap = new Map(authRoutes.value.map(route => [route.name, route])); + const authRoutesMap = new Map([]); routes.forEach(route => { authRoutesMap.set(route.name, route); diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts index e0dbe766..e1b4b1ee 100644 --- a/src/typings/app.d.ts +++ b/src/typings/app.d.ts @@ -261,6 +261,7 @@ declare namespace App { cancel: string; close: string; check: string; + expandColumn: string; columnSetting: string; config: string; confirm: string; diff --git a/src/typings/elegant-router.d.ts b/src/typings/elegant-router.d.ts index c6ef3073..4bc86730 100644 --- a/src/typings/elegant-router.d.ts +++ b/src/typings/elegant-router.d.ts @@ -60,6 +60,7 @@ declare module "@elegant-router/types" { "plugins-example": "/plugins-example"; "plugins-example_charts": "/plugins-example/charts"; "plugins-example_charts_echarts": "/plugins-example/charts/echarts"; + "plugins-example_copy": "/plugins-example/copy"; "user-center": "/user-center"; }; @@ -156,6 +157,7 @@ declare module "@elegant-router/types" { | "multi-menu_first_child" | "multi-menu_second_child_home" | "plugins-example_charts_echarts" + | "plugins-example_copy" | "user-center" >; diff --git a/src/views/plugins-example/copy/index.vue b/src/views/plugins-example/copy/index.vue new file mode 100644 index 00000000..2c2cbaf2 --- /dev/null +++ b/src/views/plugins-example/copy/index.vue @@ -0,0 +1,31 @@ + + +