Commit b6347a46aadd617c23faf1762df1f59cce089442
1 parent
0c510125
fix: 类型错误
Showing
8 changed files
with
10 additions
and
1 deletions
yudao-ui-admin-vue3/src/components/Table/src/Table.vue
| @@ -6,6 +6,7 @@ import { setIndex } from './helper' | @@ -6,6 +6,7 @@ import { setIndex } from './helper' | ||
| 6 | import { getSlot } from '@/utils/tsxHelper' | 6 | import { getSlot } from '@/utils/tsxHelper' |
| 7 | import type { TableProps } from './types' | 7 | import type { TableProps } from './types' |
| 8 | import { set } from 'lodash-es' | 8 | import { set } from 'lodash-es' |
| 9 | +import { Pagination, TableColumn, TableSetPropsType, TableSlotDefault } from '@/types/table' | ||
| 9 | 10 | ||
| 10 | export default defineComponent({ | 11 | export default defineComponent({ |
| 11 | name: 'Table', | 12 | name: 'Table', |
yudao-ui-admin-vue3/src/hooks/web/useCrudSchemas.ts
| @@ -4,6 +4,7 @@ import { getIntDictOptions } from '@/utils/dict' | @@ -4,6 +4,7 @@ import { getIntDictOptions } from '@/utils/dict' | ||
| 4 | import { FormSchema } from '@/types/form' | 4 | import { FormSchema } from '@/types/form' |
| 5 | import { TableColumn } from '@/types/table' | 5 | import { TableColumn } from '@/types/table' |
| 6 | import { DescriptionsSchema } from '@/types/descriptions' | 6 | import { DescriptionsSchema } from '@/types/descriptions' |
| 7 | +import { ComponentOptions } from '@/types/components' | ||
| 7 | 8 | ||
| 8 | export type CrudSchema = Omit<TableColumn, 'children'> & { | 9 | export type CrudSchema = Omit<TableColumn, 'children'> & { |
| 9 | search?: CrudSearchParams | 10 | search?: CrudSearchParams |
yudao-ui-admin-vue3/src/utils/dict.ts
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | * 数据字典工具类 | 2 | * 数据字典工具类 |
| 3 | */ | 3 | */ |
| 4 | import { useDictStoreWithOut } from '@/store/modules/dict' | 4 | import { useDictStoreWithOut } from '@/store/modules/dict' |
| 5 | +import { ElementPlusInfoType } from '@/types/elementPlus' | ||
| 5 | 6 | ||
| 6 | const dictStore = useDictStoreWithOut() | 7 | const dictStore = useDictStoreWithOut() |
| 7 | 8 |
yudao-ui-admin-vue3/src/views/Login/components/RegisterForm.vue
| @@ -7,6 +7,7 @@ import { ElInput, FormRules } from 'element-plus' | @@ -7,6 +7,7 @@ import { ElInput, FormRules } from 'element-plus' | ||
| 7 | import { useValidator } from '@/hooks/web/useValidator' | 7 | import { useValidator } from '@/hooks/web/useValidator' |
| 8 | import { useLoginState, LoginStateEnum } from './useLogin' | 8 | import { useLoginState, LoginStateEnum } from './useLogin' |
| 9 | import LoginFormTitle from './LoginFormTitle.vue' | 9 | import LoginFormTitle from './LoginFormTitle.vue' |
| 10 | +import { FormSchema } from '@/types/form' | ||
| 10 | 11 | ||
| 11 | const { register, elFormRef } = useForm() | 12 | const { register, elFormRef } = useForm() |
| 12 | const { handleBackLogin, getLoginState } = useLoginState() | 13 | const { handleBackLogin, getLoginState } = useLoginState() |
yudao-ui-admin-vue3/src/views/infra/codegen/components/BasicInfoForm.vue
| @@ -4,6 +4,8 @@ import { required } from '@/utils/formRules' | @@ -4,6 +4,8 @@ import { required } from '@/utils/formRules' | ||
| 4 | import { CodegenTableVO } from '@/api/infra/codegen/types' | 4 | import { CodegenTableVO } from '@/api/infra/codegen/types' |
| 5 | import { Form } from '@/components/Form' | 5 | import { Form } from '@/components/Form' |
| 6 | import { useForm } from '@/hooks/web/useForm' | 6 | import { useForm } from '@/hooks/web/useForm' |
| 7 | +import { FormSchema } from '@/types/form' | ||
| 8 | + | ||
| 7 | const props = defineProps({ | 9 | const props = defineProps({ |
| 8 | basicInfo: { | 10 | basicInfo: { |
| 9 | type: Object as PropType<Nullable<CodegenTableVO>>, | 11 | type: Object as PropType<Nullable<CodegenTableVO>>, |
yudao-ui-admin-vue3/src/views/infra/codegen/components/GenInfoForm.vue
| @@ -8,6 +8,7 @@ import { useForm } from '@/hooks/web/useForm' | @@ -8,6 +8,7 @@ import { useForm } from '@/hooks/web/useForm' | ||
| 8 | import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' | 8 | import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' |
| 9 | import { listSimpleMenusApi } from '@/api/system/menu' | 9 | import { listSimpleMenusApi } from '@/api/system/menu' |
| 10 | import { CodegenTableVO } from '@/api/infra/codegen/types' | 10 | import { CodegenTableVO } from '@/api/infra/codegen/types' |
| 11 | +import { FormSchema } from '@/types/form' | ||
| 11 | const props = defineProps({ | 12 | const props = defineProps({ |
| 12 | genInfo: { | 13 | genInfo: { |
| 13 | type: Object as PropType<Nullable<CodegenTableVO>>, | 14 | type: Object as PropType<Nullable<CodegenTableVO>>, |
yudao-ui-admin-vue3/src/views/system/dept/dept.data.ts
| 1 | import { required } from '@/utils/formRules' | 1 | import { required } from '@/utils/formRules' |
| 2 | import { reactive } from 'vue' | 2 | import { reactive } from 'vue' |
| 3 | +import { FormSchema } from '@/types/form' | ||
| 4 | + | ||
| 3 | // 表单校验 | 5 | // 表单校验 |
| 4 | export const rules = reactive({ | 6 | export const rules = reactive({ |
| 5 | name: [required], | 7 | name: [required], |
yudao-ui-admin-vue3/types/global.d.ts
| @@ -19,7 +19,7 @@ declare global { | @@ -19,7 +19,7 @@ declare global { | ||
| 19 | | 'application/x-www-form-urlencoded' | 19 | | 'application/x-www-form-urlencoded' |
| 20 | | 'multipart/form-data' | 20 | | 'multipart/form-data' |
| 21 | 21 | ||
| 22 | - declare type AxiosMethod = 'get' | 'post' | 'delete' | 'put' | 22 | + declare type AxiosMethod = 'get' | 'post' | 'delete' | 'put' | 'GET' | 'POST' | 'DELETE' | 'PUT' |
| 23 | 23 | ||
| 24 | declare type AxiosResponseType = 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | 'stream' | 24 | declare type AxiosResponseType = 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | 'stream' |
| 25 | 25 |