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

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

@@ -5,36 +5,35 @@ 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 = _interopRequireDefault(require("react"));
 var _utils = require("../../../utils");
 var _BaseDateRanger = require("./BaseDateRanger");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["fieldProps", "proFieldProps"];
-var valueType = 'dateRange';
+const valueType = 'dateRange';
 
 /**
  * 日期区间选择组件
  *
  * @param
  */
-var ProFormDateRangePicker = /*#__PURE__*/_react.default.forwardRef(function (_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, (0, _objectSpread2.default)({
+const ProFormDateRangePicker = /*#__PURE__*/_react.default.forwardRef(({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}, ref) => {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_BaseDateRanger.BaseDateRanger, {
     ref: ref,
-    fieldProps: (0, _objectSpread2.default)({}, fieldProps),
+    fieldProps: {
+      ...fieldProps
+    },
     valueType: valueType,
     proFieldProps: proFieldProps,
     fieldConfig: {
-      valueType: valueType,
+      valueType,
       customLightMode: true,
-      lightFilterLabelFormatter: function lightFilterLabelFormatter(value) {
-        return (0, _utils.dateArrayFormatter)(value, (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || 'YYYY-MM-DD');
-      }
-    }
-  }, rest));
+      lightFilterLabelFormatter: value => (0, _utils.dateArrayFormatter)(value, fieldProps?.format || 'YYYY-MM-DD')
+    },
+    ...rest
+  });
 });
 var _default = exports.default = ProFormDateRangePicker;

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

@@ -1,13 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 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 _util = require("@rc-component/util");
 var _antd = require("antd");
 var _lodashEs = require("lodash-es");
@@ -15,52 +12,49 @@ var _react = _interopRequireWildcard(require("react"));
 var _utils = require("../../../utils");
 var _List = require("../List");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["name", "originDependencies", "children", "ignoreFormListField"];
-var ProFormDependency = function ProFormDependency(_ref) {
-  var nameList = _ref.name,
-    _ref$originDependenci = _ref.originDependencies,
-    originDependencies = _ref$originDependenci === void 0 ? nameList : _ref$originDependenci,
-    _children = _ref.children,
-    ignoreFormListField = _ref.ignoreFormListField,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var context = (0, _react.useContext)(_utils.ProFormContext);
+const ProFormDependency = ({
+  name: nameList,
+  originDependencies = nameList,
+  children,
+  ignoreFormListField,
+  ...rest
+}) => {
+  const context = (0, _react.useContext)(_utils.ProFormContext);
   // ProFromList 的 field，里面有name和key
-  var formListField = (0, _react.useContext)(_List.FormListContext);
+  const formListField = (0, _react.useContext)(_List.FormListContext);
 
   // flatten each name into an (string | number)[]
-  var flattenNames = (0, _react.useMemo)(function () {
-    return nameList.map(function (itemName) {
-      var _formListField$listNa;
-      var name = [itemName];
+  const flattenNames = (0, _react.useMemo)(() => {
+    return nameList.map(itemName => {
+      const name = [itemName];
 
       // ignoreFormListField为 true 或 formListField.name === undefined 时
       // 应从全局取值，要将 names 中各项的路径前缀(formListField.listName)忽略
-      if (!ignoreFormListField && formListField.name !== undefined && (_formListField$listNa = formListField.listName) !== null && _formListField$listNa !== void 0 && _formListField$listNa.length) {
+      if (!ignoreFormListField && formListField.name !== undefined && formListField.listName?.length) {
         name.unshift(formListField.listName);
       }
       return name.flat(1);
     });
-  }, [formListField.listName, formListField.name, ignoreFormListField, nameList === null || nameList === void 0 ? void 0 : nameList.toString()]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+  }, [formListField.listName, formListField.name, ignoreFormListField, nameList?.toString()]);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, {
+    ...rest,
     noStyle: true,
-    shouldUpdate: function shouldUpdate(prevValues, nextValues, info) {
+    shouldUpdate: (prevValues, nextValues, info) => {
       if (typeof rest.shouldUpdate === 'boolean') {
         return rest.shouldUpdate;
       } else if (typeof rest.shouldUpdate === 'function') {
-        var _rest$shouldUpdate;
-        return (_rest$shouldUpdate = rest.shouldUpdate) === null || _rest$shouldUpdate === void 0 ? void 0 : _rest$shouldUpdate.call(rest, prevValues, nextValues, info);
+        return rest.shouldUpdate?.(prevValues, nextValues, info);
       }
-      return flattenNames.some(function (name) {
+      return flattenNames.some(name => {
         return !(0, _utils.isDeepEqualReact)((0, _util.get)(prevValues, name), (0, _util.get)(nextValues, name));
       });
     },
-    children: function children(form) {
-      var values = {};
-      for (var i = 0; i < nameList.length; i++) {
-        var _context$getFieldForm;
-        var itemName = flattenNames[i];
-        var originName = originDependencies[i];
-        var value = (_context$getFieldForm = context.getFieldFormatValueObject) === null || _context$getFieldForm === void 0 ? void 0 : _context$getFieldForm.call(context, itemName);
+    children: form => {
+      let values = {};
+      for (let i = 0; i < nameList.length; i++) {
+        const itemName = flattenNames[i];
+        const originName = originDependencies[i];
+        let value = context.getFieldFormatValueObject?.(itemName);
         if (value && Object.keys(value).length) {
           // transform 会生成多余的value，这里需要注入一下
           values = (0, _lodashEs.merge)({}, values, value);
@@ -68,16 +62,18 @@ var ProFormDependency = function ProFormDependency(_ref) {
             values = (0, _util.set)(values, [originName].flat(1), (0, _util.get)(value, itemName));
           }
         } else {
-          var _form$getFieldValue;
-          value = (_form$getFieldValue = form.getFieldValue) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.call(form, itemName);
+          value = form.getFieldValue?.(itemName);
           if (typeof value !== 'undefined') {
             values = (0, _util.set)(values, [originName].flat(1), value);
           }
         }
       }
-      return _children === null || _children === void 0 ? void 0 : _children(values, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, form), context));
+      return children?.(values, {
+        ...form,
+        ...context
+      });
     }
-  }));
+  });
 };
 ProFormDependency.displayName = 'ProFormDependency';
 var _default = exports.default = ProFormDependency;

package/lib/form/components/Digit/DigitRange.js

@@ -5,52 +5,51 @@ 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 = _interopRequireDefault(require("react"));
 var _field = require("../../../field");
 var _provider = require("../../../provider");
 var _Field = _interopRequireDefault(require("../Field"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["fieldProps", "proFieldProps"];
 /**
  * 数组选择组件
  *
  * @param
  */
-var ProFormDigit = function ProFormDigit(_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+const ProFormDigit = ({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}, ref) => {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provider.ProConfigProvider, {
     valueTypeMap: {
       digitRange: {
-        render: function render(text, props) {
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldDigitRange, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-            text: text,
-            placeholder: props.placeholder
-          }));
-        },
-        formItemRender: function formItemRender(text, props) {
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldDigitRange, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-            text: text,
-            placeholder: props.placeholder
-          }));
-        }
+        render: (text, props) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldDigitRange, {
+          ...props,
+          text: text,
+          placeholder: props.placeholder
+        }),
+        formItemRender: (text, props) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldDigitRange, {
+          ...props,
+          text: text,
+          placeholder: props.placeholder
+        })
       }
     },
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, (0, _objectSpread2.default)({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, {
       valueType: "digitRange",
-      fieldProps: (0, _objectSpread2.default)({}, fieldProps),
+      fieldProps: {
+        ...fieldProps
+      },
       ref: ref,
       fieldConfig: {
         defaultProps: {
           width: '100%'
         }
       },
-      proFieldProps: proFieldProps
-    }, rest))
+      proFieldProps: proFieldProps,
+      ...rest
+    })
   });
 };
