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

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

@@ -5,47 +5,43 @@ 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 ProFormRate = function ProFormRate(_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+ */const ProFormRate = ({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}, ref) => {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provider.ProConfigProvider, {
     valueTypeMap: {
       rate: {
-        render: function render(text, props) {
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldRate, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-            text: text
-          }));
-        },
-        formItemRender: function formItemRender(text, props) {
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldRate, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-            text: text
-          }));
-        }
+        render: (text, props) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldRate, {
+          ...props,
+          text: text
+        }),
+        formItemRender: (text, props) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_field.FieldRate, {
+          ...props,
+          text: text
+        })
       }
     },
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, (0, _objectSpread2.default)({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, {
       valueType: "rate",
       fieldProps: fieldProps,
       ref: ref,
       proFieldProps: proFieldProps,
       fieldConfig: {
         ignoreWidth: true
-      }
-    }, rest))
+      },
+      ...rest
+    })
   });
 };
 var _default = exports.default = /*#__PURE__*/_react.default.forwardRef(ProFormRate);

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

@@ -7,9 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {};
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _ValueTypeToComponent = _interopRequireDefault(require("../../../field/ValueTypeToComponent"));
@@ -31,13 +28,12 @@ Object.keys(_typing).forEach(function (key) {
   if (key in exports && exports[key] === _typing[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _typing[key];
     }
   });
 });
