by2025/admin-vben5
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitee.com/xia5520/ruoyi-plus-vben5 into hr

Browse Source
This commit is contained in:
liangqing xia 2024-10-17 21:32:35 +08:00
commit 8b870fde47
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web-antd/src/views/_core/profile/components/base-setting.vue
View File

@ -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: '更新信息',
},
});

4
apps/web-antd/src/views/_core/profile/components/secure-setting.vue
View File

@ -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: '修改密码',
},
});

3
apps/web-antd/src/views/demo/demo/data.ts
View File

@ -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 = () => [
{

3
apps/web-antd/src/views/demo/tree/data.ts
View File

@ -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 = () => [
{

8
apps/web-antd/src/views/system/role-assign/role-assign-drawer.vue
View File

@ -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';

2
packages/@core/ui-kit/form-ui/src/types.ts
View File

@ -291,7 +291,7 @@ export interface FormRenderProps<
export interface ActionButtonOptions extends VbenButtonProps {
content?: string;
// 原生类型
htmlType: 'button' | 'reset' | 'submit';
htmlType?: 'button' | 'reset' | 'submit';
show?: boolean;
}