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

package/es/form/components/Digit/index.js

@@ -1,6 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["fieldProps", "min", "proFieldProps", "max"];
 import React from 'react';
 import { FieldDigit } from "../../../field";
 import { ProConfigProvider } from "../../../provider";
@@ -11,44 +8,45 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *
  * @param
  */
-var ProFormDigit = function ProFormDigit(_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    min = _ref.min,
-    proFieldProps = _ref.proFieldProps,
-    max = _ref.max,
-    rest = _objectWithoutProperties(_ref, _excluded);
+const ProFormDigit = ({
+  fieldProps,
+  min,
+  proFieldProps,
+  max,
+  ...rest
+}, ref) => {
   return /*#__PURE__*/_jsx(ProConfigProvider, {
     valueTypeMap: {
       digit: {
-        render: function render(text, props) {
-          return /*#__PURE__*/_jsx(FieldDigit, _objectSpread(_objectSpread({}, props), {}, {
-            text: text,
-            placeholder: props.placeholder
-          }));
-        },
-        formItemRender: function formItemRender(text, props) {
-          return /*#__PURE__*/_jsx(FieldDigit, _objectSpread(_objectSpread({}, props), {}, {
-            text: text,
-            placeholder: props.placeholder
-          }));
-        }
+        render: (text, props) => /*#__PURE__*/_jsx(FieldDigit, {
+          ...props,
+          text: text,
+          placeholder: props.placeholder
+        }),
+        formItemRender: (text, props) => /*#__PURE__*/_jsx(FieldDigit, {
+          ...props,
+          text: text,
+          placeholder: props.placeholder
+        })
       }
     },
-    children: /*#__PURE__*/_jsx(ProFormField, _objectSpread({
+    children: /*#__PURE__*/_jsx(ProFormField, {
       valueType: "digit",
-      fieldProps: _objectSpread({
-        min: min,
-        max: max
-      }, fieldProps),
+      fieldProps: {
+        min,
+        max,
+        ...fieldProps
+      },
       ref: ref,
       fieldConfig: {
         defaultProps: {
           width: '100%'
         }
       },
-      proFieldProps: proFieldProps
-    }, rest))
+      proFieldProps: proFieldProps,
+      ...rest
+    })
   });
 };
-var ForwardRefProFormDigit = /*#__PURE__*/React.forwardRef(ProFormDigit);
+const ForwardRefProFormDigit = /*#__PURE__*/React.forwardRef(ProFormDigit);
 export default ForwardRefProFormDigit;

package/es/form/components/Field/index.js

@@ -1,7 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _ref;
-var _excluded = ["fieldProps", "children", "labelCol", "label", "autoFocus", "isDefaultDom", "render", "proFieldProps", "formItemRender", "valueType", "initialValue", "onChange", "valueEnum", "params", "name", "dependenciesValues", "cacheForSwr", "valuePropName"];
 import React, { memo, useContext, useMemo } from 'react';
 import { PureProField } from "../../../field";
 import { isDeepEqualReact, runFunction, useRefFunction } from "../../../utils";
@@ -9,92 +5,88 @@ import { EditOrReadOnlyContext } from "../../BaseForm/EditOrReadOnlyContext";
 import warpField from "../FormItem/warpField";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
-var BaseProFormField = function BaseProFormField(props) {
-  var fieldProps = props.fieldProps,
-    children = props.children,
-    labelCol = props.labelCol,
-    label = props.label,
-    autoFocus = props.autoFocus,
-    isDefaultDom = props.isDefaultDom,
-    render = props.render,
-    proFieldProps = props.proFieldProps,
-    formItemRender = props.formItemRender,
-    valueType = props.valueType,
-    initialValue = props.initialValue,
-    _onChange = props.onChange,
-    valueEnum = props.valueEnum,
-    params = props.params,
-    name = props.name,
-    dependenciesValues = props.dependenciesValues,
-    _props$cacheForSwr = props.cacheForSwr,
-    cacheForSwr = _props$cacheForSwr === void 0 ? false : _props$cacheForSwr,
-    _props$valuePropName = props.valuePropName,
-    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
-    restProps = _objectWithoutProperties(props, _excluded);
-  var modeContext = useContext(EditOrReadOnlyContext);
-  var propsParams = useMemo(function () {
+const BaseProFormField = props => {
+  const {
+    fieldProps,
+    children,
+    labelCol,
+    label,
+    autoFocus,
+    isDefaultDom,
+    render,
+    proFieldProps,
+    formItemRender,
+    valueType,
+    initialValue,
+    onChange,
+    valueEnum,
+    params,
+    name,
+    dependenciesValues,
+    cacheForSwr = false,
+    valuePropName = 'value',
+    ...restProps
+  } = props;
+  const modeContext = useContext(EditOrReadOnlyContext);
+  const propsParams = useMemo(() => {
     // 使用dependencies时 dependenciesValues是有值的
     // 此时如果存在request，注入dependenciesValues
-    return dependenciesValues && restProps.request ? _objectSpread(_objectSpread({}, params), dependenciesValues || {}) : params;
+    return dependenciesValues && restProps.request ? {
+      ...params,
+      ...(dependenciesValues || {})
+    } : params;
   }, [dependenciesValues, params, restProps.request]);
-  var memoUnChange = useRefFunction(function () {
-    if (fieldProps !== null && fieldProps !== void 0 && fieldProps.onChange) {
-      var _fieldProps$onChange;
-      for (var _len = arguments.length, restParams = new Array(_len), _key = 0; _key < _len; _key++) {
-        restParams[_key] = arguments[_key];
-      }
-      fieldProps === null || fieldProps === void 0 || (_fieldProps$onChange = fieldProps.onChange) === null || _fieldProps$onChange === void 0 || _fieldProps$onChange.call.apply(_fieldProps$onChange, [fieldProps].concat(restParams));
+  const memoUnChange = useRefFunction((...restParams) => {
+    if (fieldProps?.onChange) {
+      fieldProps?.onChange?.(...restParams);
       return;
     }
   });
-  var memoFieldProps = useMemo(function () {
-    return _objectSpread(_objectSpread({
-      autoFocus: autoFocus
-    }, fieldProps), {}, {
-      onChange: memoUnChange
-    });
-  }, [autoFocus, fieldProps, memoUnChange]);
-  var childrenRender = useMemo(function () {
+  const memoFieldProps = useMemo(() => ({
+    autoFocus,
+    ...fieldProps,
+    onChange: memoUnChange
+  }), [autoFocus, fieldProps, memoUnChange]);
+  const childrenRender = useMemo(() => {
     // 防止 formItem 的值被吃掉
     if (children) {
       if ( /*#__PURE__*/React.isValidElement(children)) {
-        return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, restProps), {}, {
-          onChange: function onChange() {
-            for (var _len2 = arguments.length, restParams = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-              restParams[_key2] = arguments[_key2];
-            }
-            if (fieldProps !== null && fieldProps !== void 0 && fieldProps.onChange) {
-              var _fieldProps$onChange2;
-              fieldProps === null || fieldProps === void 0 || (_fieldProps$onChange2 = fieldProps.onChange) === null || _fieldProps$onChange2 === void 0 || _fieldProps$onChange2.call.apply(_fieldProps$onChange2, [fieldProps].concat(restParams));
+        return /*#__PURE__*/React.cloneElement(children, {
+          ...restProps,
+          onChange: (...restParams) => {
+            if (fieldProps?.onChange) {
+              fieldProps?.onChange?.(...restParams);
               return;
             }
-            _onChange === null || _onChange === void 0 || _onChange.apply(void 0, restParams);
-          }
-        }, (children === null || children === void 0 ? void 0 : children.props) || {}));
+            onChange?.(...restParams);
+          },
+          ...(children?.props || {})
+        });
       }
       return /*#__PURE__*/_jsx(_Fragment, {
         children: children
       });
     }
     return;
-  }, [children, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.onChange, _onChange, restProps]);
+  }, [children, fieldProps?.onChange, onChange, restProps]);
   if (childrenRender) {
     return childrenRender;
   }
-  return /*#__PURE__*/_jsx(PureProField, _objectSpread(_objectSpread(_objectSpread({
-    text: fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps[valuePropName],
+  return /*#__PURE__*/_jsx(PureProField, {
+    text: fieldProps?.[valuePropName],
     render: render,
     formItemRender: formItemRender,
     valueType: valueType || 'text',
     cacheForSwr: cacheForSwr,
     fieldProps: memoFieldProps,
-    valueEnum: runFunction(valueEnum)
-  }, proFieldProps), restProps), {}, {
-    mode: (proFieldProps === null || proFieldProps === void 0 ? void 0 : proFieldProps.mode) || modeContext.mode || 'edit',
+    valueEnum: runFunction(valueEnum),
+    ...proFieldProps,
+    ...restProps,
+    mode: proFieldProps?.mode || modeContext.mode || 'edit',
     params: propsParams
-  }));
+  });
 };
-var ProFormField = (_ref = warpField) === null || _ref === void 0 ? void 0 : _ref( /*#__PURE__*/memo(BaseProFormField, function (prevProps, nextProps) {
+const ProFormField = warpField?.( /*#__PURE__*/memo(BaseProFormField, (prevProps, nextProps) => {
   return isDeepEqualReact(nextProps, prevProps, ['onChange', 'onBlur']);
 }));
 export default ProFormField;

package/es/form/components/FieldSet/index.js

@@ -1,9 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _ref3;
-var _excluded = ["children", "value", "valuePropName", "onChange", "fieldProps", "space", "type", "transform", "convertValue", "lightProps"],
-  _excluded2 = ["children", "space", "valuePropName"];
 import { toArray } from '@rc-component/util';
 import { Space } from 'antd';
 import React, { useCallback, useImperativeHandle } from 'react';
@@ -11,113 +5,111 @@ import { runFunction, useRefFunction } from "../../../utils";
 import { useGridHelpers } from "../../helpers";
 import warpField from "../FormItem/warpField";
 import { jsx as _jsx } from "react/jsx-runtime";
-var FieldSetType = {
+const FieldSetType = {
   space: Space,
   group: Space.Compact
 };
-export function defaultGetValueFromEvent(valuePropName) {
-  var event = arguments.length <= 1 ? undefined : arguments[1];
+export function defaultGetValueFromEvent(valuePropName, ...args) {
+  const event = args[0];
   if (event && event.target && valuePropName in event.target) {
     // @ts-ignore
     return event.target[valuePropName];
   }
   return event;
 }
-var FieldSet = function FieldSet(props) {
-  var children = props.children,
-    _props$value = props.value,
-    value = _props$value === void 0 ? [] : _props$value,
-    valuePropName = props.valuePropName,
-    onChange = props.onChange,
-    fieldProps = props.fieldProps,
-    space = props.space,
-    _props$type = props.type,
-    type = _props$type === void 0 ? 'space' : _props$type,
-    transform = props.transform,
-    convertValue = props.convertValue,
-    lightProps = props.lightProps,
-    rest = _objectWithoutProperties(props, _excluded);
+const FieldSet = props => {
+  const {
+    children,
+    value = [],
+    valuePropName,
+    onChange,
+    fieldProps,
+    space,
+    type = 'space',
+    transform,
+    convertValue,
+    lightProps,
+    ...rest
+  } = props;
   /**
    * 使用方法的引用防止闭包
    *
    * @param fileValue
    * @param index
    */
-  var fieldSetOnChange = useRefFunction(function (fileValue, index) {
-    var _fieldProps$onChange;
-    var newValues = _toConsumableArray(value);
+  const fieldSetOnChange = useRefFunction((fileValue, index) => {
+    const newValues = [...value];
     newValues[index] = defaultGetValueFromEvent(valuePropName || 'value', fileValue);
-    onChange === null || onChange === void 0 || onChange(newValues);
-    fieldProps === null || fieldProps === void 0 || (_fieldProps$onChange = fieldProps.onChange) === null || _fieldProps$onChange === void 0 || _fieldProps$onChange.call(fieldProps, newValues);
+    onChange?.(newValues);
+    fieldProps?.onChange?.(newValues);
   });
-  var itemIndex = -1;
-  var list = toArray(runFunction(children, value, props)).map(function (item) {
+  let itemIndex = -1;
+  const list = toArray(runFunction(children, value, props)).map(item => {
     if ( /*#__PURE__*/React.isValidElement(item)) {
-      var _item$type, _item$props, _item$props2;
       itemIndex += 1;
-      var index = itemIndex;
-      var isProFromItem =
+      const index = itemIndex;
+      const isProFromItem =
       // @ts-ignore
-      (item === null || item === void 0 || (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.displayName) === 'ProFormComponent' || (item === null || item === void 0 || (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.readonly);
-      var forkProps = isProFromItem ? _objectSpread(_objectSpread({
+      item?.type?.displayName === 'ProFormComponent' || item?.props?.readonly;
+      const forkProps = isProFromItem ? {
         key: index,
-        ignoreFormItem: true
-      }, item.props || {}), {}, {
+        ignoreFormItem: true,
+        ...(item.props || {}),
         // 如果不是我们自定义的组件 fieldProps 无法识别
-        fieldProps: _objectSpread(_objectSpread({}, item === null || item === void 0 || (_item$props2 = item.props) === null || _item$props2 === void 0 ? void 0 : _item$props2.fieldProps), {}, {
-          onChange: function onChange() {
-            fieldSetOnChange(arguments.length <= 0 ? undefined : arguments[0], index);
+        fieldProps: {
+          ...item?.props?.fieldProps,
+          onChange: (...restParams) => {
+            fieldSetOnChange(restParams[0], index);
           }
-        }),
-        value: value === null || value === void 0 ? void 0 : value[index],
+        },
+        value: value?.[index],
         onChange: undefined
-      }) : _objectSpread(_objectSpread({
-        key: index
-      }, item.props || {}), {}, {
-        value: value === null || value === void 0 ? void 0 : value[index],
-        onChange: function onChange(itemValue) {
-          var _props$onChange, _props;
+      } : {
+        key: index,
+        ...(item.props || {}),
+        value: value?.[index],
+        onChange: itemValue => {
           fieldSetOnChange(itemValue, index);
-          (_props$onChange = (_props = item.props).onChange) === null || _props$onChange === void 0 || _props$onChange.call(_props, itemValue);
+          item.props.onChange?.(itemValue);
         }
-      });
+      };
       return /*#__PURE__*/React.cloneElement(item, forkProps);
     }
     return item;
   });
-  var Components = FieldSetType[type];
-  var _useGridHelpers = useGridHelpers(rest),
-    RowWrapper = _useGridHelpers.RowWrapper;
-  var Wrapper = useCallback(function (_ref) {
-    var dom = _ref.children;
-    return /*#__PURE__*/_jsx(Components, _objectSpread(_objectSpread({}, space), {}, {
-      align: "start",
-      wrap: true,
-      children: dom
-    }));
-  }, [Components, space]);
+  const Components = FieldSetType[type];
+  const {
+    RowWrapper
+  } = useGridHelpers(rest);
+  const Wrapper = useCallback(({
+    children: dom
+  }) => /*#__PURE__*/_jsx(Components, {
+    ...space,
+    align: "start",
+    wrap: true,
+    children: dom
+  }), [Components, space]);
   return /*#__PURE__*/_jsx(RowWrapper, {
     Wrapper: Wrapper,
     children: list
   });
 };
-var BaseProFormFieldSet = /*#__PURE__*/React.forwardRef(function (_ref2, ref) {
-  var children = _ref2.children,
-    space = _ref2.space,
-    valuePropName = _ref2.valuePropName,
-    rest = _objectWithoutProperties(_ref2, _excluded2);
-  useImperativeHandle(ref, function () {
-    return {};
-  });
-  return /*#__PURE__*/_jsx(FieldSet, _objectSpread(_objectSpread(_objectSpread({
+const BaseProFormFieldSet = /*#__PURE__*/React.forwardRef(({
+  children,
+  space,
+  valuePropName,
+  ...rest
+}, ref) => {
+  useImperativeHandle(ref, () => ({}));
+  return /*#__PURE__*/_jsx(FieldSet, {
     space: space,
-    valuePropName: valuePropName
-  }, rest.fieldProps), {}, {
+    valuePropName: valuePropName,
+    ...rest.fieldProps,
     // 把 fieldProps 里的重置掉
-    onChange: undefined
-  }, rest), {}, {
+    onChange: undefined,
+    ...rest,
     children: children
-  }));
+  });
 });
-var ProFormFieldSet = (_ref3 = warpField) === null || _ref3 === void 0 ? void 0 : _ref3(BaseProFormFieldSet);
+const ProFormFieldSet = warpField?.(BaseProFormFieldSet);
 export default ProFormFieldSet;

package/es/form/components/FormItem/FormItemRender/index.js

@@ -1,38 +1,42 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _excluded = ["children"],
-  _excluded2 = ["children"];
 import { Form } from 'antd';
 import React from 'react';
 import ProFormItem from "../index";
 import { jsx as _jsx } from "react/jsx-runtime";
-function getControlConfigProps() {
-  var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var valuePropName = props.valuePropName || 'value';
-  var trigger = props.trigger || 'onChange';
-  var name = props.name;
+function getControlConfigProps(props = {}) {
+  const valuePropName = props.valuePropName || 'value';
+  const trigger = props.trigger || 'onChange';
+  const name = props.name;
   return {
-    valuePropName: valuePropName,
-    trigger: trigger,
-    name: name
+    valuePropName,
+    trigger,
+    name
   };
 }
-export function useControlModel(_ref, model) {
-  var value = _ref.value,
-    onChange = _ref.onChange;
+export function useControlModel({
+  value,
+  onChange
+}, model) {
   if (!Array.isArray(model)) {
-    var p = getControlConfigProps(model);
-    return _defineProperty(_defineProperty({}, p.valuePropName, value), p.trigger, function (e) {
-      onChange === null || onChange === void 0 || onChange(e !== null && e !== void 0 && e.target ? e.target[p.valuePropName] : e);
-    });
+    const p = getControlConfigProps(model);
+    return {
+      [p.valuePropName]: value,
+      [p.trigger]: e => {
+        onChange?.(e?.target ? e.target[p.valuePropName] : e);
+      }
+    };
   }
-  return model.reduce(function (acc, k) {
-    var p = getControlConfigProps(k);
-    var name = p.name || k;
-    acc[name] = _defineProperty(_defineProperty({}, p.valuePropName, value === null || value === void 0 ? void 0 : value[name]), p.trigger, function (v) {
-      onChange === null || onChange === void 0 || onChange(_objectSpread(_objectSpread({}, value), {}, _defineProperty({}, name, v !== null && v !== void 0 && v.target ? v.target[p.valuePropName] : v)));
-    });
+  return model.reduce((acc, k) => {
+    const p = getControlConfigProps(k);
+    const name = p.name || k;
+    acc[name] = {
+      [p.valuePropName]: value?.[name],
+      [p.trigger]: v => {
+        onChange?.({
+          ...value,
+          [name]: v?.target ? v.target[p.valuePropName] : v
+        });
+      }
+    };
     return acc;
   }, {});
 }
@@ -54,17 +58,21 @@ export function useControlModel(_ref, model) {
  * ```
  */
 export function FormControlRender(props) {
-  var children = props.children,
-    restProps = _objectWithoutProperties(props, _excluded);
-  var _Form$Item$useStatus = Form.Item.useStatus(),
-    status = _Form$Item$useStatus.status,
-    errors = _Form$Item$useStatus.errors,
-    warnings = _Form$Item$useStatus.warnings;
-  return children(_objectSpread({
-    status: status,
-    errors: errors,
-    warnings: warnings
-  }, restProps));
+  const {
+    children,
+    ...restProps
+  } = props;
+  const {
+    status,
+    errors,
+    warnings
+  } = Form.Item.useStatus();
+  return children({
+    status,
+    errors,
+    warnings,
+    ...restProps
+  });
 }
 
 /**
@@ -73,9 +81,7 @@ export function FormControlRender(props) {
 export function pickControlProps(props) {
   return {
     value: props.value,
-    onChange: function onChange(value) {
-      return props.onChange(value !== null && value !== void 0 && value.target ? value.target.value : value);
-    }
+    onChange: value => props.onChange(value?.target ? value.target.value : value)
   };
 }
 
@@ -83,9 +89,10 @@ export function pickControlProps(props) {
  * 提取props中的 value、onChange 和 id 属性
  */
 export function pickControlPropsWithId(props) {
-  return _objectSpread(_objectSpread({}, pickControlProps(props)), {}, {
+  return {
+    ...pickControlProps(props),
     id: props.id
-  });
+  };
 }
 
 /**
@@ -107,13 +114,16 @@ export function pickControlPropsWithId(props) {
  */
 export function withFormItemRender(Comp) {
   return function (props) {
-    var children = props.children,
-      restProps = _objectWithoutProperties(props, _excluded2);
-    return /*#__PURE__*/_jsx(Comp, _objectSpread(_objectSpread({}, restProps), {}, {
+    const {
+      children,
+      ...restProps
+    } = props;
+    return /*#__PURE__*/_jsx(Comp, {
+      ...restProps,
       children: /*#__PURE__*/_jsx(FormControlRender, {
         children: children
       })
-    }));
+    });
   };
 }
 
@@ -133,7 +143,7 @@ export function withFormItemRender(Comp) {
  *   </FormItemRender>
  * ```
  */
-export var FormItemRender = withFormItemRender(Form.Item);
+export const FormItemRender = withFormItemRender(Form.Item);
 
 /**
  * 用 withFormItemRender 加工 ProForm.Item，使其拥有render props能力，同时暴露出 status 属性方便自定义组件校验使用
@@ -150,4 +160,4 @@ export var FormItemRender = withFormItemRender(Form.Item);
  *   </ProFormItemRender>
  * ```
  */
-export var ProFormItemRender = withFormItemRender(ProFormItem);
+export const ProFormItemRender = withFormItemRender(ProFormItem);