-var _excluded = ["columns", "layoutType", "type", "action", "shouldUpdate", "formRef"];
-var FormLayoutType = {
+const FormLayoutType = {
   DrawerForm: _DrawerForm.DrawerForm,
   QueryFilter: _QueryFilter.QueryFilter,
   LightFilter: _LightFilter.LightFilter,
@@ -55,56 +51,44 @@ var FormLayoutType = {
  */
 
 function BetaSchemaForm(props) {
-  var columns = props.columns,
-    _props$layoutType = props.layoutType,
-    layoutType = _props$layoutType === void 0 ? 'Form' : _props$layoutType,
-    _props$type = props.type,
-    type = _props$type === void 0 ? 'form' : _props$type,
-    action = props.action,
-    _props$shouldUpdate = props.shouldUpdate,
-    shouldUpdate = _props$shouldUpdate === void 0 ? function (pre, next) {
-      return (0, _utils.stringify)(pre) !== (0, _utils.stringify)(next);
-    } : _props$shouldUpdate,
-    propsFormRef = props.formRef,
-    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var FormRenderComponents = FormLayoutType[layoutType] || _ProForm.ProForm;
-  var _Form$useForm = _antd.Form.useForm(),
-    _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
-    form = _Form$useForm2[0];
-  var formInstance = _antd.Form.useFormInstance();
-  var _useState = (0, _react.useState)([]),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    forceUpdate = _useState2[1];
-  var _useState3 = (0, _react.useState)(function () {
-      return [];
-    }),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    formDomsDeps = _useState4[0],
-    updatedFormDoms = _useState4[1];
-  var formRef = (0, _utils.useReactiveRef)(props.form || formInstance || form);
-  var oldValuesRef = (0, _react.useRef)();
-  var propsRef = (0, _utils.useLatest)(props);
+  const {
+    columns,
+    layoutType = 'Form',
+    type = 'form',
+    action,
+    shouldUpdate = (pre, next) => (0, _utils.stringify)(pre) !== (0, _utils.stringify)(next),
+    formRef: propsFormRef,
+    ...restProps
+  } = props;
+  const FormRenderComponents = FormLayoutType[layoutType] || _ProForm.ProForm;
+  const [form] = _antd.Form.useForm();
+  const formInstance = _antd.Form.useFormInstance();
+  const [, forceUpdate] = (0, _react.useState)([]);
+  const [formDomsDeps, updatedFormDoms] = (0, _react.useState)(() => []);
+  const formRef = (0, _utils.useReactiveRef)(props.form || formInstance || form);
+  const oldValuesRef = (0, _react.useRef)();
+  const propsRef = (0, _utils.useLatest)(props);
 
   /**
    * 生成子项，方便被 table 接入
    *
    * @param items
    */
-  var genItems = (0, _utils.useRefFunction)(function (items) {
-    return items.filter(function (originItem) {
+  const genItems = (0, _utils.useRefFunction)(items => {
+    return items.filter(originItem => {
       return !(originItem.hideInForm && type === 'form');
-    }).sort(function (a, b) {
+    }).sort((a, b) => {
       if (b.order || a.order) {
         return (b.order || 0) - (a.order || 0);
       }
       return (b.index || 0) - (a.index || 0);
-    }).map(function (originItem, index) {
-      var title = (0, _utils.runFunction)(originItem.title, originItem, 'form', /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.LabelIconTip, {
+    }).map((originItem, index) => {
+      const title = (0, _utils.runFunction)(originItem.title, originItem, 'form', /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.LabelIconTip, {
         label: originItem.title,
         tooltip: originItem.tooltip
       }));
-      var item = (0, _utils.omitUndefined)({
-        title: title,
+      const item = (0, _utils.omitUndefined)({
+        title,
         label: title,
         name: originItem.name,
         valueType: (0, _utils.runFunction)(originItem.valueType, {}),
@@ -124,12 +108,8 @@ function BetaSchemaForm(props) {
         dependencies: originItem.dependencies,
         proFieldProps: originItem.proFieldProps,
         ignoreFormItem: originItem.ignoreFormItem,
-        getFieldProps: originItem.fieldProps ? function () {
-          return (0, _utils.runFunction)(originItem.fieldProps, formRef.current, originItem);
-        } : undefined,
-        getFormItemProps: originItem.formItemProps ? function () {
-          return (0, _utils.runFunction)(originItem.formItemProps, formRef.current, originItem);
-        } : undefined,
+        getFieldProps: originItem.fieldProps ? () => (0, _utils.runFunction)(originItem.fieldProps, formRef.current, originItem) : undefined,
+        getFormItemProps: originItem.formItemProps ? () => (0, _utils.runFunction)(originItem.formItemProps, formRef.current, originItem) : undefined,
         render: originItem.render,
         formItemRender: originItem.formItemRender,
         renderText: originItem.renderText,
@@ -141,35 +121,37 @@ function BetaSchemaForm(props) {
         defaultKeyWords: originItem.defaultKeyWords
       });
       return (0, _valueType.renderValueType)(item, {
-        action: action,
-        type: type,
-        originItem: originItem,
-        formRef: formRef,
-        genItems: genItems
+        action,
+        type,
+        originItem,
+        formRef,
+        genItems
       });
-    }).filter(function (field) {
+    }).filter(field => {
       return Boolean(field);
     });
   });
-  var onValuesChange = (0, _react.useCallback)(function (changedValues, values) {
-    var propsOnValuesChange = propsRef.current.onValuesChange;
+  const onValuesChange = (0, _react.useCallback)((changedValues, values) => {
+    const {
+      onValuesChange: propsOnValuesChange
+    } = propsRef.current;
     if (shouldUpdate === true || typeof shouldUpdate === 'function' && shouldUpdate(values, oldValuesRef.current)) {
       updatedFormDoms([]);
     }
     oldValuesRef.current = values;
-    propsOnValuesChange === null || propsOnValuesChange === void 0 || propsOnValuesChange(changedValues, values);
+    propsOnValuesChange?.(changedValues, values);
   }, [propsRef, shouldUpdate]);
-  var formChildrenDoms = (0, _utils.useDeepCompareMemo)(function () {
+  const formChildrenDoms = (0, _utils.useDeepCompareMemo)(() => {
     // 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, formRef.current]);
+  }, [columns, restProps?.open, action, type, formDomsDeps, formRef.current]);
 
   /**
    * Append layoutType component specific props
    */
-  var specificProps = (0, _utils.useDeepCompareMemo)(function () {
+  const specificProps = (0, _utils.useDeepCompareMemo)(() => {
     if (layoutType === 'StepsForm') {
       return {
         forceUpdate: forceUpdate,
@@ -178,26 +160,30 @@ function BetaSchemaForm(props) {
     }
     return {};
   }, [columns, layoutType]);
-  (0, _react.useImperativeHandle)(propsFormRef, function () {
+  (0, _react.useImperativeHandle)(propsFormRef, () => {
     return formRef.current;
   }, [formRef.current]);
-  var context = (0, _react.useContext)(_provider.default);
+  const context = (0, _react.useContext)(_provider.default);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_provider.ProConfigProvider, {
-    valueTypeMap: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, context.valueTypeMap), _ValueTypeToComponent.default),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(FormRenderComponents, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, specificProps), restProps), {}, {
-      onInit: function onInit(_, initForm) {
-        var _restProps$onInit;
+    valueTypeMap: {
+      ...context.valueTypeMap,
+      ..._ValueTypeToComponent.default
+    },
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(FormRenderComponents, {
+      ...specificProps,
+      ...restProps,
+      onInit: (_, initForm) => {
         if (propsFormRef) {
           propsFormRef.current = initForm;
         }
-        restProps === null || restProps === void 0 || (_restProps$onInit = restProps.onInit) === null || _restProps$onInit === void 0 || _restProps$onInit.call(restProps, _, initForm);
+        restProps?.onInit?.(_, initForm);
         formRef.current = initForm;
       },
       form: props.form || form,
       formRef: formRef,
       onValuesChange: onValuesChange,
       children: formChildrenDoms
-    }))
+    })
   });
 }
 var _default = exports.default = BetaSchemaForm;

package/lib/form/components/SchemaForm/layoutType/Embed.js

@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _jsxRuntime = require("react/jsx-runtime");
-var Embed = function Embed(_ref) {
-  var children = _ref.children;
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-    children: children
-  });
-};
+const Embed = ({
+  children
+}) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+  children: children
+});
 var _default = exports.default = Embed;

package/lib/form/components/SchemaForm/layoutType/StepsForm.js

@@ -6,45 +6,41 @@ 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 _utils = require("../../../../utils");
 var _StepsForm = require("../../../layouts/StepsForm");
 var _index = _interopRequireDefault(require("../index"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["steps", "columns", "forceUpdate", "grid"];
-var StepsForm = function StepsForm(_ref) {
-  var steps = _ref.steps,
-    columns = _ref.columns,
-    forceUpdate = _ref.forceUpdate,
-    grid = _ref.grid,
-    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var propsRef = (0, _utils.useLatest)(props);
+const StepsForm = ({
+  steps,
+  columns,
+  forceUpdate,
+  grid,
+  ...props
+}) => {
+  const propsRef = (0, _utils.useLatest)(props);
 
   /**
    * Fixed StepsForm toggle step causing formRef to update
    */
-  var onCurrentChange = (0, _react.useCallback)(function (current) {
-    var _propsRef$current$onC, _propsRef$current;
-    (_propsRef$current$onC = (_propsRef$current = propsRef.current).onCurrentChange) === null || _propsRef$current$onC === void 0 || _propsRef$current$onC.call(_propsRef$current, current);
+  const onCurrentChange = (0, _react.useCallback)(current => {
+    propsRef.current.onCurrentChange?.(current);
     forceUpdate([]);
   }, [forceUpdate, propsRef]);
-  var StepDoms = (0, _react.useMemo)(function () {
-    return steps === null || steps === void 0 ? void 0 : steps.map(function (step, index) {
-      return /*#__PURE__*/(0, _react.createElement)(_index.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        grid: grid
-      }, step), {}, {
-        // eslint-disable-next-line react/no-array-index-key
-        key: index,
-        layoutType: "StepForm",
-        columns: columns[index]
-      }));
-    });
+  const StepDoms = (0, _react.useMemo)(() => {
+    return steps?.map((step, index) => /*#__PURE__*/(0, _react.createElement)(_index.default, {
+      grid: grid,
+      ...step,
+      // eslint-disable-next-line react/no-array-index-key
+      key: index,
+      layoutType: "StepForm",
+      columns: columns[index]
+    }));
   }, [columns, grid, steps]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_StepsForm.StepsForm, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_StepsForm.StepsForm, {
+    ...props,
     onCurrentChange: onCurrentChange,
     children: StepDoms
-  }));
+  });
 };
 var _default = exports.default = StepsForm;

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

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "Embed", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _Embed.default;
   }
 });
 Object.defineProperty(exports, "StepsForm", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _StepsForm.default;
   }
 });

package/lib/form/components/SchemaForm/valueType/dependency.js

@@ -5,27 +5,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.dependency = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _util = require("@rc-component/util");
 var _Dependency = _interopRequireDefault(require("../../Dependency"));
 var _react = require("react");
-var noteOnce = _util.warning.noteOnce;
-var dependency = exports.dependency = function dependency(item, helpers) {
+const {
+  noteOnce
+} = _util.warning;
+const dependency = (item, helpers) => {
   /** ProFormDependency */
   if (item.valueType === 'dependency') {
-    var _item$getFieldProps, _item$name, _item$name2;
-    var fieldProps = (_item$getFieldProps = item.getFieldProps) === null || _item$getFieldProps === void 0 ? void 0 : _item$getFieldProps.call(item);
-    noteOnce(Array.isArray((_item$name = item.name) !== null && _item$name !== void 0 ? _item$name : fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.name), 'SchemaForm: fieldProps.name should be NamePath[] when valueType is "dependency"');
+    const fieldProps = item.getFieldProps?.();
+    noteOnce(Array.isArray(item.name ?? fieldProps?.name), 'SchemaForm: fieldProps.name should be NamePath[] when valueType is "dependency"');
     noteOnce(typeof item.columns === 'function', 'SchemaForm: columns should be a function when valueType is "dependency"');
-    if (!Array.isArray((_item$name2 = item.name) !== null && _item$name2 !== void 0 ? _item$name2 : fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.name)) return null;
-    return /*#__PURE__*/(0, _react.createElement)(_Dependency.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      name: item.name
-    }, fieldProps), {}, {
+    if (!Array.isArray(item.name ?? fieldProps?.name)) return null;
+    return /*#__PURE__*/(0, _react.createElement)(_Dependency.default, {
+      name: item.name,
+      ...fieldProps,
       key: item.key
-    }), function (values) {
+    }, values => {
       if (!item.columns || typeof item.columns !== 'function') return null;
       return helpers.genItems(item.columns(values));
     });
   }
   return true;
-};
+};
+exports.dependency = dependency;

package/lib/form/components/SchemaForm/valueType/divider.js

@@ -1,20 +1,19 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.divider = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _antd = require("antd");
 var _react = require("react");
-var divider = exports.divider = function divider(item) {
+const divider = item => {
   /** 分割线 */
   if (item.valueType === 'divider') {
-    var _item$getFieldProps;
-    return /*#__PURE__*/(0, _react.createElement)(_antd.Divider, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (_item$getFieldProps = item.getFieldProps) === null || _item$getFieldProps === void 0 ? void 0 : _item$getFieldProps.call(item)), {}, {
+    return /*#__PURE__*/(0, _react.createElement)(_antd.Divider, {
+      ...item.getFieldProps?.(),
       key: item.key
-    }));
+    });
   }
   return true;
-};
+};
+exports.divider = divider;

package/lib/form/components/SchemaForm/valueType/field.js

@@ -6,68 +6,69 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.field = void 0;
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _util = require("@rc-component/util");
 var _react = _interopRequireWildcard(require("react"));
 var _utils = require("../../../../utils");
 var _Dependency = _interopRequireDefault(require("../../Dependency"));
 var _Field = _interopRequireDefault(require("../../Field"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["key"];
-var field = exports.field = function field(item, _ref) {
-  var action = _ref.action,
-    formRef = _ref.formRef,
-    type = _ref.type,
-    originItem = _ref.originItem;
+const field = (item, {
+  action,
+  formRef,
+  type,
+  originItem
+}) => {
   /** 公用的 类型 props */
-  var formFieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _util.omit)(item, ['dataIndex', 'width', 'render', 'formItemRender', 'renderText', 'title'])), {}, {
+  const formFieldProps = {
+    ...(0, _util.omit)(item, ['dataIndex', 'width', 'render', 'formItemRender', 'renderText', 'title']),
     name: item.name || item.key || item.dataIndex,
     width: item.width,
-    render: item !== null && item !== void 0 && item.render ? function (dom, entity, renderIndex) {
-      var _item$render, _item$key, _item$getFormItemProp, _item$getFieldProps;
-      return item === null || item === void 0 || (_item$render = item.render) === null || _item$render === void 0 ? void 0 : _item$render.call(item, dom, entity, renderIndex, action === null || action === void 0 ? void 0 : action.current, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        type: type
-      }, item), {}, {
-        key: (_item$key = item.key) === null || _item$key === void 0 ? void 0 : _item$key.toString(),
-        formItemProps: (_item$getFormItemProp = item.getFormItemProps) === null || _item$getFormItemProp === void 0 ? void 0 : _item$getFormItemProp.call(item),
-        fieldProps: (_item$getFieldProps = item.getFieldProps) === null || _item$getFieldProps === void 0 ? void 0 : _item$getFieldProps.call(item)
-      }));
-    } : undefined
-  });
-  var defaultRender = function defaultRender() {
-    var key = formFieldProps.key,
-      rest = (0, _objectWithoutProperties2.default)(formFieldProps, _excluded);
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+    render: item?.render ? (dom, entity, renderIndex) => item?.render?.(dom, entity, renderIndex, action?.current, {
+      type,
+      ...item,
+      key: item.key?.toString(),
+      formItemProps: item.getFormItemProps?.(),
+      fieldProps: item.getFieldProps?.()
+    }) : undefined
+  };
+  const defaultRender = () => {
+    const {
+      key,
+      ...rest
+    } = formFieldProps;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Field.default, {
+      ...rest,
       ignoreFormItem: true
-    }), key);
+    }, key);
   };
-  var formItemRender = item !== null && item !== void 0 && item.formItemRender ? function (_, config) {
-    var _item$formItemRender, _item$key2, _item$getFormItemProp2, _item$getFieldProps2;
-    var renderConfig = (0, _utils.omitUndefined)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
+  const formItemRender = item?.formItemRender ? (_, config) => {
+    const renderConfig = (0, _utils.omitUndefined)({
+      ...config,
       onChange: undefined
-    }));
-    return item === null || item === void 0 || (_item$formItemRender = item.formItemRender) === null || _item$formItemRender === void 0 ? void 0 : _item$formItemRender.call(item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      type: type
-    }, item), {}, {
-      key: (_item$key2 = item.key) === null || _item$key2 === void 0 ? void 0 : _item$key2.toString(),
-      formItemProps: (_item$getFormItemProp2 = item.getFormItemProps) === null || _item$getFormItemProp2 === void 0 ? void 0 : _item$getFormItemProp2.call(item),
-      fieldProps: (_item$getFieldProps2 = item.getFieldProps) === null || _item$getFieldProps2 === void 0 ? void 0 : _item$getFieldProps2.call(item),
+    });
+    return item?.formItemRender?.({
+      type,
+      ...item,
+      key: item.key?.toString(),
+      formItemProps: item.getFormItemProps?.(),
+      fieldProps: item.getFieldProps?.(),
       originProps: originItem
-    }), (0, _objectSpread2.default)((0, _objectSpread2.default)({}, renderConfig), {}, {
-      defaultRender: defaultRender,
-      type: type
-    }), formRef.current);
+    }, {
+      ...renderConfig,
+      defaultRender,
+      type
+    }, formRef.current);
   } : undefined;
