From ef956a550786ad873664547eb093116280a3937f Mon Sep 17 00:00:00 2001 From: dap <15891557205@163.com> Date: Thu, 17 Oct 2024 19:08:09 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=BC=8F=E6=8E=89=E7=9A=84=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/_core/profile/components/base-setting.vue | 4 ++-- .../src/views/_core/profile/components/secure-setting.vue | 4 ++-- apps/web-antd/src/views/demo/demo/data.ts | 3 ++- apps/web-antd/src/views/demo/tree/data.ts | 3 ++- .../src/views/system/role-assign/role-assign-drawer.vue | 8 ++------ 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/apps/web-antd/src/views/_core/profile/components/base-setting.vue b/apps/web-antd/src/views/_core/profile/components/base-setting.vue index a7828f72..197e9b39 100644 --- a/apps/web-antd/src/views/_core/profile/components/base-setting.vue +++ b/apps/web-antd/src/views/_core/profile/components/base-setting.vue @@ -10,7 +10,7 @@ import { useUserStore } from '@vben/stores'; import { pick } from 'lodash-es'; -import { useVbenForm, z } from '#/adapter'; +import { useVbenForm, z } from '#/adapter/form'; import { userProfileUpdate } from '#/api/system/profile'; import { useAuthStore } from '#/store'; import { getDictOptions } from '#/utils/dict'; @@ -74,7 +74,7 @@ const [BasicForm, formApi] = useVbenForm({ }, ], submitButtonOptions: { - text: '更新信息', + content: '更新信息', }, }); diff --git a/apps/web-antd/src/views/_core/profile/components/secure-setting.vue b/apps/web-antd/src/views/_core/profile/components/secure-setting.vue index 52aaeda9..58583072 100644 --- a/apps/web-antd/src/views/_core/profile/components/secure-setting.vue +++ b/apps/web-antd/src/views/_core/profile/components/secure-setting.vue @@ -4,7 +4,7 @@ import type { UpdatePasswordParam } from '#/api/system/profile/model'; import { Modal } from 'ant-design-vue'; import { omit } from 'lodash-es'; -import { useVbenForm, z } from '#/adapter'; +import { useVbenForm, z } from '#/adapter/form'; import { userUpdatePassword } from '#/api/system/profile'; import { useAuthStore } from '#/store'; @@ -67,7 +67,7 @@ const [BasicForm, formApi] = useVbenForm({ }, ], submitButtonOptions: { - text: '修改密码', + content: '修改密码', }, }); diff --git a/apps/web-antd/src/views/demo/demo/data.ts b/apps/web-antd/src/views/demo/demo/data.ts index d745d5e9..81c90c39 100755 --- a/apps/web-antd/src/views/demo/demo/data.ts +++ b/apps/web-antd/src/views/demo/demo/data.ts @@ -1,4 +1,5 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { FormSchemaGetter } from '#/adapter/form'; +import type { VxeGridProps } from '#/adapter/vxe-table'; export const querySchema: FormSchemaGetter = () => [ { diff --git a/apps/web-antd/src/views/demo/tree/data.ts b/apps/web-antd/src/views/demo/tree/data.ts index 5eaca015..a6984f67 100755 --- a/apps/web-antd/src/views/demo/tree/data.ts +++ b/apps/web-antd/src/views/demo/tree/data.ts @@ -1,4 +1,5 @@ -import type { FormSchemaGetter, VxeGridProps } from '#/adapter'; +import type { FormSchemaGetter } from '#/adapter/form'; +import type { VxeGridProps } from '#/adapter/vxe-table'; export const querySchema: FormSchemaGetter = () => [ { diff --git a/apps/web-antd/src/views/system/role-assign/role-assign-drawer.vue b/apps/web-antd/src/views/system/role-assign/role-assign-drawer.vue index 55b012e6..e3300c73 100644 --- a/apps/web-antd/src/views/system/role-assign/role-assign-drawer.vue +++ b/apps/web-antd/src/views/system/role-assign/role-assign-drawer.vue @@ -2,13 +2,9 @@ import { ref } from 'vue'; import { useRoute } from 'vue-router'; -import { useVbenDrawer } from '@vben/common-ui'; +import { useVbenDrawer, type VbenFormProps } from '@vben/common-ui'; -import { - useVbenVxeGrid, - type VbenFormProps, - type VxeGridProps, -} from '#/adapter'; +import { useVbenVxeGrid, type VxeGridProps } from '#/adapter/vxe-table'; import { roleSelectAll, roleUnallocatedList } from '#/api/system/role'; import { columns, querySchema } from './data';