@zat-design/sisyphus-react 3.0.16-beta.2 → 3.1.4

package/es/ProForm/components/old/ProRangeBox/index.js

@@ -9,12 +9,13 @@ import "antd/es/form/style";
 import _Form from "antd/es/form";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { cloneElement } from 'react';
 export default function ProRangeBox(_ref) {
   var _ref$configOption = _ref.configOption,
     configOption = _ref$configOption === void 0 ? [] : _ref$configOption;
   var CutMiddle = function CutMiddle() {
-    return /*#__PURE__*/React.createElement(_Input, {
+    return _jsx(_Input, {
       className: "site-input-split",
       style: {
         width: 40,
@@ -26,64 +27,71 @@ export default function ProRangeBox(_ref) {
       disabled: true
     });
   };
-  return /*#__PURE__*/React.createElement(_Input.Group, {
+  return _jsx(_Input.Group, {
     style: {
       display: 'flex'
     },
-    className: "site-input-group-wrapper pro-range-box"
-  }, configOption === null || configOption === void 0 ? void 0 : configOption.map(function (_item, ind) {
-    if (_item === null || _item === void 0 ? void 0 : _item.component) {
-      return /*#__PURE__*/React.createElement(React.Fragment, {
-        key: ind
-      }, /*#__PURE__*/React.createElement(_Form.Item, {
-        noStyle: true,
-        name: _item === null || _item === void 0 ? void 0 : _item.name,
-        rules: _item === null || _item === void 0 ? void 0 : _item.rules
-      }, _item.component ? /*#__PURE__*/cloneElement(_item.component, _objectSpread({
-        disabled: _item.disabled
-      }, _item)) : ''), ind === 0 && /*#__PURE__*/React.createElement(CutMiddle, null));
-    }
-    if ((_item === null || _item === void 0 ? void 0 : _item.type) === 'inputNumber') {
-      return /*#__PURE__*/React.createElement(React.Fragment, {
-        key: ind
-      }, /*#__PURE__*/React.createElement(_Form.Item, {
-        noStyle: true,
-        name: _item === null || _item === void 0 ? void 0 : _item.name,
-        rules: _item === null || _item === void 0 ? void 0 : _item.rules
-      }, /*#__PURE__*/React.createElement(_InputNumber, _objectSpread({
-        styles: {
-          width: '100%'
-        }
-      }, _item))), ind === 0 && /*#__PURE__*/React.createElement(CutMiddle, null));
-    }
-    if ((_item === null || _item === void 0 ? void 0 : _item.type) === 'Select') {
-      return /*#__PURE__*/React.createElement(React.Fragment, {
-        key: ind
-      }, /*#__PURE__*/React.createElement(_Form.Item, {
-        noStyle: true,
-        name: _item === null || _item === void 0 ? void 0 : _item.name,
-        rules: _item === null || _item === void 0 ? void 0 : _item.rules
-      }, /*#__PURE__*/React.createElement(_Select, _objectSpread({
-        allowClear: true,
-        style: {
-          width: '100%'
-        }
-      }, _item))), ind === 0 && /*#__PURE__*/React.createElement(CutMiddle, null));
-    }
-    return /*#__PURE__*/React.createElement(React.Fragment, {
-      key: ind
-    }, /*#__PURE__*/React.createElement(_Col, {
-      key: _item === null || _item === void 0 ? void 0 : _item.id
-    }, /*#__PURE__*/React.createElement(_Form.Item, {
-      noStyle: true,
-      name: _item === null || _item === void 0 ? void 0 : _item.name,
-      rules: _item === null || _item === void 0 ? void 0 : _item.rules
-    }, /*#__PURE__*/React.createElement(_Input, _objectSpread(_objectSpread({
-      style: {
-        width: '100%'
+    className: "site-input-group-wrapper pro-range-box",
+    children: configOption === null || configOption === void 0 ? void 0 : configOption.map(function (_item, ind) {
+      if (_item === null || _item === void 0 ? void 0 : _item.component) {
+        return _jsxs(React.Fragment, {
+          children: [_jsx(_Form.Item, {
+            noStyle: true,
+            name: _item === null || _item === void 0 ? void 0 : _item.name,
+            rules: _item === null || _item === void 0 ? void 0 : _item.rules,
+            children: _item.component ? /*#__PURE__*/cloneElement(_item.component, _objectSpread({
+              disabled: _item.disabled
+            }, _item)) : ''
+          }), ind === 0 && _jsx(CutMiddle, {})]
+        }, ind);
+      }
+      if ((_item === null || _item === void 0 ? void 0 : _item.type) === 'inputNumber') {
+        return _jsxs(React.Fragment, {
+          children: [_jsx(_Form.Item, {
+            noStyle: true,
+            name: _item === null || _item === void 0 ? void 0 : _item.name,
+            rules: _item === null || _item === void 0 ? void 0 : _item.rules,
+            children: _jsx(_InputNumber, _objectSpread({
+              styles: {
+                width: '100%'
+              }
+            }, _item))
+          }), ind === 0 && _jsx(CutMiddle, {})]
+        }, ind);
+      }
+      if ((_item === null || _item === void 0 ? void 0 : _item.type) === 'Select') {
+        return _jsxs(React.Fragment, {
+          children: [_jsx(_Form.Item, {
+            noStyle: true,
+            name: _item === null || _item === void 0 ? void 0 : _item.name,
+            rules: _item === null || _item === void 0 ? void 0 : _item.rules,
+            children: _jsx(_Select, _objectSpread({
+              allowClear: true,
+              style: {
+                width: '100%'
+              }
+            }, _item))
+          }), ind === 0 && _jsx(CutMiddle, {})]
+        }, ind);
       }
-    }, _item), {}, {
-      rules: _item === null || _item === void 0 ? void 0 : _item.rules
-    })))), ind === 0 && /*#__PURE__*/React.createElement(_Col, null, /*#__PURE__*/React.createElement(CutMiddle, null)));
-  }));
+      return _jsxs(React.Fragment, {
+        children: [_jsx(_Col, {
+          children: _jsx(_Form.Item, {
+            noStyle: true,
+            name: _item === null || _item === void 0 ? void 0 : _item.name,
+            rules: _item === null || _item === void 0 ? void 0 : _item.rules,
+            children: _jsx(_Input, _objectSpread(_objectSpread({
+              style: {
+                width: '100%'
+              }
+            }, _item), {}, {
+              rules: _item === null || _item === void 0 ? void 0 : _item.rules
+            }))
+          })
+        }, _item === null || _item === void 0 ? void 0 : _item.id), ind === 0 && _jsx(_Col, {
+          children: _jsx(CutMiddle, {})
+        })]
+      }, ind);
+    })
+  });
 }

package/es/ProForm/components/render/Render.js

@@ -1,28 +1,32 @@
 import "antd/es/col/style";
 import _Col from "antd/es/col";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 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 _excluded = ["labelWidth", "hiddenNames", "trim", "className", "rules", "required", "labelRequired", "tooltip"];
+var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
-import React, { useEffect, useMemo } from 'react';
+
+import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
-import { cloneDeep, isBoolean, isFunction, isString, omit } from 'lodash';
+import { isFunction, isString, omit } from 'lodash';
 import useShouldUpdate from '../../utils/useShouldUpdate';
-import { isNullArray, isTrim, filterInternalFields } from '../../utils/index';
+import { isTrim, isUpperCase, findOptionByValue } from '../../utils/index';
 import transformNames from '../../utils/transformNames';
 import valueTypeMap from '../../utils/valueType';
 import { useChanged } from '../../utils/useChanged';
-import { rulesCreator } from '../../utils/rulesCreator';
 import tipSvg from '../../../assets/tip.svg';
+import useRules from '../../utils/useRules';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
   var _classNames, _otherProps$names2;
@@ -31,7 +35,6 @@ var Render = function Render(props) {
     _props$formItemProps = props.formItemProps,
     formItemProps = _props$formItemProps === void 0 ? {} : _props$formItemProps,
     otherProps = props.otherProps,
-    colProps = props.colProps,
     componentProps = props.componentProps,
     _props$show = props.show,
     show = _props$show === void 0 ? true : _props$show,
@@ -41,11 +44,14 @@ var Render = function Render(props) {
     type = props.type,
     isSelect = props.isSelect,
     originalValues = props.originalValues,
-    equalWith = props.equalWith;
+    equalWith = props.equalWith,
+    requiredOnView = props.requiredOnView;
+  var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
     hiddenNames = formItemProps.hiddenNames,
     trim = formItemProps.trim,
+    upperCase = formItemProps.upperCase,
     className = formItemProps.className,
     rules = formItemProps.rules,
     required = formItemProps.required,
@@ -63,7 +69,8 @@ var Render = function Render(props) {
       componentProps: componentProps,
       fieldProps: fieldProps,
       component: component,
-      originComponent: originComponent
+      originComponent: originComponent,
+      type: type
     }),
     shouldUpdate = _useShouldUpdate.shouldUpdate,
     _show = _useShouldUpdate.show,
@@ -87,43 +94,17 @@ var Render = function Render(props) {
       return Array.isArray(name) ? name.join('_') : name;
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
-  // 判断当前字段是否
+  // 判断当前字段是否变更
   var changed = useChanged(formItemProps.name, otherProps.names, namesStr, originalValues, form, equalWith);
-  // 根据 required 添加 rules
-  var internalRule = useMemo(function () {
-    var result = {
-      rules: _rules || []
-    };
-    if (_required === true) {
-      var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
-        return 'required' in rule;
-      }));
-      if (!requiredRule) {
-        var message = isSelect ? "\u8BF7\u9009\u62E9".concat(otherFormItemProps.label || '') : "\u8BF7\u8F93\u5165".concat(otherFormItemProps.label || '');
-        var rule = {
-          required: _required,
-          message: message
-        };
-        result.rules = Array.isArray(rules) ? [].concat(_toConsumableArray(rules), [rule]) : [rule];
-      }
-    }
-    return result;
-  }, [_rules, _required]);
-  // type转换为内置rules
-  internalRule.rules = internalRule.rules && rulesCreator(internalRule.rules, otherProps.label, isSelect);
-  useEffect(function () {
-    if (otherProps.names && !isBoolean(labelRequired)) {
-      var customRequired = {
-        validator: function validator(rules, value) {
-          if (Array.isArray(value) && isNullArray(value, otherProps.names.length)) {
-            return Promise.reject(new Error("\u8BF7\u5B8C\u6574\u586B\u5199".concat(otherFormItemProps.label || '')));
-          }
-          return Promise.resolve();
-        }
-      };
-      internalRule.rules.push(customRequired);
-    }
-  }, [internalRule]);
+  var internalRule = useRules({
+    names: otherProps.names,
+    label: otherFormItemProps.label,
+    labelRequired: labelRequired,
+    required: _required,
+    rules: _rules,
+    isSelect: isSelect,
+    type: type
+  });
   /**
    * 基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
@@ -154,29 +135,42 @@ var Render = function Render(props) {
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
   }, internalRule, labelRequired || _required ? {
-    required: true
-  } : null, _objectSpread({}, isTrim(type, trim)), {
+    required: labelRequired || _required
+  } : null, otherProps.isView && !requiredOnView ? {
+    required: false
+  } : null, _objectSpread({}, isTrim(type, trim)), _objectSpread({}, isUpperCase(type, upperCase)), {
     validateFirst: true
   });
+  // 添加label宽度
+  if (labelWidth) {
+    otherFormItemProps.labelCol = {
+      flex: "".concat(labelWidth, "px")
+    };
+  }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
   // 优先取formDisabled（全局），其次取disabled函数返回值，最后取fieldProps函数返回的disabled
   var lastDisabled = componentProps.disabledStrictly ? formDisabled || _disabled || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) : false;
-  // 取更新后的组件Props
+  /**
+   * 最新fieldProps: 更新后的组件Props
+   */
   var lastComponentProps = _objectSpread(_objectSpread(_objectSpread({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = classNames((_classNames = {}, _defineProperty(_classNames, className, className), _defineProperty(_classNames, 'pro-form-item-changed', changed), _defineProperty(_classNames, 'label-width', labelWidth !== undefined), _classNames));
+  var _className = classNames((_classNames = {}, _defineProperty(_classNames, className, className), _defineProperty(_classNames, 'pro-form-item-changed', changed), _classNames));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
-    return /*#__PURE__*/React.createElement(_Form.Item, _objectSpread(_objectSpread({}, _otherFormItemProps), {}, {
+    return _jsx(_Form.Item, {
+      name: _otherFormItemProps.name,
+      shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
       noStyle: true,
       hidden: true,
       rules: [{
         required: false
-      }]
-    }), /*#__PURE__*/React.createElement(_Input, null));
+      }],
+      children: _jsx(_Input, {})
+    });
   }
   /**
    * 函数新参数组装
@@ -193,7 +187,7 @@ var Render = function Render(props) {
     // 优先处理FormList场景
     if (Array.isArray(_otherFormItemProps.namePath) && (_otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n = _otherFormItemProps.namePath) === null || _otherFormItemProps$n === void 0 ? void 0 : _otherFormItemProps$n.length)) {
       var _otherFormItemProps$n2;
-      _args[1] = filterInternalFields(cloneDeep(form.getFieldValue(_otherFormItemProps.namePath)));
+      _args[1] = form.getFieldValue(_otherFormItemProps.namePath);
       _args[2].namePath = _otherFormItemProps.namePath;
       _args[2].index = _otherFormItemProps.namePath[(_otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n2 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n2 === void 0 ? void 0 : _otherFormItemProps$n2.length) - 1];
     }
@@ -243,6 +237,17 @@ var Render = function Render(props) {
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat(_toConsumableArray(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat(_toConsumableArray(_args))));
       return false;
     }
+    // Group默认校验, 延时校验解决值未同步最新的问题
+    if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
+      setTimeout(function () {
+        form.validateFields([formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames]);
+      }, 60);
+    }
+    // ProTreeSelect返回option
+    if (['ProTreeSelect', 'ProTree'].includes(type)) {
+      var _args2, _args2$;
+      _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
+    }
     (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat(_toConsumableArray(_args)));
   };
   /**
@@ -254,12 +259,12 @@ var Render = function Render(props) {
         args,
         _key2,
         _args,
-        _args2 = arguments;
+        _args3 = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-              args[_key2] = _args2[_key2];
+            for (_len2 = _args3.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+              args[_key2] = _args3[_key2];
             }
             _args = functionArgs([].concat(args));
             _context.t0 = lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur;
@@ -279,19 +284,6 @@ var Render = function Render(props) {
       return _ref3.apply(this, arguments);
     };
   }();
-  if (type === 'FormList') {
-    lastComponentProps.disabled = lastDisabled;
-    return /*#__PURE__*/React.createElement(_Col, {
-      span: 24
-    }, /*#__PURE__*/React.createElement(_Form.List, _objectSpread({}, _otherFormItemProps), function (fields, operation, meta) {
-      return /*#__PURE__*/React.createElement(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
-        otherProps: otherProps,
-        fields: fields,
-        operation: operation,
-        meta: meta
-      }));
-    }));
-  }
   var renderItem = function renderItem() {
     // 表单渲染 start
     var childProps = _objectSpread(_objectSpread(_objectSpread({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
@@ -300,54 +292,123 @@ var Render = function Render(props) {
       onChange: handleChange,
       onBlur: handleBlur
     });
+    /**
+     * formItem前后值添加
+     */
+    var internalItemRender = {
+      mark: 'pro_table_render',
+      render: function render(inputProps, doms) {
+        return _jsxs(_Fragment, {
+          children: [_jsxs("div", {
+            style: {
+              display: 'flex',
+              alignItems: 'center'
+            },
+            children: [(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.before) ? _jsx("div", {
+              style: {
+                marginInlineEnd: 8
+              },
+              children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.before
+            }) : null, doms.input, (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after) ? _jsx("div", {
+              style: {
+                marginInlineStart: 8
+              },
+              children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
+            }) : null]
+          }), _jsx(_Space, {
+            size: 0,
+            style: {
+              marginTop: 8
+            },
+            children: formItemProps.extra
+          }), doms.errorList]
+        });
+      }
+    };
     // 自定义组件移除otherProps参数
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? /*#__PURE__*/React.cloneElement(AutoComponent, childProps) : /*#__PURE__*/React.createElement(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
-      otherProps: otherProps,
+    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? /*#__PURE__*/React.cloneElement(AutoComponent, childProps) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
+      otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
+        show: show,
+        disabled: lastDisabled,
+        required: required
+      }),
       onChange: handleChange,
       onBlur: handleBlur
     }));
-    // 表单渲染 end
-    if (labelWidth) {
-      _otherFormItemProps.label = /*#__PURE__*/React.createElement("span", {
-        style: {
-          width: labelWidth
-        }
-      }, otherFormItemProps.label);
-    }
     // 表单提示
     if (tooltip) {
       _otherFormItemProps.tooltip = {
         title: isString(tooltip) ? tooltip : tooltip.title,
-        icon: isString(tooltip) ? /*#__PURE__*/React.createElement(ReactSVG, {
+        icon: isString(tooltip) ? _jsx(ReactSVG, {
           className: "pro-icon-tip",
           src: tipSvg
         }) : tooltip.icon
       };
     }
+    // 需要过滤掉的form_item的key
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    if (type === 'FormList') {
+      lastComponentProps.disabled = lastDisabled;
+      var lessMode = lastComponentProps.mode === 'less';
+      child = _jsx(_Form.List, _objectSpread(_objectSpread({}, _otherFormItemProps), {}, {
+        children: function children(fields, operation, meta) {
+          return _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
+            otherProps: otherProps,
+            fields: fields,
+            operation: operation,
+            meta: meta
+          }));
+        }
+      }));
+      colProps = _objectSpread(_objectSpread({}, colProps), {}, {
+        span: lessMode ? colProps.span : 24 // 默认占一行
+      });
+    }
+    //  默认占据一行
+    if (['ProCollapse', 'Container'].includes(type)) {
+      colProps = _objectSpread(_objectSpread({}, colProps), {}, {
+        span: 24 // 默认占一行
+      });
+    }
     // 当存在shouldUpdate时补货所有form变更（防止表单onchange设置form值时无法更新的问题）
     if (_otherFormItemProps.shouldUpdate) {
-      return /*#__PURE__*/React.createElement(_Form.Item, {
+      return _jsx(_Form.Item, {
         shouldUpdate: _otherFormItemProps.shouldUpdate,
-        noStyle: true
-      }, function () {
-        return /*#__PURE__*/React.createElement(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, ['onFieldChange', 'shouldUpdate', 'namePath'])), {}, {
-          className: _className
-        }), child);
+        noStyle: true,
+        children: function children() {
+          return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+            // @ts-ignore
+            _internalItemRender: internalItemRender,
+            className: _className,
+            children: child
+          }));
+        }
       });
     }