-  var getField = function getField() {
-    if (item !== null && item !== void 0 && item.formItemRender) {
-      var dom = formItemRender === null || formItemRender === void 0 ? void 0 : formItemRender(null, {});
+  const getField = () => {
+    if (item?.formItemRender) {
+      const dom = formItemRender?.(null, {});
       if (!dom || item.ignoreFormItem) return dom;
     }
-    return /*#__PURE__*/(0, _react.createElement)(_Field.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formFieldProps), {}, {
+    return /*#__PURE__*/(0, _react.createElement)(_Field.default, {
+      ...formFieldProps,
       key: [item.key, item.index || 0].join('-'),
       formItemRender: formItemRender
-    }));
+    });
   };
   if (item.dependencies) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dependency.default, {
@@ -76,4 +77,5 @@ var field = exports.field = function field(item, _ref) {
     }, item.key);
   }
   return getField();
-};
+};
+exports.field = field;

package/lib/form/components/SchemaForm/valueType/formList.js

@@ -1,26 +1,27 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.formList = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _List = require("../../List");
 var _react = require("react");
-var formList = exports.formList = function formList(item, _ref) {
-  var genItems = _ref.genItems;
+const formList = (item, {
+  genItems
+}) => {
   if (item.valueType === 'formList' && item.dataIndex) {
-    var _item$getFormItemProp, _item$getFieldProps;
     if (!item.columns || !Array.isArray(item.columns)) return null;
-    return /*#__PURE__*/(0, _react.createElement)(_List.ProFormList, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (_item$getFormItemProp = item.getFormItemProps) === null || _item$getFormItemProp === void 0 ? void 0 : _item$getFormItemProp.call(item)), {}, {
+    return /*#__PURE__*/(0, _react.createElement)(_List.ProFormList, {
+      ...item.getFormItemProps?.(),
       key: item.key,
       name: item.dataIndex,
       label: item.label,
       initialValue: item.initialValue,
       colProps: item.colProps,
-      rowProps: item.rowProps
-    }, (_item$getFieldProps = item.getFieldProps) === null || _item$getFieldProps === void 0 ? void 0 : _item$getFieldProps.call(item)), genItems(item.columns));
+      rowProps: item.rowProps,
+      ...item.getFieldProps?.()
+    }, genItems(item.columns));
   }
   return true;
