From 14377705e7e3e4d7145be0a3becf267ac73bdd9c Mon Sep 17 00:00:00 2001 From: Netfan Date: Wed, 23 Apr 2025 12:20:52 +0800 Subject: [PATCH 01/28] fix: alert confirm state in beforeClose callback (#6019) --- packages/@core/ui-kit/popup-ui/src/alert/alert.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/@core/ui-kit/popup-ui/src/alert/alert.vue b/packages/@core/ui-kit/popup-ui/src/alert/alert.vue index 9b133ee1..6223ecd7 100644 --- a/packages/@core/ui-kit/popup-ui/src/alert/alert.vue +++ b/packages/@core/ui-kit/popup-ui/src/alert/alert.vue @@ -47,6 +47,10 @@ function onAlertClosed() { isConfirm.value = false; } +function onEscapeKeyDown() { + isConfirm.value = false; +} + const getIconRender = computed(() => { let iconRender: Component | null = null; if (props.icon) { @@ -116,13 +120,11 @@ function handleCancel() { const loading = ref(false); async function handleOpenChange(val: boolean) { - const confirmState = isConfirm.value; - isConfirm.value = false; - await nextTick(); + await nextTick(); // 等待标记isConfirm状态 if (!val && props.beforeClose) { loading.value = true; try { - const res = await props.beforeClose({ isConfirm: confirmState }); + const res = await props.beforeClose({ isConfirm: isConfirm.value }); if (res !== false) { open.value = false; } @@ -142,6 +144,7 @@ async function handleOpenChange(val: boolean) { :overlay-blur="overlayBlur" @opened="emits('opened')" @closed="onAlertClosed" + @escape-key-down="onEscapeKeyDown" :class=" cn( containerClass, From 5ffd7db8e0b57b27545049200191acf63dc2e9cb Mon Sep 17 00:00:00 2001 From: panda7 Date: Fri, 25 Apr 2025 08:35:03 +0800 Subject: [PATCH 02/28] fix: the initial value echo for the check-button-group (#6029) Co-authored-by: sqchen <9110848@qq.com> --- .../shadcn-ui/src/components/button/check-button-group.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue b/packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue index 834b883f..c29cea5a 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue @@ -41,7 +41,6 @@ watch( innerValue.value.length > 0 ? innerValue.value[0] : undefined; } }, - { immediate: true }, ); watch( @@ -60,7 +59,7 @@ watch( innerValue.value = val === undefined ? [] : [val as ValueType]; } }, - { deep: true }, + { deep: true, immediate: true }, ); async function onBtnClick(value: ValueType) { From cb45987fe2bd69fb013c8a849f5bdd6deaa0896d Mon Sep 17 00:00:00 2001 From: Netfan Date: Fri, 25 Apr 2025 11:44:47 +0800 Subject: [PATCH 03/28] docs: update example (#6036) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 跟进后端菜单逻辑的修改,现已无需传递basicLayout布局 --- docs/src/guide/in-depth/access.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/src/guide/in-depth/access.md b/docs/src/guide/in-depth/access.md index be7d2ba0..0dbd0819 100644 --- a/docs/src/guide/in-depth/access.md +++ b/docs/src/guide/in-depth/access.md @@ -114,8 +114,6 @@ async function generateAccess(options: GenerateMenuAndRoutesOptions) { ```ts const dashboardMenus = [ { - // 这里固定写死 BasicLayout,不可更改 - component: 'BasicLayout', meta: { order: -1, title: 'page.dashboard.title', @@ -144,6 +142,16 @@ const dashboardMenus = [ }, ], }, + { + name: 'Test', + path: '/test', + component: '/test/index', + meta: { + title: 'page.test', + // 部分特殊页面如果不需要基础布局(页面顶部和侧边栏),可将noBasicLayout设置为true + noBasicLayout: true, + }, + }, ]; ``` From be840460d891bb6e446a8a319f36e5766435e475 Mon Sep 17 00:00:00 2001 From: Netfan Date: Fri, 25 Apr 2025 23:37:03 +0800 Subject: [PATCH 04/28] feat: vbenSelect support prop `allowClear` (#6043) --- .../src/components/select/select.vue | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue b/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue index 66525c02..24b8ea2a 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue @@ -1,4 +1,6 @@ diff --git a/apps/web-antd/src/views/bpm/task/done/index.vue b/apps/web-antd/src/views/bpm/task/done/index.vue index b23eef1e..bd5ffef0 100644 --- a/apps/web-antd/src/views/bpm/task/done/index.vue +++ b/apps/web-antd/src/views/bpm/task/done/index.vue @@ -1,21 +1,40 @@ \ No newline at end of file + diff --git a/apps/web-antd/src/views/bpm/task/manager/index.vue b/apps/web-antd/src/views/bpm/task/manager/index.vue index d564ebbd..0da6999b 100644 --- a/apps/web-antd/src/views/bpm/task/manager/index.vue +++ b/apps/web-antd/src/views/bpm/task/manager/index.vue @@ -1,18 +1,31 @@ \ No newline at end of file + diff --git a/apps/web-antd/src/views/bpm/task/todo/index.vue b/apps/web-antd/src/views/bpm/task/todo/index.vue index 976ddc01..9829b2ee 100644 --- a/apps/web-antd/src/views/bpm/task/todo/index.vue +++ b/apps/web-antd/src/views/bpm/task/todo/index.vue @@ -1,21 +1,40 @@ \ No newline at end of file + From 3e6d9cb1cdca9af643baaee68192a4a71c300947 Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Mon, 28 Apr 2025 11:42:33 +0800 Subject: [PATCH 25/28] feat: add useVbenForm common config class --- apps/web-antd/src/views/bpm/category/data.ts | 1 - apps/web-antd/src/views/infra/config/modules/form.vue | 7 +++++++ .../src/views/infra/dataSourceConfig/modules/form.vue | 7 +++++++ .../src/views/infra/demo/demo01/modules/form.vue | 7 +++++++ apps/web-antd/src/views/infra/demo/demo02/data.ts | 1 - .../src/views/infra/demo/demo02/modules/form.vue | 7 +++++++ .../demo/demo03/erp/modules/demo03-course-form.vue | 7 +++++++ .../demo/demo03/erp/modules/demo03-grade-form.vue | 7 +++++++ .../src/views/infra/demo/demo03/erp/modules/form.vue | 7 +++++++ .../views/infra/demo/demo03/inner/modules/form.vue | 7 +++++++ .../views/infra/demo/demo03/normal/modules/form.vue | 7 +++++++ apps/web-antd/src/views/infra/file/modules/form.vue | 11 ++++++++--- apps/web-antd/src/views/infra/fileConfig/data.ts | 2 -- .../src/views/infra/fileConfig/modules/form.vue | 6 +++++- apps/web-antd/src/views/infra/job/data.ts | 3 --- apps/web-antd/src/views/infra/job/modules/form.vue | 10 +++++++--- apps/web-antd/src/views/system/dict/data.ts | 1 - apps/web-antd/src/views/system/menu/data.ts | 1 - .../web-antd/src/views/system/notify/template/data.ts | 1 - apps/web-antd/src/views/system/role/modules/form.vue | 2 ++ 20 files changed, 85 insertions(+), 17 deletions(-) diff --git a/apps/web-antd/src/views/bpm/category/data.ts b/apps/web-antd/src/views/bpm/category/data.ts index cc7b6504..179eefc0 100644 --- a/apps/web-antd/src/views/bpm/category/data.ts +++ b/apps/web-antd/src/views/bpm/category/data.ts @@ -63,7 +63,6 @@ export function useFormSchema(): VbenFormSchema[] { component: 'InputNumber', componentProps: { min: 0, - class: 'w-full', controlsPosition: 'right', placeholder: '请输入分类排序', }, diff --git a/apps/web-antd/src/views/infra/config/modules/form.vue b/apps/web-antd/src/views/infra/config/modules/form.vue index e52d9192..389648c6 100644 --- a/apps/web-antd/src/views/infra/config/modules/form.vue +++ b/apps/web-antd/src/views/infra/config/modules/form.vue @@ -22,6 +22,13 @@ const getTitle = computed(() => { }); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + }, layout: 'horizontal', schema: useFormSchema(), showDefaultActions: false, diff --git a/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue b/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue index 4439400a..ab66b86b 100644 --- a/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue +++ b/apps/web-antd/src/views/infra/dataSourceConfig/modules/form.vue @@ -26,6 +26,13 @@ const getTitle = computed(() => { }); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + }, layout: 'horizontal', schema: useFormSchema(), showDefaultActions: false, diff --git a/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue index 452fc704..b9b5ea2d 100644 --- a/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue +++ b/apps/web-antd/src/views/infra/demo/demo01/modules/form.vue @@ -26,6 +26,13 @@ const getTitle = computed(() => { }); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + }, layout: 'horizontal', schema: useFormSchema(), showDefaultActions: false, diff --git a/apps/web-antd/src/views/infra/demo/demo02/data.ts b/apps/web-antd/src/views/infra/demo/demo02/data.ts index 73aaec1a..adf23bce 100644 --- a/apps/web-antd/src/views/infra/demo/demo02/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo02/data.ts @@ -36,7 +36,6 @@ export function useFormSchema(): VbenFormSchema[] { }); return handleTree(data); }, - class: 'w-full', labelField: 'name', valueField: 'id', childrenField: 'children', diff --git a/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue index f3d5114b..3d38f5ba 100644 --- a/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue +++ b/apps/web-antd/src/views/infra/demo/demo02/modules/form.vue @@ -31,6 +31,13 @@ const getTitle = computed(() => { }); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + }, layout: 'horizontal', schema: useFormSchema(), showDefaultActions: false, diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-form.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-form.vue index 2d208959..d98f4fa1 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-form.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-course-form.vue @@ -26,6 +26,13 @@ const getTitle = computed(() => { }); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + }, layout: 'horizontal', schema: useDemo03CourseFormSchema(), showDefaultActions: false, diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-form.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-form.vue index 153daadc..4b134e20 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-form.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/demo03-grade-form.vue @@ -26,6 +26,13 @@ const getTitle = computed(() => { }); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + }, layout: 'horizontal', schema: useDemo03GradeFormSchema(), showDefaultActions: false, diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue index f7201765..8fee6aa2 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/erp/modules/form.vue @@ -26,6 +26,13 @@ const getTitle = computed(() => { }); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + }, layout: 'horizontal', schema: useFormSchema(), showDefaultActions: false, diff --git a/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue index c834daee..1c5e6509 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/inner/modules/form.vue @@ -33,6 +33,13 @@ const demo03CourseFormRef = ref>(); const demo03GradeFormRef = ref>(); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + }, layout: 'horizontal', schema: useFormSchema(), showDefaultActions: false, diff --git a/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue b/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue index 0eaa4ab6..52022688 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue +++ b/apps/web-antd/src/views/infra/demo/demo03/normal/modules/form.vue @@ -33,6 +33,13 @@ const demo03CourseFormRef = ref>(); const demo03GradeFormRef = ref>(); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + }, layout: 'horizontal', schema: useFormSchema(), showDefaultActions: false, diff --git a/apps/web-antd/src/views/infra/file/modules/form.vue b/apps/web-antd/src/views/infra/file/modules/form.vue index 42992ed3..9eb497e4 100644 --- a/apps/web-antd/src/views/infra/file/modules/form.vue +++ b/apps/web-antd/src/views/infra/file/modules/form.vue @@ -14,12 +14,17 @@ import { useFormSchema } from '../data'; const emit = defineEmits(['success']); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + hideLabel: true, + }, layout: 'horizontal', schema: useFormSchema().map((item) => ({ ...item, label: '' })), // 去除label showDefaultActions: false, - commonConfig: { - hideLabel: true, - }, }); const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/infra/fileConfig/data.ts b/apps/web-antd/src/views/infra/fileConfig/data.ts index bdf80d62..fec4f28f 100644 --- a/apps/web-antd/src/views/infra/fileConfig/data.ts +++ b/apps/web-antd/src/views/infra/fileConfig/data.ts @@ -36,7 +36,6 @@ export function useFormSchema(): VbenFormSchema[] { componentProps: { options: getDictOptions(DICT_TYPE.INFRA_FILE_STORAGE, 'number'), placeholder: '请选择存储器', - class: 'w-full', }, rules: 'required', dependencies: { @@ -87,7 +86,6 @@ export function useFormSchema(): VbenFormSchema[] { component: 'InputNumber', componentProps: { min: 0, - class: 'w-full', controlsPosition: 'right', placeholder: '请输入主机端口', }, diff --git a/apps/web-antd/src/views/infra/fileConfig/modules/form.vue b/apps/web-antd/src/views/infra/fileConfig/modules/form.vue index 59776c67..a7393833 100644 --- a/apps/web-antd/src/views/infra/fileConfig/modules/form.vue +++ b/apps/web-antd/src/views/infra/fileConfig/modules/form.vue @@ -27,7 +27,11 @@ const getTitle = computed(() => { const [Form, formApi] = useVbenForm({ commonConfig: { - labelWidth: 120, + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, }, layout: 'horizontal', schema: useFormSchema(), diff --git a/apps/web-antd/src/views/infra/job/data.ts b/apps/web-antd/src/views/infra/job/data.ts index 4be98ecb..953f7ba9 100644 --- a/apps/web-antd/src/views/infra/job/data.ts +++ b/apps/web-antd/src/views/infra/job/data.ts @@ -65,7 +65,6 @@ export function useFormSchema(): VbenFormSchema[] { componentProps: { placeholder: '请输入重试次数。设置为 0 时,不进行重试', min: 0, - class: 'w-full', }, rules: 'required', }, @@ -76,7 +75,6 @@ export function useFormSchema(): VbenFormSchema[] { componentProps: { placeholder: '请输入重试间隔,单位:毫秒。设置为 0 时,无需间隔', min: 0, - class: 'w-full', }, rules: 'required', }, @@ -87,7 +85,6 @@ export function useFormSchema(): VbenFormSchema[] { componentProps: { placeholder: '请输入监控超时时间,单位:毫秒', min: 0, - class: 'w-full', }, }, ]; diff --git a/apps/web-antd/src/views/infra/job/modules/form.vue b/apps/web-antd/src/views/infra/job/modules/form.vue index 5c81d9f7..31653a8e 100644 --- a/apps/web-antd/src/views/infra/job/modules/form.vue +++ b/apps/web-antd/src/views/infra/job/modules/form.vue @@ -22,12 +22,16 @@ const getTitle = computed(() => { }); const [Form, formApi] = useVbenForm({ + commonConfig: { + componentProps: { + class: 'w-full', + }, + formItemClass: 'col-span-2', + labelWidth: 80, + }, layout: 'horizontal', schema: useFormSchema(), showDefaultActions: false, - commonConfig: { - labelWidth: 140, - }, }); const [Modal, modalApi] = useVbenModal({ diff --git a/apps/web-antd/src/views/system/dict/data.ts b/apps/web-antd/src/views/system/dict/data.ts index cbbc7f27..78f0ee52 100644 --- a/apps/web-antd/src/views/system/dict/data.ts +++ b/apps/web-antd/src/views/system/dict/data.ts @@ -204,7 +204,6 @@ export function useDataFormSchema(): VbenFormSchema[] { return { api: getSimpleDictTypeList, placeholder: '请输入字典类型', - class: 'w-full', labelField: 'name', valueField: 'type', disabled: !!values.id, diff --git a/apps/web-antd/src/views/system/menu/data.ts b/apps/web-antd/src/views/system/menu/data.ts index 0821ddf9..6b0336e6 100644 --- a/apps/web-antd/src/views/system/menu/data.ts +++ b/apps/web-antd/src/views/system/menu/data.ts @@ -166,7 +166,6 @@ export function useFormSchema(): VbenFormSchema[] { component: 'AutoComplete', componentProps: { allowClear: true, - class: 'w-full', filterOption(input: string, option: { value: string }) { return option.value.toLowerCase().includes(input.toLowerCase()); }, diff --git a/apps/web-antd/src/views/system/notify/template/data.ts b/apps/web-antd/src/views/system/notify/template/data.ts index 123c5fb5..0a347d21 100644 --- a/apps/web-antd/src/views/system/notify/template/data.ts +++ b/apps/web-antd/src/views/system/notify/template/data.ts @@ -200,7 +200,6 @@ export function useSendNotifyFormSchema(): VbenFormSchema[] { component: 'ApiSelect', componentProps: { api: getSimpleUserList, - class: 'w-full', labelField: 'nickname', valueField: 'id', placeholder: '请选择接收人', diff --git a/apps/web-antd/src/views/system/role/modules/form.vue b/apps/web-antd/src/views/system/role/modules/form.vue index ae24bd6f..30c16984 100644 --- a/apps/web-antd/src/views/system/role/modules/form.vue +++ b/apps/web-antd/src/views/system/role/modules/form.vue @@ -26,6 +26,8 @@ const [Form, formApi] = useVbenForm({ componentProps: { class: 'w-full', }, + formItemClass: 'col-span-2', + labelWidth: 80, }, layout: 'horizontal', schema: useFormSchema(), From afd22aefbb1a8eb2b9bd52493574ac3c7be3ab1f Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Mon, 28 Apr 2025 15:04:01 +0800 Subject: [PATCH 26/28] =?UTF-8?q?fix:=20VxeTableGridOptions=20=E4=BB=8E=20?= =?UTF-8?q?#/adapter/vxe-table=20=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/views/infra/demo/demo01/data.ts | 4 +--- apps/web-antd/src/views/infra/demo/demo02/data.ts | 4 +--- apps/web-antd/src/views/infra/demo/demo03/erp/data.ts | 4 +--- apps/web-antd/src/views/infra/demo/demo03/inner/data.ts | 4 +--- apps/web-antd/src/views/infra/demo/demo03/normal/data.ts | 4 +--- apps/web-antd/src/views/system/area/data.ts | 3 +-- apps/web-antd/src/views/system/dept/data.ts | 4 +--- playground/src/views/system/dept/data.ts | 4 +--- 8 files changed, 8 insertions(+), 23 deletions(-) diff --git a/apps/web-antd/src/views/infra/demo/demo01/data.ts b/apps/web-antd/src/views/infra/demo/demo01/data.ts index 3033dec4..fd6b2151 100644 --- a/apps/web-antd/src/views/infra/demo/demo01/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo01/data.ts @@ -1,7 +1,5 @@ -import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; - import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn } from '#/adapter/vxe-table'; +import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo01ContactApi } from '#/api/infra/demo/demo01'; import { useAccess } from '@vben/access'; diff --git a/apps/web-antd/src/views/infra/demo/demo02/data.ts b/apps/web-antd/src/views/infra/demo/demo02/data.ts index adf23bce..c5e6b211 100644 --- a/apps/web-antd/src/views/infra/demo/demo02/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo02/data.ts @@ -1,7 +1,5 @@ -import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; - import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn } from '#/adapter/vxe-table'; +import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo02CategoryApi } from '#/api/infra/demo/demo02'; import { useAccess } from '@vben/access'; diff --git a/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts b/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts index 897d2813..22baa000 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo03/erp/data.ts @@ -1,7 +1,5 @@ -import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; - import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn } from '#/adapter/vxe-table'; +import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/erp'; import { useAccess } from '@vben/access'; diff --git a/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts b/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts index a40a4f5f..53bad6dc 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo03/inner/data.ts @@ -1,7 +1,5 @@ -import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; - import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn } from '#/adapter/vxe-table'; +import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/inner'; import { useAccess } from '@vben/access'; diff --git a/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts b/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts index ee65fee1..0134bca9 100644 --- a/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts +++ b/apps/web-antd/src/views/infra/demo/demo03/normal/data.ts @@ -1,7 +1,5 @@ -import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; - import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn } from '#/adapter/vxe-table'; +import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { Demo03StudentApi } from '#/api/infra/demo/demo03/normal'; import { useAccess } from '@vben/access'; diff --git a/apps/web-antd/src/views/system/area/data.ts b/apps/web-antd/src/views/system/area/data.ts index 46aceccd..48339f19 100644 --- a/apps/web-antd/src/views/system/area/data.ts +++ b/apps/web-antd/src/views/system/area/data.ts @@ -1,6 +1,5 @@ -import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; - import type { VbenFormSchema } from '#/adapter/form'; +import type { VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemAreaApi } from '#/api/system/area'; /** 查询 IP 的表单 */ diff --git a/apps/web-antd/src/views/system/dept/data.ts b/apps/web-antd/src/views/system/dept/data.ts index 5010d14b..f868c625 100644 --- a/apps/web-antd/src/views/system/dept/data.ts +++ b/apps/web-antd/src/views/system/dept/data.ts @@ -1,7 +1,5 @@ -import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; - import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn } from '#/adapter/vxe-table'; +import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemDeptApi } from '#/api/system/dept'; import { useAccess } from '@vben/access'; diff --git a/playground/src/views/system/dept/data.ts b/playground/src/views/system/dept/data.ts index 48773625..8c3e557a 100644 --- a/playground/src/views/system/dept/data.ts +++ b/playground/src/views/system/dept/data.ts @@ -1,7 +1,5 @@ -import type { VxeTableGridOptions } from '@vben/plugins/vxe-table'; - import type { VbenFormSchema } from '#/adapter/form'; -import type { OnActionClickFn } from '#/adapter/vxe-table'; +import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table'; import type { SystemDeptApi } from '#/api/system/dept'; import { z } from '#/adapter/form'; From c2af4fc83adb0f695f8cbad2d197505b3d26aa0f Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Mon, 28 Apr 2025 15:05:19 +0800 Subject: [PATCH 27/28] chore: cspell --- .vscode/settings.json | 13 +------------ cspell.json | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index da724dd1..8b76b276 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -223,16 +223,5 @@ "commentTranslate.multiLineMerge": true, "vue.server.hybridMode": true, "typescript.tsdk": "node_modules/typescript/lib", - "oxc.enable": false, - "cSpell.words": [ - "archiver", - "axios", - "dotenv", - "isequal", - "jspm", - "napi", - "nolebase", - "rollup", - "vitest" - ] + "oxc.enable": false } diff --git a/cspell.json b/cspell.json index 89545b43..ea6130a7 100644 --- a/cspell.json +++ b/cspell.json @@ -52,7 +52,21 @@ "vitepress", "vnode", "vueuse", - "yxxx" + "yxxx", + "archiver", + "axios", + "cropperjs", + "dotenv", + "gitee", + "isequal", + "jspm", + "napi", + "nolebase", + "rollup", + "Tinymce", + "vitest", + "xingyu", + "yudao" ], "ignorePaths": [ "**/node_modules/**", From f4fe36e9d04f7e51f22d7fe9fcefbcc875cab4fc Mon Sep 17 00:00:00 2001 From: xingyu4j Date: Mon, 28 Apr 2025 15:06:12 +0800 Subject: [PATCH 28/28] chore: package lint --- apps/web-antd/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index 99188b2f..0e558986 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -45,7 +45,6 @@ "@vben/utils": "workspace:*", "@vueuse/core": "catalog:", "ant-design-vue": "catalog:", - "vxe-table": "catalog:", "cropperjs": "catalog:", "crypto-js": "catalog:", "dayjs": "catalog:", @@ -53,7 +52,8 @@ "pinia": "catalog:", "vue": "catalog:", "vue-dompurify-html": "catalog:", - "vue-router": "catalog:" + "vue-router": "catalog:", + "vxe-table": "catalog:" }, "devDependencies": { "@types/crypto-js": "catalog:"