@ant-design/pro-components 3.0.1-0 → 3.0.2-0

package/es/table/utils/genProColumnToColumn.js

@@ -4,7 +4,7 @@ import { Table } from 'antd';
 import { proFieldParsingValueEnumToArray } from "../../field";
 import { omitBoolean, omitUndefinedAndEmptyArr, runFunction } from "../../utils";
 import { columnRender, defaultOnFilter, renderColumnsTitle } from "./columnRender";
-import { genColumnKey } from "./index";
+import { genColumnKey, parseProFilteredValue, parseProSortOrder } from "./index";
 /**
  * 转化 columns 到 pro 的格式 主要是 render 方法的自行实现
  *
@@ -24,8 +24,7 @@ export function genProColumnToColumn(params, parents) {
     rowKey = _params$rowKey === void 0 ? 'id' : _params$rowKey,
     _params$childrenColum = params.childrenColumnName,
     childrenColumnName = _params$childrenColum === void 0 ? 'children' : _params$childrenColum,
-    _params$proFilter = params.proFilter,
-    proFilter = _params$proFilter === void 0 ? {} : _params$proFilter,
+    proFilter = params.proFilter,
     proSort = params.proSort;
   var subNameRecord = new Map();
   return columns === null || columns === void 0 || (_columns$map = columns.map(function (columnProps, columnsIndex) {
@@ -40,9 +39,7 @@ export function genProColumnToColumn(params, parents) {
       children = _ref.children,
       onFilter = _ref.onFilter,
       _ref$filters = _ref.filters,
-      filters = _ref$filters === void 0 ? [] : _ref$filters,
-      sorter = _ref.sorter,
-      columnFilteredValue = _ref.filteredValue;
+      filters = _ref$filters === void 0 ? [] : _ref$filters;
     var columnKey = genColumnKey(key || (dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString()), [parents === null || parents === void 0 ? void 0 : parents.key, columnsIndex].filter(Boolean).join('-'));
     // 这些都没有，说明是普通的表格不需要 pro 管理
     var noNeedPro = !valueEnum && !valueType && !children;
@@ -62,11 +59,6 @@ export function genProColumnToColumn(params, parents) {
       }
       return omitBoolean(onFilter);
     };
-
-    // 对应筛选值，用作双向绑定
-    var filteredValue = columnKey && (proFilter === null || proFilter === void 0 ? void 0 : proFilter[columnKey]) !== undefined ? proFilter === null || proFilter === void 0 ? void 0 : proFilter[columnKey] : null;
-    // 对应排序值，用作双向绑定
-    var sortOrder = columnKey && proSort[columnKey] !== undefined ? proSort[columnKey] : null;
     var keyName = rowKey;
     var tempColumns = _objectSpread(_objectSpread({
       index: columnsIndex,
@@ -78,12 +70,8 @@ export function genProColumnToColumn(params, parents) {
         return valueItem && valueItem.value !== 'all';
       }) : filters,
       onFilter: genOnFilter(),
-      filteredValue:
-      // 优先使用用户明确设置的 filteredValue
-      columnFilteredValue !== undefined ? columnFilteredValue :
-      // 否则，只有在服务端筛选时才使用计算的 filteredValue
-      filters && genOnFilter() == null && filteredValue !== null ? filteredValue : undefined,
-      sortOrder: sorter === true ? sortOrder : undefined,
+      filteredValue: parseProFilteredValue(proFilter, columnProps),
+      sortOrder: parseProSortOrder(proSort, columnProps),
       fixed: config.fixed,
       width: columnProps.width || (columnProps.fixed ? 200 : undefined),
       children: columnProps.children ? genProColumnToColumn(_objectSpread(_objectSpread({}, params), {}, {

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

@@ -1,10 +1,10 @@
 import type { TablePaginationConfig } from 'antd';
-import type { SortOrder } from 'antd/lib/table/interface';
+import type { FilterValue as AntFilterValue, SorterResult, SortOrder } from 'antd/lib/table/interface';
 import type React from 'react';
 import { Key } from 'react';
 import type { IntlType } from '../../provider';
 import type { UseEditableUtilType } from '../../utils';
-import type { ActionType, Bordered, BorderedType, ProColumns, UseFetchDataAction } from '../typing';
+import type { ActionType, Bordered, BorderedType, FilterValue, ProColumns, ProColumnType, ProSorter, UseFetchDataAction } from '../typing';
 /**
  * 检查值是否存在 为了 避开 0 和 false
  *
@@ -33,6 +33,8 @@ export declare function useActionType<T>(ref: React.MutableRefObject<ActionType
     onCleanSelected: () => void;
     resetAll: () => void;
     editableUtils: UseEditableUtilType;
+    /** 透传给 ActionType 的滚动能力 */
+    scrollTo?: ActionType['scrollTo'];
 }): void;
 type PostDataType<T> = (data: T) => T;
 /**
@@ -53,12 +55,63 @@ export declare const isMergeCell: (dom: any) => any;
  */
 export declare const genColumnKey: (key?: string | number | Key, index?: number | string) => string;
 /**
- * 从 ProColumns 数组中取出默认的排序和筛选数据
+ * 将 ProTable - column - dataIndex 转为字符串形式
  *
+ * @param dataIndex Column 中的 dataIndex
+ */
+export declare const parseDataIndex: (dataIndex: ProColumnType['dataIndex']) => string | undefined;
+/**
+ * 平铺所有columns, 用于判断是用的是本地筛选/排序
+ * @param data 列配置
+ * @returns 平铺后的列配置
+ */
+export declare const flattenColumns: (data: any[]) => any[];
+/**
+ * 判断是否为本地筛选
+ * @param filters 筛选配置
+ * @param onFilter 筛选函数
+ * @returns 是否为本地筛选
+ */
+export declare const isLocaleFilter: <T>(filters: ProColumnType<T>['filters'], onFilter: ProColumnType<T>['onFilter']) => boolean;
+/**
+ * 判断是否为本地排序
+ * @param sorter 排序配置
+ * @returns 是否为本地排序
+ */
+export declare const isLocaleSorter: <T>(sorter: ProSorter<T>) => boolean;
+/**
+ * 获取服务端筛选数据
+ * @param filters 筛选数据
+ * @param columns 列配置
+ * @returns 服务端筛选数据
+ */
+export declare const getServerFilterResult: <T>(filters: Record<string, AntFilterValue | null>, columns: ProColumnType<T>[]) => Record<string, FilterValue>;
+/**
+ * 获取服务端排序数据
+ * @param sorterResult 排序数据
+ * @returns 服务端排序数据
+ */
+export declare const getServerSorterResult: <T>(sorterResult: SorterResult<T> | SorterResult<T>[]) => Record<string, SortOrder | undefined>;
+/**
+ * 从 ProColumns 数组中取出默认的服务端排序和筛选数据
  * @param columns ProColumns
  */
