@ant-design/pro-components 3.1.12-0 → 3.1.13-0

package/es/utils/conversionMomentValue/index.js

@@ -1,13 +1,20 @@
 import { get } from '@rc-component/util';
 import dayjs from 'dayjs';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+import isoWeek from 'dayjs/plugin/isoWeek';
 import quarterOfYear from 'dayjs/plugin/quarterOfYear';
 import { isNil } from "../isNil";
+import { normalizeSerializedDayjsLike } from "../parseValueToMoment";
+dayjs.extend(isoWeek);
+dayjs.extend(advancedFormat);
 dayjs.extend(quarterOfYear);
+/** 周字段：表单提交转字符串用 ISO 周 `GGGG-[W]WW`；选择器/只读展示用 `gggg-wo`（与 rc-picker 一致） */
 export const dateFormatterMap = {
   time: 'HH:mm:ss',
   timeRange: 'HH:mm:ss',
   date: 'YYYY-MM-DD',
-  dateWeek: 'YYYY-wo',
+  dateWeek: 'GGGG-[W]WW',
+  dateWeekRange: 'GGGG-[W]WW',
   dateMonth: 'YYYY-MM',
   dateQuarter: 'YYYY-[Q]Q',
   dateYear: 'YYYY',
@@ -15,6 +22,17 @@ export const dateFormatterMap = {
   dateTime: 'YYYY-MM-DD HH:mm:ss',
   dateTimeRange: 'YYYY-MM-DD HH:mm:ss'
 };
+
+/**
+ * LightFilter 收起态日期范围展示。`dateWeekRange` 在 map 中为 ISO 周（提交用），标签需与周选择器展示一致。
+ */
+export function getLightFilterRangeDisplayFormat(valueType) {
+  if (valueType && valueType in dateFormatterMap) {
+    return dateFormatterMap[valueType];
+  }
+  return 'YYYY-MM-DD';
+}
+
 /**
  * 判断是不是一个 object
  * @param  {any} o
@@ -29,7 +47,7 @@ function isObject(o) {
  * @returns boolean
  */
 export function isPlainObject(o) {
-  if (isObject(o) === false) return false;
+  if (!isObject(o)) return false;
 
   // If has modified constructor
   const ctor = o.constructor;
@@ -37,7 +55,7 @@ export function isPlainObject(o) {
 
   // If has modified prototype
   const prot = ctor.prototype;
-  if (isObject(prot) === false) return false;
+  if (!isObject(prot)) return false;
 
   // If constructor does not have an Object-specific method
   if (prot.hasOwnProperty('isPrototypeOf') === false) {
@@ -65,18 +83,25 @@ export const convertMoment = (value, dateFormatter, valueType) => {
   if (!dateFormatter) {
     return value;
   }
-  if (dayjs.isDayjs(value) || isMoment(value)) {
+  let target = value;
+  if (value instanceof Date && !Number.isNaN(value.getTime())) {
+    target = dayjs(value);
+  }
+  if (dayjs.isDayjs(target) || isMoment(target)) {
+    if (typeof target.format !== 'function') {
+      return value;
+    }
     if (dateFormatter === 'number') {
-      return value.valueOf();
+      return target.valueOf();
     }
     if (dateFormatter === 'string') {
-      return value.format(dateFormatterMap[valueType] || 'YYYY-MM-DD HH:mm:ss');
+      return target.format(dateFormatterMap[valueType] || 'YYYY-MM-DD HH:mm:ss');
     }
     if (typeof dateFormatter === 'string' && dateFormatter !== 'string') {
-      return value.format(dateFormatter);
+      return target.format(dateFormatter);
     }
     if (typeof dateFormatter === 'function') {
-      return dateFormatter(value, valueType);
+      return dateFormatter(target, valueType);
     }
   }
   return value;
@@ -87,9 +112,8 @@ export const convertMoment = (value, dateFormatter, valueType) => {
  * @param  {T} value
  * @param  {DateFormatter} dateFormatter
  * @param  {Record<string} valueTypeMap
- * @param  {ProFieldValueType;dateFormat:string;}|any>} |{valueType
- * @param  {boolean} omitNil?
- * @param  {NamePath} parentKey?
+ * @param omitNil
+ * @param parentKey
  */
 export const conversionMomentValue = (value, dateFormatter, valueTypeMap, omitNil, parentKey) => {
   const tmpValue = {};
@@ -118,6 +142,22 @@ export const conversionMomentValue = (value, dateFormatter, valueTypeMap, omitNi
     if (omitNil && itemValue === '') {
       return;
     }
+    const currentDateFormatter = dateFormatter ?? 'string';
+    let finalDateFormatter;
+    if (currentDateFormatter === 'number' || currentDateFormatter === false || typeof currentDateFormatter === 'function') {
+      finalDateFormatter = currentDateFormatter;
+    } else if (currentDateFormatter === 'string') {
+      finalDateFormatter = dateFormat || dateFormatterMap[valueType];
+    } else {
+      // Custom format string
+      finalDateFormatter = currentDateFormatter;
+    }
+    const serializedDayjs = normalizeSerializedDayjsLike(itemValue);
+    if (serializedDayjs) {
+      tmpValue[valueKey] = convertMoment(serializedDayjs, finalDateFormatter, valueType);
+      return;
+    }
+
     // 处理嵌套的情况
     if (isPlainObject(itemValue) &&
     // 不是数组
@@ -129,16 +169,6 @@ export const conversionMomentValue = (value, dateFormatter, valueTypeMap, omitNi
       tmpValue[valueKey] = conversionMomentValue(itemValue, dateFormatter, valueTypeMap, omitNil, namePath);
       return;
     }
-    const currentDateFormatter = dateFormatter ?? 'string';
-    let finalDateFormatter;
-    if (currentDateFormatter === 'number' || currentDateFormatter === false || typeof currentDateFormatter === 'function') {
-      finalDateFormatter = currentDateFormatter;
-    } else if (currentDateFormatter === 'string') {
-      finalDateFormatter = dateFormat || dateFormatterMap[valueType];
-    } else {
-      // Custom format string
-      finalDateFormatter = currentDateFormatter;
-    }
     // 处理 FormList 的 value
     if (Array.isArray(itemValue)) {
       tmpValue[valueKey] = itemValue.map((arrayValue, index) => {
@@ -147,6 +177,11 @@ export const conversionMomentValue = (value, dateFormatter, valueTypeMap, omitNi
           const arrayDateFormatter = finalDateFormatter === undefined && currentDateFormatter === 'string' ? 'string' : finalDateFormatter;
           return convertMoment(arrayValue, arrayDateFormatter, valueType);
         }
+        const serialized = normalizeSerializedDayjsLike(arrayValue);
+        if (serialized) {
+          const arrayDateFormatter = finalDateFormatter === undefined && currentDateFormatter === 'string' ? 'string' : finalDateFormatter;
+          return convertMoment(serialized, arrayDateFormatter, valueType);
+        }
         return conversionMomentValue(arrayValue, dateFormatter, valueTypeMap, omitNil, [valueKey, `${index}`].flat(1));
       });
       return;

package/es/utils/dateArrayFormatter/index.js

@@ -5,11 +5,21 @@ import dayjs from 'dayjs';
  * @param  {FormatType} format
  * @return string
  */
+const toDayjsInstance = endText => {
+  if (dayjs.isDayjs(endText)) {
+    return endText;
+  }
+  if (endText != null && typeof endText.format === 'function' && typeof endText.isValid === 'function') {
+    return endText;
+  }
+  return dayjs(endText);
+};
 const formatString = (endText, format) => {
+  const d = toDayjsInstance(endText);
   if (typeof format === 'function') {
-    return format(dayjs(endText));
+    return format(d);
   }
-  return dayjs(endText).format(format);
+  return d.format(format);
 };
 /**
  * 格式化区域日期,如果是一个数组，会返回 start ~ end

package/es/utils/genCopyable/index.d.ts

@@ -13,4 +13,4 @@ export type ProEllipsis = ProEllipsisTooltip | boolean;
  * @param text renderText 的返回值，可能是 string/number 或 React 元素
  * @param copyText 用于复制的原始文本，当 renderText 返回 JSX 时避免复制 [object Object]
  */
-export declare const genCopyable: (dom: React.ReactNode, item: any, text: string | React.ReactNode, copyText?: unknown) => string | number | boolean | Iterable<React.ReactNode> | import("react/jsx-runtime").JSX.Element | null | undefined;
+export declare const genCopyable: (dom: React.ReactNode, item: any, text: string | React.ReactNode, copyText?: unknown) => string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;

package/es/utils/hooks/useUrlSearchParams/index.d.ts

@@ -0,0 +1,6 @@
+export declare function useUrlSearchParams(initial?: Record<string, string | number>, config?: {
+    disabled?: boolean;
+}): [
+    Record<string, string | number | boolean | string[]>,
+    (value: Record<string, string | number>) => void
+];

package/es/utils/hooks/useUrlSearchParams/index.js

@@ -0,0 +1,146 @@
+import { useEffect, useMemo, useState } from 'react';
+
+/**
+ * 与 `@umijs/use-params@1.0.9` 的 `useUrlSearchParams` 行为一致（内联实现，便于去掉该依赖）。
+ *
+ * @see https://github.com/chenshuai2144/use-params
+ */
+function setQueryToCurrentUrl(params) {
+  const href = typeof window !== 'undefined' && window.location ? window.location.href : 'http://localhost/';
+  const url = new URL(href);
+  Object.keys(params).forEach(key => {
+    const value = params[key];
+    if (value !== null && value !== undefined) {
+      if (Array.isArray(value)) {
+        url.searchParams.delete(key);
+        value.forEach(valueItem => {
+          url.searchParams.append(key, String(valueItem));
+        });
+      } else if (value instanceof Date) {
+        if (!Number.isNaN(value.getTime())) {
+          url.searchParams.set(key, value.toISOString());
+        }
+      } else if (typeof value === 'object') {
+        url.searchParams.set(key, JSON.stringify(value));
+      } else {
+        url.searchParams.set(key, String(value));
+      }
+    } else {
+      url.searchParams.delete(key);
+    }
+  });
+  return url;
+}
+const booleanValues = {
+  true: true,
+  false: false
+};
+function parseValue(key, _value, types, defaultParams) {
+  if (!types) {
+    return _value;
+  }
+  const type = types[key];
+  const value = _value === undefined ? defaultParams[key] : _value;
+  if (type === Number) {
+    return Number(value);
+  }
+  if (type === Boolean || _value === 'true' || _value === 'false') {
+    return booleanValues[String(value)];
+  }
+  if (Array.isArray(type)) {
+    return type.find(item => item == value) ?? defaultParams[key];
+  }
+  return value;
+}
+export function useUrlSearchParams(initial = {}, config = {
+  disabled: false
+}) {
+  const [, forceUpdate] = useState();
+  const locationSearch = typeof window !== 'undefined' && window.location ? window.location.search : undefined;
+
+  /** disabled 时与上游包一致，使用空对象占位（勿改为 URLSearchParams，以免影响 toString 比较逻辑） */
+  const urlSearchParams = useMemo(() => {
+    if (config.disabled) {
+      return {};
+    }
+    return new URLSearchParams(locationSearch ?? '');
+  }, [config.disabled, locationSearch]);
+  const params = useMemo(() => {
+    if (config.disabled) {
+      return {};
+    }
+    if (typeof window === 'undefined' || !window.URL) {
+      return {};
+    }
+    const result = [];
+    urlSearchParams.forEach((value, key) => {
+      result.push({
+        key,
+        value
+      });
+    });
+    const grouped = result.reduce((acc, val) => {
+      (acc[val.key] = acc[val.key] || []).push(val);
+      return acc;
+    }, {});
+    const merged = Object.keys(grouped).map(key => {
+      const valueGroup = grouped[key];
+      if (valueGroup.length === 1) {
+        return [key, valueGroup[0].value];
+      }
+      return [key, valueGroup.map(v => v.value)];
+    });
+    const newParams = {
+      ...initial
+    };
+    merged.forEach(([key, value]) => {
+      newParams[key] = parseValue(key, value, {}, initial);
+    });
+    return newParams;
+  }, [config.disabled, initial, urlSearchParams]);
+  function redirectToNewSearchParams(newParams) {
+    if (typeof window === 'undefined' || !window.URL) {
+      return;
+    }
+    const url = setQueryToCurrentUrl(newParams);
+    if (window.location.search !== url.search) {
+      window.history.replaceState({}, '', url.toString());
+    }
+    const prev = urlSearchParams instanceof URLSearchParams ? urlSearchParams.toString() : Object.prototype.toString.call(urlSearchParams);
+    if (prev !== url.searchParams.toString()) {
+      forceUpdate({});
+    }
+  }
+  useEffect(() => {
+    if (config.disabled) {
+      return;
+    }
+    if (typeof window === 'undefined' || !window.URL) {
+      return;
+    }
+    redirectToNewSearchParams({
+      ...initial,
+      ...params
+    });
+    // eslint-disable-next-line react-hooks/exhaustive-deps -- 对齐 @umijs/use-params：仅随 params / disabled 同步
+  }, [config.disabled, params]);
+  const setParams = newParams => {
+    redirectToNewSearchParams(newParams);
+  };
+  useEffect(() => {
+    if (config.disabled) {
+      return () => {};
+    }
+    if (typeof window === 'undefined' || !window.URL) {
+      return () => {};
+    }
+    const onPopState = () => {
+      forceUpdate({});
+    };
+    window.addEventListener('popstate', onPopState);
+    return () => {
+      window.removeEventListener('popstate', onPopState);
+    };
+  }, [config.disabled]);
+  return [params, setParams];
+}

package/es/utils/index.d.ts

@@ -8,7 +8,7 @@ import { InlineErrorFormItem } from './components/InlineErrorFormItem';
 import { LabelIconTip } from './components/LabelIconTip';
 import type { ProFormInstanceType } from './components/ProFormContext';
 import { ProFormContext } from './components/ProFormContext';
-import { conversionMomentValue, convertMoment, dateFormatterMap } from './conversionMomentValue';
+import { conversionMomentValue, convertMoment, dateFormatterMap, getLightFilterRangeDisplayFormat } from './conversionMomentValue';
 import { dateArrayFormatter } from './dateArrayFormatter';
 import type { ProEllipsis } from './genCopyable';
 import { genCopyable } from './genCopyable';
@@ -25,6 +25,7 @@ import { usePrevious } from './hooks/usePrevious';
 import { useReactiveRef } from './hooks/useReactiveRef';
 import { useRefCallback } from './hooks/useRefCallback';
 import { useRefFunction } from './hooks/useRefFunction';
+import { useUrlSearchParams } from './hooks/useUrlSearchParams';
 import { isBrowser } from './isBrowser';
 import { isDeepEqualReact } from './isDeepEqualReact';
 import { isDropdownValueType } from './isDropdownValueType';
@@ -49,5 +50,5 @@ import type { UseEditableMapType, UseEditableMapUtilType } from './useEditableMa
 import { useEditableMap } from './useEditableMap';
 import { useBreakpoint } from './useMediaQuery';
 export * from './typing';
-export { autoFocusToFirstChild, conversionMomentValue, conversionMomentValue as conversionSubmitValue, convertMoment, dateArrayFormatter, dateFormatterMap, DropdownFooter, editableRowByKey, ErrorBoundary, FieldLabel, FilterDropdown, genCopyable, getFieldPropsOrFormItemProps, InlineErrorFormItem, isBrowser, isDeepEqualReact, isDropdownValueType, isImg, isNil, isUrl, LabelIconTip, lighten, merge, nanoid, objectToMap, omitBoolean, omitUndefined, omitUndefinedAndEmptyArr, operationUnit, parseValueToDay, pickProFormItemProps, pickProProps, proFieldParsingText, ProFormContext, recordKeyToString, resetComponent, runFunction, setAlpha, stringify, transformKeySubmitValue, useBreakpoint, useDebounceFn, useDebounceValue, useDeepCompareEffect, useDeepCompareEffectDebounce, useDeepCompareMemo, useDocumentTitle, useEditableArray, useEditableMap, useFetchData, useLatest, usePrevious, useReactiveRef, useRefCallback, useRefFunction, useStyle, };
+export { autoFocusToFirstChild, conversionMomentValue, conversionMomentValue as conversionSubmitValue, convertMoment, dateArrayFormatter, dateFormatterMap, DropdownFooter, getLightFilterRangeDisplayFormat, editableRowByKey, ErrorBoundary, FieldLabel, FilterDropdown, genCopyable, getFieldPropsOrFormItemProps, InlineErrorFormItem, isBrowser, isDeepEqualReact, isDropdownValueType, isImg, isNil, isUrl, LabelIconTip, lighten, merge, nanoid, objectToMap, omitBoolean, omitUndefined, omitUndefinedAndEmptyArr, operationUnit, parseValueToDay, pickProFormItemProps, pickProProps, proFieldParsingText, ProFormContext, recordKeyToString, resetComponent, runFunction, setAlpha, stringify, transformKeySubmitValue, useBreakpoint, useDebounceFn, useDebounceValue, useDeepCompareEffect, useDeepCompareEffectDebounce, useDeepCompareMemo, useDocumentTitle, useEditableArray, useEditableMap, useFetchData, useLatest, usePrevious, useReactiveRef, useRefCallback, useRefFunction, useStyle, useUrlSearchParams, };
 export type { ProEllipsis, ProFormInstanceType, ProRequestData, RowEditableConfig, RowEditableType, UseEditableMapType, UseEditableMapUtilType, UseEditableType, UseEditableUtilType, };

package/es/utils/index.js

@@ -7,7 +7,7 @@ import { FilterDropdown } from "./components/FilterDropdown";
 import { InlineErrorFormItem } from "./components/InlineErrorFormItem";
 import { LabelIconTip } from "./components/LabelIconTip";
 import { ProFormContext } from "./components/ProFormContext";
-import { conversionMomentValue, convertMoment, dateFormatterMap } from "./conversionMomentValue";
+import { conversionMomentValue, convertMoment, dateFormatterMap, getLightFilterRangeDisplayFormat } from "./conversionMomentValue";
 import { dateArrayFormatter } from "./dateArrayFormatter";
 import { genCopyable } from "./genCopyable";
 import { getFieldPropsOrFormItemProps } from "./getFieldPropsOrFormItemProps";
@@ -22,6 +22,7 @@ import { usePrevious } from "./hooks/usePrevious";
 import { useReactiveRef } from "./hooks/useReactiveRef";
 import { useRefCallback } from "./hooks/useRefCallback";
 import { useRefFunction } from "./hooks/useRefFunction";
+import { useUrlSearchParams } from "./hooks/useUrlSearchParams";
 import { isBrowser } from "./isBrowser";
 import { isDeepEqualReact } from "./isDeepEqualReact";
 import { isDropdownValueType } from "./isDropdownValueType";
@@ -44,8 +45,8 @@ import { editableRowByKey, recordKeyToString, useEditableArray } from "./useEdit
 import { useEditableMap } from "./useEditableMap";
 import { useBreakpoint } from "./useMediaQuery";
 export * from "./typing";
-export { autoFocusToFirstChild, conversionMomentValue, conversionMomentValue as conversionSubmitValue, convertMoment, dateArrayFormatter, dateFormatterMap, DropdownFooter, editableRowByKey, ErrorBoundary, FieldLabel, FilterDropdown, genCopyable, getFieldPropsOrFormItemProps, InlineErrorFormItem, isBrowser, isDeepEqualReact, isDropdownValueType, isImg, isNil, isUrl, LabelIconTip, lighten, merge, nanoid, objectToMap, omitBoolean, omitUndefined, omitUndefinedAndEmptyArr, operationUnit, parseValueToDay, pickProFormItemProps, pickProProps, proFieldParsingText, ProFormContext, recordKeyToString, resetComponent, runFunction, setAlpha, stringify,
+export { autoFocusToFirstChild, conversionMomentValue, conversionMomentValue as conversionSubmitValue, convertMoment, dateArrayFormatter, dateFormatterMap, DropdownFooter, getLightFilterRangeDisplayFormat, editableRowByKey, ErrorBoundary, FieldLabel, FilterDropdown, genCopyable, getFieldPropsOrFormItemProps, InlineErrorFormItem, isBrowser, isDeepEqualReact, isDropdownValueType, isImg, isNil, isUrl, LabelIconTip, lighten, merge, nanoid, objectToMap, omitBoolean, omitUndefined, omitUndefinedAndEmptyArr, operationUnit, parseValueToDay, pickProFormItemProps, pickProProps, proFieldParsingText, ProFormContext, recordKeyToString, resetComponent, runFunction, setAlpha, stringify,
 // function
 transformKeySubmitValue, useBreakpoint, useDebounceFn, useDebounceValue, useDeepCompareEffect, useDeepCompareEffectDebounce, useDeepCompareMemo, useDocumentTitle,
 // hooks
-useEditableArray, useEditableMap, useFetchData, useLatest, usePrevious, useReactiveRef, useRefCallback, useRefFunction, useStyle };
+useEditableArray, useEditableMap, useFetchData, useLatest, usePrevious, useReactiveRef, useRefCallback, useRefFunction, useStyle, useUrlSearchParams };

package/es/utils/nanoid/index.js

@@ -15,8 +15,9 @@ let genNanoid = (t = 21) => {
  * @description 生成uuid，如果不支持 randomUUID，就用 genNanoid
  */
 export const nanoid = () => {
-  if (window?.crypto?.randomUUID && typeof crypto.randomUUID === 'function') {
-    return crypto.randomUUID();
+  if (typeof window === 'undefined') return genNanoid();
+  if (window.crypto && typeof window.crypto.randomUUID === 'function') {
+    return window.crypto.randomUUID();
   }
   return genNanoid();
 };

package/es/utils/parseValueToMoment/index.d.ts

@@ -1,4 +1,9 @@
 import dayjs from 'dayjs';
-type DateValue = dayjs.Dayjs | dayjs.Dayjs[] | string | string[] | number | number[];
+type DateValue = dayjs.Dayjs | dayjs.Dayjs[] | string | string[] | number | number[] | Date;
+/**
+ * Immer / JSON 后只剩 plain object，但 `$d` / `$isDayjsObject` 仍可还原为合法 Dayjs。
+ * 若不处理，`dayjs(plain)` 会按「配置对象」解析导致无效值，进而使 rc-picker 报错。
+ */
+export declare function normalizeSerializedDayjsLike(value: unknown): dayjs.Dayjs | null;
 export declare const parseValueToDay: (value: DateValue, formatter?: string) => dayjs.Dayjs | dayjs.Dayjs[] | null | undefined;
 export {};

package/es/utils/parseValueToMoment/index.js

@@ -8,16 +8,83 @@ dayjs.extend(customParseFormat);
  * @returns
  */
 const isMoment = value => !!value?._isAMomentObject;
-export const parseValueToDay = (value, formatter) => {
-  if (isNil(value) || dayjs.isDayjs(value) || isMoment(value)) {
-    if (isMoment(value)) {
-      return dayjs(value);
+function hasOwn(source, key) {
+  return Object.prototype.hasOwnProperty.call(source, key);
+}
+
+/**
+ * Immer / JSON 后只剩 plain object，但 `$d` / `$isDayjsObject` 仍可还原为合法 Dayjs。
+ * 若不处理，`dayjs(plain)` 会按「配置对象」解析导致无效值，进而使 rc-picker 报错。
+ */
+export function normalizeSerializedDayjsLike(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) {
+    return null;
+  }
+  const rec = value;
+  if (hasOwn(rec, '$d')) {
+    const raw = rec.$d;
+    if (isNil(raw) || raw === '') {
+      return null;
     }
+    const parsed = raw instanceof Date ? dayjs(raw) : dayjs(raw);
+    return parsed.isValid() ? parsed : null;
+  }
+  if (rec.$isDayjsObject === true && typeof value.valueOf === 'function') {
+    const ms = Number(value.valueOf());
+    if (Number.isFinite(ms)) {
+      const d = dayjs(ms);
+      return d.isValid() ? d : null;
+    }
+  }
+  return null;
+}
+export const parseValueToDay = (value, formatter) => {
+  if (isNil(value)) {
     return value;
   }
   if (Array.isArray(value)) {
     return value.map(v => parseValueToDay(v, formatter));
   }
-  if (typeof value === 'number') return dayjs(value);
-  return dayjs(value, formatter);
+  if (isMoment(value)) {
+    return dayjs(value);
+  }
+  const serialized = normalizeSerializedDayjsLike(value);
+  if (serialized) {
+    return serialized;
+  }
+  if (dayjs.isDayjs(value)) {
+    const d = value;
+    if (typeof d.clone === 'function' && d.isValid()) {
+      return d;
+    }
+    const ms = typeof d.valueOf === 'function' ? Number(d.valueOf()) : NaN;
+    if (Number.isFinite(ms)) {
+      const fromMs = dayjs(ms);
+      if (fromMs.isValid()) {
+        return fromMs;
+      }
+    }
+    return null;
+  }
+  if (typeof value === 'number') {
+    return dayjs(value);
+  }
+  if (value instanceof Date && !Number.isNaN(value.getTime())) {
+    return dayjs(value);
+  }
+  if (typeof value === 'string') {
+    const parsed = formatter ? dayjs(value, formatter) : dayjs(value);
+    return parsed.isValid() ? parsed : null;
+  }
+  if (value && typeof value === 'object') {
+    const ms = typeof value.valueOf === 'function' ? Number(value.valueOf()) : NaN;
+    if (Number.isFinite(ms) && (value.$isDayjsObject === true || hasOwn(value, '$d'))) {
+      const fromMs = dayjs(ms);
+      if (fromMs.isValid()) {
+        return fromMs;
+      }
+    }
+  }
+  const fallback = formatter ? dayjs(value, formatter) : dayjs(value);
+  return fallback.isValid() ? fallback : null;
 };

package/es/utils/proFieldParsingText/index.d.ts

@@ -17,5 +17,11 @@ export declare const objectToMap: (value: ProFieldValueEnumType | undefined) =>
  * @param valueEnumParams
  * @param key
  */
-export declare const proFieldParsingText: (text: string | number | (string | number)[], valueEnumParams: ProFieldValueEnumType, key?: number | string) => React.ReactNode;
+type LabelInValueItem = {
+    label?: ReactNode;
+    title?: ReactNode;
+    value?: unknown;
+};
+type ProFieldTextValue = string | number | LabelInValueItem | (string | number | LabelInValueItem)[];
+export declare const proFieldParsingText: (text: ProFieldTextValue, valueEnumParams: ProFieldValueEnumType, key?: number | string) => React.ReactNode;
 export {};

package/es/utils/proFieldParsingText/index.js

@@ -8,7 +8,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  */
 function getType(obj) {
   // @ts-ignore
-  const type = Object.prototype.toString.call(obj).match(/^\[object (.*)\]$/)[1].toLowerCase();
+  const type = Object.prototype.toString.call(obj).match(/^\[object (.*)]$/)[1].toLowerCase();
   if (type === 'string' && typeof obj === 'object') return 'object'; // Let "new String('')" return 'object'
   if (obj === null) return 'null'; // PhantomJS has type "DOMWindow" for null
   if (obj === undefined) return 'undefined'; // PhantomJS has type "DOMWindow" for undefined
@@ -89,6 +89,7 @@ const TableStatus = {
     text: children
   })
 };
+
 /**
  * 转化 text 和 valueEnum 通过 type 来添加 Status
  *
@@ -96,6 +97,7 @@ const TableStatus = {
  * @param valueEnumParams
  * @param key
  */
+
 export const proFieldParsingText = (text, valueEnumParams, key) => {
   if (Array.isArray(text)) {
     return /*#__PURE__*/_jsx(Space, {
@@ -105,16 +107,17 @@ export const proFieldParsingText = (text, valueEnumParams, key) => {
       children: text.map((value, index) => proFieldParsingText(value, valueEnumParams, index))
     }, key);
   }
+  if (typeof text === 'object' && text !== null) {
+    return text.label ?? text.title ?? '';
+  }
   const valueEnum = objectToMap(valueEnumParams);
   if (!valueEnum.has(text) && !valueEnum.has(`${text}`)) {
-    // @ts-ignore
-    return text?.label || text;
+    return text;
   }
   const domText = valueEnum.get(text) || valueEnum.get(`${text}`);
   if (!domText) {
-    // @ts-ignore
     return /*#__PURE__*/_jsx(React.Fragment, {
-      children: text?.label || text
+      children: text
     }, key);
   }
   const {

package/es/utils/transformKeySubmitValue/index.d.ts

@@ -1,5 +1,7 @@
 import type { SearchTransformKeyFn } from '../typing';
-export type DataFormatMapType = Record<string, SearchTransformKeyFn | undefined>;
+export interface DataFormatMapType {
+    [key: string]: SearchTransformKeyFn | undefined | DataFormatMapType;
+}
 /**
  * 判断一个值是否为普通对象（可以被遍历的对象）
  * 暂时还不支持 Set 和 Map 结构