-var ForwardRefProFormDigit = /*#__PURE__*/_react.default.forwardRef(ProFormDigit);
+const ForwardRefProFormDigit = /*#__PURE__*/_react.default.forwardRef(ProFormDigit);
 var _default = exports.default = ForwardRefProFormDigit;

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

@@ -5,57 +5,55 @@ 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 = _interopRequireDefault(require("react"));
 var _field = require("../../../field");
 var _provider = require("../../../provider");
 var _Field = _interopRequireDefault(require("../Field"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["fieldProps", "min", "proFieldProps", "max"];
 /**
  * 数组选择组件
  *
  * @param
  */
-var ProFormDigit = function ProFormDigit(_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    min = _ref.min,
-    proFieldProps = _ref.proFieldProps,
-    max = _ref.max,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+const ProFormDigit = ({
+  fieldProps,
+  min,
+  proFieldProps,
+  max,
+  ...rest
+}, ref) => {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provider.ProConfigProvider, {
     valueTypeMap: {
       digit: {
-        render: function render(text, props) {
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldDigit, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-            text: text,
-            placeholder: props.placeholder
-          }));
-        },
-        formItemRender: function formItemRender(text, props) {
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldDigit, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-            text: text,
-            placeholder: props.placeholder
-          }));
-        }
+        render: (text, props) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldDigit, {
+          ...props,
+          text: text,
+          placeholder: props.placeholder
+        }),
+        formItemRender: (text, props) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldDigit, {
+          ...props,
+          text: text,
+          placeholder: props.placeholder
+        })
       }
     },
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, (0, _objectSpread2.default)({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, {
       valueType: "digit",
-      fieldProps: (0, _objectSpread2.default)({
-        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.default.forwardRef(ProFormDigit);
+const ForwardRefProFormDigit = /*#__PURE__*/_react.default.forwardRef(ProFormDigit);
 var _default = exports.default = ForwardRefProFormDigit;

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;