@ant-design/pro-components 3.1.0-0 → 3.1.1-0

package/es/field/AllProField.js

@@ -1,12 +1,3 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["fieldProps"],
-  _excluded2 = ["fieldProps"],
-  _excluded3 = ["fieldProps"],
-  _excluded4 = ["fieldProps"],
-  _excluded5 = ["text", "valueType", "mode", "onChange", "formItemRender", "value", "readonly", "fieldProps"],
-  _excluded6 = ["placeholder"];
 import { Avatar } from 'antd';
 import dayjs from 'dayjs';
 import advancedFormat from 'dayjs/plugin/advancedFormat';
@@ -65,39 +56,43 @@ dayjs.extend(weekday);
  * @param text String | number
  * @param valueType ProColumnsValueObjectType
  */
-var defaultRenderTextByObject = function defaultRenderTextByObject(text, valueType, props) {
-  var pickFormItemProps = pickProProps(props.fieldProps);
+const defaultRenderTextByObject = (text, valueType, props) => {
+  const pickFormItemProps = pickProProps(props.fieldProps);
   if (valueType.type === 'progress') {
-    return /*#__PURE__*/_jsx(FieldProgress, _objectSpread(_objectSpread({}, props), {}, {
+    return /*#__PURE__*/_jsx(FieldProgress, {
+      ...props,
       text: text,
-      fieldProps: _objectSpread({
-        status: valueType.status ? valueType.status : undefined
-      }, pickFormItemProps)
-    }));
+      fieldProps: {
+        status: valueType.status ? valueType.status : undefined,
+        ...pickFormItemProps
+      }
+    });
   }
   if (valueType.type === 'money') {
-    return /*#__PURE__*/_jsx(FieldMoney, _objectSpread(_objectSpread({
-      locale: valueType.locale
-    }, props), {}, {
+    return /*#__PURE__*/_jsx(FieldMoney, {
+      locale: valueType.locale,
+      ...props,
       fieldProps: pickFormItemProps,
       text: text,
       moneySymbol: valueType.moneySymbol
-    }));
+    });
   }
   if (valueType.type === 'percent') {
-    return /*#__PURE__*/_jsx(FieldPercent, _objectSpread(_objectSpread({}, props), {}, {
+    return /*#__PURE__*/_jsx(FieldPercent, {
+      ...props,
       text: text,
       showSymbol: valueType.showSymbol,
       precision: valueType.precision,
       fieldProps: pickFormItemProps,
       showColor: valueType.showColor
-    }));
+    });
   }
   if (valueType.type === 'image') {
-    return /*#__PURE__*/_jsx(FieldImage, _objectSpread(_objectSpread({}, props), {}, {
+    return /*#__PURE__*/_jsx(FieldImage, {
+      ...props,
       text: text,
       width: valueType.width
-    }));
+    });
   }
   return text;
 };
@@ -108,19 +103,22 @@ var defaultRenderTextByObject = function defaultRenderTextByObject(text, valueTy
  * @param dataValue
  * @param valueType
  */
-export var defaultRenderText = function defaultRenderText(dataValue, valueType, props, valueTypeMap) {
-  var _props$mode = props.mode,
-    mode = _props$mode === void 0 ? 'read' : _props$mode,
-    _props$emptyText = props.emptyText,
-    emptyText = _props$emptyText === void 0 ? '-' : _props$emptyText;
+export const defaultRenderText = (dataValue, valueType, props, valueTypeMap) => {
+  const {
+    mode = 'read',
+    emptyText = '-'
+  } = props;
   if (emptyText !== false && mode === 'read' && valueType !== 'option' && valueType !== 'switch') {
     if (typeof dataValue !== 'boolean' && typeof dataValue !== 'number' && !dataValue) {
-      var fieldProps = props.fieldProps,
-        render = props.render;
+      const {
+        fieldProps,
+        render
+      } = props;
       if (render) {
-        return render(dataValue, _objectSpread({
-          mode: mode
-        }, fieldProps), /*#__PURE__*/_jsx(_Fragment, {
+        return render(dataValue, {
+          mode,
+          ...fieldProps
+        }, /*#__PURE__*/_jsx(_Fragment, {
           children: emptyText
         }));
       }
@@ -132,28 +130,27 @@ export var defaultRenderText = function defaultRenderText(dataValue, valueType,
 
   // eslint-disable-next-line no-param-reassign
   delete props.emptyText;
-  if (_typeof(valueType) === 'object') {
+  if (typeof valueType === 'object') {
     return defaultRenderTextByObject(dataValue, valueType, props);
   }
-  var customValueTypeConfig = valueTypeMap && valueTypeMap[valueType];
+  const customValueTypeConfig = valueTypeMap && valueTypeMap[valueType];
   if (customValueTypeConfig) {
     // eslint-disable-next-line no-param-reassign
     delete props.ref;
     if (mode === 'read') {
-      var _customValueTypeConfi;
-      return (_customValueTypeConfi = customValueTypeConfig.render) === null || _customValueTypeConfi === void 0 ? void 0 : _customValueTypeConfi.call(customValueTypeConfig, dataValue, _objectSpread(_objectSpread({
-        text: dataValue
-      }, props), {}, {
+      return customValueTypeConfig.render?.(dataValue, {
+        text: dataValue,
+        ...props,
         mode: mode || 'read'
-      }), /*#__PURE__*/_jsx(_Fragment, {
+      }, /*#__PURE__*/_jsx(_Fragment, {
         children: dataValue
       }));
     }
     if (mode === 'update' || mode === 'edit') {
-      var _customValueTypeConfi2;
-      return (_customValueTypeConfi2 = customValueTypeConfig.formItemRender) === null || _customValueTypeConfi2 === void 0 ? void 0 : _customValueTypeConfi2.call(customValueTypeConfig, dataValue, _objectSpread({
-        text: dataValue
-      }, props), /*#__PURE__*/_jsx(_Fragment, {
+      return customValueTypeConfig.formItemRender?.(dataValue, {
+        text: dataValue,
+        ...props
+      }, /*#__PURE__*/_jsx(_Fragment, {
         children: dataValue
       }));
     }
@@ -161,19 +158,21 @@ export var defaultRenderText = function defaultRenderText(dataValue, valueType,
 
   /** 如果是金额的值 */
   if (valueType === 'money') {
-    return /*#__PURE__*/_jsx(FieldMoney, _objectSpread(_objectSpread({}, props), {}, {
+    return /*#__PURE__*/_jsx(FieldMoney, {
+      ...props,
       text: dataValue
-    }));
+    });
   }
 
   /** 如果是日期的值 */
   if (valueType === 'date') {
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldDatePicker, {
         text: dataValue,
-        format: "YYYY-MM-DD"
-      }, props))
+        format: "YYYY-MM-DD",
+        ...props
+      })
     });
   }
 
@@ -181,79 +180,96 @@ export var defaultRenderText = function defaultRenderText(dataValue, valueType,
   if (valueType === 'dateWeek') {
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldDatePicker, {
         text: dataValue,
         format: "YYYY-wo",
-        picker: "week"
-      }, props))
+        picker: "week",
+        ...props
+      })
     });
   }
 
   /** 如果是周范围的值 */
   if (valueType === 'dateWeekRange') {
-    var _fieldProps = props.fieldProps,
-      otherProps = _objectWithoutProperties(props, _excluded);
+    const {
+      fieldProps,
+      ...otherProps
+    } = props;
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldRangePicker, {
         text: dataValue,
         format: "YYYY-W",
         showTime: true,
-        fieldProps: _objectSpread({
-          picker: 'week'
-        }, _fieldProps)
-      }, otherProps))
+        fieldProps: {
+          picker: 'week',
+          ...fieldProps
+        },
+        ...otherProps
+      })
     });
   }
 
   /** 如果是月范围的值 */
   if (valueType === 'dateMonthRange') {
-    var _fieldProps2 = props.fieldProps,
-      _otherProps = _objectWithoutProperties(props, _excluded2);
+    const {
+      fieldProps,
+      ...otherProps
+    } = props;
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldRangePicker, {
         text: dataValue,
         format: "YYYY-MM",
         showTime: true,
-        fieldProps: _objectSpread({
-          picker: 'month'
-        }, _fieldProps2)
-      }, _otherProps))
+        fieldProps: {
+          picker: 'month',
+          ...fieldProps
+        },
+        ...otherProps
+      })
     });
   }
 
   /** 如果是季范围的值 */
   if (valueType === 'dateQuarterRange') {
-    var _fieldProps3 = props.fieldProps,
-      _otherProps2 = _objectWithoutProperties(props, _excluded3);
+    const {
+      fieldProps,
+      ...otherProps
+    } = props;
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldRangePicker, {
         text: dataValue,
         format: "YYYY-Q",
         showTime: true,
-        fieldProps: _objectSpread({
-          picker: 'quarter'
-        }, _fieldProps3)
-      }, _otherProps2))
+        fieldProps: {
+          picker: 'quarter',
+          ...fieldProps
+        },
+        ...otherProps
+      })
     });
   }
 
   /** 如果是年范围的值 */
   if (valueType === 'dateYearRange') {
-    var _fieldProps4 = props.fieldProps,
-      _otherProps3 = _objectWithoutProperties(props, _excluded4);
+    const {
+      fieldProps,
+      ...otherProps
+    } = props;
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldRangePicker, {
         text: dataValue,
         format: "YYYY",
         showTime: true,
-        fieldProps: _objectSpread({
-          picker: 'year'
-        }, _fieldProps4)
-      }, _otherProps3))
+        fieldProps: {
+          picker: 'year',
+          ...fieldProps
+        },
+        ...otherProps
+      })
     });
   }
 