-export declare function parseDefaultColumnConfig<T, Value>(columns: ProColumns<T, Value>[]): {
+export declare const parseServerDefaultColumnConfig: <T, Value>(columns: ProColumns<T, Value>[]) => {
     sort: Record<string, SortOrder>;
-    filter: Record<string, (string | number)[] | null>;
+    filter: Record<string, FilterValue>;
 };
+/**
+ * 解析对应排序值，用作双向绑定
+ * @param proSort 排序配置
+ * @param columnProps 列配置
+ * @returns 排序值
+ */
+export declare const parseProSortOrder: <T>(proSort: Record<string, SortOrder>, columnProps: ProColumnType<T>) => SortOrder | undefined;
+/**
+ * 解析对应筛选值，用作双向绑定
+ * @param proFilter 筛选配置
+ * @param columnProps 列配置
+ * @returns 筛选值
+ */
+export declare const parseProFilteredValue: <T>(proFilter: Record<string, FilterValue>, columnProps: ProColumnType<T>) => FilterValue | undefined;
 export {};

package/es/table/utils/index.js

@@ -1,3 +1,5 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
@@ -147,7 +149,9 @@ export function useActionType(ref, action, props) {
     },
     setPageInfo: function setPageInfo(rest) {
       return action.setPageInfo(rest);
-    }
+    },
+    // 透出 scrollTo（如上层提供）
+    scrollTo: props.scrollTo
   });
   // eslint-disable-next-line no-param-reassign
   ref.current = userAction;