-    return /*#__PURE__*/React.createElement(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, ['onFieldChange', 'shouldUpdate', 'namePath'])), {}, {
-      className: _className
-    }), child);
+    return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+      // @ts-ignore
+      _internalItemRender: internalItemRender,
+      className: _className,
+      children: child
+    }));
   };
-  return /*#__PURE__*/React.createElement(_Col, _objectSpread({}, colProps), renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
-    return /*#__PURE__*/React.createElement(_Form.Item, {
-      hidden: true,
-      name: name,
-      key: name
-    }, /*#__PURE__*/React.createElement(_Input, null));
-  }) : null);
+  var FormItem = _jsxs(_Fragment, {
+    children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
+      return _jsx(_Form.Item, {
+        hidden: true,
+        name: name,
+        children: _jsx(_Input, {})
+      }, name);
+    }) : null]
+  });
+  if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
+    return FormItem;
+  }
+  return _jsx(_Col, _objectSpread(_objectSpread({}, colProps), {}, {
+    children: FormItem
+  }));
 };
 export default Render;

package/es/ProForm/components/render/RenderFields.d.ts

@@ -8,13 +8,15 @@ interface Props<T = any> {
     columns: ProColumnProps[];
     disabled?: boolean;
     form: FormInstance<T>;
-    expand?: false | number;
+    expand?: boolean | number;
     colProps?: ColProps;
     viewEmpty?: React.ReactNode;
     openState?: boolean;
     labelWidth?: string | number;
     originalValues?: ProFormProps<T>['originalValues'];
     clearNotShow?: boolean;
+    requiredOnView?: boolean;
+    required?: boolean | (() => boolean);
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;