@@ -261,11 +277,12 @@ export var defaultRenderText = function defaultRenderText(dataValue, valueType,
   if (valueType === 'dateMonth') {
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldDatePicker, {
         text: dataValue,
         format: "YYYY-MM",
-        picker: "month"
-      }, props))
+        picker: "month",
+        ...props
+      })
     });
   }
 
@@ -273,11 +290,12 @@ export var defaultRenderText = function defaultRenderText(dataValue, valueType,
   if (valueType === 'dateQuarter') {
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldDatePicker, {
         text: dataValue,
         format: "YYYY-[Q]Q",
-        picker: "quarter"
-      }, props))
+        picker: "quarter",
+        ...props
+      })
     });
   }
 
@@ -285,31 +303,34 @@ export var defaultRenderText = function defaultRenderText(dataValue, valueType,
   if (valueType === 'dateYear') {
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldDatePicker, {
         text: dataValue,
         format: "YYYY",
-        picker: "year"
-      }, props))
+        picker: "year",
+        ...props
+      })
     });
   }
 
   /** 如果是日期范围的值 */
   if (valueType === 'dateRange') {
-    return /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread({
+    return /*#__PURE__*/_jsx(FieldRangePicker, {
       text: dataValue,
-      format: "YYYY-MM-DD"
-    }, props));
+      format: "YYYY-MM-DD",
+      ...props
+    });
   }
 
   /** 如果是日期加时间类型的值 */
   if (valueType === 'dateTime') {
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldDatePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldDatePicker, {
         text: dataValue,
         format: "YYYY-MM-DD HH:mm:ss",
-        showTime: true
-      }, props))
+        showTime: true,
+        ...props
+      })
     });
   }
 
