@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

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

@@ -1,39 +1,30 @@
-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 _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _debounce from "lodash/debounce";
-import _set from "lodash/set";
-import _omit from "lodash/omit";
-import _isString from "lodash/isString";
-import _isFunction from "lodash/isFunction";
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
-
+import { Col, Form, Input, Space } from 'antd';
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
-import useShouldUpdate from '../../utils/useShouldUpdate';
-import { isTrim, isUpperCase, findOptionByValue, parseNamePath } from '../../utils/index';
-import { useProConfig } from '../../../ProConfigProvider';
-import transformNames from '../../utils/transformNames';
-import valueTypeMap from '../../utils/valueType';
-import tipSvg from '../../../assets/tip.svg';
-import useRules from '../../utils/useRules';
-import ConfirmWrapper from './ConfirmWrapper';
-import ChangedWrapper from './ChangedWrapper';
+import { isFunction, isString, omit, set, debounce } from 'lodash';
+import useShouldUpdate from "../../utils/useShouldUpdate";
+import { isTrim, isUpperCase, findOptionByValue, parseNamePath } from "../../utils/index";
+import { useProConfig } from "../../../ProConfigProvider";
+import transformNames from "../../utils/transformNames";
+import valueTypeMap from "../../utils/valueType";
+import tipSvg from "../../../assets/tip.svg";
+import useRules from "../../utils/useRules";
+import ConfirmWrapper from "./ConfirmWrapper";
+import ChangedWrapper from "./ChangedWrapper";
+
 // 这个组件只管渲染, 参数的整理在外部处理
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var Render = function Render(props) {
   var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
   var component = props.component,
@@ -58,6 +49,7 @@ var Render = function Render(props) {
     viewRender = props.viewRender,
     desensitization = props.desensitization;
   var colProps = props.colProps;
+
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
     hiddenNames = formItemProps.hiddenNames,
@@ -71,6 +63,7 @@ var Render = function Render(props) {
     _formItemProps$valida = formItemProps.validateFirst,
     validateFirst = _formItemProps$valida === void 0 ? true : _formItemProps$valida,
     otherFormItemProps = _objectWithoutProperties(formItemProps, _excluded);
+
   // 更新show & disabled & rules
   var _useShouldUpdate = useShouldUpdate({
       show: show,
@@ -116,6 +109,7 @@ var Render = function Render(props) {
     isSelect: isSelect,
     type: type
   });
+
   /**
    * 基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
@@ -135,8 +129,9 @@ var Render = function Render(props) {
       return {};
     }
     var params = _objectSpread(_objectSpread({}, otherProps), otherFormItemProps);
-    return _isFunction(valueTypeMap[valueType]) ? valueTypeMap[valueType](params) : {};
+    return isFunction(valueTypeMap[valueType]) ? valueTypeMap[valueType](params) : {};
   };
+
   /**
    * transform对象
    * 存在names通过transformNames转换平铺处理
@@ -145,12 +140,14 @@ var Render = function Render(props) {
   var transforms = Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names) ? transformNames(_objectSpread(_objectSpread({}, otherFormItemProps), valueTypeTransform()),
   // 合并valueType的transform
   form, otherProps.names, namesStr, otherProps.type) : valueTypeTransform();
+
   /**
    * globalControl 全局控制优先
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
    * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
    */
   var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
+
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
@@ -168,14 +165,17 @@ var Render = function Render(props) {
   {
     disabled: lastDisabled
   });
+
   // 添加label宽度
   if (labelWidth) {
     otherFormItemProps.labelCol = {
       flex: "".concat(labelWidth, "px")
     };
   }
+
   /** 移除多余参数，防止透传给formItem报错 */
-  var _otherFormItemProps = _omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
+  var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
+
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -186,7 +186,7 @@ var Render = function Render(props) {
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
-    return _jsx(_Form.Item, {
+    return /*#__PURE__*/_jsx(Form.Item, {
       name: _otherFormItemProps.name || 'proFormItemHidden',
       shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
@@ -195,9 +195,10 @@ var Render = function Render(props) {
       rules: [{
         required: false
       }],
-      children: _jsx(_Input, {})
+      children: /*#__PURE__*/_jsx(Input, {})
     });
   }
+
   /**
    * 函数新参数组装
    */
@@ -211,14 +212,16 @@ var Render = function Render(props) {
       form: form
     };
     // 优先处理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)) {
+    if (Array.isArray(_otherFormItemProps.namePath) && _otherFormItemProps !== null && _otherFormItemProps !== void 0 && (_otherFormItemProps$n = _otherFormItemProps.namePath) !== null && _otherFormItemProps$n !== void 0 && _otherFormItemProps$n.length) {
       var _otherFormItemProps$n2;
       _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];
+      _args[2].index = _otherFormItemProps.namePath[(_otherFormItemProps === null || _otherFormItemProps === void 0 || (_otherFormItemProps$n2 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n2 === void 0 ? void 0 : _otherFormItemProps$n2.length) - 1];
     }
+
     // 返回表单元素默认值
     _args[2].extra = args;
+
     // 当设置valueType后返回转换后的值
     if (valueType) {
       _args[2].transformValue = form.getFieldValue(_otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : _otherFormItemProps.name) || undefined;
@@ -237,6 +240,7 @@ var Render = function Render(props) {
     }
     return _args;
   };
+
   /**
    * onChange参数重置 (value, record, { form, index, namePath, option }) => void
    */
@@ -246,6 +250,7 @@ var Render = function Render(props) {
       args[_key] = arguments[_key];
     }
     var _args = [].concat(args);
+
     // 优先使用onFieldChange
     var changeKey = Object.keys(lastComponentProps).includes('onFieldChange') ? 'onFieldChange' : 'onChange';
     if (changeKey === 'onChange') {
@@ -254,40 +259,43 @@ var Render = function Render(props) {
     if (changeKey === 'onFieldChange') {
       _args = functionArgs([].concat(args));
     }
-    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
-    if (/*#__PURE__*/React.isValidElement(AutoComponent)) {
-      var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
-      ((_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))));
+    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 || (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
+    if ( /*#__PURE__*/React.isValidElement(AutoComponent)) {
+      var _changeKey, _ref7, _lastComponentProps$c;
+      ((_changeKey = (_ref7 = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _changeKey === void 0 ? void 0 : _changeKey.call.apply(_changeKey, [_ref7].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;
     }
+
     // FormList 和 Group场景 对比值改变的话, 回显到表单上
     if (inList && changeKey === 'onFieldChange') {
       var values = form.getFieldsValue();
-      var newValues = _set(values, _otherFormItemProps.namePath, _args[1]);
+      var newValues = set(values, _otherFormItemProps.namePath, _args[1]);
       form.setFieldsValue(newValues);
     }
+
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
-    if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
+    if (formItemProps !== null && formItemProps !== void 0 && formItemProps.parentNames) {
       setTimeout(function () {
         var namePath = parseNamePath(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames);
         form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(namePath));
         form.validateFields(namePath);
       }, 60);
     }
+
     // ProTreeSelect返回option
     if (['ProTree'].includes(type) && !_args[2].option) {
-      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 === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
+      var _args2;
+      _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 || (_args2 = _args2[0]) === null || _args2 === void 0 ? void 0 : _args2[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }
-    (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat(_toConsumableArray(_args)));
+    (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 || _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat(_toConsumableArray(_args)));
   };
-  var debouncedHandleChange = _debounce(defaultHandleChange, lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.debounceWait);
+  var debouncedHandleChange = debounce(defaultHandleChange, lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.debounceWait);
   var handleChange = function handleChange() {
     for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
       args[_key2] = arguments[_key2];
     }
     var _args = [].concat(args);
-    if (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.debounceWait) {
+    if (lastComponentProps !== null && lastComponentProps !== void 0 && lastComponentProps.debounceWait) {
       // 为了兼容 Input 和 TextArea 的 onChange 事件，需要将 event 对象转换为 value
       if (['Input', 'TextArea'].includes(type)) {
         _args[0] = {
@@ -301,11 +309,12 @@ var Render = function Render(props) {
       defaultHandleChange.apply(void 0, _toConsumableArray(_args));
     }
   };
+
   /**
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len3,
         args,
         _key3,
@@ -332,55 +341,63 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
     // 移除多余字段，group保留onFieldChange
     var lastComponentPropsFilter = ['onFieldChange', 'disabledStrictly'];
+
     // 表单渲染 start
-    var childProps = _objectSpread(_objectSpread(_objectSpread({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), _omit(lastComponentProps, lastComponentPropsFilter)), {}, {
+    var childProps = _objectSpread(_objectSpread(_objectSpread({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), omit(lastComponentProps, lastComponentPropsFilter)), {}, {
       // @ts-ignore
       otherProps: otherProps,
       onChange: handleChange,
       onBlur: handleBlur
     });
+
     /**
      * formItem前后值添加
      */
     var internalItemRender = {
       mark: 'pro_table_render',
       render: function render(inputProps, doms) {
-        return _jsxs(_Fragment, {
-          children: [_jsx(_Space, {
+        return /*#__PURE__*/_jsxs(_Fragment, {
+          children: [/*#__PURE__*/_jsx(Space, {
             size: 0,
             style: {
               marginTop: 8
             },
             children: formItemProps.above
-          }), _jsxs("div", {
+          }), /*#__PURE__*/_jsxs("div", {
             style: {
               display: 'flex',
               alignItems: 'center'
             },
-            children: [(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.before) ? _jsx("div", {
+            children: [formItemProps !== null && formItemProps !== void 0 && formItemProps.before ? /*#__PURE__*/_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", {
+            }) : null, doms.input, formItemProps !== null && formItemProps !== void 0 && formItemProps.after ? /*#__PURE__*/_jsx("div", {
               style: {
                 marginInlineStart: 8
               },
               children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
             }) : null]
-          }), _jsx(_Space, {
+          }), /*#__PURE__*/_jsx(Space, {
             size: 0,
             style: {
               marginTop: 8
             },
             children: formItemProps.extra
-          }), doms.errorList]
+          }), doms.errorList ? /*#__PURE__*/_jsx("div", {
+            className: "ant-form-item-additional",
+            style: {
+              minHeight: '16px'
+            },
+            children: doms.errorList
+          }) : null]
         });
       }
     };
@@ -388,7 +405,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? (/*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, _omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
+    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : /*#__PURE__*/_jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
       otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,
@@ -398,22 +415,24 @@ var Render = function Render(props) {
       onBlur: handleBlur
     }));
     if (confirm) {
-      child = _jsx(ConfirmWrapper, _objectSpread(_objectSpread({
+      child = /*#__PURE__*/_jsx(ConfirmWrapper, _objectSpread(_objectSpread({
         confirm: confirm
       }, childProps), {}, {
         children: child
       }));
     }
+
     // 表单提示
     if (tooltip) {
       _otherFormItemProps.tooltip = {
-        title: _isString(tooltip) ? tooltip : tooltip.title,
-        icon: _isString(tooltip) ? _jsx(ReactSVG, {
+        title: isString(tooltip) ? tooltip : tooltip.title,
+        icon: isString(tooltip) ? /*#__PURE__*/_jsx(ReactSVG, {
           className: "pro-icon-tip",
           src: tipSvg
         }) : tooltip.icon
       };
     }
+
     // 需要过滤掉的form_item的key
     var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName', 'fixed'];
     if (type === 'FormList') {
@@ -422,15 +441,15 @@ var Render = function Render(props) {
       colProps = _objectSpread(_objectSpread({}, colProps), {}, {
         span: lessMode ? colProps.span : 24 // 默认占一行
       });
-      return _jsx(_Form.Item, _objectSpread(_objectSpread({}, _omit(_otherFormItemProps, filterFormItemKey)), {}, {
+      return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
         // @ts-ignore
         _internalItemRender: internalItemRender,
         className: _className,
-        children: _jsx(_Form.List, _objectSpread(_objectSpread({
+        children: /*#__PURE__*/_jsx(Form.List, _objectSpread(_objectSpread({
           name: _otherFormItemProps.name
-        }, _omit(_otherFormItemProps, ['rules'])), {}, {
+        }, omit(_otherFormItemProps, ['rules'])), {}, {
           children: function children(fields, operation, meta) {
-            return _jsx(AutoComponent, _objectSpread(_objectSpread({}, _omit(lastComponentProps, lastComponentPropsFilter)), {}, {
+            return /*#__PURE__*/_jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, lastComponentPropsFilter)), {}, {
               otherProps: otherProps,
               fields: fields,
               operation: operation,
@@ -440,14 +459,15 @@ var Render = function Render(props) {
         }))
       }));
     }
+
     //  默认占据一行
     if (['ProCollapse', 'Container'].includes(type)) {
       colProps = _objectSpread(_objectSpread({}, colProps), {}, {
         span: 24 // 默认占一行
       });
     }
-    if (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) {
-      child = _jsx(ChangedWrapper, {
+    if (diffConfig !== null && diffConfig !== void 0 && diffConfig.originalValues) {
+      child = /*#__PURE__*/_jsx(ChangedWrapper, {
         name: formItemProps.name,
         names: otherProps.names,
         namesStr: namesStr,
@@ -464,36 +484,35 @@ var Render = function Render(props) {
         children: child
       });
     }
-    return _jsx(_Form.Item, _objectSpread(_objectSpread({}, _omit(_otherFormItemProps, filterFormItemKey)), {}, {
+    return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
   };
-  var FormItem = _jsxs(_Fragment, {
+  var FormItem = /*#__PURE__*/_jsxs(_Fragment, {
     children: [_otherFormItemProps.shouldUpdate ?
+    /*#__PURE__*/
     // 空标签防止气泡不显示
-    _jsx(_Fragment, {
-      children: _jsx(_Form.Item, {
-        shouldUpdate: _otherFormItemProps.shouldUpdate,
-        noStyle: true,
-        children: function children() {
-          return renderItem();
-        }
-      })
-    }) : 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, {
+    _jsx(Form.Item, {
+      shouldUpdate: _otherFormItemProps.shouldUpdate,
+      noStyle: true,
+      children: function children() {
+        return renderItem();
+      }
+    }) : renderItem(), otherProps !== null && otherProps !== void 0 && (_otherProps$names2 = otherProps.names) !== null && _otherProps$names2 !== void 0 && _otherProps$names2.length ? otherProps.names.map(function (name) {
+      return /*#__PURE__*/_jsx(Form.Item, {
         hidden: true,
         name: name,
-        children: _jsx(_Input, {})
+        children: /*#__PURE__*/_jsx(Input, {})
       }, name);
     }) : null]
   });
-  if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
+  if (formItemProps !== null && formItemProps !== void 0 && formItemProps.parentNames) {
     return FormItem;
   }
-  return _jsx(_Col, _objectSpread(_objectSpread({}, colProps), {}, {
+  return /*#__PURE__*/_jsx(Col, _objectSpread(_objectSpread({}, colProps), {}, {
     children: FormItem
   }));
 };

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

@@ -1,19 +1,17 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _isString from "lodash/isString";
-import _union from "lodash/union";
-import _isFunction from "lodash/isFunction";
-import _isBoolean from "lodash/isBoolean";
 var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization", "span"];
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
-import Render from './Render';
-import { getDefaultProps } from '../../utils/getDefaultProps';
-import * as componentMap from '../index';
-import { isSelect } from '../../utils';
-import { FieldProvider } from '../../utils/useFieldProps';
-import locale from '../../../locale';
-import processDependencies from '../../utils/processDependencies';
+import { isBoolean, isFunction, union, isString } from 'lodash';
+import Render from "./Render";
+import { getDefaultProps } from "../../utils/getDefaultProps";
+import * as componentMap from "../index";
+import { isSelect } from "../../utils";
+import { FieldProvider } from "../../utils/useFieldProps";
+import locale from "../../../locale";
+import processDependencies from "../../utils/processDependencies";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var RenderFields = function RenderFields(props) {
   var isView = props.isView,
     _props$columns = props.columns,
@@ -32,10 +30,12 @@ var RenderFields = function RenderFields(props) {
     diffConfig = props.diffConfig,
     globalControl = props.globalControl,
     desensitizationKey = props.desensitizationKey;
+
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
   }) || [];
+
   // 创建hidden字段供表单收集
   if (hiddenData.length) {
     var hiddenArray = [];
@@ -86,6 +86,7 @@ var RenderFields = function RenderFields(props) {
     var defaultProps = getDefaultProps(column);
     // 处理dependencies，支持namesPaths格式
     var processedDeps = processDependencies(column.dependencies);
+
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
     var _formItemProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), formItemProps), otherFormItemProps), {}, {
       required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
@@ -93,11 +94,13 @@ var RenderFields = function RenderFields(props) {
       dependencies: processedDeps
     });
     _formItemProps.labelWidth = _formItemProps.labelWidth || labelWidth; // 接收Form中的labelWidth
+
     if (type && component) {
       console.error('Warning: type and component are mutually exclusive. type will not take effect');
     }
     var _type = type || 'Input';
     var TargetComponent;
+
     // 查看高阶函数
     var viewRenderHandle = function viewRenderHandle() {
       var _column$namePath;
@@ -105,9 +108,9 @@ var RenderFields = function RenderFields(props) {
       var record = form.getFieldsValue();
       var index;
       // FormList场景
-      if (Array.isArray(column === null || column === void 0 ? void 0 : column.namePath) && (column === null || column === void 0 ? void 0 : (_column$namePath = column.namePath) === null || _column$namePath === void 0 ? void 0 : _column$namePath.length)) {
+      if (Array.isArray(column === null || column === void 0 ? void 0 : column.namePath) && column !== null && column !== void 0 && (_column$namePath = column.namePath) !== null && _column$namePath !== void 0 && _column$namePath.length) {
         // @ts-ignore
-        value = form.getFieldValue(_union(column.namePath, (column === null || column === void 0 ? void 0 : column.name) || []));
+        value = form.getFieldValue(union(column.namePath, (column === null || column === void 0 ? void 0 : column.name) || []));
         record = form.getFieldValue(column.namePath);
         index = column === null || column === void 0 ? void 0 : column.index;
       }
@@ -127,7 +130,7 @@ var RenderFields = function RenderFields(props) {
     if (component && /*#__PURE__*/React.isValidElement(component)) {
       var _newComponent$props;
       var newComponent = component;
-      var isProEditTable = (newComponent === null || newComponent === void 0 ? void 0 : (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
+      var isProEditTable = (newComponent === null || newComponent === void 0 || (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
       TargetComponent = _isView ? viewRenderHandle || '' : component;
       // 可编辑表格内部支持
       if (isProEditTable) {
@@ -139,19 +142,21 @@ var RenderFields = function RenderFields(props) {
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
     var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
+
     // 当前组件是不是一个选择组件
     var _isSelect = isSelect({
       dataSource: dataSource,
       type: _type
     });
     var placeholderHandle = function placeholderHandle() {
-      var _label = _isString(label) ? label : '';
-      var _formLabel = _isString(formLabel) ? formLabel : '';
+      var _label = isString(label) ? label : '';
+      var _formLabel = isString(formLabel) ? formLabel : '';
       return placeholder || "".concat(_isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(_label || _formLabel || '');
     };
+
     // 表单组件Props 兼容2.0版本
     var _fieldProps = _objectSpread(_objectSpread({}, formItemChildProps), fieldProps);
-    if (_isBoolean(formDisabled)) {
+    if (isBoolean(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
     var componentProps = _objectSpread(_objectSpread({
@@ -159,20 +164,24 @@ var RenderFields = function RenderFields(props) {
     }, _fieldProps), {}, {
       disabled: comDisabled
     });
+
     // 容器组件，额外处理show的问题
     if (['ProCollapse', 'Container'].includes(_type)) {
       componentProps.show = show;
       componentProps.clearNotShow = clearNotShow;
       componentProps.diffConfig = diffConfig;
     }
+
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';
     }
+
     // 时间范围placeholder处理
-    if (['RangePicker'].includes(_type) && !(fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.placeholder)) {
+    if (['RangePicker'].includes(_type) && !(fieldProps !== null && fieldProps !== void 0 && fieldProps.placeholder)) {
       delete componentProps.placeholder;
     }
+
     // 没有找到对应组件  不渲染
     if (!TargetComponent) {
       return [];
@@ -180,6 +189,7 @@ var RenderFields = function RenderFields(props) {
     var _colProps = span ? {
       span: span
     } : _objectSpread(_objectSpread({}, defaultColProps), colProps);
+
     // 其余参数收进对象里传给子组件 componentProps只包含子组件参数
     var otherProps = {
       label: _formItemProps.label,
@@ -202,23 +212,28 @@ var RenderFields = function RenderFields(props) {
       diffConfig: diffConfig,
       desensitizationKey: desensitizationKey
     };
-    return _jsx(FieldProvider, {
+    return /*#__PURE__*/_jsx(FieldProvider, {
       value: otherProps,
-      children: _jsx(Render, {
+      children: /*#__PURE__*/_jsx(Render, {
         show: show,
         form: form,
-        disabled: column.disabled,
-        formDisabled: formDisabled,
+        disabled: column.disabled // 外层配置disabled
+        ,
+        formDisabled: formDisabled // 表单全局disabled
+        ,
         type: _type,
-        originComponent: component,
-        component: TargetComponent,
+        originComponent: component // 原始自定义component，用于动态函数场景，TargetComponent已经默认赋值Input被污染
+        ,
+        component: TargetComponent
         // @ts-ignore
+        ,
         formItemProps: _formItemProps,
         confirm: confirm,
         colProps: _colProps,
         componentProps: componentProps,
         otherProps: otherProps,
-        fieldProps: _isFunction(fieldProps) ? fieldProps : null,
+        fieldProps: isFunction(fieldProps) ? fieldProps : null // 透传fieldProps函数
+        ,
         isSelect: _isSelect,
         diffConfig: diffConfig,
         onDiff: onDiff,
@@ -229,7 +244,7 @@ var RenderFields = function RenderFields(props) {
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });
-  return _jsx(_Fragment, {
+  return /*#__PURE__*/_jsx(_Fragment, {
     children: comList
   });
 };