fix(form): 修复dateFormatter使用string类型提示错误 (#8029)

ant-design · Dec 29, 2023 · 6d764ad · 6d764ad
1 parent 0b26161
commit 6d764ad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/form/src/BaseForm/BaseForm.tsx b/packages/form/src/BaseForm/BaseForm.tsx
@@ -144,6 +144,7 @@ export type CommonFormProps<
    * @example  dateFormatter={(value)=>value.format("YYYY-MM-DD")}
    */
   dateFormatter?:
+    | (string & {})
     | 'string'
     | 'number'
     | ((value: dayjs.Dayjs, valueType: string) => string | number)

diff --git a/packages/table/src/typing.ts b/packages/table/src/typing.ts
@@ -375,6 +375,7 @@ export type ProTableProps<DataSource, U, ValueType = 'text'> = {
    * @name 如何格式化日期
    */
   dateFormatter?:
+    | (string & {})
     | 'string'
     | 'number'
     | ((value: dayjs.Dayjs, valueType: string) => string | number)

diff --git a/packages/utils/src/conversionMomentValue/index.ts b/packages/utils/src/conversionMomentValue/index.ts
@@ -8,6 +8,7 @@ import type { ProFieldValueType } from '../typing';
 dayjs.extend(quarterOfYear);
 
 type DateFormatter =
+  | (string & {})
   | 'number'
   | 'string'
   | ((value: dayjs.Dayjs, valueType: string) => string | number)
@@ -73,10 +74,7 @@ const isMoment = (value: any): boolean => !!value?._isAMomentObject;
  */
 export const convertMoment = (
   value: dayjs.Dayjs,
-  dateFormatter:
-    | string
-    | ((value: dayjs.Dayjs, valueType: string) => string | number)
-    | false,
+  dateFormatter: DateFormatter,
   valueType: string,
 ) => {
   if (!dateFormatter) {