@@ -202,41 +206,174 @@ export var genColumnKey = function genColumnKey(key, index) {
  *
  * @param dataIndex Column 中的 dataIndex
  */
-function parseDataIndex(dataIndex) {
+export var parseDataIndex = function parseDataIndex(dataIndex) {
   if (Array.isArray(dataIndex)) {
     return dataIndex.join(',');
   }
   return dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString();
-}
+};
 
 /**
- * 从 ProColumns 数组中取出默认的排序和筛选数据
- *
+ * 平铺所有columns, 用于判断是用的是本地筛选/排序
+ * @param data 列配置
+ * @returns 平铺后的列配置
+ */
+export var flattenColumns = function flattenColumns(data) {
+  var _columns = [];
+  for (var i = 0; i < data.length; i++) {
+    var _curItem = data[i];
+    if (_curItem.children) {
+      _columns.push.apply(_columns, _toConsumableArray(flattenColumns(_curItem.children)));
+    } else {
+      _columns.push(_curItem);
+    }
+  }
+  return _columns;
+};
+
+/**
+ * 判断是否为本地筛选
+ * @param filters 筛选配置
+ * @param onFilter 筛选函数
+ * @returns 是否为本地筛选
+ */
+export var isLocaleFilter = function isLocaleFilter(filters, onFilter) {
+  return !!filters && !!onFilter;
+};
+
+/**
+ * 判断是否为本地排序
+ * @param sorter 排序配置
+ * @returns 是否为本地排序
+ */
+export var isLocaleSorter = function isLocaleSorter(sorter) {
+  return typeof sorter === 'function' || _typeof(sorter) === 'object' && typeof sorter.compare === 'function';
+};
+
+/**
+ * 获取服务端筛选数据
+ * @param filters 筛选数据
+ * @param columns 列配置
+ * @returns 服务端筛选数据
+ */
+export var getServerFilterResult = function getServerFilterResult(filters, columns) {
+  // 过滤掉本地筛选的列
+  return Object.entries(filters).reduce(function (acc, _ref2) {
+    var _ref3 = _slicedToArray(_ref2, 2),
+      key = _ref3[0],
+      value = _ref3[1];
+    var column = columns.find(function (column) {
+      return parseDataIndex(column.dataIndex) === key;
+    });
+    if (column != null && !isLocaleFilter(column.filters, column.onFilter)) acc[key] = value;
+    return acc;
+  }, {});
+};
+
+/**
+ * 获取服务端排序数据
+ * @param sorterResult 排序数据
+ * @returns 服务端排序数据
+ */
+export var getServerSorterResult = function getServerSorterResult(sorterResult) {
+  var result = Array.isArray(sorterResult) ? sorterResult : [sorterResult];
+  var serverSorter = result.reduce(function (acc, item) {
+    var _item$column, _item$column2;
+    var sorter = (_item$column = item.column) === null || _item$column === void 0 ? void 0 : _item$column.sorter;
+    if (sorter != null && isLocaleSorter(sorter)) return acc;
+    var sortKey = typeof sorter === 'string' ? sorter : parseDataIndex((_item$column2 = item.column) === null || _item$column2 === void 0 ? void 0 : _item$column2.dataIndex);
+    if (sortKey != null) acc[sortKey] = item.order;
+    return acc;
+  }, {});
+  return serverSorter;
+};
+
+/**
+ * 从 ProColumns 数组中取出默认的服务端排序和筛选数据
  * @param columns ProColumns
  */
-export function parseDefaultColumnConfig(columns) {
+export var parseServerDefaultColumnConfig = function parseServerDefaultColumnConfig(columns) {
   var filter = {};
   var sort = {};
   columns.forEach(function (column) {
     // 转换 dataIndex
     var dataIndex = parseDataIndex(column.dataIndex);
-    if (!dataIndex) {
-      return;
+    if (!dataIndex) return; // 没有 dataIndex 的列不参与服务端排序/筛选
+
+    // 当 column 启用服务端 filters 功能时，取出默认的筛选值
+    if (column.filters && !isLocaleFilter(column.filters, column.onFilter)) {
+      var _ref4;
+      filter[dataIndex] = (_ref4 = column.defaultFilteredValue) !== null && _ref4 !== void 0 ? _ref4 : null;
     }
-    // 当 column 启用 filters 功能时，取出默认的筛选值
-    if (column.filters) {
-      var defaultFilteredValue = column.defaultFilteredValue;
-      if (defaultFilteredValue !== undefined) {
-        filter[dataIndex] = column.defaultFilteredValue;
+
+    // 当 column 启用服务端 sorter 功能时，取出默认的排序值
+    if (column.sorter && !isLocaleSorter(column.sorter)) {
+      if (typeof column.sorter === 'string') {
+        var _column$defaultSortOr;
+        sort[column.sorter] = (_column$defaultSortOr = column.defaultSortOrder) !== null && _column$defaultSortOr !== void 0 ? _column$defaultSortOr : null;
+      } else {
+        var _column$defaultSortOr2;
+        sort[dataIndex] = (_column$defaultSortOr2 = column.defaultSortOrder) !== null && _column$defaultSortOr2 !== void 0 ? _column$defaultSortOr2 : null;
       }
     }
-    // 当 column 启用 sorter 功能时，取出默认的排序值
-    if (column.sorter && column.defaultSortOrder) {
-      sort[dataIndex] = column.defaultSortOrder;
-    }
   });
   return {
     sort: sort,
     filter: filter
   };
-}
+};
+
+/**
+ * 解析对应排序值，用作双向绑定
+ * @param proSort 排序配置
+ * @param columnProps 列配置
+ * @returns 排序值
+ */
+export var parseProSortOrder = function parseProSortOrder(proSort, columnProps) {
+  var sorter = columnProps.sorter,
+    columnSortOrder = columnProps.sortOrder,
+    dataIndex = columnProps.dataIndex;
+
+  // 优先使用用户明确设置的 sortOrder
+  if (columnSortOrder !== undefined) return columnSortOrder;
+
+  // 如果没有排序器配置，直接返回 undefined
+  if (sorter == null) return undefined;
+
+  // 如果是本地排序，不使用 proSort 中的值
+  if (isLocaleSorter(sorter)) return undefined;
+
+  // 服务端排序：确定排序键
+  var sortKey = typeof sorter === 'string' ? sorter : parseDataIndex(dataIndex);
+
+  // 返回对应的排序值
+  return sortKey ? proSort[sortKey] : undefined;
+};
+
+/**
+ * 解析对应筛选值，用作双向绑定
+ * @param proFilter 筛选配置
+ * @param columnProps 列配置
+ * @returns 筛选值
+ */
+export var parseProFilteredValue = function parseProFilteredValue(proFilter, columnProps) {
+  var filters = columnProps.filters,
+    onFilter = columnProps.onFilter,
+    columnFilteredValue = columnProps.filteredValue,
+    dataIndex = columnProps.dataIndex;
+
+  // 优先使用用户设置的 filteredValue
+  if (columnFilteredValue !== undefined) return columnFilteredValue;
+
+  // 如果没有筛选配置，直接返回 undefined
+  if (filters == null) return undefined;
+
+  // 如果是本地筛选，不使用 proFilter 中的值
+  if (isLocaleFilter(filters, onFilter)) return undefined;
+
+  // 服务端排序：获取筛选键
+  var filterKey = parseDataIndex(dataIndex);
+
+  // 返回对应的筛选值
+  return filterKey ? proFilter[filterKey] : undefined;
+};

package/es/utils/conversionMomentValue/index.js

@@ -132,17 +132,29 @@ export var conversionMomentValue = function conversionMomentValue(value, dateFor
       tmpValue[valueKey] = conversionMomentValue(itemValue, dateFormatter, valueTypeMap, omitNil, namePath);
       return;
     }
+    var currentDateFormatter = dateFormatter !== null && dateFormatter !== void 0 ? dateFormatter : 'string';
+    var 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(function (arrayValue, index) {
         if (dayjs.isDayjs(arrayValue) || isMoment(arrayValue)) {
-          return convertMoment(arrayValue, dateFormat || dateFormatter, valueType);
+          // For arrays, if no format is defined and dateFormatter is 'string', use 'string' with default format
+          var arrayDateFormatter = finalDateFormatter === undefined && currentDateFormatter === 'string' ? 'string' : finalDateFormatter;
+          return convertMoment(arrayValue, arrayDateFormatter, valueType);
         }
         return conversionMomentValue(arrayValue, dateFormatter, valueTypeMap, omitNil, [valueKey, "".concat(index)].flat(1));
       });
       return;
     }
-    tmpValue[valueKey] = convertMoment(itemValue, dateFormat || (dateFormatter === 'string' ? dateFormatterMap[valueType] : dateFormatter), valueType);
+    tmpValue[valueKey] = convertMoment(itemValue, finalDateFormatter, valueType);
   });
   return tmpValue;
 };

