diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue index 28ad32bd4..9e057527b 100644 --- a/src/components/Form/src/components/FormItem.vue +++ b/src/components/Form/src/components/FormItem.vue @@ -3,7 +3,7 @@ import type { PropType, Ref } from 'vue'; import { computed, defineComponent, toRefs, unref } from 'vue'; import type { FormActionType, FormProps, FormSchema } from '../types/form'; - import type { ValidationRule } from 'ant-design-vue/lib/form/Form'; + import type { Rule as ValidationRule } from 'ant-design-vue/lib/form/interface'; import type { TableActionType } from '/@/components/Table'; import { Col, Divider, Form } from 'ant-design-vue'; import { componentMap } from '../componentMap'; diff --git a/src/components/Form/src/helper.ts b/src/components/Form/src/helper.ts index e37f5e9ef..9118f3557 100644 --- a/src/components/Form/src/helper.ts +++ b/src/components/Form/src/helper.ts @@ -1,4 +1,4 @@ -import type { ValidationRule } from 'ant-design-vue/lib/form/Form'; +import type { Rule as ValidationRule } from 'ant-design-vue/lib/form/interface'; import type { ComponentType } from './types/index'; import { useI18n } from '/@/hooks/web/useI18n'; import { dateUtil } from '/@/utils/dateUtil'; @@ -55,7 +55,7 @@ export function setComponentRuleType( export function processDateValue(attr: Recordable, component: string) { const { valueFormat, value } = attr; if (valueFormat) { - attr.value = isObject(value) ? dateUtil(value).format(valueFormat) : value; + attr.value = isObject(value) ? dateUtil(value as unknown as Date).format(valueFormat) : value; } else if (DATE_TYPE.includes(component) && value) { attr.value = dateUtil(attr.value); }