-};
+};
+exports.formList = formList;

package/lib/form/components/SchemaForm/valueType/formSet.js

@@ -5,22 +5,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.formSet = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _FieldSet = _interopRequireDefault(require("../../FieldSet"));
 var _react = require("react");
-var formSet = exports.formSet = function formSet(item, _ref) {
-  var genItems = _ref.genItems;
+const formSet = (item, {
+  genItems
+}) => {
   if (item.valueType === 'formSet' && item.dataIndex) {
-    var _item$getFormItemProp, _item$getFieldProps;
     if (!item.columns || !Array.isArray(item.columns)) return null;
-    return /*#__PURE__*/(0, _react.createElement)(_FieldSet.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (_item$getFormItemProp = item.getFormItemProps) === null || _item$getFormItemProp === void 0 ? void 0 : _item$getFormItemProp.call(item)), {}, {
+    return /*#__PURE__*/(0, _react.createElement)(_FieldSet.default, {
+      ...item.getFormItemProps?.(),
       key: item.key,
       initialValue: item.initialValue,
       name: item.dataIndex,
       label: item.label,
       colProps: item.colProps,
-      rowProps: item.rowProps
-    }, (_item$getFieldProps = item.getFieldProps) === null || _item$getFieldProps === void 0 ? void 0 : _item$getFieldProps.call(item)), genItems(item.columns));
+      rowProps: item.rowProps,
+      ...item.getFieldProps?.()
+    }, genItems(item.columns));
   }
   return true;
-};
+};
+exports.formSet = formSet;