package/lib/card/components/Statistic/style.js

@@ -40,13 +40,9 @@ var genProStyle = function genProStyle(token) {
         transform: 'rotate(180deg)'
       }
     },
-    '&-content': (0, _defineProperty2.default)({
+    '&-content': {
       width: '100%'
-    }, "".concat(token.antCls, "-statistic-content"), {
-      '&-value-int': {
-        fontSize: token.fontSizeHeading3
-      }
-    }),
+    },
     '&-description': {
       width: '100%'
     }

package/lib/descriptions/index.js

@@ -174,7 +174,8 @@ var FieldRender = exports.FieldRender = function FieldRender(props) {
       marginTop: -5,
       marginBottom: -5,
       marginLeft: 0,
-      marginRight: 0
+      marginRight: 0,
+      width: '100%'
     },
     children: renderDom()
   });

package/lib/field/ValueTypeToComponent.js

@@ -762,22 +762,22 @@ var ValueTypeToComponentMap = {
     render: function render(text, props) {
       var fieldProps = (0, _utils.pickProProps)(props.fieldProps);
       var placeholder = typeof props.placeholder === 'string' ? props.placeholder : undefined;
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Cascader.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Cascader.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
         mode: props.mode,
         text: text,
         placeholder: placeholder,
         fieldProps: fieldProps
-      });
+      }));
     },
     formItemRender: function formItemRender(text, props) {
       var fieldProps = (0, _utils.pickProProps)(props.fieldProps);
       var placeholder = typeof props.placeholder === 'string' ? props.placeholder : undefined;
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Cascader.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Cascader.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
         mode: props.mode,
         text: text,
         placeholder: placeholder,
         fieldProps: fieldProps
-      });
+      }));
     }
   },
   treeSelect: {

package/lib/field/components/ColorPicker/index.d.ts

@@ -3,5 +3,5 @@ import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<import("src/provider").BaseProFieldFC & import("src/provider").ProRenderFieldPropsType & {
     text: string;
     mode?: "update" | "read" | "edit" | undefined;
-} & Partial<Omit<ColorPickerProps, "value" | "mode">> & React.RefAttributes<any>>;
+} & Partial<Omit<ColorPickerProps, "mode" | "value">> & React.RefAttributes<any>>;
 export default _default;