@@ -318,11 +339,12 @@ export var defaultRenderText = function defaultRenderText(dataValue, valueType,
     // 值不存在的时候显示 "-"
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldRangePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldRangePicker, {
         text: dataValue,
         format: "YYYY-MM-DD HH:mm:ss",
-        showTime: true
-      }, props))
+        showTime: true,
+        ...props
+      })
     });
   }
 
@@ -330,10 +352,11 @@ export var defaultRenderText = function defaultRenderText(dataValue, valueType,
   if (valueType === 'time') {
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldTimePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldTimePicker, {
         text: dataValue,
-        format: "HH:mm:ss"
-      }, props))
+        format: "HH:mm:ss",
+        ...props
+      })
     });
   }
 
@@ -341,16 +364,18 @@ export var defaultRenderText = function defaultRenderText(dataValue, valueType,
   if (valueType === 'timeRange') {
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldTimeRangePicker, _objectSpread({
+      children: /*#__PURE__*/_jsx(FieldTimeRangePicker, {
         text: dataValue,
-        format: "HH:mm:ss"
-      }, props))
+        format: "HH:mm:ss",
+        ...props
+      })
     });
   }
   if (valueType === 'fromNow') {
-    return /*#__PURE__*/_jsx(FieldFromNow, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldFromNow, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'index') {
     return /*#__PURE__*/_jsx(FieldIndexColumn, {
@@ -364,15 +389,17 @@ export var defaultRenderText = function defaultRenderText(dataValue, valueType,
     });
   }
   if (valueType === 'progress') {
-    return /*#__PURE__*/_jsx(FieldProgress, _objectSpread(_objectSpread({}, props), {}, {
+    return /*#__PURE__*/_jsx(FieldProgress, {
+      ...props,
       text: dataValue
-    }));
+    });
   }
   /** 百分比, 默认展示符号, 不展示小数位 */
   if (valueType === 'percent') {
-    return /*#__PURE__*/_jsx(FieldPercent, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldPercent, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'avatar' && typeof dataValue === 'string' && props.mode === 'read') {
     return /*#__PURE__*/_jsx(Avatar, {
@@ -382,163 +409,185 @@ export var defaultRenderText = function defaultRenderText(dataValue, valueType,
     });
   }
   if (valueType === 'code') {
-    return /*#__PURE__*/_jsx(FieldCode, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldCode, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'jsonCode') {
-    return /*#__PURE__*/_jsx(FieldCode, _objectSpread({
+    return /*#__PURE__*/_jsx(FieldCode, {
       text: dataValue,
-      language: "json"
-    }, props));
+      language: "json",
+      ...props
+    });
   }
   if (valueType === 'textarea') {
-    return /*#__PURE__*/_jsx(FieldTextArea, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldTextArea, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'digit') {
-    return /*#__PURE__*/_jsx(FieldDigit, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldDigit, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'digitRange') {
-    return /*#__PURE__*/_jsx(FieldDigitRange, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldDigitRange, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'second') {
-    return /*#__PURE__*/_jsx(FieldSecond, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldSecond, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'select' || valueType === 'text' && (props.valueEnum || props.request)) {
     return /*#__PURE__*/_jsx(FieldHOC, {
       isLight: props.light,
-      children: /*#__PURE__*/_jsx(FieldSelect, _objectSpread({
-        text: dataValue
-      }, props))
+      children: /*#__PURE__*/_jsx(FieldSelect, {
+        text: dataValue,
+        ...props
+      })
     });
   }
   if (valueType === 'checkbox') {
-    return /*#__PURE__*/_jsx(FieldCheckbox, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldCheckbox, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'radio') {
-    return /*#__PURE__*/_jsx(FieldRadio, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldRadio, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'radioButton') {
-    return /*#__PURE__*/_jsx(FieldRadio, _objectSpread({
+    return /*#__PURE__*/_jsx(FieldRadio, {
       radioType: "button",
-      text: dataValue
-    }, props));
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'rate') {
-    return /*#__PURE__*/_jsx(FieldRate, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldRate, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'slider') {
-    return /*#__PURE__*/_jsx(FieldSlider, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldSlider, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'switch') {
-    return /*#__PURE__*/_jsx(FieldSwitch, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldSwitch, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'option') {
-    return /*#__PURE__*/_jsx(FieldOptions, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldOptions, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'password') {
-    return /*#__PURE__*/_jsx(FieldPassword, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldPassword, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'image') {
-    return /*#__PURE__*/_jsx(FieldImage, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldImage, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'cascader') {
-    return /*#__PURE__*/_jsx(FieldCascader, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldCascader, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'treeSelect') {
-    return /*#__PURE__*/_jsx(FieldTreeSelect, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldTreeSelect, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'color') {
-    return /*#__PURE__*/_jsx(FieldColorPicker, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldColorPicker, {
+      text: dataValue,
+      ...props
+    });
   }
   if (valueType === 'segmented') {
-    return /*#__PURE__*/_jsx(FieldSegmented, _objectSpread({
-      text: dataValue
-    }, props));
+    return /*#__PURE__*/_jsx(FieldSegmented, {
+      text: dataValue,
+      ...props
+    });
   }
-  return /*#__PURE__*/_jsx(FieldText, _objectSpread({
-    text: dataValue
-  }, props));
+  return /*#__PURE__*/_jsx(FieldText, {
+    text: dataValue,
+    ...props
+  });
 };
-var ProFieldComponent = function ProFieldComponent(_ref, ref) {
-  var _ref2, _fieldProps$value, _ref3, _rest$placeholder, _rest$placeholder2, _Object$keys;
-  var text = _ref.text,
-    _ref$valueType = _ref.valueType,
-    valueType = _ref$valueType === void 0 ? 'text' : _ref$valueType,
-    _ref$mode = _ref.mode,
-    mode = _ref$mode === void 0 ? 'read' : _ref$mode,
-    onChange = _ref.onChange,
-    formItemRender = _ref.formItemRender,
-    value = _ref.value,
-    readonly = _ref.readonly,
-    restFieldProps = _ref.fieldProps,
-    rest = _objectWithoutProperties(_ref, _excluded5);
-  var context = useContext(ProConfigContext);
-  var onChangeCallBack = useRefFunction(function () {
-    var _restFieldProps$onCha;
-    for (var _len = arguments.length, restParams = new Array(_len), _key = 0; _key < _len; _key++) {
-      restParams[_key] = arguments[_key];
-    }
-    restFieldProps === null || restFieldProps === void 0 || (_restFieldProps$onCha = restFieldProps.onChange) === null || _restFieldProps$onCha === void 0 || _restFieldProps$onCha.call.apply(_restFieldProps$onCha, [restFieldProps].concat(restParams));
-    onChange === null || onChange === void 0 || onChange.apply(void 0, restParams);
+const ProFieldComponent = ({
+  text,
+  valueType = 'text',
+  mode = 'read',
+  onChange,
+  formItemRender,
+  value,
+  readonly,
+  fieldProps: restFieldProps,
+  ...rest
+}, ref) => {
+  const context = useContext(ProConfigContext);
+  const onChangeCallBack = useRefFunction((...restParams) => {
+    restFieldProps?.onChange?.(...restParams);
+    onChange?.(...restParams);
   });
-  var fieldProps = useDeepCompareMemo(function () {
-    return (value !== undefined || restFieldProps) && _objectSpread(_objectSpread({
-      value: value
-    }, omitUndefined(restFieldProps)), {}, {
+  const fieldProps = useDeepCompareMemo(() => {
+    return (value !== undefined || restFieldProps) && {
+      value,
+      // fieldProps 优先级更高，在类似 LightFilter 场景下需要覆盖默认的 value 和 onChange
+      ...omitUndefined(restFieldProps),
       onChange: onChangeCallBack
-    });
+    };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [value, restFieldProps, onChangeCallBack]);
-  var renderedDom = defaultRenderText(mode === 'edit' ? (_ref2 = (_fieldProps$value = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.value) !== null && _fieldProps$value !== void 0 ? _fieldProps$value : text) !== null && _ref2 !== void 0 ? _ref2 : '' : (_ref3 = text !== null && text !== void 0 ? text : fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.value) !== null && _ref3 !== void 0 ? _ref3 : '', valueType || 'text', omitUndefined(_objectSpread(_objectSpread({
-    ref: ref
-  }, rest), {}, {
+  const renderedDom = defaultRenderText(mode === 'edit' ? fieldProps?.value ?? text ?? '' : text ?? fieldProps?.value ?? '', valueType || 'text', omitUndefined({
+    ref,
+    ...rest,
     mode: readonly ? 'read' : mode,
-    formItemRender: formItemRender ? function (curText, props, dom) {
-      var _placeholder = props.placeholder,
-        restProps = _objectWithoutProperties(props, _excluded6);
-      var newDom = formItemRender(curText, restProps, dom);
+    formItemRender: formItemRender ? (curText, props, dom) => {
+      const {
+        placeholder: _placeholder,
+        ...restProps
+      } = props;
+      const newDom = formItemRender(curText, restProps, dom);
       // formItemRender 之后的dom可能没有props，这里会帮忙注入一下
-      if ( /*#__PURE__*/React.isValidElement(newDom)) return /*#__PURE__*/React.cloneElement(newDom, _objectSpread(_objectSpread({}, fieldProps), newDom.props || {}));
+      if ( /*#__PURE__*/React.isValidElement(newDom)) return /*#__PURE__*/React.cloneElement(newDom, {
+        ...fieldProps,
+        ...(newDom.props || {})
+      });
       return newDom;
     } : undefined,
-    placeholder: formItemRender ? undefined : (_rest$placeholder = rest === null || rest === void 0 ? void 0 : rest.placeholder) !== null && _rest$placeholder !== void 0 ? _rest$placeholder : fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.placeholder,
-    fieldProps: pickProProps(omitUndefined(_objectSpread(_objectSpread({}, fieldProps), {}, {
-      placeholder: formItemRender ? undefined : (_rest$placeholder2 = rest === null || rest === void 0 ? void 0 : rest.placeholder) !== null && _rest$placeholder2 !== void 0 ? _rest$placeholder2 : fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.placeholder
-    })), (_Object$keys = Object.keys(context.valueTypeMap || {})) === null || _Object$keys === void 0 ? void 0 : _Object$keys.includes(valueType))
-  })), context.valueTypeMap || {});
+    placeholder: formItemRender ? undefined : rest?.placeholder ?? fieldProps?.placeholder,
+    fieldProps: pickProProps(omitUndefined({
+      ...fieldProps,
+      placeholder: formItemRender ? undefined : rest?.placeholder ?? fieldProps?.placeholder
+    }), Object.keys(context.valueTypeMap || {})?.includes(valueType))
+  }), context.valueTypeMap || {});
   return /*#__PURE__*/_jsx(React.Fragment, {
     children: renderedDom
   });
 };
-export var ProField = /*#__PURE__*/React.forwardRef(ProFieldComponent);
+export const ProField = /*#__PURE__*/React.forwardRef(ProFieldComponent);