From 4a393a192083ebabdbc66a7a3eb6b8007e18444a Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Thu, 17 Oct 2024 15:16:22 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/_core/profile/components/online-device.vue | 2 +- apps/web-antd/src/views/demo/demo/demo-modal.vue | 2 +- apps/web-antd/src/views/demo/demo/index.vue | 2 +- apps/web-antd/src/views/demo/tree/index.vue | 2 +- apps/web-antd/src/views/demo/tree/tree-modal.vue | 2 +- apps/web-antd/src/views/monitor/logininfor/data.tsx | 3 ++- apps/web-antd/src/views/monitor/logininfor/index.vue | 2 +- apps/web-antd/src/views/monitor/online/data.ts | 3 ++- apps/web-antd/src/views/monitor/online/index.vue | 2 +- apps/web-antd/src/views/monitor/operlog/data.tsx | 3 ++- apps/web-antd/src/views/monitor/operlog/index.vue | 2 +- apps/web-antd/src/views/system/client/client-drawer.vue | 2 +- apps/web-antd/src/views/system/client/data.tsx | 3 ++- apps/web-antd/src/views/system/client/index.vue | 2 +- apps/web-antd/src/views/system/config/config-modal.vue | 2 +- apps/web-antd/src/views/system/config/data.ts | 3 ++- apps/web-antd/src/views/system/config/index.vue | 2 +- apps/web-antd/src/views/system/dept/data.ts | 4 +++- apps/web-antd/src/views/system/dept/dept-drawer.vue | 2 +- apps/web-antd/src/views/system/dept/index.vue | 2 +- apps/web-antd/src/views/system/dict/data/data.ts | 3 ++- apps/web-antd/src/views/system/dict/data/dict-data-drawer.vue | 2 +- apps/web-antd/src/views/system/dict/data/index.vue | 2 +- apps/web-antd/src/views/system/dict/type/data.ts | 4 +++- apps/web-antd/src/views/system/dict/type/dict-type-modal.vue | 2 +- apps/web-antd/src/views/system/dict/type/index.vue | 2 +- apps/web-antd/src/views/system/menu/data.tsx | 4 +++- apps/web-antd/src/views/system/menu/index.vue | 2 +- apps/web-antd/src/views/system/menu/menu-drawer.vue | 2 +- apps/web-antd/src/views/system/notice/data.ts | 3 ++- apps/web-antd/src/views/system/notice/index.vue | 2 +- apps/web-antd/src/views/system/notice/notice-modal.vue | 2 +- apps/web-antd/src/views/system/oss-config/data.tsx | 4 +++- apps/web-antd/src/views/system/oss-config/index.vue | 2 +- .../src/views/system/oss-config/oss-config-drawer.vue | 2 +- apps/web-antd/src/views/system/oss/data.tsx | 4 +++- apps/web-antd/src/views/system/oss/index.vue | 2 +- apps/web-antd/src/views/system/post/data.ts | 4 +++- apps/web-antd/src/views/system/post/index.vue | 2 +- apps/web-antd/src/views/system/post/post-drawer.vue | 2 +- apps/web-antd/src/views/system/role-assign/data.tsx | 4 +++- apps/web-antd/src/views/system/role-assign/index.vue | 2 +- apps/web-antd/src/views/system/role/data.tsx | 3 ++- apps/web-antd/src/views/system/role/index.vue | 2 +- apps/web-antd/src/views/system/role/role-auth-modal.vue | 2 +- apps/web-antd/src/views/system/role/role-drawer.vue | 2 +- apps/web-antd/src/views/system/tenant/data.tsx | 4 +++- apps/web-antd/src/views/system/tenant/index.vue | 2 +- apps/web-antd/src/views/system/tenant/tenant-drawer.vue | 2 +- apps/web-antd/src/views/system/tenantPackage/data.ts | 4 +++- apps/web-antd/src/views/system/tenantPackage/index.vue | 2 +- .../src/views/system/tenantPackage/tenant-package-drawer.vue | 2 +- apps/web-antd/src/views/system/user/data.tsx | 4 +++- apps/web-antd/src/views/system/user/index.vue | 2 +- apps/web-antd/src/views/system/user/user-drawer.vue | 2 +- apps/web-antd/src/views/system/user/user-reset-pwd-modal.vue | 2 +- apps/web-antd/src/views/tool/gen/data.tsx | 4 +++- apps/web-antd/src/views/tool/gen/edit-steps/basic.tsx | 2 +- apps/web-antd/src/views/tool/gen/edit-steps/gen-config.vue | 2 +- apps/web-antd/src/views/tool/gen/edit-steps/gen-data.tsx | 2 +- apps/web-antd/src/views/tool/gen/index.vue | 2 +- apps/web-antd/src/views/tool/gen/table-import-modal.vue | 2 +- apps/web-antd/src/views/演示使用自行删除/sse/index.vue | 2 +- .../src/views/演示使用自行删除/sse/send-msg-modal.vue | 2 +- 64 files changed, 94 insertions(+), 64 deletions(-) diff --git a/apps/web-antd/src/views/_core/profile/components/online-device.vue b/apps/web-antd/src/views/_core/profile/components/online-device.vue index f882b6e6..db17878e 100644 --- a/apps/web-antd/src/views/_core/profile/components/online-device.vue +++ b/apps/web-antd/src/views/_core/profile/components/online-device.vue @@ -3,7 +3,7 @@ import type { Recordable } from '@vben/types'; import { Popconfirm } from 'ant-design-vue'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { forceLogout2, onlineDeviceList } from '#/api/monitor/online'; import { columns } from '#/views/monitor/online/data'; diff --git a/apps/web-antd/src/views/demo/demo/demo-modal.vue b/apps/web-antd/src/views/demo/demo/demo-modal.vue index 758cc031..8126362d 100755 --- a/apps/web-antd/src/views/demo/demo/demo-modal.vue +++ b/apps/web-antd/src/views/demo/demo/demo-modal.vue @@ -5,7 +5,7 @@ import { useVbenModal } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { cloneDeep } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { demoAdd, demoInfo, demoUpdate } from './api'; import { modalSchema } from './data'; diff --git a/apps/web-antd/src/views/demo/demo/index.vue b/apps/web-antd/src/views/demo/demo/index.vue index e7d6a4be..44ad7bc6 100644 --- a/apps/web-antd/src/views/demo/demo/index.vue +++ b/apps/web-antd/src/views/demo/demo/index.vue @@ -9,7 +9,7 @@ import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { downloadExcel } from '#/utils/file/download'; import { demoExport, demoList, demoRemove } from './api'; diff --git a/apps/web-antd/src/views/demo/tree/index.vue b/apps/web-antd/src/views/demo/tree/index.vue index 0b4452e3..d5829b12 100644 --- a/apps/web-antd/src/views/demo/tree/index.vue +++ b/apps/web-antd/src/views/demo/tree/index.vue @@ -8,7 +8,7 @@ import { getPopupContainer, listToTree } from '@vben/utils'; import { Popconfirm, Space } from 'ant-design-vue'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { treeList, treeRemove } from './api'; import { columns, querySchema } from './data'; diff --git a/apps/web-antd/src/views/demo/tree/tree-modal.vue b/apps/web-antd/src/views/demo/tree/tree-modal.vue index 00907d4d..bfe628c0 100755 --- a/apps/web-antd/src/views/demo/tree/tree-modal.vue +++ b/apps/web-antd/src/views/demo/tree/tree-modal.vue @@ -5,7 +5,7 @@ import { useVbenModal } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { cloneDeep, listToTree } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { treeAdd, treeInfo, treeList, treeUpdate } from './api'; import { modalSchema } from './data'; diff --git a/apps/web-antd/src/views/monitor/logininfor/data.tsx b/apps/web-antd/src/views/monitor/logininfor/data.tsx index 9f544f2d..7307dec9 100644 --- a/apps/web-antd/src/views/monitor/logininfor/data.tsx +++ b/apps/web-antd/src/views/monitor/logininfor/data.tsx @@ -1,10 +1,11 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; import type { DescItem } from '#/components/description'; import type { VNode } from 'vue'; import { DictEnum } from '@vben/constants'; +import { type FormSchemaGetter } from '#/adapter/form'; import { getDictOptions } from '#/utils/dict'; import { renderBrowserIcon, renderDict, renderOsIcon } from '#/utils/render'; diff --git a/apps/web-antd/src/views/monitor/logininfor/index.vue b/apps/web-antd/src/views/monitor/logininfor/index.vue index 00e8e014..31229e8d 100644 --- a/apps/web-antd/src/views/monitor/logininfor/index.vue +++ b/apps/web-antd/src/views/monitor/logininfor/index.vue @@ -9,7 +9,7 @@ import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { loginInfoClean, loginInfoExport, diff --git a/apps/web-antd/src/views/monitor/online/data.ts b/apps/web-antd/src/views/monitor/online/data.ts index b0f6bef8..efd10248 100644 --- a/apps/web-antd/src/views/monitor/online/data.ts +++ b/apps/web-antd/src/views/monitor/online/data.ts @@ -1,9 +1,10 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; import type { VNode } from 'vue'; import dayjs from 'dayjs'; +import { type FormSchemaGetter } from '#/adapter/form'; import { renderBrowserIcon, renderOsIcon } from '#/utils/render'; export const querySchema: FormSchemaGetter = () => [ diff --git a/apps/web-antd/src/views/monitor/online/index.vue b/apps/web-antd/src/views/monitor/online/index.vue index d004fb3c..5f147f71 100644 --- a/apps/web-antd/src/views/monitor/online/index.vue +++ b/apps/web-antd/src/views/monitor/online/index.vue @@ -6,7 +6,7 @@ import { getPopupContainer } from '@vben/utils'; import { Popconfirm } from 'ant-design-vue'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { forceLogout, onlineList } from '#/api/monitor/online'; import { columns, querySchema } from './data'; diff --git a/apps/web-antd/src/views/monitor/operlog/data.tsx b/apps/web-antd/src/views/monitor/operlog/data.tsx index 848dd97a..f5e693ed 100644 --- a/apps/web-antd/src/views/monitor/operlog/data.tsx +++ b/apps/web-antd/src/views/monitor/operlog/data.tsx @@ -1,10 +1,11 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; import type { DescItem } from '#/components/description'; import { DictEnum } from '@vben/constants'; import { Tag } from 'ant-design-vue'; +import { type FormSchemaGetter } from '#/adapter/form'; import { getDictOptions } from '#/utils/dict'; import { renderDict, diff --git a/apps/web-antd/src/views/monitor/operlog/index.vue b/apps/web-antd/src/views/monitor/operlog/index.vue index 66157f93..6721bf1f 100644 --- a/apps/web-antd/src/views/monitor/operlog/index.vue +++ b/apps/web-antd/src/views/monitor/operlog/index.vue @@ -12,7 +12,7 @@ import { Modal, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; import { isEmpty } from 'lodash-es'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { operLogClean, operLogDelete, diff --git a/apps/web-antd/src/views/system/client/client-drawer.vue b/apps/web-antd/src/views/system/client/client-drawer.vue index ed000753..cdfad0de 100644 --- a/apps/web-antd/src/views/system/client/client-drawer.vue +++ b/apps/web-antd/src/views/system/client/client-drawer.vue @@ -5,7 +5,7 @@ import { useVbenDrawer } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { cloneDeep } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { clientAdd, clientInfo, clientUpdate } from '#/api/system/client'; import { drawerSchema } from './data'; diff --git a/apps/web-antd/src/views/system/client/data.tsx b/apps/web-antd/src/views/system/client/data.tsx index 5bf7233e..4e9e6e3b 100644 --- a/apps/web-antd/src/views/system/client/data.tsx +++ b/apps/web-antd/src/views/system/client/data.tsx @@ -1,8 +1,9 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; import { DictEnum } from '@vben/constants'; import { getPopupContainer } from '@vben/utils'; +import { type FormSchemaGetter } from '#/adapter/form'; import { getDict, getDictOptions } from '#/utils/dict'; import { renderDict, renderDictTags } from '#/utils/render'; diff --git a/apps/web-antd/src/views/system/client/index.vue b/apps/web-antd/src/views/system/client/index.vue index 72f5c676..72766398 100644 --- a/apps/web-antd/src/views/system/client/index.vue +++ b/apps/web-antd/src/views/system/client/index.vue @@ -9,7 +9,7 @@ import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { clientChangeStatus, clientExport, diff --git a/apps/web-antd/src/views/system/config/config-modal.vue b/apps/web-antd/src/views/system/config/config-modal.vue index f639cae3..9569f0c5 100644 --- a/apps/web-antd/src/views/system/config/config-modal.vue +++ b/apps/web-antd/src/views/system/config/config-modal.vue @@ -5,7 +5,7 @@ import { useVbenModal } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { cloneDeep } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { configAdd, configInfo, configUpdate } from '#/api/system/config'; import { modalSchema } from './data'; diff --git a/apps/web-antd/src/views/system/config/data.ts b/apps/web-antd/src/views/system/config/data.ts index 01009d85..79aa6118 100644 --- a/apps/web-antd/src/views/system/config/data.ts +++ b/apps/web-antd/src/views/system/config/data.ts @@ -1,8 +1,9 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; import { DictEnum } from '@vben/constants'; import { getPopupContainer } from '@vben/utils'; +import { type FormSchemaGetter } from '#/adapter/form'; import { getDictOptions } from '#/utils/dict'; import { renderDict } from '#/utils/render'; diff --git a/apps/web-antd/src/views/system/config/index.vue b/apps/web-antd/src/views/system/config/index.vue index 4daf2244..2ecfb7d7 100644 --- a/apps/web-antd/src/views/system/config/index.vue +++ b/apps/web-antd/src/views/system/config/index.vue @@ -9,7 +9,7 @@ import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { configExport, configList, diff --git a/apps/web-antd/src/views/system/dept/data.ts b/apps/web-antd/src/views/system/dept/data.ts index d55ad4d8..5febdeae 100644 --- a/apps/web-antd/src/views/system/dept/data.ts +++ b/apps/web-antd/src/views/system/dept/data.ts @@ -1,7 +1,9 @@ +import type { VxeGridProps } from '#/adapter/vxe-table'; + import { DictEnum } from '@vben/constants'; import { getPopupContainer } from '@vben/utils'; -import { type FormSchemaGetter, type VxeGridProps, z } from '#/adapter'; +import { type FormSchemaGetter, z } from '#/adapter/form'; import { getDictOptions } from '#/utils/dict'; import { renderDict } from '#/utils/render'; diff --git a/apps/web-antd/src/views/system/dept/dept-drawer.vue b/apps/web-antd/src/views/system/dept/dept-drawer.vue index cc6aa314..3bf9e043 100644 --- a/apps/web-antd/src/views/system/dept/dept-drawer.vue +++ b/apps/web-antd/src/views/system/dept/dept-drawer.vue @@ -5,7 +5,7 @@ import { useVbenDrawer } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { addFullName, cloneDeep, listToTree } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { deptAdd, deptInfo, diff --git a/apps/web-antd/src/views/system/dept/index.vue b/apps/web-antd/src/views/system/dept/index.vue index ab9630fc..e54f492e 100644 --- a/apps/web-antd/src/views/system/dept/index.vue +++ b/apps/web-antd/src/views/system/dept/index.vue @@ -14,7 +14,7 @@ import { import { QuestionCircleOutlined } from '@ant-design/icons-vue'; import { Popconfirm, Space, Tooltip } from 'ant-design-vue'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { deptList, deptRemove } from '#/api/system/dept'; import { columns, querySchema } from './data'; diff --git a/apps/web-antd/src/views/system/dict/data/data.ts b/apps/web-antd/src/views/system/dict/data/data.ts index 8f6f86cd..8fcbd0d2 100644 --- a/apps/web-antd/src/views/system/dict/data/data.ts +++ b/apps/web-antd/src/views/system/dict/data/data.ts @@ -1,9 +1,10 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; import { reactive } from 'vue'; import { getPopupContainer } from '@vben/utils'; +import { type FormSchemaGetter } from '#/adapter/form'; import { dictOptionSelectList } from '#/api/system/dict/dict-type'; import { renderDictTag } from '#/utils/render'; diff --git a/apps/web-antd/src/views/system/dict/data/dict-data-drawer.vue b/apps/web-antd/src/views/system/dict/data/dict-data-drawer.vue index 421442d5..74c29f90 100644 --- a/apps/web-antd/src/views/system/dict/data/dict-data-drawer.vue +++ b/apps/web-antd/src/views/system/dict/data/dict-data-drawer.vue @@ -5,7 +5,7 @@ import { useVbenDrawer } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { cloneDeep } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { dictDataAdd, dictDataUpdate, diff --git a/apps/web-antd/src/views/system/dict/data/index.vue b/apps/web-antd/src/views/system/dict/data/index.vue index f86cc3a1..37708b8c 100644 --- a/apps/web-antd/src/views/system/dict/data/index.vue +++ b/apps/web-antd/src/views/system/dict/data/index.vue @@ -9,7 +9,7 @@ import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { dictDataExport, dictDataList, diff --git a/apps/web-antd/src/views/system/dict/type/data.ts b/apps/web-antd/src/views/system/dict/type/data.ts index 78dad00f..3caa45e1 100644 --- a/apps/web-antd/src/views/system/dict/type/data.ts +++ b/apps/web-antd/src/views/system/dict/type/data.ts @@ -1,4 +1,6 @@ -import { type FormSchemaGetter, type VxeGridProps, z } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; + +import { type FormSchemaGetter, z } from '#/adapter/form'; export const querySchema: FormSchemaGetter = () => [ { diff --git a/apps/web-antd/src/views/system/dict/type/dict-type-modal.vue b/apps/web-antd/src/views/system/dict/type/dict-type-modal.vue index 79079d79..1c43ba11 100644 --- a/apps/web-antd/src/views/system/dict/type/dict-type-modal.vue +++ b/apps/web-antd/src/views/system/dict/type/dict-type-modal.vue @@ -5,7 +5,7 @@ import { useVbenModal } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { cloneDeep } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { dictTypeAdd, dictTypeInfo, diff --git a/apps/web-antd/src/views/system/dict/type/index.vue b/apps/web-antd/src/views/system/dict/type/index.vue index 05cd7557..755cc017 100644 --- a/apps/web-antd/src/views/system/dict/type/index.vue +++ b/apps/web-antd/src/views/system/dict/type/index.vue @@ -18,7 +18,7 @@ import { } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { dictTypeExport, dictTypeList, diff --git a/apps/web-antd/src/views/system/menu/data.tsx b/apps/web-antd/src/views/system/menu/data.tsx index e78318d5..9ca1388e 100644 --- a/apps/web-antd/src/views/system/menu/data.tsx +++ b/apps/web-antd/src/views/system/menu/data.tsx @@ -1,8 +1,10 @@ +import type { VxeGridProps } from '#/adapter/vxe-table'; + import { DictEnum } from '@vben/constants'; import { $t } from '@vben/locales'; import { getPopupContainer } from '@vben/utils'; -import { type FormSchemaGetter, type VxeGridProps, z } from '#/adapter'; +import { type FormSchemaGetter, z } from '#/adapter/form'; import { getDictOptions } from '#/utils/dict'; import { renderDict, renderIcon } from '#/utils/render'; diff --git a/apps/web-antd/src/views/system/menu/index.vue b/apps/web-antd/src/views/system/menu/index.vue index 3f3bcf77..0fcce25d 100644 --- a/apps/web-antd/src/views/system/menu/index.vue +++ b/apps/web-antd/src/views/system/menu/index.vue @@ -15,7 +15,7 @@ import { import { Popconfirm, Space, Tooltip } from 'ant-design-vue'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { menuList, menuRemove } from '#/api/system/menu'; import { columns, querySchema } from './data'; diff --git a/apps/web-antd/src/views/system/menu/menu-drawer.vue b/apps/web-antd/src/views/system/menu/menu-drawer.vue index e07224e9..2234169c 100644 --- a/apps/web-antd/src/views/system/menu/menu-drawer.vue +++ b/apps/web-antd/src/views/system/menu/menu-drawer.vue @@ -10,7 +10,7 @@ import { listToTree, } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { menuAdd, menuInfo, menuList, menuUpdate } from '#/api/system/menu'; import { drawerSchema } from './data'; diff --git a/apps/web-antd/src/views/system/notice/data.ts b/apps/web-antd/src/views/system/notice/data.ts index 07ae5b21..608ba3ab 100644 --- a/apps/web-antd/src/views/system/notice/data.ts +++ b/apps/web-antd/src/views/system/notice/data.ts @@ -1,8 +1,9 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; import { DictEnum } from '@vben/constants'; import { getPopupContainer } from '@vben/utils'; +import { type FormSchemaGetter } from '#/adapter/form'; import { getDictOptions } from '#/utils/dict'; import { renderDict } from '#/utils/render'; diff --git a/apps/web-antd/src/views/system/notice/index.vue b/apps/web-antd/src/views/system/notice/index.vue index fe2d94ad..dd035ece 100644 --- a/apps/web-antd/src/views/system/notice/index.vue +++ b/apps/web-antd/src/views/system/notice/index.vue @@ -9,7 +9,7 @@ import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { noticeList, noticeRemove } from '#/api/system/notice'; import { columns, querySchema } from './data'; diff --git a/apps/web-antd/src/views/system/notice/notice-modal.vue b/apps/web-antd/src/views/system/notice/notice-modal.vue index 0c5c6343..d220bc93 100644 --- a/apps/web-antd/src/views/system/notice/notice-modal.vue +++ b/apps/web-antd/src/views/system/notice/notice-modal.vue @@ -5,7 +5,7 @@ import { useVbenModal } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { cloneDeep } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { noticeAdd, noticeInfo, noticeUpdate } from '#/api/system/notice'; import { modalSchema } from './data'; diff --git a/apps/web-antd/src/views/system/oss-config/data.tsx b/apps/web-antd/src/views/system/oss-config/data.tsx index dd4d2d33..06409ade 100644 --- a/apps/web-antd/src/views/system/oss-config/data.tsx +++ b/apps/web-antd/src/views/system/oss-config/data.tsx @@ -1,8 +1,10 @@ +import type { VxeGridProps } from '#/adapter/vxe-table'; + import { DictEnum } from '@vben/constants'; import { Tag } from 'ant-design-vue'; -import { type FormSchemaGetter, type VxeGridProps, z } from '#/adapter'; +import { type FormSchemaGetter, z } from '#/adapter/form'; import { getDictOptions } from '#/utils/dict'; const accessPolicyOptions = [ diff --git a/apps/web-antd/src/views/system/oss-config/index.vue b/apps/web-antd/src/views/system/oss-config/index.vue index 1e3f1df4..d4f529bb 100644 --- a/apps/web-antd/src/views/system/oss-config/index.vue +++ b/apps/web-antd/src/views/system/oss-config/index.vue @@ -10,7 +10,7 @@ import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { ossConfigChangeStatus, ossConfigList, diff --git a/apps/web-antd/src/views/system/oss-config/oss-config-drawer.vue b/apps/web-antd/src/views/system/oss-config/oss-config-drawer.vue index e8ea0981..3ec5f380 100644 --- a/apps/web-antd/src/views/system/oss-config/oss-config-drawer.vue +++ b/apps/web-antd/src/views/system/oss-config/oss-config-drawer.vue @@ -5,7 +5,7 @@ import { useVbenDrawer } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { cloneDeep } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { ossConfigAdd, ossConfigInfo, diff --git a/apps/web-antd/src/views/system/oss/data.tsx b/apps/web-antd/src/views/system/oss/data.tsx index 39b49d20..d1d75907 100644 --- a/apps/web-antd/src/views/system/oss/data.tsx +++ b/apps/web-antd/src/views/system/oss/data.tsx @@ -1,4 +1,6 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; + +import { type FormSchemaGetter } from '#/adapter/form'; export const querySchema: FormSchemaGetter = () => [ { diff --git a/apps/web-antd/src/views/system/oss/index.vue b/apps/web-antd/src/views/system/oss/index.vue index dc8b6d98..3b522bf8 100644 --- a/apps/web-antd/src/views/system/oss/index.vue +++ b/apps/web-antd/src/views/system/oss/index.vue @@ -20,7 +20,7 @@ import { import dayjs from 'dayjs'; import { isEmpty } from 'lodash-es'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { configInfoByKey } from '#/api/system/config'; import { ossDownload, ossList, ossRemove } from '#/api/system/oss'; import { downloadByData } from '#/utils/file/download'; diff --git a/apps/web-antd/src/views/system/post/data.ts b/apps/web-antd/src/views/system/post/data.ts index fd0702a6..57bcae1f 100644 --- a/apps/web-antd/src/views/system/post/data.ts +++ b/apps/web-antd/src/views/system/post/data.ts @@ -1,7 +1,9 @@ +import type { VxeGridProps } from '#/adapter/vxe-table'; + import { DictEnum } from '@vben/constants'; import { getPopupContainer } from '@vben/utils'; -import { type FormSchemaGetter, type VxeGridProps } from '#/adapter'; +import { type FormSchemaGetter } from '#/adapter/form'; import { getDictOptions } from '#/utils/dict'; import { renderDict } from '#/utils/render'; diff --git a/apps/web-antd/src/views/system/post/index.vue b/apps/web-antd/src/views/system/post/index.vue index 115b5136..962e57d4 100644 --- a/apps/web-antd/src/views/system/post/index.vue +++ b/apps/web-antd/src/views/system/post/index.vue @@ -9,7 +9,7 @@ import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { postExport, postList, postRemove } from '#/api/system/post'; import { downloadExcel } from '#/utils/file/download'; import DeptTree from '#/views/system/user/dept-tree.vue'; diff --git a/apps/web-antd/src/views/system/post/post-drawer.vue b/apps/web-antd/src/views/system/post/post-drawer.vue index 2a9b2474..100e8d05 100644 --- a/apps/web-antd/src/views/system/post/post-drawer.vue +++ b/apps/web-antd/src/views/system/post/post-drawer.vue @@ -5,7 +5,7 @@ import { useVbenDrawer } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { addFullName, cloneDeep } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { postAdd, postInfo, postUpdate } from '#/api/system/post'; import { getDeptTree } from '#/api/system/user'; diff --git a/apps/web-antd/src/views/system/role-assign/data.tsx b/apps/web-antd/src/views/system/role-assign/data.tsx index 093ebd72..be0de709 100644 --- a/apps/web-antd/src/views/system/role-assign/data.tsx +++ b/apps/web-antd/src/views/system/role-assign/data.tsx @@ -1,4 +1,6 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; + +import { type FormSchemaGetter } from '#/adapter/form'; export const querySchema: FormSchemaGetter = () => [ { diff --git a/apps/web-antd/src/views/system/role-assign/index.vue b/apps/web-antd/src/views/system/role-assign/index.vue index b48daaa7..e6ab3ca9 100644 --- a/apps/web-antd/src/views/system/role-assign/index.vue +++ b/apps/web-antd/src/views/system/role-assign/index.vue @@ -9,7 +9,7 @@ import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { roleAllocatedList, roleAuthCancel, diff --git a/apps/web-antd/src/views/system/role/data.tsx b/apps/web-antd/src/views/system/role/data.tsx index 0b078530..64761ec1 100644 --- a/apps/web-antd/src/views/system/role/data.tsx +++ b/apps/web-antd/src/views/system/role/data.tsx @@ -1,10 +1,11 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; import { DictEnum } from '@vben/constants'; import { getPopupContainer } from '@vben/utils'; import { Tag } from 'ant-design-vue'; +import { type FormSchemaGetter } from '#/adapter/form'; import { getDictOptions } from '#/utils/dict'; /** diff --git a/apps/web-antd/src/views/system/role/index.vue b/apps/web-antd/src/views/system/role/index.vue index aadf2d02..a6882753 100644 --- a/apps/web-antd/src/views/system/role/index.vue +++ b/apps/web-antd/src/views/system/role/index.vue @@ -23,7 +23,7 @@ import { } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { roleChangeStatus, roleExport, diff --git a/apps/web-antd/src/views/system/role/role-auth-modal.vue b/apps/web-antd/src/views/system/role/role-auth-modal.vue index e725861a..c3e7a601 100644 --- a/apps/web-antd/src/views/system/role/role-auth-modal.vue +++ b/apps/web-antd/src/views/system/role/role-auth-modal.vue @@ -4,7 +4,7 @@ import { ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; import { cloneDeep } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { roleDataScope, roleDeptTree, roleInfo } from '#/api/system/role'; import { TreeSelectPanel } from '#/components/tree'; diff --git a/apps/web-antd/src/views/system/role/role-drawer.vue b/apps/web-antd/src/views/system/role/role-drawer.vue index 92568f56..01f4d637 100644 --- a/apps/web-antd/src/views/system/role/role-drawer.vue +++ b/apps/web-antd/src/views/system/role/role-drawer.vue @@ -5,7 +5,7 @@ import { useVbenDrawer } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { cloneDeep, eachTree } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { menuTreeSelect, roleMenuTreeSelect } from '#/api/system/menu'; import { roleAdd, roleInfo, roleUpdate } from '#/api/system/role'; import { TreeSelectPanel } from '#/components/tree'; diff --git a/apps/web-antd/src/views/system/tenant/data.tsx b/apps/web-antd/src/views/system/tenant/data.tsx index 2594a165..9909c802 100644 --- a/apps/web-antd/src/views/system/tenant/data.tsx +++ b/apps/web-antd/src/views/system/tenant/data.tsx @@ -1,8 +1,10 @@ +import type { VxeGridProps } from '#/adapter/vxe-table'; + import { getPopupContainer } from '@vben/utils'; import dayjs from 'dayjs'; -import { type FormSchemaGetter, type VxeGridProps, z } from '#/adapter'; +import { type FormSchemaGetter, z } from '#/adapter/form'; export const querySchema: FormSchemaGetter = () => [ { diff --git a/apps/web-antd/src/views/system/tenant/index.vue b/apps/web-antd/src/views/system/tenant/index.vue index d854a447..e5da6e7b 100644 --- a/apps/web-antd/src/views/system/tenant/index.vue +++ b/apps/web-antd/src/views/system/tenant/index.vue @@ -11,7 +11,7 @@ import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { tenantExport, tenantList, diff --git a/apps/web-antd/src/views/system/tenant/tenant-drawer.vue b/apps/web-antd/src/views/system/tenant/tenant-drawer.vue index 899ff666..3df2901e 100644 --- a/apps/web-antd/src/views/system/tenant/tenant-drawer.vue +++ b/apps/web-antd/src/views/system/tenant/tenant-drawer.vue @@ -7,7 +7,7 @@ import { cloneDeep } from '@vben/utils'; import { Tag } from 'ant-design-vue'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { tenantAdd, tenantInfo, tenantUpdate } from '#/api/system/tenant'; import { packageSelectList } from '#/api/system/tenant-package'; import { useTenantStore } from '#/store/tenant'; diff --git a/apps/web-antd/src/views/system/tenantPackage/data.ts b/apps/web-antd/src/views/system/tenantPackage/data.ts index 98c46da1..127f8f43 100644 --- a/apps/web-antd/src/views/system/tenantPackage/data.ts +++ b/apps/web-antd/src/views/system/tenantPackage/data.ts @@ -1,4 +1,6 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; + +import { type FormSchemaGetter } from '#/adapter/form'; export const querySchema: FormSchemaGetter = () => [ { diff --git a/apps/web-antd/src/views/system/tenantPackage/index.vue b/apps/web-antd/src/views/system/tenantPackage/index.vue index d83488b5..7e9246db 100644 --- a/apps/web-antd/src/views/system/tenantPackage/index.vue +++ b/apps/web-antd/src/views/system/tenantPackage/index.vue @@ -11,7 +11,7 @@ import { getPopupContainer } from '@vben/utils'; import { Modal, Popconfirm, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { packageChangeStatus, packageExport, diff --git a/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue b/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue index cbfffaec..f0136b3f 100644 --- a/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue +++ b/apps/web-antd/src/views/system/tenantPackage/tenant-package-drawer.vue @@ -5,7 +5,7 @@ import { useVbenDrawer } from '@vben/common-ui'; import { $t } from '@vben/locales'; import { cloneDeep, eachTree, listToTree } from '@vben/utils'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { menuList, tenantPackageMenuTreeSelect } from '#/api/system/menu'; import { packageAdd, diff --git a/apps/web-antd/src/views/system/user/data.tsx b/apps/web-antd/src/views/system/user/data.tsx index d56a8716..1bb8c79b 100644 --- a/apps/web-antd/src/views/system/user/data.tsx +++ b/apps/web-antd/src/views/system/user/data.tsx @@ -1,7 +1,9 @@ +import type { VxeGridProps } from '#/adapter/vxe-table'; + import { DictEnum } from '@vben/constants'; import { getPopupContainer } from '@vben/utils'; -import { type FormSchemaGetter, type VxeGridProps, z } from '#/adapter'; +import { type FormSchemaGetter, z } from '#/adapter/form'; import { getDictOptions } from '#/utils/dict'; export const querySchema: FormSchemaGetter = () => [ diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue index 6890cdd5..9a46107a 100644 --- a/apps/web-antd/src/views/system/user/index.vue +++ b/apps/web-antd/src/views/system/user/index.vue @@ -24,7 +24,7 @@ import { } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { userExport, userList, diff --git a/apps/web-antd/src/views/system/user/user-drawer.vue b/apps/web-antd/src/views/system/user/user-drawer.vue index 9a1e7348..9a490cb5 100644 --- a/apps/web-antd/src/views/system/user/user-drawer.vue +++ b/apps/web-antd/src/views/system/user/user-drawer.vue @@ -9,7 +9,7 @@ import { addFullName, cloneDeep, getPopupContainer } from '@vben/utils'; import { Tag } from 'ant-design-vue'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { configInfoByKey } from '#/api/system/config'; import { postOptionSelect } from '#/api/system/post'; import { diff --git a/apps/web-antd/src/views/system/user/user-reset-pwd-modal.vue b/apps/web-antd/src/views/system/user/user-reset-pwd-modal.vue index 68d7a88e..f0e55fcc 100644 --- a/apps/web-antd/src/views/system/user/user-reset-pwd-modal.vue +++ b/apps/web-antd/src/views/system/user/user-reset-pwd-modal.vue @@ -3,7 +3,7 @@ import type { Recordable } from '@vben/types'; import { useVbenModal, z } from '@vben/common-ui'; -import { useVbenForm } from '#/adapter'; +import { useVbenForm } from '#/adapter/form'; import { userResetPassword } from '#/api/system/user'; import { Description, useDescription } from '#/components/description'; diff --git a/apps/web-antd/src/views/tool/gen/data.tsx b/apps/web-antd/src/views/tool/gen/data.tsx index 843be16e..3a05380a 100644 --- a/apps/web-antd/src/views/tool/gen/data.tsx +++ b/apps/web-antd/src/views/tool/gen/data.tsx @@ -1,4 +1,6 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; + +import { type FormSchemaGetter } from '#/adapter/form'; export const querySchema: FormSchemaGetter = () => [ { diff --git a/apps/web-antd/src/views/tool/gen/edit-steps/basic.tsx b/apps/web-antd/src/views/tool/gen/edit-steps/basic.tsx index 234f798d..60a9d41b 100644 --- a/apps/web-antd/src/views/tool/gen/edit-steps/basic.tsx +++ b/apps/web-antd/src/views/tool/gen/edit-steps/basic.tsx @@ -1,6 +1,6 @@ import { getPopupContainer } from '@vben/utils'; -import { type FormSchemaGetter, z } from '#/adapter'; +import { type FormSchemaGetter, z } from '#/adapter/form'; export const formSchema: FormSchemaGetter = () => [ { diff --git a/apps/web-antd/src/views/tool/gen/edit-steps/gen-config.vue b/apps/web-antd/src/views/tool/gen/edit-steps/gen-config.vue index 6ee8a015..6c38b888 100644 --- a/apps/web-antd/src/views/tool/gen/edit-steps/gen-config.vue +++ b/apps/web-antd/src/views/tool/gen/edit-steps/gen-config.vue @@ -6,7 +6,7 @@ import { inject, type Ref, unref } from 'vue'; import { message, Space } from 'ant-design-vue'; import { cloneDeep } from 'lodash-es'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { editSave } from '#/api/tool/gen'; import { toCurrentStep } from '../mitt'; diff --git a/apps/web-antd/src/views/tool/gen/edit-steps/gen-data.tsx b/apps/web-antd/src/views/tool/gen/edit-steps/gen-data.tsx index 0a7f2bc3..7b2b8da7 100644 --- a/apps/web-antd/src/views/tool/gen/edit-steps/gen-data.tsx +++ b/apps/web-antd/src/views/tool/gen/edit-steps/gen-data.tsx @@ -1,6 +1,6 @@ import type { Recordable } from '@vben/types'; -import type { VxeGridProps } from '#/adapter'; +import type { VxeGridProps } from '#/adapter/vxe-table'; import { reactive } from 'vue'; diff --git a/apps/web-antd/src/views/tool/gen/index.vue b/apps/web-antd/src/views/tool/gen/index.vue index e1a2a931..c7df3093 100644 --- a/apps/web-antd/src/views/tool/gen/index.vue +++ b/apps/web-antd/src/views/tool/gen/index.vue @@ -9,7 +9,7 @@ import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui'; import { message, Modal, Popconfirm, Space } from 'ant-design-vue'; import dayjs from 'dayjs'; -import { useVbenVxeGrid, type VxeGridProps } from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { batchGenCode, generatedList, diff --git a/apps/web-antd/src/views/tool/gen/table-import-modal.vue b/apps/web-antd/src/views/tool/gen/table-import-modal.vue index 1d60fac6..34a8af57 100644 --- a/apps/web-antd/src/views/tool/gen/table-import-modal.vue +++ b/apps/web-antd/src/views/tool/gen/table-import-modal.vue @@ -1,7 +1,7 @@