package/lib/field/components/Percent/util.d.ts

@@ -1,7 +1,7 @@
 /** 获取展示符号 */
 export declare function getSymbolByRealValue(realValue: number): "-" | "+" | null;
 /** 获取颜色 */
-export declare function getColorByRealValue(realValue: number /** ,color: string */): "#52c41a" | "#595959" | "#ff4d4f";
+export declare function getColorByRealValue(realValue: number /** ,color: string */): "#595959" | "#52c41a" | "#ff4d4f";
 /** 获取到最后展示的数字 */
 export declare function getRealTextWithPrecision(realValue: number, precision?: number): string | number;
 /**

package/lib/form/BaseForm/BaseForm.js

@@ -54,6 +54,7 @@ var covertFormName = function covertFormName(name) {
   if (Array.isArray(name)) return name;
   return [name];
 };
+var defaultExtraUrlParams = {};
 function BaseFormComponents(props) {
   var _ConfigProvider$useCo;
   var children = props.children,
@@ -69,7 +70,7 @@ function BaseFormComponents(props) {
     loading = props.loading,
     formComponentType = props.formComponentType,
     _props$extraUrlParams = props.extraUrlParams,
-    extraUrlParams = _props$extraUrlParams === void 0 ? {} : _props$extraUrlParams,
+    extraUrlParams = _props$extraUrlParams === void 0 ? defaultExtraUrlParams : _props$extraUrlParams,
     syncToUrl = props.syncToUrl,
     onUrlSearchChange = props.onUrlSearchChange,
     _onReset = props.onReset,
@@ -405,7 +406,7 @@ function BaseFormComponents(props) {
 var requestFormCacheId = 0;
 function BaseForm(props) {
   var _props$extraUrlParams2 = props.extraUrlParams,
-    extraUrlParams = _props$extraUrlParams2 === void 0 ? {} : _props$extraUrlParams2,
+    extraUrlParams = _props$extraUrlParams2 === void 0 ? defaultExtraUrlParams : _props$extraUrlParams2,
     syncToUrl = props.syncToUrl,
     isKeyPressSubmit = props.isKeyPressSubmit,
     _props$syncToUrlAsImp = props.syncToUrlAsImportant,

package/lib/form/components/DatePicker/BaseDatePicker.js

@@ -27,24 +27,32 @@ var BaseDatePicker = exports.BaseDatePicker = /*#__PURE__*/_react.default.forwar
     valueType = _ref.valueType,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var context = (0, _react.useContext)(_FieldContext.default);
