From 469f3d09be0ae92724e0877fb85a9c7d1fe14a6c Mon Sep 17 00:00:00 2001 From: xingyu Date: Tue, 18 Oct 2022 10:21:06 +0800 Subject: [PATCH 01/16] feat: update 1.8.2 --- yudao-ui-admin-vue3/package.json | 5 +++-- .../src/layout/components/ToolHeader.vue | 10 +++++----- .../src/layout/components/useRenderLayout.tsx | 6 +++--- yudao-ui-admin-vue3/windi.config.ts | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index ab056d30b..aab38555a 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi-vue-pro-vue3", - "version": "1.6.4.1811", + "version": "1.6.4.1821", "description": "基于vue3、element-plus、typesScript、vite3", "author": "xingyu", "private": false, @@ -22,7 +22,8 @@ "lint:style": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/", "lint:lint-staged": "lint-staged -c ", "lint:pretty": "pretty-quick --staged", - "p": "plop" + "p": "plop", + "analysis": "windicss-analysis" }, "dependencies": { "@iconify/iconify": "^3.0.0", diff --git a/yudao-ui-admin-vue3/src/layout/components/ToolHeader.vue b/yudao-ui-admin-vue3/src/layout/components/ToolHeader.vue index 091a25a32..2c6d86c13 100644 --- a/yudao-ui-admin-vue3/src/layout/components/ToolHeader.vue +++ b/yudao-ui-admin-vue3/src/layout/components/ToolHeader.vue @@ -48,25 +48,25 @@ export default defineComponent({ {layout.value !== 'top' ? (
{hamburger.value && layout.value !== 'cutMenu' ? ( - + ) : undefined} {breadcrumb.value ? : undefined}
) : undefined}
{screenfull.value ? ( - + ) : undefined} {size.value ? ( - + ) : undefined} {locale.value ? ( ) : undefined} - +
) diff --git a/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx b/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx index 40134a667..d388d5f5b 100644 --- a/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx +++ b/yudao-ui-admin-vue3/src/layout/components/useRenderLayout.tsx @@ -110,7 +110,7 @@ export const useRenderLayout = () => { return ( <>
- {logo.value ? : undefined} + {logo.value ? : undefined}
@@ -167,7 +167,7 @@ export const useRenderLayout = () => { return ( <>
- {logo.value ? : undefined} + {logo.value ? : undefined}
@@ -204,7 +204,7 @@ export const useRenderLayout = () => { return ( <>
- {logo.value ? : undefined} + {logo.value ? : undefined}
diff --git a/yudao-ui-admin-vue3/windi.config.ts b/yudao-ui-admin-vue3/windi.config.ts index d8712bb31..cf32f9752 100644 --- a/yudao-ui-admin-vue3/windi.config.ts +++ b/yudao-ui-admin-vue3/windi.config.ts @@ -38,7 +38,7 @@ export default defineConfig({ } }) addComponents({ - '.hover-tigger': { + '.hover-trigger': { display: 'flex', height: '100%', padding: '1px 10px 0', @@ -49,7 +49,7 @@ export default defineConfig({ backgroundColor: 'var(--top-header-hover-color)' } }, - '.dark .hover-tigger': { + '.dark .hover-trigger': { '&:hover': { backgroundColor: 'var(--el-bg-color-overlay)' } From 2fcbee040071b688f9ade09bb56a1c6324668483 Mon Sep 17 00:00:00 2001 From: xingyu Date: Wed, 19 Oct 2022 10:42:37 +0800 Subject: [PATCH 02/16] docs: update --- yudao-ui-admin-vue3/README.md | 2 +- yudao-ui-admin-vue3/package.json | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/yudao-ui-admin-vue3/README.md b/yudao-ui-admin-vue3/README.md index b9032638e..7e6ebb455 100644 --- a/yudao-ui-admin-vue3/README.md +++ b/yudao-ui-admin-vue3/README.md @@ -2,7 +2,7 @@

- + diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index aab38555a..ca72ce7c1 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -22,8 +22,7 @@ "lint:style": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/", "lint:lint-staged": "lint-staged -c ", "lint:pretty": "pretty-quick --staged", - "p": "plop", - "analysis": "windicss-analysis" + "p": "plop" }, "dependencies": { "@iconify/iconify": "^3.0.0", @@ -102,8 +101,7 @@ "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-windicss": "^1.8.8", "vue-tsc": "^1.0.8", - "windicss": "^3.5.6", - "windicss-analysis": "^0.3.5" + "windicss": "^3.5.6" }, "engines": { "node": ">= 14.18.0" From 4e415486eb26ce0a59e2922814e743a4929e008c Mon Sep 17 00:00:00 2001 From: xingyu Date: Wed, 19 Oct 2022 17:10:19 +0800 Subject: [PATCH 03/16] feat: add vxe-table --- yudao-ui-admin-vue3/package.json | 4 +- .../src/components/ProTable/index.ts | 3 + .../src/components/ProTable/src/ProTable.vue | 62 +++++++++ yudao-ui-admin-vue3/src/main.ts | 5 + .../src/plugins/vxeTable/index.ts | 120 ++++++++++++++++++ yudao-ui-admin-vue3/vite.config.ts | 10 +- 6 files changed, 201 insertions(+), 3 deletions(-) create mode 100644 yudao-ui-admin-vue3/src/components/ProTable/index.ts create mode 100644 yudao-ui-admin-vue3/src/components/ProTable/src/ProTable.vue create mode 100644 yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index ca72ce7c1..12b6dabc0 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -51,7 +51,9 @@ "vue-i18n": "9.2.2", "vue-router": "^4.1.5", "vue-types": "^4.2.1", - "web-storage-cache": "^1.1.1" + "vxe-table": "^4.3.5", + "web-storage-cache": "^1.1.1", + "xe-utils": "^3.5.7" }, "devDependencies": { "@commitlint/cli": "^17.1.2", diff --git a/yudao-ui-admin-vue3/src/components/ProTable/index.ts b/yudao-ui-admin-vue3/src/components/ProTable/index.ts new file mode 100644 index 000000000..778514602 --- /dev/null +++ b/yudao-ui-admin-vue3/src/components/ProTable/index.ts @@ -0,0 +1,3 @@ +import ProTable from './src/ProTable.vue' + +export { ProTable } diff --git a/yudao-ui-admin-vue3/src/components/ProTable/src/ProTable.vue b/yudao-ui-admin-vue3/src/components/ProTable/src/ProTable.vue new file mode 100644 index 000000000..6921afcad --- /dev/null +++ b/yudao-ui-admin-vue3/src/components/ProTable/src/ProTable.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/yudao-ui-admin-vue3/src/main.ts b/yudao-ui-admin-vue3/src/main.ts index 785f3e9e4..03369099d 100644 --- a/yudao-ui-admin-vue3/src/main.ts +++ b/yudao-ui-admin-vue3/src/main.ts @@ -16,6 +16,9 @@ import { setupGlobCom } from '@/components' // 引入element-plus import { setupElementPlus } from '@/plugins/elementPlus' +// 引入vxe-table +import { setupVxeTable } from '@/plugins/vxeTable' + // 引入全局样式 import '@/styles/index.less' @@ -44,6 +47,8 @@ const setupAll = async () => { setupElementPlus(app) + setupVxeTable(app) + setupRouter(app) setupAuth(app) diff --git a/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts b/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts new file mode 100644 index 000000000..8a8ce8c87 --- /dev/null +++ b/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts @@ -0,0 +1,120 @@ +import { App, unref } from 'vue' +import 'xe-utils' +import XEUtils from 'xe-utils' +import { i18n } from '@/plugins/vueI18n' +import zhCN from 'vxe-table/es/locale/lang/zh-CN' +import enUS from 'vxe-table/lib/locale/lang/en-US' +import { + // 全局对象 + VXETable, + + // 表格功能 + Filter, + Edit, + Menu, + Export, + Keyboard, + Validator, + + // 可选组件 + Icon, + Column, + Colgroup, + Grid, + Tooltip, + Toolbar, + Pager, + Form, + FormItem, + FormGather, + Checkbox, + CheckboxGroup, + Radio, + RadioGroup, + RadioButton, + Switch, + Input, + Select, + Optgroup, + Option, + Textarea, + Button, + Modal, + List, + Pulldown, + + // 表格 + Table +} from 'vxe-table' + +// 全局默认参数 +VXETable.setup({ + size: 'medium', // 全局尺寸 + version: 0, // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据 + zIndex: 1008, // 全局 zIndex 起始值，如果项目的的 z-index 样式值过大时就需要跟随设置更大，避免被遮挡 + loadingText: '加载中...', // 全局loading提示内容，如果为null则不显示文本 + table: { + // 自动监听父元素的变化去重新计算表格 + autoResize: true, + emptyText: '暂无数据', + // 鼠标移到行是否要高亮显示 + highlightHoverRow: true + }, + pager: { + autoHidden: false, + perfect: true, + pageSize: 10, + pagerCount: 7, + pageSizes: [10, 15, 20, 50, 100], + layouts: ['PrevJump', 'PrevPage', 'Jump', 'PageCount', 'NextPage', 'NextJump', 'Sizes', 'Total'] + }, + input: { + clearable: true + }, + i18n: (key, args) => { + return unref(i18n.global.locale) === 'zh' + ? XEUtils.toFormatString(XEUtils.get(zhCN, key), args) + : XEUtils.toFormatString(XEUtils.get(enUS, key), args) + } +}) +export const setupVxeTable = (app: App) => { + // 表格功能 + app.use(Filter).use(Edit).use(Menu).use(Export).use(Keyboard).use(Validator) + + // 可选组件 + app + .use(Icon) + .use(Column) + .use(Colgroup) + .use(Grid) + .use(Tooltip) + .use(Toolbar) + .use(Pager) + .use(Form) + .use(FormItem) + .use(FormGather) + .use(Checkbox) + .use(CheckboxGroup) + .use(Radio) + .use(RadioGroup) + .use(RadioButton) + .use(Switch) + .use(Input) + .use(Select) + .use(Optgroup) + .use(Option) + .use(Textarea) + .use(Button) + .use(Modal) + .use(List) + .use(Pulldown) + + // 安装表格 + .use(Table) + + // 给 vue 实例挂载内部对象，例如： + // app.config.globalProperties.$XModal = VXETable.modal + // app.config.globalProperties.$XPrint = VXETable.print + // app.config.globalProperties.$XSaveFile = VXETable.saveFile + // app.config.globalProperties.$XReadFile = VXETable.readFile +} diff --git a/yudao-ui-admin-vue3/vite.config.ts b/yudao-ui-admin-vue3/vite.config.ts index 83b03c0bc..12d958c83 100644 --- a/yudao-ui-admin-vue3/vite.config.ts +++ b/yudao-ui-admin-vue3/vite.config.ts @@ -6,7 +6,7 @@ import WindiCSS from 'vite-plugin-windicss' import VueJsx from '@vitejs/plugin-vue-jsx' import EslintPlugin from 'vite-plugin-eslint' import VueI18n from '@intlify/vite-plugin-vue-i18n' -import { createStyleImportPlugin, ElementPlusResolve } from 'vite-plugin-style-import' +import { createStyleImportPlugin, ElementPlusResolve, VxeTableResolve } from 'vite-plugin-style-import' import { createSvgIconsPlugin } from 'vite-plugin-svg-icons' import PurgeIcons from 'vite-plugin-purge-icons' import { createHtmlPlugin } from 'vite-plugin-html' @@ -56,13 +56,19 @@ export default ({ command, mode }: ConfigEnv): UserConfig => { VueJsx(), WindiCSS(), createStyleImportPlugin({ - resolves: [ElementPlusResolve()], + resolves: [ElementPlusResolve(),VxeTableResolve()], libs: [{ libraryName: 'element-plus', esModule: true, resolveStyle: (name) => { return `element-plus/es/components/${name.substring(3)}/style/css` } + },{ + libraryName: 'vxe-table', + esModule: true, + resolveStyle: (name) => { + return `vxe-table/es/${name}/style.css` + } }] }), EslintPlugin({ From aa3aa56140fdb1462ffb94443084ff8340ee389e Mon Sep 17 00:00:00 2001 From: xingyu Date: Wed, 19 Oct 2022 18:08:42 +0800 Subject: [PATCH 04/16] feat: add vxe-table --- .../src/components/ProTable/src/ProTable.vue | 174 ++++++++++++++++-- .../src/plugins/vxeTable/index.ts | 2 +- 2 files changed, 163 insertions(+), 13 deletions(-) diff --git a/yudao-ui-admin-vue3/src/components/ProTable/src/ProTable.vue b/yudao-ui-admin-vue3/src/components/ProTable/src/ProTable.vue index 6921afcad..0f40b9b52 100644 --- a/yudao-ui-admin-vue3/src/components/ProTable/src/ProTable.vue +++ b/yudao-ui-admin-vue3/src/components/ProTable/src/ProTable.vue @@ -1,35 +1,185 @@ diff --git a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue index 04a4eb8c8..04bcd1a03 100644 --- a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue +++ b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue @@ -132,7 +132,7 @@ const doSocialLogin = async (type: string) => { location.origin + '/social-login?type=' + type + '&redirect=' + (redirect.value || '/') // 进行跳转 const res = await LoginApi.socialAuthRedirectApi(type, encodeURIComponent(redirectUri)) - window.open = res + window.location.href = res } watch( () => currentRoute.value, diff --git a/yudao-ui-admin-vue3/src/views/system/user/index.vue b/yudao-ui-admin-vue3/src/views/system/user/index.vue index 78e702192..c907232eb 100644 --- a/yudao-ui-admin-vue3/src/views/system/user/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/user/index.vue @@ -121,9 +121,10 @@ const handleAdd = () => { // 修改操作 const handleUpdate = async (row: UserVO) => { await setDialogTile('update') + unref(formRef)?.delSchema('username') + unref(formRef)?.delSchema('password') // 设置数据 const res = await UserApi.getUserApi(row.id) - console.info(res) deptId.value = res.deptId postIds.value = res.postIds unref(formRef)?.setValues(res) @@ -358,9 +359,6 @@ onMounted(async () => { v-model:currentPage="tableObject.currentPage" @register="register" > - - diff --git a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts index ec7d6a502..4d83c6f7b 100644 --- a/yudao-ui-admin-vue3/src/views/system/user/user.data.ts +++ b/yudao-ui-admin-vue3/src/views/system/user/user.data.ts @@ -36,13 +36,20 @@ const crudSchemas = reactive([ { label: '用户账号', field: 'username', - form: { - show: false - }, search: { show: true } }, + { + label: '用户密码', + field: 'password', + form: { + component: 'InputPassword' + }, + detail: { + show: false + } + }, { label: '用户昵称', field: 'nickname' @@ -58,11 +65,6 @@ const crudSchemas = reactive([ show: true } }, - { - label: '用户性别', - field: 'sex', - dictType: DICT_TYPE.SYSTEM_USER_SEX - }, { label: '部门', field: 'deptId', From 6a542b61047ec3a26211751bf776314d244d87af Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Tue, 1 Nov 2022 09:46:13 +0800 Subject: [PATCH 10/16] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/Descriptions/src/Descriptions.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue b/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue index 946546680..7fa023afb 100644 --- a/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue +++ b/yudao-ui-admin-vue3/src/components/Descriptions/src/Descriptions.vue @@ -2,7 +2,7 @@ import { ElCollapseTransition, ElDescriptions, ElDescriptionsItem, ElTooltip } from 'element-plus' import { useDesign } from '@/hooks/web/useDesign' import { propTypes } from '@/utils/propTypes' -import { ref, unref, PropType, computed, useAttrs } from 'vue' +import { ref, unref, PropType, computed, useAttrs, useSlots } from 'vue' import { useAppStore } from '@/store/modules/app' import { DescriptionsSchema } from '@/types/descriptions' @@ -12,6 +12,8 @@ const mobile = computed(() => appStore.getMobile) const attrs = useAttrs() +const slots = useSlots() + const props = defineProps({ title: propTypes.string.def(''), message: propTypes.string.def(''), @@ -96,6 +98,9 @@ const toggleClick = () => { :direction="mobile ? 'vertical' : 'horizontal'" v-bind="getBindValue" > + Date: Tue, 1 Nov 2022 10:04:15 +0800 Subject: [PATCH 11/16] chore: update devs --- README.md | 52 +-- sql/mysql/vue3-menu.sql | 4 +- yudao-dependencies/pom.xml | 4 +- yudao-ui-admin-vue3/README.md | 2 +- yudao-ui-admin-vue3/package.json | 28 +- yudao-ui-admin-vue3/pnpm-lock.yaml | 590 +++++++++++++++-------------- 6 files changed, 357 insertions(+), 323 deletions(-) diff --git a/README.md b/README.md index 260c3f03b..892e0fc7c 100644 --- a/README.md +++ b/README.md @@ -174,29 +174,29 @@ ps：核心功能已经实现，正在对接微信小程序中... ### 后端 -| 框架 | 说明 | 版本 | 学习指南 | -|---------------------------------------------------------------------------------------------|-----------------------|------------------|----------------------------------------------------------------| -| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.6.12 | [文档](https://github.com/YunaiV/SpringBoot-Labs) | -| [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 / 8.0+ | | -| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.13-SNSAPSHOT | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | -| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.2 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) | -| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.5.2 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | -| [Redis](https://redis.io/) | key-value 数据库 | 5.0 | | -| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.17.7 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) | -| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.20 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) | -| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.6.5 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) | -| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.3 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) | -| [Flowable](https://github.com/flowable/flowable-engine) | 工作流引擎 | 6.7.2 | [文档](https://doc.iocoder.cn/bpm/) | -| [Quartz](https://github.com/quartz-scheduler) | 任务调度组件 | 2.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao) | -| [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 3.0.3 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) | -| [Resilience4j](https://github.com/resilience4j/resilience4j) | 服务保障组件 | 1.7.1 | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao) | -| [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.5.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) | -| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.6.9 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) | -| [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.13.3 | | -| [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.3.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) | -| [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.24 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) | -| [JUnit](https://junit.org/junit5/) | Java 单元测试框架 | 5.8.2 | - | -| [Mockito](https://github.com/mockito/mockito) | Java Mock 框架 | 4.8.0 | - | +| 框架 | 说明 | 版本 | 学习指南 | +|---------------------------------------------------------------------------------------------|-----------------------|-------------|----------------------------------------------------------------| +| [Spring Boot](https://spring.io/projects/spring-boot) | 应用开发框架 | 2.6.13 | [文档](https://github.com/YunaiV/SpringBoot-Labs) | +| [MySQL](https://www.mysql.com/cn/) | 数据库服务器 | 5.7 / 8.0+ | | +| [Druid](https://github.com/alibaba/druid) | JDBC 连接池、监控组件 | 1.2.14 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | +| [MyBatis Plus](https://mp.baomidou.com/) | MyBatis 增强工具包 | 3.5.2 | [文档](http://www.iocoder.cn/Spring-Boot/MyBatis/?yudao) | +| [Dynamic Datasource](https://dynamic-datasource.com/) | 动态数据源 | 3.5.2 | [文档](http://www.iocoder.cn/Spring-Boot/datasource-pool/?yudao) | +| [Redis](https://redis.io/) | key-value 数据库 | 5.0 | | +| [Redisson](https://github.com/redisson/redisson) | Redis 客户端 | 3.17.7 | [文档](http://www.iocoder.cn/Spring-Boot/Redis/?yudao) | +| [Spring MVC](https://github.com/spring-projects/spring-framework/tree/master/spring-webmvc) | MVC 框架 | 5.3.20 | [文档](http://www.iocoder.cn/SpringMVC/MVC/?yudao) | +| [Spring Security](https://github.com/spring-projects/spring-security) | Spring 安全框架 | 5.6.7 | [文档](http://www.iocoder.cn/Spring-Boot/Spring-Security/?yudao) | +| [Hibernate Validator](https://github.com/hibernate/hibernate-validator) | 参数校验组件 | 6.2.3 | [文档](http://www.iocoder.cn/Spring-Boot/Validation/?yudao) | +| [Flowable](https://github.com/flowable/flowable-engine) | 工作流引擎 | 6.7.2 | [文档](https://doc.iocoder.cn/bpm/) | +| [Quartz](https://github.com/quartz-scheduler) | 任务调度组件 | 2.3.2 | [文档](http://www.iocoder.cn/Spring-Boot/Job/?yudao) | +| [Knife4j](https://gitee.com/xiaoym/knife4j) | Swagger 增强 UI 实现 | 3.0.3 | [文档](http://www.iocoder.cn/Spring-Boot/Swagger/?yudao) | +| [Resilience4j](https://github.com/resilience4j/resilience4j) | 服务保障组件 | 1.7.1 | [文档](http://www.iocoder.cn/Spring-Boot/Resilience4j/?yudao) | +| [SkyWalking](https://skywalking.apache.org/) | 分布式应用追踪系统 | 8.5.0 | [文档](http://www.iocoder.cn/Spring-Boot/SkyWalking/?yudao) | +| [Spring Boot Admin](https://github.com/codecentric/spring-boot-admin) | Spring Boot 监控平台 | 2.6.9 | [文档](http://www.iocoder.cn/Spring-Boot/Admin/?yudao) | +| [Jackson](https://github.com/FasterXML/jackson) | JSON 工具库 | 2.13.3 | | +| [MapStruct](https://mapstruct.org/) | Java Bean 转换 | 1.5.3.Final | [文档](http://www.iocoder.cn/Spring-Boot/MapStruct/?yudao) | +| [Lombok](https://projectlombok.org/) | 消除冗长的 Java 代码 | 1.18.24 | [文档](http://www.iocoder.cn/Spring-Boot/Lombok/?yudao) | +| [JUnit](https://junit.org/junit5/) | Java 单元测试框架 | 5.8.2 | - | +| [Mockito](https://github.com/mockito/mockito) | Java Mock 框架 | 4.8.0 | - | ### [管理后台 Vue2 前端](./yudao-ui-admin) @@ -207,10 +207,10 @@ ps：核心功能已经实现，正在对接微信小程序中... ### [管理后台 Vue3 前端](./yudao-ui-admin-vue3) -| 框架 | 说明 | 版本 | +| 框架 | 说明 | 版本 | |----------------------------------------------------------------------|-----------------|--------| -| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.41 | -| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.1.8 | +| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.41 | +| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.2.2 | | [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.19 | | [TypeScript](https://www.typescriptlang.org/docs/) | TypeScript | 4.8.4 | | [pinia](https://pinia.vuejs.org/) | vuex5 | 2.0.23 | diff --git a/sql/mysql/vue3-menu.sql b/sql/mysql/vue3-menu.sql index 9e9c709b5..6a252a0a7 100644 --- a/sql/mysql/vue3-menu.sql +++ b/sql/mysql/vue3-menu.sql @@ -257,7 +257,7 @@ INSERT INTO `system_menu` VALUES (1264, '客户端查询', 'system:oauth2-client INSERT INTO `system_menu` VALUES (1265, '客户端创建', 'system:oauth2-client:create', 3, 2, 1263, '', '', '', 0, b'1', b'1', '', '2022-05-10 16:26:33', '1', '2022-05-11 00:31:23', b'0'); INSERT INTO `system_menu` VALUES (1266, '客户端更新', 'system:oauth2-client:update', 3, 3, 1263, '', '', '', 0, b'1', b'1', '', '2022-05-10 16:26:33', '1', '2022-05-11 00:31:28', b'0'); INSERT INTO `system_menu` VALUES (1267, '客户端删除', 'system:oauth2-client:delete', 3, 4, 1263, '', '', '', 0, b'1', b'1', '', '2022-05-10 16:26:33', '1', '2022-05-11 00:31:33', b'0'); -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1281, '可视化报表', '', 1, 12, 0, '/visualization', 'ep:histogram', NULL, 0, b'1', b'1', '1', '2022-07-10 20:22:15', '1', '2022-07-10 20:33:30', b'0'); -INSERT INTO `system_menu` (`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `visible`, `keep_alive`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1282, '积木报表', '', 2, 1, 1281, 'jimu-report', 'ep:histogram', 'visualization/jmreport/index', 0, b'1', b'1', '1', '2022-07-10 20:26:36', '1', '2022-07-28 21:17:34', b'0'); +INSERT INTO `system_menu` VALUES (1281, '可视化报表', '', 1, 12, 0, '/visualization', 'ep:histogram', NULL, 0, b'1', b'1', '1', '2022-07-10 20:22:15', '1', '2022-07-10 20:33:30', b'0'); +INSERT INTO `system_menu` VALUES (1282, '积木报表', '', 2, 1, 1281, 'jimu-report', 'ep:histogram', 'visualization/jmreport/index', 0, b'1', b'1', '1', '2022-07-10 20:26:36', '1', '2022-07-28 21:17:34', b'0'); SET FOREIGN_KEY_CHECKS = 1; diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index 9b68b9a05..341948b51 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -16,13 +16,13 @@ 1.6.4-snapshot - 2.6.12 + 2.6.13 3.0.3 1.6.7 2.5 - 1.2.13-SNSAPSHOT + 1.2.14 3.5.2 3.5.2 3.5.2 diff --git a/yudao-ui-admin-vue3/README.md b/yudao-ui-admin-vue3/README.md index 45599fbef..3027db3eb 100644 --- a/yudao-ui-admin-vue3/README.md +++ b/yudao-ui-admin-vue3/README.md @@ -28,7 +28,7 @@ | 框架 | 说明 | 版本 | | --- | --- |--------| | [Vue](https://staging-cn.vuejs.org/) | vue 框架 | 3.2.41 | -| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.1.8 | +| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 3.2.2 | | [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.19 | | [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.8.4 | | [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.23 | diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index fef0945b4..6b055720e 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -1,7 +1,7 @@ { "name": "ruoyi-vue-pro-vue3", - "version": "1.6.4.1821", - "description": "基于vue3、element-plus、typesScript、vite3", + "version": "1.6.4.1831", + "description": "基于vue3、vite3、element-plus、typesScript", "author": "xingyu", "private": false, "scripts": { @@ -56,9 +56,9 @@ "xe-utils": "^3.5.7" }, "devDependencies": { - "@commitlint/cli": "^17.1.2", - "@commitlint/config-conventional": "^17.1.0", - "@iconify/json": "^2.1.127", + "@commitlint/cli": "^17.2.0", + "@commitlint/config-conventional": "^17.2.0", + "@iconify/json": "^2.1.131", "@intlify/vite-plugin-vue-i18n": "^6.0.3", "@purge-icons/generated": "^0.9.0", "@types/intro.js": "^5.1.0", @@ -67,16 +67,16 @@ "@types/nprogress": "^0.2.0", "@types/qrcode": "^1.5.0", "@types/qs": "^6.9.7", - "@typescript-eslint/eslint-plugin": "^5.41.0", - "@typescript-eslint/parser": "^5.41.0", - "@vitejs/plugin-vue": "^3.1.2", - "@vitejs/plugin-vue-jsx": "^2.0.1", - "autoprefixer": "^10.4.12", + "@typescript-eslint/eslint-plugin": "^5.42.0", + "@typescript-eslint/parser": "^5.42.0", + "@vitejs/plugin-vue": "^3.2.0", + "@vitejs/plugin-vue-jsx": "^2.1.0", + "autoprefixer": "^10.4.13", "eslint": "^8.26.0", "eslint-config-prettier": "^8.5.0", - "eslint-define-config": "^1.8.0", + "eslint-define-config": "^1.11.0", "eslint-plugin-prettier": "^4.2.1", - "eslint-plugin-vue": "^9.6.0", + "eslint-plugin-vue": "^9.7.0", "less": "^4.1.3", "lint-staged": "^13.0.3", "plop": "^3.1.1", @@ -93,8 +93,8 @@ "stylelint-config-standard": "^29.0.0", "stylelint-order": "^5.0.0", "typescript": "4.8.4", - "unplugin-vue-macros": "^0.14.0", - "vite": "3.1.8", + "unplugin-vue-macros": "^0.15.2", + "vite": "3.2.2", "vite-plugin-compression": "^0.5.1", "vite-plugin-eslint": "^1.8.1", "vite-plugin-html": "^3.2.0", diff --git a/yudao-ui-admin-vue3/pnpm-lock.yaml b/yudao-ui-admin-vue3/pnpm-lock.yaml index 68cf2d56c..065eebbb8 100644 --- a/yudao-ui-admin-vue3/pnpm-lock.yaml +++ b/yudao-ui-admin-vue3/pnpm-lock.yaml @@ -1,10 +1,10 @@ lockfileVersion: 5.4 specifiers: - '@commitlint/cli': ^17.1.2 - '@commitlint/config-conventional': ^17.1.0 + '@commitlint/cli': ^17.2.0 + '@commitlint/config-conventional': ^17.2.0 '@iconify/iconify': ^3.0.0 - '@iconify/json': ^2.1.127 + '@iconify/json': ^2.1.131 '@intlify/vite-plugin-vue-i18n': ^6.0.3 '@purge-icons/generated': ^0.9.0 '@types/intro.js': ^5.1.0 @@ -13,16 +13,16 @@ specifiers: '@types/nprogress': ^0.2.0 '@types/qrcode': ^1.5.0 '@types/qs': ^6.9.7 - '@typescript-eslint/eslint-plugin': ^5.41.0 - '@typescript-eslint/parser': ^5.41.0 - '@vitejs/plugin-vue': ^3.1.2 - '@vitejs/plugin-vue-jsx': ^2.0.1 + '@typescript-eslint/eslint-plugin': ^5.42.0 + '@typescript-eslint/parser': ^5.42.0 + '@vitejs/plugin-vue': ^3.2.0 + '@vitejs/plugin-vue-jsx': ^2.1.0 '@vueuse/core': ^9.4.0 '@wangeditor/editor': ^5.1.22 '@wangeditor/editor-for-vue': ^5.1.10 '@zxcvbn-ts/core': ^2.1.0 animate.css: ^4.1.1 - autoprefixer: ^10.4.12 + autoprefixer: ^10.4.13 axios: ^0.27.2 crypto-js: ^4.1.1 dayjs: ^1.11.6 @@ -31,9 +31,9 @@ specifiers: element-plus: 2.2.19 eslint: ^8.26.0 eslint-config-prettier: ^8.5.0 - eslint-define-config: ^1.8.0 + eslint-define-config: ^1.11.0 eslint-plugin-prettier: ^4.2.1 - eslint-plugin-vue: ^9.6.0 + eslint-plugin-vue: ^9.7.0 intro.js: ^6.0.0 jsencrypt: ^3.3.0 less: ^4.1.3 @@ -58,9 +58,9 @@ specifiers: stylelint-config-standard: ^29.0.0 stylelint-order: ^5.0.0 typescript: 4.8.4 - unplugin-vue-macros: ^0.14.0 + unplugin-vue-macros: ^0.15.2 url: ^0.11.0 - vite: 3.1.8 + vite: 3.2.2 vite-plugin-compression: ^0.5.1 vite-plugin-eslint: ^1.8.1 vite-plugin-html: ^3.2.0 @@ -111,10 +111,10 @@ dependencies: xe-utils: 3.5.7 devDependencies: - '@commitlint/cli': 17.1.2 - '@commitlint/config-conventional': 17.1.0 - '@iconify/json': 2.1.127 - '@intlify/vite-plugin-vue-i18n': 6.0.3_vite@3.1.8+vue-i18n@9.2.2 + '@commitlint/cli': 17.2.0 + '@commitlint/config-conventional': 17.2.0 + '@iconify/json': 2.1.131 + '@intlify/vite-plugin-vue-i18n': 6.0.3_vite@3.2.2+vue-i18n@9.2.2 '@purge-icons/generated': 0.9.0 '@types/intro.js': 5.1.0 '@types/lodash-es': 4.17.6 @@ -122,16 +122,16 @@ devDependencies: '@types/nprogress': 0.2.0 '@types/qrcode': 1.5.0 '@types/qs': 6.9.7 - '@typescript-eslint/eslint-plugin': 5.41.0_huremdigmcnkianavgfk3x6iou - '@typescript-eslint/parser': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m - '@vitejs/plugin-vue': 3.1.2_vite@3.1.8+vue@3.2.41 - '@vitejs/plugin-vue-jsx': 2.0.1_vite@3.1.8+vue@3.2.41 - autoprefixer: 10.4.12_postcss@8.4.18 + '@typescript-eslint/eslint-plugin': 5.42.0_6xw5wg2354iw4zujk2f3vyfrzu + '@typescript-eslint/parser': 5.42.0_wyqvi574yv7oiwfeinomdzmc3m + '@vitejs/plugin-vue': 3.2.0_vite@3.2.2+vue@3.2.41 + '@vitejs/plugin-vue-jsx': 2.1.0_vite@3.2.2+vue@3.2.41 + autoprefixer: 10.4.13_postcss@8.4.18 eslint: 8.26.0 eslint-config-prettier: 8.5.0_eslint@8.26.0 - eslint-define-config: 1.8.0 + eslint-define-config: 1.11.0 eslint-plugin-prettier: 4.2.1_aniwkeyvlpmwkidetuytnokvcm - eslint-plugin-vue: 9.6.0_eslint@8.26.0 + eslint-plugin-vue: 9.7.0_eslint@8.26.0 less: 4.1.3 lint-staged: 13.0.3 plop: 3.1.1 @@ -148,15 +148,15 @@ devDependencies: stylelint-config-standard: 29.0.0_stylelint@14.14.0 stylelint-order: 5.0.0_stylelint@14.14.0 typescript: 4.8.4 - unplugin-vue-macros: 0.14.0_vzwbnacjq6rhyu4ywwt6bu33j4 - vite: 3.1.8_less@4.1.3 - vite-plugin-compression: 0.5.1_vite@3.1.8 - vite-plugin-eslint: 1.8.1_eslint@8.26.0+vite@3.1.8 - vite-plugin-html: 3.2.0_vite@3.1.8 - vite-plugin-purge-icons: 0.9.1_vite@3.1.8 - vite-plugin-style-import: 2.0.0_vite@3.1.8 - vite-plugin-svg-icons: 2.0.1_vite@3.1.8 - vite-plugin-windicss: 1.8.8_vite@3.1.8 + unplugin-vue-macros: 0.15.2_mbqnf624zbi2ta2juc2wzs2gvm + vite: 3.2.2_less@4.1.3 + vite-plugin-compression: 0.5.1_vite@3.2.2 + vite-plugin-eslint: 1.8.1_eslint@8.26.0+vite@3.2.2 + vite-plugin-html: 3.2.0_vite@3.2.2 + vite-plugin-purge-icons: 0.9.1_vite@3.2.2 + vite-plugin-style-import: 2.0.0_vite@3.2.2 + vite-plugin-svg-icons: 2.0.1_vite@3.2.2 + vite-plugin-windicss: 1.8.8_vite@3.2.2 vue-tsc: 1.0.9_typescript@4.8.4 windicss: 3.5.6 @@ -190,20 +190,20 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/core/7.19.3: - resolution: {integrity: sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==} + /@babel/core/7.19.6: + resolution: {integrity: sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.0 '@babel/code-frame': 7.18.6 - '@babel/generator': 7.19.3 - '@babel/helper-compilation-targets': 7.19.3_@babel+core@7.19.3 - '@babel/helper-module-transforms': 7.19.0 - '@babel/helpers': 7.19.0 - '@babel/parser': 7.19.3 + '@babel/generator': 7.20.0 + '@babel/helper-compilation-targets': 7.19.3_@babel+core@7.19.6 + '@babel/helper-module-transforms': 7.19.6 + '@babel/helpers': 7.20.0 + '@babel/parser': 7.20.0 '@babel/template': 7.18.10 - '@babel/traverse': 7.19.3 - '@babel/types': 7.19.3 + '@babel/traverse': 7.20.0 + '@babel/types': 7.19.4 convert-source-map: 1.8.0 debug: 4.3.4 gensync: 1.0.0-beta.2 @@ -213,11 +213,11 @@ packages: - supports-color dev: true - /@babel/generator/7.19.3: - resolution: {integrity: sha512-fqVZnmp1ncvZU757UzDheKZpfPgatqY59XtW2/j/18H7u76akb8xqvjw82f+i2UKd/ksYsSick/BCLQUUtJ/qQ==} + /@babel/generator/7.20.0: + resolution: {integrity: sha512-GUPcXxWibClgmYJuIwC2Bc2Lg+8b9VjaJ+HlNdACEVt+Wlr1eoU1OPZjZRm7Hzl0gaTsUZNQfeihvZJhG7oc3w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.19.3 + '@babel/types': 7.20.0 '@jridgewell/gen-mapping': 0.3.2 jsesc: 2.5.2 dev: true @@ -226,29 +226,29 @@ packages: resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.19.3 + '@babel/types': 7.20.0 dev: true - /@babel/helper-compilation-targets/7.19.3_@babel+core@7.19.3: + /@babel/helper-compilation-targets/7.19.3_@babel+core@7.19.6: resolution: {integrity: sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: '@babel/compat-data': 7.19.3 - '@babel/core': 7.19.3 + '@babel/core': 7.19.6 '@babel/helper-validator-option': 7.18.6 browserslist: 4.21.4 semver: 6.3.0 dev: true - /@babel/helper-create-class-features-plugin/7.19.0_@babel+core@7.19.3: + /@babel/helper-create-class-features-plugin/7.19.0_@babel+core@7.19.6: resolution: {integrity: sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.19.3 + '@babel/core': 7.19.6 '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-function-name': 7.19.0 @@ -270,42 +270,42 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.18.10 - '@babel/types': 7.19.3 + '@babel/types': 7.20.0 dev: true /@babel/helper-hoist-variables/7.18.6: resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.19.3 + '@babel/types': 7.20.0 dev: true /@babel/helper-member-expression-to-functions/7.18.9: resolution: {integrity: sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.19.3 + '@babel/types': 7.20.0 dev: true /@babel/helper-module-imports/7.18.6: resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.19.3 + '@babel/types': 7.20.0 dev: true - /@babel/helper-module-transforms/7.19.0: - resolution: {integrity: sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==} + /@babel/helper-module-transforms/7.19.6: + resolution: {integrity: sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-module-imports': 7.18.6 - '@babel/helper-simple-access': 7.18.6 + '@babel/helper-simple-access': 7.19.4 '@babel/helper-split-export-declaration': 7.18.6 '@babel/helper-validator-identifier': 7.19.1 '@babel/template': 7.18.10 - '@babel/traverse': 7.19.3 - '@babel/types': 7.19.3 + '@babel/traverse': 7.20.0 + '@babel/types': 7.19.4 transitivePeerDependencies: - supports-color dev: true @@ -314,7 +314,7 @@ packages: resolution: {integrity: sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.19.3 + '@babel/types': 7.20.0 dev: true /@babel/helper-plugin-utils/7.19.0: @@ -329,24 +329,24 @@ packages: '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-member-expression-to-functions': 7.18.9 '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/traverse': 7.19.3 - '@babel/types': 7.19.3 + '@babel/traverse': 7.20.0 + '@babel/types': 7.20.0 transitivePeerDependencies: - supports-color dev: true - /@babel/helper-simple-access/7.18.6: - resolution: {integrity: sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==} + /@babel/helper-simple-access/7.19.4: + resolution: {integrity: sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.19.3 + '@babel/types': 7.20.0 dev: true /@babel/helper-split-export-declaration/7.18.6: resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.19.3 + '@babel/types': 7.20.0 dev: true /@babel/helper-string-parser/7.18.10: @@ -367,13 +367,13 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helpers/7.19.0: - resolution: {integrity: sha512-DRBCKGwIEdqY3+rPJgG/dKfQy9+08rHIAJx8q2p+HSWP87s2HCrQmaAMMyMll2kIXKCW0cO1RdQskx15Xakftg==} + /@babel/helpers/7.20.0: + resolution: {integrity: sha512-aGMjYraN0zosCEthoGLdqot1oRsmxVTQRHadsUPz5QM44Zej2PYRz7XiDE7GqnkZnNtLbOuxqoZw42vkU7+XEQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.18.10 - '@babel/traverse': 7.19.3 - '@babel/types': 7.19.3 + '@babel/traverse': 7.20.0 + '@babel/types': 7.20.0 transitivePeerDependencies: - supports-color dev: true @@ -394,45 +394,44 @@ packages: dependencies: '@babel/types': 7.19.3 - /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.19.3: - resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} - peerDependencies: - '@babel/core': ^7.0.0-0 + /@babel/parser/7.20.0: + resolution: {integrity: sha512-G9VgAhEaICnz8iiJeGJQyVl6J2nTjbW0xeisva0PK6XcKsga7BIaqm4ZF8Rg1Wbaqmy6znspNqhPaPkyukujzg==} + engines: {node: '>=6.0.0'} + hasBin: true dependencies: - '@babel/core': 7.19.3 - '@babel/helper-plugin-utils': 7.19.0 + '@babel/types': 7.19.4 dev: true - /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.19.3: + /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.19.6: resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.19.3 + '@babel/core': 7.19.6 '@babel/helper-plugin-utils': 7.19.0 dev: true - /@babel/plugin-syntax-typescript/7.18.6_@babel+core@7.19.3: + /@babel/plugin-syntax-typescript/7.18.6_@babel+core@7.19.6: resolution: {integrity: sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.19.3 + '@babel/core': 7.19.6 '@babel/helper-plugin-utils': 7.19.0 dev: true - /@babel/plugin-transform-typescript/7.19.3_@babel+core@7.19.3: + /@babel/plugin-transform-typescript/7.19.3_@babel+core@7.19.6: resolution: {integrity: sha512-z6fnuK9ve9u/0X0rRvI9MY0xg+DOUaABDYOe+/SQTxtlptaBB/V9JIUxJn6xp3lMBeb9qe8xSFmHU35oZDXD+w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.19.3 - '@babel/helper-create-class-features-plugin': 7.19.0_@babel+core@7.19.3 + '@babel/core': 7.19.6 + '@babel/helper-create-class-features-plugin': 7.19.0_@babel+core@7.19.6 '@babel/helper-plugin-utils': 7.19.0 - '@babel/plugin-syntax-typescript': 7.18.6_@babel+core@7.19.3 + '@babel/plugin-syntax-typescript': 7.18.6_@babel+core@7.19.6 transitivePeerDependencies: - supports-color dev: true @@ -449,8 +448,8 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.18.6 - '@babel/parser': 7.19.3 - '@babel/types': 7.19.3 + '@babel/parser': 7.20.0 + '@babel/types': 7.20.0 dev: true /@babel/traverse/7.19.3: @@ -458,13 +457,31 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.18.6 - '@babel/generator': 7.19.3 + '@babel/generator': 7.20.0 '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-function-name': 7.19.0 '@babel/helper-hoist-variables': 7.18.6 '@babel/helper-split-export-declaration': 7.18.6 - '@babel/parser': 7.19.3 - '@babel/types': 7.19.3 + '@babel/parser': 7.20.0 + '@babel/types': 7.20.0 + debug: 4.3.4 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color + dev: true + + /@babel/traverse/7.20.0: + resolution: {integrity: sha512-5+cAXQNARgjRUK0JWu2UBwja4JLSO/rBMPJzpsKb+oBF5xlUuCfljQepS4XypBQoiigL0VQjTZy6WiONtUdScQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.18.6 + '@babel/generator': 7.20.0 + '@babel/helper-environment-visitor': 7.18.9 + '@babel/helper-function-name': 7.19.0 + '@babel/helper-hoist-variables': 7.18.6 + '@babel/helper-split-export-declaration': 7.18.6 + '@babel/parser': 7.20.0 + '@babel/types': 7.20.0 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: @@ -488,15 +505,24 @@ packages: to-fast-properties: 2.0.0 dev: true - /@commitlint/cli/17.1.2: - resolution: {integrity: sha512-h/4Hlka3bvCLbnxf0Er2ri5A44VMlbMSkdTRp8Adv2tRiklSTRIoPGs7OEXDv3EoDs2AAzILiPookgM4Gi7LOw==} + /@babel/types/7.20.0: + resolution: {integrity: sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.19.4 + '@babel/helper-validator-identifier': 7.19.1 + to-fast-properties: 2.0.0 + dev: true + + /@commitlint/cli/17.2.0: + resolution: {integrity: sha512-kd1zykcrjIKyDRftWW1E1TJqkgzeosEkv1BiYPCdzkb/g/3BrfgwZUHR1vg+HO3qKUb/0dN+jNXArhGGAHpmaQ==} engines: {node: '>=v14'} hasBin: true dependencies: '@commitlint/format': 17.0.0 - '@commitlint/lint': 17.1.0 - '@commitlint/load': 17.1.2 - '@commitlint/read': 17.1.0 + '@commitlint/lint': 17.2.0 + '@commitlint/load': 17.2.0 + '@commitlint/read': 17.2.0 '@commitlint/types': 17.0.0 execa: 5.1.1 lodash: 4.17.21 @@ -508,8 +534,8 @@ packages: - '@swc/wasm' dev: true - /@commitlint/config-conventional/17.1.0: - resolution: {integrity: sha512-WU2p0c9/jLi8k2q2YrDV96Y8XVswQOceIQ/wyJvQxawJSCasLdRB3kUIYdNjOCJsxkpoUlV/b90ZPxp1MYZDiA==} + /@commitlint/config-conventional/17.2.0: + resolution: {integrity: sha512-g5hQqRa80f++SYS233dbDSg16YdyounMTAhVcmqtInNeY/GF3aA4st9SVtJxpeGrGmueMrU4L+BBb+6Vs5wrcg==} engines: {node: '>=v14'} dependencies: conventional-changelog-conventionalcommits: 5.0.0 @@ -544,26 +570,26 @@ packages: chalk: 4.1.2 dev: true - /@commitlint/is-ignored/17.1.0: - resolution: {integrity: sha512-JITWKDMHhIh8IpdIbcbuH9rEQJty1ZWelgjleTFrVRAcEwN/sPzk1aVUXRIZNXMJWbZj8vtXRJnFihrml8uECQ==} + /@commitlint/is-ignored/17.2.0: + resolution: {integrity: sha512-rgUPUQraHxoMLxiE8GK430HA7/R2vXyLcOT4fQooNrZq9ERutNrP6dw3gdKLkq22Nede3+gEHQYUzL4Wu75ndg==} engines: {node: '>=v14'} dependencies: '@commitlint/types': 17.0.0 semver: 7.3.7 dev: true - /@commitlint/lint/17.1.0: - resolution: {integrity: sha512-ltpqM2ogt/+SDhUaScFo0MdscncEF96lvQTPMM/VTTWlw7sTGLLWkOOppsee2MN/uLNNWjQ7kqkd4h6JqoM9AQ==} + /@commitlint/lint/17.2.0: + resolution: {integrity: sha512-N2oLn4Dj672wKH5qJ4LGO+73UkYXGHO+NTVUusGw83SjEv7GjpqPGKU6KALW2kFQ/GsDefSvOjpSi3CzWHQBDg==} engines: {node: '>=v14'} dependencies: - '@commitlint/is-ignored': 17.1.0 - '@commitlint/parse': 17.0.0 - '@commitlint/rules': 17.0.0 + '@commitlint/is-ignored': 17.2.0 + '@commitlint/parse': 17.2.0 + '@commitlint/rules': 17.2.0 '@commitlint/types': 17.0.0 dev: true - /@commitlint/load/17.1.2: - resolution: {integrity: sha512-sk2p/jFYAWLChIfOIp/MGSIn/WzZ0vkc3afw+l4X8hGEYkvDe4gQUUAVxjl/6xMRn0HgnSLMZ04xXh5pkTsmgg==} + /@commitlint/load/17.2.0: + resolution: {integrity: sha512-HDD57qSqNrk399R4TIjw31AWBG8dBjNj1MrDKZKmC/wvimtnIFlqzcu1+sxfXIOHj/+M6tcMWDtvknGUd7SU+g==} engines: {node: '>=v14'} dependencies: '@commitlint/config-validator': 17.1.0 @@ -583,13 +609,13 @@ packages: - '@swc/wasm' dev: true - /@commitlint/message/17.0.0: - resolution: {integrity: sha512-LpcwYtN+lBlfZijHUdVr8aNFTVpHjuHI52BnfoV01TF7iSLnia0jttzpLkrLmI8HNQz6Vhr9UrxDWtKZiMGsBw==} + /@commitlint/message/17.2.0: + resolution: {integrity: sha512-/4l2KFKxBOuoEn1YAuuNNlAU05Zt7sNsC9H0mPdPm3chOrT4rcX0pOqrQcLtdMrMkJz0gC7b3SF80q2+LtdL9Q==} engines: {node: '>=v14'} dev: true - /@commitlint/parse/17.0.0: - resolution: {integrity: sha512-cKcpfTIQYDG1ywTIr5AG0RAiLBr1gudqEsmAGCTtj8ffDChbBRxm6xXs2nv7GvmJN7msOt7vOKleLvcMmRa1+A==} + /@commitlint/parse/17.2.0: + resolution: {integrity: sha512-vLzLznK9Y21zQ6F9hf8D6kcIJRb2haAK5T/Vt1uW2CbHYOIfNsR/hJs0XnF/J9ctM20Tfsqv4zBitbYvVw7F6Q==} engines: {node: '>=v14'} dependencies: '@commitlint/types': 17.0.0 @@ -597,8 +623,8 @@ packages: conventional-commits-parser: 3.2.4 dev: true - /@commitlint/read/17.1.0: - resolution: {integrity: sha512-73BoFNBA/3Ozo2JQvGsE0J8SdrJAWGfZQRSHqvKaqgmY042Su4gXQLqvAzgr55S9DI1l9TiU/5WDuh8IE86d/g==} + /@commitlint/read/17.2.0: + resolution: {integrity: sha512-bbblBhrHkjxra3ptJNm0abxu7yeAaxumQ8ZtD6GIVqzURCETCP7Dm0tlVvGRDyXBuqX6lIJxh3W7oyKqllDsHQ==} engines: {node: '>=v14'} dependencies: '@commitlint/top-level': 17.0.0 @@ -620,12 +646,12 @@ packages: resolve-global: 1.0.0 dev: true - /@commitlint/rules/17.0.0: - resolution: {integrity: sha512-45nIy3dERKXWpnwX9HeBzK5SepHwlDxdGBfmedXhL30fmFCkJOdxHyOJsh0+B0RaVsLGT01NELpfzJUmtpDwdQ==} + /@commitlint/rules/17.2.0: + resolution: {integrity: sha512-1YynwD4Eh7HXZNpqG8mtUlL2pSX2jBy61EejYJv4ooZPcg50Ak7LPOyD3a9UZnsE76AXWFBz+yo9Hv4MIpAa0Q==} engines: {node: '>=v14'} dependencies: '@commitlint/ensure': 17.0.0 - '@commitlint/message': 17.0.0 + '@commitlint/message': 17.2.0 '@commitlint/to-lines': 17.0.0 '@commitlint/types': 17.0.0 execa: 5.1.1 @@ -759,8 +785,8 @@ packages: dependencies: '@iconify/types': 2.0.0 - /@iconify/json/2.1.127: - resolution: {integrity: sha512-pahFCt5Q8XyXHgDz/PQ7LDwqcB+GZ6fuIcikxMYTTI/uoodjT+97QqYV2AcNrYK+gWZU7DqzY2T689Icf4uYfA==} + /@iconify/json/2.1.131: + resolution: {integrity: sha512-VUQLJ2IHEcB0Is9K/grtLEC0OuLV3Fj0h3t04fKMN9hXwJkn2SKounQr44w7LzcBlu2RRYA7/npGlovtWV0iXQ==} dependencies: '@iconify/types': 2.0.0 pathe: 0.3.9 @@ -828,7 +854,7 @@ packages: engines: {node: '>= 14'} dev: true - /@intlify/vite-plugin-vue-i18n/6.0.3_vite@3.1.8+vue-i18n@9.2.2: + /@intlify/vite-plugin-vue-i18n/6.0.3_vite@3.2.2+vue-i18n@9.2.2: resolution: {integrity: sha512-6SgNzPAOCR90wvt368lKzi7f/5ZEWJn22UCGvhFsP3XvKqlF3cVzojahgQ6o+LTdCkExeM6wPgd+haFf28E9VQ==} engines: {node: '>= 14.6'} peerDependencies: @@ -849,7 +875,7 @@ packages: debug: 4.3.4 fast-glob: 3.2.12 source-map: 0.6.1 - vite: 3.1.8_less@4.1.3 + vite: 3.2.2_less@4.1.3 vue-i18n: 9.2.2_vue@3.2.41 transitivePeerDependencies: - supports-color @@ -1092,8 +1118,8 @@ packages: /@types/web-bluetooth/0.0.16: resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==} - /@typescript-eslint/eslint-plugin/5.41.0_huremdigmcnkianavgfk3x6iou: - resolution: {integrity: sha512-DXUS22Y57/LAFSg3x7Vi6RNAuLpTXwxB9S2nIA7msBb/Zt8p7XqMwdpdc1IU7CkOQUPgAqR5fWvxuKCbneKGmA==} + /@typescript-eslint/eslint-plugin/5.42.0_6xw5wg2354iw4zujk2f3vyfrzu: + resolution: {integrity: sha512-5TJh2AgL6+wpL8H/GTSjNb4WrjKoR2rqvFxR/DDTqYNk6uXn8BJMEcncLSpMbf/XV1aS0jAjYwn98uvVCiAywQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: '@typescript-eslint/parser': ^5.0.0 @@ -1103,13 +1129,14 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m - '@typescript-eslint/scope-manager': 5.41.0 - '@typescript-eslint/type-utils': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m - '@typescript-eslint/utils': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m + '@typescript-eslint/parser': 5.42.0_wyqvi574yv7oiwfeinomdzmc3m + '@typescript-eslint/scope-manager': 5.42.0 + '@typescript-eslint/type-utils': 5.42.0_wyqvi574yv7oiwfeinomdzmc3m + '@typescript-eslint/utils': 5.42.0_wyqvi574yv7oiwfeinomdzmc3m debug: 4.3.4 eslint: 8.26.0 ignore: 5.2.0 + natural-compare-lite: 1.4.0 regexpp: 3.2.0 semver: 7.3.8 tsutils: 3.21.0_typescript@4.8.4 @@ -1118,8 +1145,8 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.41.0_wyqvi574yv7oiwfeinomdzmc3m: - resolution: {integrity: sha512-HQVfix4+RL5YRWZboMD1pUfFN8MpRH4laziWkkAzyO1fvNOY/uinZcvo3QiFJVS/siNHupV8E5+xSwQZrl6PZA==} + /@typescript-eslint/parser/5.42.0_wyqvi574yv7oiwfeinomdzmc3m: + resolution: {integrity: sha512-Ixh9qrOTDRctFg3yIwrLkgf33AHyEIn6lhyf5cCfwwiGtkWhNpVKlEZApi3inGQR/barWnY7qY8FbGKBO7p3JA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 @@ -1128,9 +1155,9 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.41.0 - '@typescript-eslint/types': 5.41.0 - '@typescript-eslint/typescript-estree': 5.41.0_typescript@4.8.4 + '@typescript-eslint/scope-manager': 5.42.0 + '@typescript-eslint/types': 5.42.0 + '@typescript-eslint/typescript-estree': 5.42.0_typescript@4.8.4 debug: 4.3.4 eslint: 8.26.0 typescript: 4.8.4 @@ -1138,16 +1165,16 @@ packages: - supports-color dev: true - /@typescript-eslint/scope-manager/5.41.0: - resolution: {integrity: sha512-xOxPJCnuktUkY2xoEZBKXO5DBCugFzjrVndKdUnyQr3+9aDWZReKq9MhaoVnbL+maVwWJu/N0SEtrtEUNb62QQ==} + /@typescript-eslint/scope-manager/5.42.0: + resolution: {integrity: sha512-l5/3IBHLH0Bv04y+H+zlcLiEMEMjWGaCX6WyHE5Uk2YkSGAMlgdUPsT/ywTSKgu9D1dmmKMYgYZijObfA39Wow==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.41.0 - '@typescript-eslint/visitor-keys': 5.41.0 + '@typescript-eslint/types': 5.42.0 + '@typescript-eslint/visitor-keys': 5.42.0 dev: true - /@typescript-eslint/type-utils/5.41.0_wyqvi574yv7oiwfeinomdzmc3m: - resolution: {integrity: sha512-L30HNvIG6A1Q0R58e4hu4h+fZqaO909UcnnPbwKiN6Rc3BUEx6ez2wgN7aC0cBfcAjZfwkzE+E2PQQ9nEuoqfA==} + /@typescript-eslint/type-utils/5.42.0_wyqvi574yv7oiwfeinomdzmc3m: + resolution: {integrity: sha512-HW14TXC45dFVZxnVW8rnUGnvYyRC0E/vxXShFCthcC9VhVTmjqOmtqj6H5rm9Zxv+ORxKA/1aLGD7vmlLsdlOg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '*' @@ -1156,8 +1183,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.41.0_typescript@4.8.4 - '@typescript-eslint/utils': 5.41.0_wyqvi574yv7oiwfeinomdzmc3m + '@typescript-eslint/typescript-estree': 5.42.0_typescript@4.8.4 + '@typescript-eslint/utils': 5.42.0_wyqvi574yv7oiwfeinomdzmc3m debug: 4.3.4 eslint: 8.26.0 tsutils: 3.21.0_typescript@4.8.4 @@ -1166,13 +1193,13 @@ packages: - supports-color dev: true - /@typescript-eslint/types/5.41.0: - resolution: {integrity: sha512-5BejraMXMC+2UjefDvrH0Fo/eLwZRV6859SXRg+FgbhA0R0l6lDqDGAQYhKbXhPN2ofk2kY5sgGyLNL907UXpA==} + /@typescript-eslint/types/5.42.0: + resolution: {integrity: sha512-t4lzO9ZOAUcHY6bXQYRuu+3SSYdD9TS8ooApZft4WARt4/f2Cj/YpvbTe8A4GuhT4bNW72goDMOy7SW71mZwGw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true - /@typescript-eslint/typescript-estree/5.41.0_typescript@4.8.4: - resolution: {integrity: sha512-SlzFYRwFSvswzDSQ/zPkIWcHv8O5y42YUskko9c4ki+fV6HATsTODUPbRbcGDFYP86gaJL5xohUEytvyNNcXWg==} + /@typescript-eslint/typescript-estree/5.42.0_typescript@4.8.4: + resolution: {integrity: sha512-2O3vSq794x3kZGtV7i4SCWZWCwjEtkWfVqX4m5fbUBomOsEOyd6OAD1qU2lbvV5S8tgy/luJnOYluNyYVeOTTg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: typescript: '*' @@ -1180,8 +1207,8 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.41.0 - '@typescript-eslint/visitor-keys': 5.41.0 + '@typescript-eslint/types': 5.42.0 + '@typescript-eslint/visitor-keys': 5.42.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -1192,17 +1219,17 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.41.0_wyqvi574yv7oiwfeinomdzmc3m: - resolution: {integrity: sha512-QlvfwaN9jaMga9EBazQ+5DDx/4sAdqDkcs05AsQHMaopluVCUyu1bTRUVKzXbgjDlrRAQrYVoi/sXJ9fmG+KLQ==} + /@typescript-eslint/utils/5.42.0_wyqvi574yv7oiwfeinomdzmc3m: + resolution: {integrity: sha512-JZ++3+h1vbeG1NUECXQZE3hg0kias9kOtcQr3+JVQ3whnjvKuMyktJAAIj6743OeNPnGBmjj7KEmiDL7qsdnCQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: '@types/json-schema': 7.0.11 '@types/semver': 7.3.12 - '@typescript-eslint/scope-manager': 5.41.0 - '@typescript-eslint/types': 5.41.0 - '@typescript-eslint/typescript-estree': 5.41.0_typescript@4.8.4 + '@typescript-eslint/scope-manager': 5.42.0 + '@typescript-eslint/types': 5.42.0 + '@typescript-eslint/typescript-estree': 5.42.0_typescript@4.8.4 eslint: 8.26.0 eslint-scope: 5.1.1 eslint-utils: 3.0.0_eslint@8.26.0 @@ -1212,11 +1239,11 @@ packages: - typescript dev: true - /@typescript-eslint/visitor-keys/5.41.0: - resolution: {integrity: sha512-vilqeHj267v8uzzakbm13HkPMl7cbYpKVjgFWZPIOHIJHZtinvypUhJ5xBXfWYg4eFKqztbMMpOgFpT9Gfx4fw==} + /@typescript-eslint/visitor-keys/5.42.0: + resolution: {integrity: sha512-QHbu5Hf/2lOEOwy+IUw0GoSCuAzByTAWWrOTKzTzsotiUnWFpuKnXcAhC9YztAf2EElQ0VvIK+pHJUPkM0q7jg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - '@typescript-eslint/types': 5.41.0 + '@typescript-eslint/types': 5.42.0 eslint-visitor-keys: 3.3.0 dev: true @@ -1261,31 +1288,30 @@ packages: nanoid: 3.3.4 dev: false - /@vitejs/plugin-vue-jsx/2.0.1_vite@3.1.8+vue@3.2.41: - resolution: {integrity: sha512-lmiR1k9+lrF7LMczO0pxtQ8mOn6XeppJDHxnpxkJQpT5SiKz4SKhKdeNstXaTNuR8qZhUo5X0pJlcocn72Y4Jg==} + /@vitejs/plugin-vue-jsx/2.1.0_vite@3.2.2+vue@3.2.41: + resolution: {integrity: sha512-vvL8MHKN0hUf5LE+/rCk1rduwzW6NihD6xEfM4s1gGCSWQFYd5zLdxBs++z3S7AV/ynr7Yig5Xp1Bm0wlB4IAA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^3.0.0 vue: ^3.0.0 dependencies: - '@babel/core': 7.19.3 - '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.19.3 - '@babel/plugin-transform-typescript': 7.19.3_@babel+core@7.19.3 - '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.19.3 - vite: 3.1.8_less@4.1.3 + '@babel/core': 7.19.6 + '@babel/plugin-transform-typescript': 7.19.3_@babel+core@7.19.6 + '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.19.6 + vite: 3.2.2_less@4.1.3 vue: 3.2.41 transitivePeerDependencies: - supports-color dev: true - /@vitejs/plugin-vue/3.1.2_vite@3.1.8+vue@3.2.41: - resolution: {integrity: sha512-3zxKNlvA3oNaKDYX0NBclgxTQ1xaFdL7PzwF6zj9tGFziKwmBa3Q/6XcJQxudlT81WxDjEhHmevvIC4Orc1LhQ==} + /@vitejs/plugin-vue/3.2.0_vite@3.2.2+vue@3.2.41: + resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^3.0.0 vue: ^3.2.25 dependencies: - vite: 3.1.8_less@4.1.3 + vite: 3.2.2_less@4.1.3 vue: 3.2.41 dev: true @@ -1329,17 +1355,35 @@ packages: '@volar/vue-language-core': 1.0.9 dev: true - /@vue-macros/common/0.12.3: - resolution: {integrity: sha512-APF/V0WaUwdED+x1BfEoak0GeFXa/mDffQLl4A6WRfHRoJYv+tfJ86CDVqV0KgNhTemEXpMxvR1vY/pARmy3Ow==} + /@vue-macros/api/0.1.1: + resolution: {integrity: sha512-SZHwR1zsmgTi3HmqvcjUEiI+pdSLSOj1pW2g1rdXK8s2hpI9EdxPRPv+r3MSb+513rBZ8ZRsIs8HkDYszqi3vg==} engines: {node: '>=14.19.0'} dependencies: - '@babel/types': 7.19.4 + '@babel/types': 7.20.0 + '@vue-macros/common': 0.13.2 + dev: true + + /@vue-macros/better-define/0.0.3: + resolution: {integrity: sha512-X3J6PEC2iNps1TCs1g/po15UMfW/6HG8VvRbDbGPCzjZ7MyQCYJE/aZ1vF5aqrU/+1xiGCCXkJv+5no6RAmq0Q==} + engines: {node: '>=14.19.0'} + dependencies: + '@rollup/pluginutils': 4.2.1 + '@vue-macros/api': 0.1.1 + '@vue-macros/common': 0.13.2 + unplugin: 0.10.2 + dev: true + + /@vue-macros/common/0.13.2: + resolution: {integrity: sha512-2pv9aUIw21IzdcROpo4FgMjEFR4zdV0ikHVF/kE/HX0xHcCteG4Pm7rHYK/JvIBhtiLDLWrcD31Y0B0XBaE0PQ==} + engines: {node: '>=14.19.0'} + dependencies: + '@babel/types': 7.20.0 '@vue/compiler-sfc': 3.2.41 magic-string: 0.26.7 dev: true - /@vue-macros/define-model/0.13.4_@vueuse+core@9.4.0: - resolution: {integrity: sha512-GjCE4YRon9sfWvvq0SyNXJFg4B9803Q1KhSRq55waj9qD7xh97rFQhqfSLf9mr3NgM1OlgzQf8kFm6J8N7CTvg==} + /@vue-macros/define-model/0.13.7_@vueuse+core@9.4.0: + resolution: {integrity: sha512-nJXeeh94C49to6k6eGiSnaQGwWVqVpdLxHGFnJynzGCUIbaDAsrVfLWZWG1sbKNlGHHJRAFam4VqBavvqR7zAg==} engines: {node: '>=14.19.0'} peerDependencies: '@vueuse/core': ^9.0.0 @@ -1348,55 +1392,55 @@ packages: optional: true dependencies: '@rollup/pluginutils': 4.2.1 - '@vue-macros/common': 0.12.3 + '@vue-macros/common': 0.13.2 '@vueuse/core': 9.4.0_vue@3.2.41 - ast-walker-scope: 0.2.3 - unplugin: 0.9.6 + ast-walker-scope: 0.3.0 + unplugin: 0.10.2 dev: true - /@vue-macros/define-render/0.13.4_vue@3.2.41: - resolution: {integrity: sha512-cKl8RzTVgmgnnUzK40KmEtV7C92Y4VRpxG5rgkdwNvdvLtDYPkTEg4gnnYtyhZ/DnwJujOKjvfX381TNToVh3Q==} + /@vue-macros/define-render/0.13.7_vue@3.2.41: + resolution: {integrity: sha512-7+9PDVVwKp9wtxFhsYDKIBTyr1qJYPOg5aMeG5btJ9zN2zVtNVVO+tx7yAE0xQBkHI7ml2bwy2PG3dFK/phmrQ==} engines: {node: '>=14.19.0'} peerDependencies: vue: ^2.7.0 || ^3.0.0 dependencies: '@rollup/pluginutils': 4.2.1 - '@vue-macros/common': 0.12.3 - unplugin: 0.9.6 + '@vue-macros/common': 0.13.2 + unplugin: 0.10.2 vue: 3.2.41 dev: true - /@vue-macros/define-slots/0.0.1_vue@3.2.41: - resolution: {integrity: sha512-Qdo7H0GI9cRBDDUpws8a7e/E8se1a2JqrR88JIHJCCiUAThLex66o64+tUa19EAVgO/0c877n5rQKZobALwEew==} + /@vue-macros/define-slots/0.0.4_vue@3.2.41: + resolution: {integrity: sha512-AAUz85J1ZL9Lsq3omhwkBe1p95L/VHixdcBonmt1jTCpjpCMmDWUmzl4iPh5pRMkk0D1lfvm5V/m0D68YqKZIg==} engines: {node: '>=14.19.0'} peerDependencies: vue: ^2.7.0 || ^3.0.0 dependencies: '@rollup/pluginutils': 4.2.1 - '@vue-macros/common': 0.12.3 - unplugin: 0.9.6 + '@vue-macros/common': 0.13.2 + unplugin: 0.10.2 vue: 3.2.41 dev: true - /@vue-macros/hoist-static/0.12.3: - resolution: {integrity: sha512-TdwTg8rZvbz4nJlEdzZBaZ7V+89x4WgHm9A1HM0O2oMaARUKUJWGEJHTEA3Qpgs5//kVylJRITiCTgUKvJAWbw==} + /@vue-macros/hoist-static/0.12.6: + resolution: {integrity: sha512-TeF6Dbug2PHaDuHd4VaiL+wPx58yJwaZyPhHA7IvGeo7xHh/nyXSj64aRMj3g5ovi38zXHHLvSb+yMNc3PYhBg==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 - '@vue-macros/common': 0.12.3 - unplugin: 0.9.6 + '@vue-macros/common': 0.13.2 + unplugin: 0.10.2 dev: true - /@vue-macros/named-template/0.0.1_fqlke5zd32z6y6rj5ddmcmlgue: - resolution: {integrity: sha512-o6FUkZJ5NaXJ9QRm0yyW+dJ6WI0p97pNQ042l8i5wp8iV5/bel52rMb7QPavvZxpNYrKhnkcJTN8F5W2ofwJlQ==} + /@vue-macros/named-template/0.0.4_4bxfdhtj34q3f6vjmpq7dc2fyi: + resolution: {integrity: sha512-Hq2QSfglJD73boibJvKXUyiQyI/Gd5bSIF74mzY1Ec1CXhoUO4nupZE+0Ue/qk8Fq5XjUXYDGd2c/SCckBlK9w==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 - '@vitejs/plugin-vue': 3.1.2_vite@3.1.8+vue@3.2.41 - '@vue-macros/common': 0.12.3 + '@vitejs/plugin-vue': 3.2.0_vite@3.2.2+vue@3.2.41 + '@vue-macros/common': 0.13.2 '@vue/compiler-dom': 3.2.41 - unplugin: 0.9.6 - unplugin-combine: 0.2.5_rollup@2.79.1+vite@3.1.8 + unplugin: 0.10.2 + unplugin-combine: 0.2.8_rollup@2.79.1+vite@3.2.2 transitivePeerDependencies: - esbuild - rollup @@ -1405,45 +1449,51 @@ packages: - webpack dev: true - /@vue-macros/setup-component/0.12.3: - resolution: {integrity: sha512-wKSrBY/HFpKiydMqj0uyAeB3tiPwCT1SV4GoQwUimktEaVpvEx6Zo6ZTdlX7mSlFBGeL2MQEL1OmHMrJ5j1ncQ==} + /@vue-macros/setup-component/0.12.6_rollup@2.79.1+vite@3.2.2: + resolution: {integrity: sha512-oYknsBrC13HzZI9xvFz51KeQ8eOzCuki8wpT7BFOub33d9gJuvynpmqLl45FHSw2AJo8UA6vaKi6ef74JMukRg==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 - '@vue-macros/common': 0.12.3 - unplugin: 0.9.6 + '@vue-macros/common': 0.13.2 + unplugin: 0.10.2 + unplugin-combine: 0.2.8_rollup@2.79.1+vite@3.2.2 + transitivePeerDependencies: + - esbuild + - rollup + - vite + - webpack dev: true - /@vue-macros/setup-sfc/0.12.3: - resolution: {integrity: sha512-ppxmCZfc2oNVqj2/qq3jLA7mW+1jLRuu4f/mj/sPtlp0SVRE6OlgQe6ngrczGPmhT8yRVLjBrstMPWNTFQDLCQ==} + /@vue-macros/setup-sfc/0.12.6: + resolution: {integrity: sha512-V7jXQ2sTTcxE4c+BTaWExd2kMi5w5qnJMjyzRPbQUTDf/KWNtPznTCxcmb9wVyJQRrrKfg61VYqpQ1jAtiDFoQ==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 - '@vue-macros/common': 0.12.3 - unplugin: 0.9.6 + '@vue-macros/common': 0.13.2 + unplugin: 0.10.2 dev: true - /@vue-macros/short-emits/0.12.4: - resolution: {integrity: sha512-8DcVobiMkjxZ7EjsDEuABJ88s3cB7RtMMqQVNOGG667k73PQKhdraz/ZKNYpPStGQD/0Cn2DDH3fqAKTc+vvwg==} + /@vue-macros/short-emits/0.12.7: + resolution: {integrity: sha512-CGy7Za/caP3WejNsHg4Si2bHeqxl2piv7Bf7TAMI/+948FuizQUFI8dRiv6dEQ8rGvegsU2BuTYH8JNDyzAK1A==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 - '@vue-macros/common': 0.12.3 - unplugin: 0.9.6 + '@vue-macros/common': 0.13.2 + unplugin: 0.10.2 dev: true /@vue/babel-helper-vue-transform-on/1.0.2: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} dev: true - /@vue/babel-plugin-jsx/1.1.1_@babel+core@7.19.3: + /@vue/babel-plugin-jsx/1.1.1_@babel+core@7.19.6: resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} dependencies: '@babel/helper-module-imports': 7.18.6 - '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.19.3 + '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.19.6 '@babel/template': 7.18.10 '@babel/traverse': 7.19.3 - '@babel/types': 7.19.3 + '@babel/types': 7.19.4 '@vue/babel-helper-vue-transform-on': 1.0.2 camelcase: 6.3.0 html-tags: 3.2.0 @@ -1762,7 +1812,7 @@ packages: '@windicss/config': 1.8.8 debug: 4.3.4 fast-glob: 3.2.12 - magic-string: 0.26.6 + magic-string: 0.26.7 micromatch: 4.0.5 windicss: 3.5.6 transitivePeerDependencies: @@ -1953,12 +2003,12 @@ packages: engines: {node: '>=0.10.0'} dev: true - /ast-walker-scope/0.2.3: - resolution: {integrity: sha512-9reB+iYF6jCCDqKDNNQI8iA2MJcy0jCLvEjfya72F7Zai5i2CB8hk9K/kzkZhagja9othQCFPEvQW11LhPKjmg==} + /ast-walker-scope/0.3.0: + resolution: {integrity: sha512-bsOBv3jB+1kGaxwPHhkLiagS+75KfzEqtkNWvATgMGtXM6kJZG3PlG4fYQFMiHeLpoAkwc6G61w07+hEXx39aA==} engines: {node: '>=14.19.0'} dependencies: - '@babel/parser': 7.19.3 - '@babel/types': 7.19.4 + '@babel/parser': 7.20.0 + '@babel/types': 7.20.0 dev: true /astral-regex/2.0.0: @@ -1984,15 +2034,15 @@ packages: hasBin: true dev: true - /autoprefixer/10.4.12_postcss@8.4.18: - resolution: {integrity: sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==} + /autoprefixer/10.4.13_postcss@8.4.18: + resolution: {integrity: sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==} engines: {node: ^10 || ^12 || >=14} hasBin: true peerDependencies: postcss: ^8.1.0 dependencies: browserslist: 4.21.4 - caniuse-lite: 1.0.30001418 + caniuse-lite: 1.0.30001427 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -2118,7 +2168,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001418 + caniuse-lite: 1.0.30001427 electron-to-chromium: 1.4.276 node-releases: 2.0.6 update-browserslist-db: 1.0.10_browserslist@4.21.4 @@ -2194,8 +2244,8 @@ packages: engines: {node: '>=10'} dev: true - /caniuse-lite/1.0.30001418: - resolution: {integrity: sha512-oIs7+JL3K9JRQ3jPZjlH6qyYDp+nBTCais7hjh0s+fuBwufc7uZ7hPYMXrDOJhV360KGMTcczMRObk0/iMqZRg==} + /caniuse-lite/1.0.30001427: + resolution: {integrity: sha512-lfXQ73oB9c8DP5Suxaszm+Ta2sr/4tf8+381GkIm1MLj/YdLf+rEDyDSRCzeltuyTVGm+/s18gdZ0q+Wmp8VsQ==} dev: true /capital-case/1.0.4: @@ -3237,9 +3287,9 @@ packages: eslint: 8.26.0 dev: true - /eslint-define-config/1.8.0: - resolution: {integrity: sha512-YibjbNkHKMo3QAnV3bgc+BdvmYCcCpuoRdAIc+6W/P91G02ZOrCVaPrco9Uf4md25NanjkV2bnfwce8XfPRS7A==} - engines: {node: '>= 14.6.0', npm: '>= 6.0.0', pnpm: '>= 7.0.0'} + /eslint-define-config/1.11.0: + resolution: {integrity: sha512-J5xNmL5EyXJzrRCGuyr8eKia2boFnJl3Lzurrv1tpM3oxtNONlp9/HW+zRFZ6+W3U7BQDCtnLunGmyCCtFHioQ==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13', pnpm: '>= 7.0.0'} dev: true /eslint-plugin-prettier/4.2.1_aniwkeyvlpmwkidetuytnokvcm: @@ -3259,8 +3309,8 @@ packages: prettier-linter-helpers: 1.0.0 dev: true - /eslint-plugin-vue/9.6.0_eslint@8.26.0: - resolution: {integrity: sha512-zzySkJgVbFCylnG2+9MDF7N+2Rjze2y0bF8GyUNpFOnT8mCMfqqtLDJkHBuYu9N/psW1A6DVbQhPkP92E+qakA==} + /eslint-plugin-vue/9.7.0_eslint@8.26.0: + resolution: {integrity: sha512-DrOO3WZCZEwcLsnd3ohFwqCoipGRSTKTBTnLwdhqAbYZtzWl0o7D+D8ZhlmiZvABKTEl8AFsqH1GHGdybyoQmw==} engines: {node: ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 @@ -4758,13 +4808,6 @@ packages: dependencies: sourcemap-codec: 1.4.8 - /magic-string/0.26.6: - resolution: {integrity: sha512-6d+3bFybzyQFJYSoRsl9ZC0wheze8M1LrQC7tNMRqXR4izUTDOLMd9BtSuExK9iAukFh+s5K0WAhc/dlQ+HKYA==} - engines: {node: '>=12'} - dependencies: - sourcemap-codec: 1.4.8 - dev: true - /magic-string/0.26.7: resolution: {integrity: sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==} engines: {node: '>=12'} @@ -5041,6 +5084,10 @@ packages: - supports-color dev: true + /natural-compare-lite/1.4.0: + resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==} + dev: true + /natural-compare/1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true @@ -5885,14 +5932,6 @@ packages: - supports-color dev: true - /rollup/2.78.1: - resolution: {integrity: sha512-VeeCgtGi4P+o9hIg+xz4qQpRl6R401LWEXBmxYKOV4zlF82lyhgh2hTZnheFUbANE8l2A41F458iwj2vEYaXJg==} - engines: {node: '>=10.0.0'} - hasBin: true - optionalDependencies: - fsevents: 2.3.2 - dev: true - /rollup/2.79.1: resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==} engines: {node: '>=10.0.0'} @@ -6691,8 +6730,8 @@ packages: engines: {node: '>= 10.0.0'} dev: true - /unplugin-combine/0.2.5_rollup@2.79.1+vite@3.1.8: - resolution: {integrity: sha512-25XxqY7BVYR7788FhKfXZiLXrd3WMn6nTm3a7sHsb94chwTLseEdkOIIh7FnqhGuDiHKc1km508G+U1fbCNYNw==} + /unplugin-combine/0.2.8_rollup@2.79.1+vite@3.2.2: + resolution: {integrity: sha512-Z38AC/TEjXbVyZ5HjVqo+lADj0/dcfwWC0Z4y0LNhybJzJQwmcMxm+ZsqHY3faauj4YigmlRMdptR5JEW9RuLg==} engines: {node: '>=14.19.0'} peerDependencies: esbuild: '>=0.13' @@ -6712,37 +6751,38 @@ packages: '@antfu/utils': 0.6.0 rollup: 2.79.1 unplugin: 0.10.2 - vite: 3.1.8_less@4.1.3 + vite: 3.2.2_less@4.1.3 dev: true - /unplugin-vue-define-options/0.12.3: - resolution: {integrity: sha512-Jo4XFyW8so2BnVxMKa1hcarnMErp9vOueOrHLUHxf3ixZ98aHsatrg9uYGw3Ax9u4IqheIRslU2upvpTp9yunQ==} + /unplugin-vue-define-options/0.12.6: + resolution: {integrity: sha512-uD4JTJVTDTRUTwLaT39VZkQ3gMlCba166oweU3jZJeIk8ku4Fh7N7UFazVzRch4THHFBVQ6dHvqvs4oPuCcJjg==} engines: {node: '>=14.19.0'} dependencies: '@rollup/pluginutils': 4.2.1 - '@vue-macros/common': 0.12.3 - ast-walker-scope: 0.2.3 - unplugin: 0.9.6 + '@vue-macros/common': 0.13.2 + ast-walker-scope: 0.3.0 + unplugin: 0.10.2 dev: true - /unplugin-vue-macros/0.14.0_vzwbnacjq6rhyu4ywwt6bu33j4: - resolution: {integrity: sha512-Ve8kmHGskFAtrZVvhcCa2xQtNPCGCzaJmhYCCv+0PuSxDdVWIeyzEOEOzOM1aq6/rFxQ46iefJ7qdPjNlK8EXA==} + /unplugin-vue-macros/0.15.2_mbqnf624zbi2ta2juc2wzs2gvm: + resolution: {integrity: sha512-hFtUJRk9JE534S+mflAFh8QITOspACNCshVgn21NhdECRDAjyrp4xu+CzSIgKAob/xOgS7J2flLaOHSyqePSCQ==} engines: {node: '>=14.19.0'} peerDependencies: vue: ^2.7.0 || ^3.2.25 dependencies: '@rollup/pluginutils': 4.2.1 - '@vue-macros/define-model': 0.13.4_@vueuse+core@9.4.0 - '@vue-macros/define-render': 0.13.4_vue@3.2.41 - '@vue-macros/define-slots': 0.0.1_vue@3.2.41 - '@vue-macros/hoist-static': 0.12.3 - '@vue-macros/named-template': 0.0.1_fqlke5zd32z6y6rj5ddmcmlgue - '@vue-macros/setup-component': 0.12.3 - '@vue-macros/setup-sfc': 0.12.3 - '@vue-macros/short-emits': 0.12.4 + '@vue-macros/better-define': 0.0.3 + '@vue-macros/define-model': 0.13.7_@vueuse+core@9.4.0 + '@vue-macros/define-render': 0.13.7_vue@3.2.41 + '@vue-macros/define-slots': 0.0.4_vue@3.2.41 + '@vue-macros/hoist-static': 0.12.6 + '@vue-macros/named-template': 0.0.4_4bxfdhtj34q3f6vjmpq7dc2fyi + '@vue-macros/setup-component': 0.12.6_rollup@2.79.1+vite@3.2.2 + '@vue-macros/setup-sfc': 0.12.6 + '@vue-macros/short-emits': 0.12.7 local-pkg: 0.4.2 - unplugin-combine: 0.2.5_rollup@2.79.1+vite@3.1.8 - unplugin-vue-define-options: 0.12.3 + unplugin-combine: 0.2.8_rollup@2.79.1+vite@3.2.2 + unplugin-vue-define-options: 0.12.6 vue: 3.2.41 transitivePeerDependencies: - '@vueuse/core' @@ -6761,15 +6801,6 @@ packages: webpack-virtual-modules: 0.4.5 dev: true - /unplugin/0.9.6: - resolution: {integrity: sha512-YYLtfoNiie/lxswy1GOsKXgnLJTE27la/PeCGznSItk+8METYZErO+zzV9KQ/hXhPwzIJsfJ4s0m1Rl7ZCWZ4Q==} - dependencies: - acorn: 8.8.0 - chokidar: 3.5.3 - webpack-sources: 3.2.3 - webpack-virtual-modules: 0.4.5 - dev: true - /unset-value/1.0.0: resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==} engines: {node: '>=0.10.0'} @@ -6853,7 +6884,7 @@ packages: engines: {node: '>= 0.8'} dev: true - /vite-plugin-compression/0.5.1_vite@3.1.8: + /vite-plugin-compression/0.5.1_vite@3.2.2: resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==} peerDependencies: vite: '>=2.0.0' @@ -6861,12 +6892,12 @@ packages: chalk: 4.1.2 debug: 4.3.4 fs-extra: 10.1.0 - vite: 3.1.8_less@4.1.3 + vite: 3.2.2_less@4.1.3 transitivePeerDependencies: - supports-color dev: true - /vite-plugin-eslint/1.8.1_eslint@8.26.0+vite@3.1.8: + /vite-plugin-eslint/1.8.1_eslint@8.26.0+vite@3.2.2: resolution: {integrity: sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==} peerDependencies: eslint: '>=7' @@ -6876,10 +6907,10 @@ packages: '@types/eslint': 8.4.6 eslint: 8.26.0 rollup: 2.79.1 - vite: 3.1.8_less@4.1.3 + vite: 3.2.2_less@4.1.3 dev: true - /vite-plugin-html/3.2.0_vite@3.1.8: + /vite-plugin-html/3.2.0_vite@3.2.2: resolution: {integrity: sha512-2VLCeDiHmV/BqqNn5h2V+4280KRgQzCFN47cst3WiNK848klESPQnzuC3okH5XHtgwHH/6s1Ho/YV6yIO0pgoQ==} peerDependencies: vite: '>=2.0.0' @@ -6896,10 +6927,10 @@ packages: html-minifier-terser: 6.1.0 node-html-parser: 5.4.2 pathe: 0.2.0 - vite: 3.1.8_less@4.1.3 + vite: 3.2.2_less@4.1.3 dev: true - /vite-plugin-purge-icons/0.9.1_vite@3.1.8: + /vite-plugin-purge-icons/0.9.1_vite@3.2.2: resolution: {integrity: sha512-oS0Y9Iq6vGnTDVRzB8xJNhA/gGlyR0lfCICU6+9FRKdrO5PnT34fRjvd8YWEsegCrk91+w3GVZc0HJDj/dPp5Q==} engines: {node: '>= 12'} peerDependencies: @@ -6908,13 +6939,13 @@ packages: '@purge-icons/core': 0.9.1 '@purge-icons/generated': 0.9.0 rollup-plugin-purge-icons: 0.9.1 - vite: 3.1.8_less@4.1.3 + vite: 3.2.2_less@4.1.3 transitivePeerDependencies: - encoding - supports-color dev: true - /vite-plugin-style-import/2.0.0_vite@3.1.8: + /vite-plugin-style-import/2.0.0_vite@3.2.2: resolution: {integrity: sha512-qtoHQae5dSUQPo/rYz/8p190VU5y19rtBaeV7ryLa/AYAU/e9CG89NrN/3+k7MR8mJy/GPIu91iJ3zk9foUOSA==} peerDependencies: vite: '>=2.0.0' @@ -6926,10 +6957,10 @@ packages: fs-extra: 10.1.0 magic-string: 0.25.9 pathe: 0.2.0 - vite: 3.1.8_less@4.1.3 + vite: 3.2.2_less@4.1.3 dev: true - /vite-plugin-svg-icons/2.0.1_vite@3.1.8: + /vite-plugin-svg-icons/2.0.1_vite@3.2.2: resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==} peerDependencies: vite: '>=2.0.0' @@ -6942,12 +6973,12 @@ packages: pathe: 0.2.0 svg-baker: 1.7.0 svgo: 2.8.0 - vite: 3.1.8_less@4.1.3 + vite: 3.2.2_less@4.1.3 transitivePeerDependencies: - supports-color dev: true - /vite-plugin-windicss/1.8.8_vite@3.1.8: + /vite-plugin-windicss/1.8.8_vite@3.2.2: resolution: {integrity: sha512-iyu+ZX0NmhNEUaLPv7xtC+EFRBpWMmw0nhd9a9upayfuNG/thwslKiQKmRB7U/dG0k/2oWLvPDvN/B9i7oRgSA==} peerDependencies: vite: ^2.0.1 || ^3.0.0 @@ -6955,20 +6986,21 @@ packages: '@windicss/plugin-utils': 1.8.8 debug: 4.3.4 kolorist: 1.6.0 - vite: 3.1.8_less@4.1.3 + vite: 3.2.2_less@4.1.3 windicss: 3.5.6 transitivePeerDependencies: - supports-color dev: true - /vite/3.1.8_less@4.1.3: - resolution: {integrity: sha512-m7jJe3nufUbuOfotkntGFupinL/fmuTNuQmiVE7cH2IZMuf4UbfbGYMUT3jVWgGYuRVLY9j8NnrRqgw5rr5QTg==} + /vite/3.2.2_less@4.1.3: + resolution: {integrity: sha512-pLrhatFFOWO9kS19bQ658CnRYzv0WLbsPih6R+iFeEEhDOuYgYCX2rztUViMz/uy/V8cLCJvLFeiOK7RJEzHcw==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: less: '*' sass: '*' stylus: '*' + sugarss: '*' terser: ^5.4.0 peerDependenciesMeta: less: @@ -6977,6 +7009,8 @@ packages: optional: true stylus: optional: true + sugarss: + optional: true terser: optional: true dependencies: @@ -6984,7 +7018,7 @@ packages: less: 4.1.3 postcss: 8.4.18 resolve: 1.22.1 - rollup: 2.78.1 + rollup: 2.79.1 optionalDependencies: fsevents: 2.3.2 dev: true From 220e0316e07a0842664db4355b3c921104c67e22 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Tue, 1 Nov 2022 14:36:18 +0800 Subject: [PATCH 12/16] feat: vxe demo --- .../src/api/system/post/types.ts | 8 +- .../src/plugins/vxeTable/index.ts | 32 ++ .../src/views/system/post/index.vue | 409 ++++++++++++------ .../src/views/system/post/indexd.vue | 194 +++++++++ 4 files changed, 504 insertions(+), 139 deletions(-) create mode 100644 yudao-ui-admin-vue3/src/views/system/post/indexd.vue diff --git a/yudao-ui-admin-vue3/src/api/system/post/types.ts b/yudao-ui-admin-vue3/src/api/system/post/types.ts index 261553514..5d6a70c85 100644 --- a/yudao-ui-admin-vue3/src/api/system/post/types.ts +++ b/yudao-ui-admin-vue3/src/api/system/post/types.ts @@ -1,5 +1,5 @@ export type PostVO = { - id: number + id?: number name: string code: string sort: number @@ -11,11 +11,13 @@ export type PostVO = { export type PostPageReqVO = { code: string name: string - status: number + status?: number + pageSize?: number + pageNo?: number } export type PostExportReqVO = { code: string name: string - status: number + status?: number } diff --git a/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts b/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts index 53a9aad17..40831feee 100644 --- a/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts +++ b/yudao-ui-admin-vue3/src/plugins/vxeTable/index.ts @@ -53,14 +53,46 @@ VXETable.setup({ version: 0, // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据 zIndex: 1008, // 全局 zIndex 起始值，如果项目的的 z-index 样式值过大时就需要跟随设置更大，避免被遮挡 loadingText: '加载中...', // 全局loading提示内容，如果为null则不显示文本 + height: 600, table: { + border: 'inner', // 自动监听父元素的变化去重新计算表格 autoResize: true, emptyText: '暂无数据', // 鼠标移到行是否要高亮显示 highlightHoverRow: true }, + grid: { + toolbarConfig: { + refresh: true, + import: true, + export: true, + print: true, + zoom: true, + custom: true + }, + pagerConfig: { + border: false, + background: true, + autoHidden: true, + perfect: true, + pageSize: 10, + pagerCount: 7, + pageSizes: [5, 10, 15, 20, 50, 100, 200, 500], + layouts: [ + 'PrevJump', + 'PrevPage', + 'Jump', + 'PageCount', + 'NextPage', + 'NextJump', + 'Sizes', + 'Total' + ] + } + }, pager: { + background: true, autoHidden: false, perfect: true, pageSize: 10, diff --git a/yudao-ui-admin-vue3/src/views/system/post/index.vue b/yudao-ui-admin-vue3/src/views/system/post/index.vue index 4275ec15b..0b58abd8f 100644 --- a/yudao-ui-admin-vue3/src/views/system/post/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/post/index.vue @@ -1,139 +1,270 @@ -