@zat-design/sisyphus-react 4.0.0-beta.2 → 4.0.0-beta.4

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

@@ -1,34 +1,32 @@
+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 _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"];
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
-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 _ref2, _ref3, _ref4, _ref5, _otherProps$names3;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -49,8 +47,10 @@ var Render = function Render(props) {
     globalControl = props.globalControl,
     diffConfig = props.diffConfig,
     viewRender = props.viewRender,
-    desensitization = props.desensitization;
+    desensitization = props.desensitization,
+    shouldUpdateDebounce = props.shouldUpdateDebounce;
   var colProps = props.colProps;
+
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
     hiddenNames = formItemProps.hiddenNames,
@@ -64,6 +64,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,
@@ -76,7 +77,8 @@ var Render = function Render(props) {
       component: component,
       originComponent: originComponent,
       type: type,
-      desensitization: desensitization
+      desensitization: desensitization,
+      shouldUpdateDebounce: shouldUpdateDebounce
     }),
     shouldUpdate = _useShouldUpdate.shouldUpdate,
     _show = _useShouldUpdate.show,
@@ -109,6 +111,7 @@ var Render = function Render(props) {
     isSelect: isSelect,
     type: type
   });
+
   /**
    * 基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
@@ -128,8 +131,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转换平铺处理
@@ -138,12 +142,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
@@ -161,14 +167,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
    */
@@ -179,7 +188,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,
@@ -188,9 +197,10 @@ var Render = function Render(props) {
       rules: [{
         required: false
       }],
-      children: _jsx(Input, {})
+      children: /*#__PURE__*/_jsx(Input, {})
     });
   }
+
   /**
    * 函数新参数组装
    */
@@ -204,14 +214,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;
@@ -230,6 +242,7 @@ var Render = function Render(props) {
     }
     return _args;
   };
+
   /**
    * onChange参数重置 (value, record, { form, index, namePath, option }) => void
    */
@@ -239,6 +252,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') {
@@ -247,40 +261,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] = {
@@ -294,86 +311,89 @@ 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__*/_regenerator().m(function _callee() {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len3,
         args,
         _key3,
         _args,
-        _args3 = arguments,
-        _t;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.n) {
+        _args3 = arguments;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
             _args = functionArgs([].concat(args));
-            _t = lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur;
-            if (!_t) {
-              _context.n = 1;
+            _context.t0 = lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur;
+            if (!_context.t0) {
+              _context.next = 6;
               break;
             }
-            _context.n = 1;
+            _context.next = 6;
             return lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur.apply(lastComponentProps, _toConsumableArray(_args));
-          case 1:
-            return _context.a(2);
+          case 6:
+          case "end":
+            return _context.stop();
         }
       }, _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 ? _jsx("div", {
+          }), doms.errorList ? /*#__PURE__*/_jsx("div", {
             className: "ant-form-item-additional",
             style: {
               minHeight: '16px'
@@ -387,7 +407,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,
@@ -397,22 +417,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') {
@@ -421,15 +443,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,
@@ -439,16 +461,27 @@ 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) {
+      var _otherProps$namePath, _otherProps$names2;
+      var nextNames = otherProps.names;
+      // FormList中的names字段需要去除前缀
+      if (otherProps !== null && otherProps !== void 0 && (_otherProps$namePath = otherProps.namePath) !== null && _otherProps$namePath !== void 0 && _otherProps$namePath.length && (_otherProps$names2 = otherProps.names) !== null && _otherProps$names2 !== void 0 && _otherProps$names2.length) {
+        var _otherProps$namePath2;
+        var prefixLength = (otherProps === null || otherProps === void 0 || (_otherProps$namePath2 = otherProps.namePath) === null || _otherProps$namePath2 === void 0 ? void 0 : _otherProps$namePath2.length) - 1;
+        nextNames = otherProps.names.map(function (name) {
+          return name.slice(prefixLength);
+        });
+      }
+      child = /*#__PURE__*/_jsx(ChangedWrapper, {
         name: formItemProps.name,
-        names: otherProps.names,
+        names: nextNames,
         namesStr: namesStr,
         diffConfig: diffConfig,
         form: form,
@@ -463,15 +496,16 @@ 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(Form.Item, {
       shouldUpdate: _otherFormItemProps.shouldUpdate,
@@ -479,18 +513,18 @@ var Render = function Render(props) {
       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, {
+    }) : renderItem(), otherProps !== null && otherProps !== void 0 && (_otherProps$names3 = otherProps.names) !== null && _otherProps$names3 !== void 0 && _otherProps$names3.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.d.ts

@@ -21,6 +21,7 @@ interface Props<T = any> {
     required?: boolean | boolean[] | (() => boolean | boolean[]);
     globalControl?: boolean;
     desensitizationKey?: string;
+    shouldUpdateDebounce?: number;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;