+  var mergedFieldProps = (0, _react.useMemo)(function () {
+    var nextFieldProps = fieldProps ? (0, _objectSpread2.default)({}, fieldProps) : {};
+    if (valueType === 'dateTime' && nextFieldProps.showTime === undefined) {
+      nextFieldProps.showTime = true;
+    }
+    return nextFieldProps;
+  }, [fieldProps, valueType]);
+  var renderFieldDatePicker = (0, _react.useCallback)(function (text, props) {
+    var _ref2, _fieldPropsFromContex;
+    var fieldPropsFromContext = (_ref2 = props.fieldProps) !== null && _ref2 !== void 0 ? _ref2 : mergedFieldProps;
+    var format = valueType === 'dateTime' ? (_fieldPropsFromContex = fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format) !== null && _fieldPropsFromContex !== void 0 ? _fieldPropsFromContex : 'YYYY-MM-DD HH:mm:ss' : fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldDatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+      format: format,
+      text: text
+    }));
+  }, [mergedFieldProps, valueType]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provider.ProConfigProvider, {
     valueTypeMap: (0, _defineProperty2.default)({}, valueType, {
-      render: function render(text, props) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldDatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-          text: text
-        }));
-      },
-      formItemRender: function formItemRender(text, props) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldDatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-          text: text
-        }));
-      }
+      render: renderFieldDatePicker,
+      formItemRender: renderFieldDatePicker
     }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       valueType: valueType,
       fieldProps: (0, _objectSpread2.default)({
         getPopupContainer: context.getPopupContainer
-      }, fieldProps),
+      }, mergedFieldProps),
       proFieldProps: proFieldProps,
       fieldConfig: {
         valueType: valueType,

package/lib/form/components/DateRangePicker/BaseDateRanger.js

@@ -23,30 +23,55 @@ var BaseDateRanger = exports.BaseDateRanger = /*#__PURE__*/_react.default.forwar
     valueType = _ref.valueType,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var context = (0, _react.useContext)(_FieldContext.default);
+  var mergedFieldProps = (0, _react.useMemo)(function () {
+    var nextFieldProps = fieldProps ? (0, _objectSpread2.default)({}, fieldProps) : {};
+    if (valueType === 'dateTimeRange' && nextFieldProps.showTime === undefined) {
+      nextFieldProps.showTime = true;
+    }
+    return nextFieldProps;
+  }, [fieldProps, valueType]);
+  var lightFilterFormat = (0, _react.useMemo)(function () {
+    if (mergedFieldProps.format) return mergedFieldProps.format;
+    switch (valueType) {
+      case 'dateTimeRange':
+        return 'YYYY-MM-DD HH:mm:ss';
+      case 'dateWeekRange':
+        return 'YYYY-wo';
+      case 'dateMonthRange':
+        return 'YYYY-MM';
+      case 'dateQuarterRange':
+        return 'YYYY-[Q]Q';
+      case 'dateYearRange':
+        return 'YYYY';
+      default:
+        return 'YYYY-MM-DD';
+    }
+  }, [mergedFieldProps.format, valueType]);
+  var renderFieldRangePicker = (0, _react.useCallback)(function (text, props) {
+    var _ref2, _fieldPropsFromContex;
+    var fieldPropsFromContext = (_ref2 = props.fieldProps) !== null && _ref2 !== void 0 ? _ref2 : mergedFieldProps;
+    var format = valueType === 'dateTimeRange' ? (_fieldPropsFromContex = fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format) !== null && _fieldPropsFromContex !== void 0 ? _fieldPropsFromContex : 'YYYY-MM-DD HH:mm:ss' : fieldPropsFromContext === null || fieldPropsFromContext === void 0 ? void 0 : fieldPropsFromContext.format;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+      format: format,
+      text: text
+    }));
+  }, [mergedFieldProps, valueType]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provider.ProConfigProvider, {
     valueTypeMap: (0, _defineProperty2.default)({}, valueType, {
-      render: function render(text, props) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-          text: text
-        }));
-      },
-      formItemRender: function formItemRender(text, props) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-          text: text
-        }));
-      }
+      render: renderFieldRangePicker,
+      formItemRender: renderFieldRangePicker
     }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       fieldProps: (0, _objectSpread2.default)({
         getPopupContainer: context.getPopupContainer
-      }, fieldProps),
+      }, mergedFieldProps),
       valueType: valueType,
       proFieldProps: proFieldProps,
       fieldConfig: {
         valueType: valueType,
         customLightMode: true,
         lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
-          return (0, _utils.dateArrayFormatter)(value, (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || 'YYYY-MM');
+          return (0, _utils.dateArrayFormatter)(value, lightFilterFormat);
         }
       }
     }, rest), {}, {

package/lib/form/components/Digit/DigitRange.d.ts

@@ -13,7 +13,7 @@ export type ProFormDigitRangeProps = ProFormFieldItemProps<RangeInputNumberProps
     separatorWidth?: number;
 };
 declare const ForwardRefProFormDigit: React.ForwardRefExoticComponent<{
-    fieldProps?: Partial<import("../../typing").FieldProps<any> & Omit<InputNumberProps<number>, "defaultValue" | "onChange" | "placeholder" | "value"> & {
+    fieldProps?: Partial<import("../../typing").FieldProps<any> & Omit<InputNumberProps<number>, "value" | "defaultValue" | "onChange" | "placeholder"> & {
         value?: ValuePair | undefined;
         defaultValue?: ValuePair | undefined;
         onChange?: ((value?: ValuePair) => void) | undefined;

package/lib/form/components/SchemaForm/index.js

@@ -160,12 +160,11 @@ function BetaSchemaForm(props) {
     propsOnValuesChange === null || propsOnValuesChange === void 0 || propsOnValuesChange(changedValues, values);
   }, [propsRef, shouldUpdate]);
   var formChildrenDoms = (0, _utils.useDeepCompareMemo)(function () {
-    if (!formRef.current) return;
     // like StepsForm's columns but not only for StepsForm
     if (columns.length && Array.isArray(columns[0])) return;
     return genItems(columns);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [columns, restProps === null || restProps === void 0 ? void 0 : restProps.open, action, type, formDomsDeps]);
+  }, [columns, restProps === null || restProps === void 0 ? void 0 : restProps.open, action, type, formDomsDeps, formRef.current]);
 
   /**
    * Append layoutType component specific props

package/lib/form/components/UploadButton/index.d.ts

@@ -48,5 +48,5 @@ export type ProFormUploadButtonProps = ProFormFieldItemProps<UploadProps<any>, H
      */
     imageProps?: Omit<ImageProps, 'src'>;
 } & PickUploadProps;
-declare const ProFormUploadButton: React.ForwardRefRenderFunction<any, ProFormUploadButtonProps>;
+declare const ProFormUploadButton: React.FC<ProFormUploadButtonProps>;
 export default ProFormUploadButton;

package/lib/form/components/UploadButton/index.js

@@ -36,7 +36,7 @@ var getBase64 = function getBase64(file) {
  *
  * @param
  */
-var BaseProFormUploadButton = function BaseProFormUploadButton(_ref, ref) {
+var BaseProFormUploadButton = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
   var _fieldProps$name;
   var fieldProps = _ref.fieldProps,
     action = _ref.action,
@@ -134,8 +134,8 @@ var BaseProFormUploadButton = function BaseProFormUploadButton(_ref, ref) {
       src: previewImage
     }))]
   });
-};
-var ProFormUploadButton = (_ref3 = _warpField.default) === null || _ref3 === void 0 ? void 0 : _ref3( /*#__PURE__*/_react.default.forwardRef(BaseProFormUploadButton), {
+});
+var ProFormUploadButton = (_ref3 = _warpField.default) === null || _ref3 === void 0 ? void 0 : _ref3(BaseProFormUploadButton, {
   getValueFromEvent: function getValueFromEvent(value) {
     return value.fileList;
   }