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

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

@@ -6,102 +6,94 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _field = require("../../../field");
 var _utils = require("../../../utils");
 var _EditOrReadOnlyContext = require("../../BaseForm/EditOrReadOnlyContext");
 var _warpField = _interopRequireDefault(require("../FormItem/warpField"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _ref;
-var _excluded = ["fieldProps", "children", "labelCol", "label", "autoFocus", "isDefaultDom", "render", "proFieldProps", "formItemRender", "valueType", "initialValue", "onChange", "valueEnum", "params", "name", "dependenciesValues", "cacheForSwr", "valuePropName"];
-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 = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var modeContext = (0, _react.useContext)(_EditOrReadOnlyContext.EditOrReadOnlyContext);
-  var propsParams = (0, _react.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 = (0, _react.useContext)(_EditOrReadOnlyContext.EditOrReadOnlyContext);
+  const propsParams = (0, _react.useMemo)(() => {
     // 使用dependencies时 dependenciesValues是有值的
     // 此时如果存在request，注入dependenciesValues
-    return dependenciesValues && restProps.request ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), dependenciesValues || {}) : params;
+    return dependenciesValues && restProps.request ? {
+      ...params,
+      ...(dependenciesValues || {})
+    } : params;
   }, [dependenciesValues, params, restProps.request]);
-  var memoUnChange = (0, _utils.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 = (0, _utils.useRefFunction)((...restParams) => {
+    if (fieldProps?.onChange) {
+      fieldProps?.onChange?.(...restParams);
       return;
     }
   });
-  var memoFieldProps = (0, _react.useMemo)(function () {
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      autoFocus: autoFocus
-    }, fieldProps), {}, {
-      onChange: memoUnChange
-    });
-  }, [autoFocus, fieldProps, memoUnChange]);
-  var childrenRender = (0, _react.useMemo)(function () {
+  const memoFieldProps = (0, _react.useMemo)(() => ({
+    autoFocus,
+    ...fieldProps,
+    onChange: memoUnChange
+  }), [autoFocus, fieldProps, memoUnChange]);
+  const childrenRender = (0, _react.useMemo)(() => {
     // 防止 formItem 的值被吃掉
     if (children) {
       if ( /*#__PURE__*/_react.default.isValidElement(children)) {
-        return /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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.default.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__*/(0, _jsxRuntime.jsx)(_jsxRuntime.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__*/(0, _jsxRuntime.jsx)(_field.PureProField, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-    text: fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps[valuePropName],
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.PureProField, {
+    text: fieldProps?.[valuePropName],
     render: render,
     formItemRender: formItemRender,
     valueType: valueType || 'text',
     cacheForSwr: cacheForSwr,
     fieldProps: memoFieldProps,
-    valueEnum: (0, _utils.runFunction)(valueEnum)
-  }, proFieldProps), restProps), {}, {
-    mode: (proFieldProps === null || proFieldProps === void 0 ? void 0 : proFieldProps.mode) || modeContext.mode || 'edit',
+    valueEnum: (0, _utils.runFunction)(valueEnum),
+    ...proFieldProps,
+    ...restProps,
+    mode: proFieldProps?.mode || modeContext.mode || 'edit',
     params: propsParams
-  }));
+  });
 };
-var ProFormField = (_ref = _warpField.default) === null || _ref === void 0 ? void 0 : _ref( /*#__PURE__*/(0, _react.memo)(BaseProFormField, function (prevProps, nextProps) {
+const ProFormField = (0, _warpField.default)?.( /*#__PURE__*/(0, _react.memo)(BaseProFormField, (prevProps, nextProps) => {
   return (0, _utils.isDeepEqualReact)(nextProps, prevProps, ['onChange', 'onBlur']);
 }));
 var _default = exports.default = ProFormField;

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

@@ -7,9 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.defaultGetValueFromEvent = defaultGetValueFromEvent;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
@@ -17,116 +14,111 @@ var _utils = require("../../../utils");
 var _helpers = require("../../helpers");
 var _warpField = _interopRequireDefault(require("../FormItem/warpField"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _ref3;
-var _excluded = ["children", "value", "valuePropName", "onChange", "fieldProps", "space", "type", "transform", "convertValue", "lightProps"],
-  _excluded2 = ["children", "space", "valuePropName"];
-var FieldSetType = {
+const FieldSetType = {
   space: _antd.Space,
   group: _antd.Space.Compact
 };
-function defaultGetValueFromEvent(valuePropName) {
-  var event = arguments.length <= 1 ? undefined : arguments[1];
+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 = (0, _objectWithoutProperties2.default)(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 = (0, _utils.useRefFunction)(function (fileValue, index) {
-    var _fieldProps$onChange;
-    var newValues = (0, _toConsumableArray2.default)(value);
+  const fieldSetOnChange = (0, _utils.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 = (0, _util.toArray)((0, _utils.runFunction)(children, value, props)).map(function (item) {
+  let itemIndex = -1;
+  const list = (0, _util.toArray)((0, _utils.runFunction)(children, value, props)).map(item => {
     if ( /*#__PURE__*/_react.default.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 ? (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      item?.type?.displayName === 'ProFormComponent' || item?.props?.readonly;
+      const forkProps = isProFromItem ? {
         key: index,
-        ignoreFormItem: true
-      }, item.props || {}), {}, {
+        ignoreFormItem: true,
+        ...(item.props || {}),
         // 如果不是我们自定义的组件 fieldProps 无法识别
-        fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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
-      }) : (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        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.default.cloneElement(item, forkProps);
     }
     return item;
   });
-  var Components = FieldSetType[type];
-  var _useGridHelpers = (0, _helpers.useGridHelpers)(rest),
-    RowWrapper = _useGridHelpers.RowWrapper;
-  var Wrapper = (0, _react.useCallback)(function (_ref) {
-    var dom = _ref.children;
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(Components, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, space), {}, {
-      align: "start",
-      wrap: true,
-      children: dom
-    }));
-  }, [Components, space]);
+  const Components = FieldSetType[type];
+  const {
+    RowWrapper
+  } = (0, _helpers.useGridHelpers)(rest);
+  const Wrapper = (0, _react.useCallback)(({
+    children: dom
+  }) => /*#__PURE__*/(0, _jsxRuntime.jsx)(Components, {
+    ...space,
+    align: "start",
+    wrap: true,
+    children: dom
+  }), [Components, space]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(RowWrapper, {
     Wrapper: Wrapper,
     children: list
   });
 };
-var BaseProFormFieldSet = /*#__PURE__*/_react.default.forwardRef(function (_ref2, ref) {
-  var children = _ref2.children,
-    space = _ref2.space,
-    valuePropName = _ref2.valuePropName,
-    rest = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
-  (0, _react.useImperativeHandle)(ref, function () {
-    return {};
-  });
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(FieldSet, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+const BaseProFormFieldSet = /*#__PURE__*/_react.default.forwardRef(({
+  children,
+  space,
+  valuePropName,
+  ...rest
+}, ref) => {
+  (0, _react.useImperativeHandle)(ref, () => ({}));
+  return /*#__PURE__*/(0, _jsxRuntime.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.default) === null || _ref3 === void 0 ? void 0 : _ref3(BaseProFormFieldSet);
+const ProFormFieldSet = (0, _warpField.default)?.(BaseProFormFieldSet);
 var _default = exports.default = ProFormFieldSet;

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

@@ -10,41 +10,45 @@ exports.pickControlProps = pickControlProps;
 exports.pickControlPropsWithId = pickControlPropsWithId;
 exports.useControlModel = useControlModel;
 exports.withFormItemRender = withFormItemRender;
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _index = _interopRequireDefault(require("../index"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["children"],
-  _excluded2 = ["children"];
-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
   };
 }
-function useControlModel(_ref, model) {
-  var value = _ref.value,
-    onChange = _ref.onChange;
+function useControlModel({
+  value,
+  onChange
+}, model) {
   if (!Array.isArray(model)) {
-    var p = getControlConfigProps(model);
-    return (0, _defineProperty2.default)((0, _defineProperty2.default)({}, 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] = (0, _defineProperty2.default)((0, _defineProperty2.default)({}, p.valuePropName, value === null || value === void 0 ? void 0 : value[name]), p.trigger, function (v) {
-      onChange === null || onChange === void 0 || onChange((0, _objectSpread3.default)((0, _objectSpread3.default)({}, value), {}, (0, _defineProperty2.default)({}, 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;
   }, {});
 }
@@ -66,17 +70,21 @@ function useControlModel(_ref, model) {
  * ```
  */
 function FormControlRender(props) {
-  var children = props.children,
-    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _Form$Item$useStatus = _antd.Form.Item.useStatus(),
-    status = _Form$Item$useStatus.status,
-    errors = _Form$Item$useStatus.errors,
-    warnings = _Form$Item$useStatus.warnings;
-  return children((0, _objectSpread3.default)({
-    status: status,
-    errors: errors,
-    warnings: warnings
-  }, restProps));
+  const {
+    children,
+    ...restProps
+  } = props;
+  const {
+    status,
+    errors,
+    warnings
+  } = _antd.Form.Item.useStatus();
+  return children({
+    status,
+    errors,
+    warnings,
+    ...restProps
+  });
 }
 
 /**
@@ -85,9 +93,7 @@ function FormControlRender(props) {
 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)
   };
 }
 
@@ -95,9 +101,10 @@ function pickControlProps(props) {
  * 提取props中的 value、onChange 和 id 属性
  */
 function pickControlPropsWithId(props) {
-  return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, pickControlProps(props)), {}, {
+  return {
+    ...pickControlProps(props),
     id: props.id
-  });
+  };
 }
 
 /**
@@ -119,13 +126,16 @@ function pickControlPropsWithId(props) {
  */
 function withFormItemRender(Comp) {
   return function (props) {
-    var children = props.children,
-      restProps = (0, _objectWithoutProperties2.default)(props, _excluded2);
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, restProps), {}, {
+    const {
+      children,
+      ...restProps
+    } = props;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
+      ...restProps,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(FormControlRender, {
         children: children
       })
-    }));
+    });
   };
 }
 
@@ -145,7 +155,7 @@ function withFormItemRender(Comp) {
  *   </FormItemRender>
  * ```
  */
-var FormItemRender = exports.FormItemRender = withFormItemRender(_antd.Form.Item);
+const FormItemRender = exports.FormItemRender = withFormItemRender(_antd.Form.Item);
 
 /**
  * 用 withFormItemRender 加工 ProForm.Item，使其拥有render props能力，同时暴露出 status 属性方便自定义组件校验使用
@@ -162,4 +172,4 @@ var FormItemRender = exports.FormItemRender = withFormItemRender(_antd.Form.Item
  *   </ProFormItemRender>
  * ```
  */
-var ProFormItemRender = exports.ProFormItemRender = withFormItemRender(_index.default);
+const ProFormItemRender = exports.ProFormItemRender = withFormItemRender(_index.default);