@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.5

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

@@ -1,9 +1,10 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["name", "names", "namesStr", "form", "onDiff", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
-import { Space, Tooltip } from 'antd';
 import classNames from 'classnames';
 import { get } from 'lodash';
 import React, { useMemo } from 'react';
@@ -13,7 +14,7 @@ import { isEmpty } from "../../../utils";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 var componentsWithFloatWindow = ['Select', 'ProSelect', 'ProEnum', 'ProTimeLimit', 'ProModalSelect', 'ProCascader', 'DataPicker', 'RangePicker', 'TimePicker'];
-var ChangedWrapper = function ChangedWrapper(props) {
+var ChangedWrapper = props => {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
     names = props.names,
@@ -38,11 +39,9 @@ var ChangedWrapper = function ChangedWrapper(props) {
     scrollFollowParent = _diffConfig$scrollFol === void 0 ? true : _diffConfig$scrollFol;
   var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
-  var originalValue = names !== null && names !== void 0 && names.length ? names.map(function (name) {
-    return get(originalValues, name);
-  }) : get(originalValues, name);
+  var originalValue = names !== null && names !== void 0 && names.length ? names.map(name => get(originalValues, name)) : get(originalValues, name);
   var noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
-  var diffType = useMemo(function () {
+  var diffType = useMemo(() => {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
     : props[valuePropName];
@@ -57,27 +56,28 @@ var ChangedWrapper = function ChangedWrapper(props) {
     return diffOriginal({
       value: _value,
       originalValue: _originalValue,
-      form: form,
-      onDiff: onDiff
-      // name: namesStr || name,
+      form,
+      onDiff,
+      type: props.type
     });
-  }, [isWatch, noChange, props[valuePropName], originalValue, _typeof(onDiff)]);
+  }, [isWatch, noChange, props[valuePropName], originalValue, typeof onDiff]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
-  var tipContent = useMemo(function () {
+  var tipContent = useMemo(() => {
     if (!isWatch || noChange) return undefined;
     var valueProps = getValueProps ? getValueProps(originalValue, true) : {
       value: originalValue
     };
     if (viewRender) {
       return viewRender(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value, originalValues, {
-        form: form
+        form
       });
     }
-    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, _defineProperty({
-      isView: true
-    }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
-  }, [_typeof(viewRender), originalValue, children]);
+    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, {
+      isView: true,
+      [valuePropName]: valueProps === null || valueProps === void 0 ? void 0 : valueProps.value
+    })) : undefined;
+  }, [typeof viewRender, originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件
     var isNestedField = ['ProEditTable'].includes(type);
@@ -87,7 +87,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
   }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  var tipOpenCalc = function tipOpenCalc() {
+  var tipOpenCalc = () => {
     if (!toolTip) return false;
 
     // 传入undefined 鼠标移入显示移出隐藏 获得焦点时不显示气泡
@@ -106,26 +106,24 @@ var ChangedWrapper = function ChangedWrapper(props) {
   });
   var open = tipOpenCalc();
   var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
-    scrollFollowParent: scrollFollowParent
+    scrollFollowParent
   } : {};
-  return /*#__PURE__*/_jsx(Tooltip, {
+  return /*#__PURE__*/_jsx(_Tooltip, {
     open: open,
-    getPopupContainer: function getPopupContainer(trigger) {
-      return scrollFollowParent ? trigger.parentElement : document.body;
-    },
+    getPopupContainer: trigger => scrollFollowParent ? trigger.parentElement : document.body,
     classNames: {
       root: 'original-value-tooltip'
     },
     placement: "topLeft",
     autoAdjustOverflow: false,
-    title: /*#__PURE__*/_jsxs(Space, {
+    title: /*#__PURE__*/_jsxs(_Space, {
       direction: "vertical",
       className: "changed-tooltip",
-      children: [/*#__PURE__*/_jsxs(Space, {
+      children: [/*#__PURE__*/_jsxs(_Space, {
         align: "start",
         className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
-      }), _showEllipse && /*#__PURE__*/_jsxs(Space, {
+      }), _showEllipse && /*#__PURE__*/_jsxs(_Space, {
         className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, children.props), rest), scrollFollowParentConfig), {}, {
           isView: true

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

@@ -1,11 +1,12 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/modal/style";
+import _Modal from "antd/es/modal";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["onChange", "children", "confirm", "otherProps"];
 import { isFunction, isObject } from 'lodash';
 import React from 'react';
-import { Modal } from 'antd';
 import ProForm from "../../index";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -13,7 +14,7 @@ var defaultConfirmProps = {
   title: '操作提示',
   content: '确定要修改该字段吗？'
 };
-var ConfirmWrapper = function ConfirmWrapper(props) {
+var ConfirmWrapper = props => {
   var onChange = props.onChange,
     children = props.children,
     confirm = props.confirm,
@@ -43,7 +44,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
             _context2.next = 5;
             return confirm(value, form.getFieldsValue(), {
               option: other[0],
-              form: form,
+              form,
               namePath: otherProps.namePath,
               name: otherProps.name,
               index: otherProps.index,
@@ -59,17 +60,15 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
             confirmProps = _context2.t0;
             // 只处理 false, true 和 对象的情况
             if (confirmProps === false) {
-              onChange === null || onChange === void 0 || onChange.apply(void 0, [_value].concat(other));
+              onChange === null || onChange === void 0 || onChange(_value, ...other);
             }
             if (confirmProps === true) {
-              Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
-                onOk: function onOk() {
-                  return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-                }
+              _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
+                onOk: () => onChange === null || onChange === void 0 ? void 0 : onChange(_value, ...other)
               }));
             }
             if (isObject(confirmProps)) {
-              Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
+              _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
                 onOk: function () {
                   var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
                     var _confirmProps$onOk;
@@ -84,9 +83,9 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
                             arg[_key2] = _args[_key2];
                           }
                           _context.next = 3;
-                          return (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
+                          return (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call(confirmProps, ...arg);
                         case 3:
-                          onChange === null || onChange === void 0 || onChange.apply(void 0, [_value].concat(other));
+                          onChange === null || onChange === void 0 || onChange(_value, ...other);
                         case 4:
                         case "end":
                           return _context.stop();

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

@@ -1,12 +1,17 @@
+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 _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
+import "antd/es/input/style";
+import _Input from "antd/es/input";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
 /* 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';
@@ -25,8 +30,8 @@ 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 Render = props => {
+  var _ref2, _ref3, _ref4, _ref5, _otherProps$names3;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -47,7 +52,8 @@ 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
@@ -66,17 +72,18 @@ var Render = function Render(props) {
 
   // 更新show & disabled & rules
   var _useShouldUpdate = useShouldUpdate({
-      show: show,
-      formItemProps: formItemProps,
-      form: form,
-      disabled: disabled,
-      rules: rules,
-      required: required,
-      fieldProps: fieldProps,
-      component: component,
-      originComponent: originComponent,
-      type: type,
-      desensitization: desensitization
+      show,
+      formItemProps,
+      form,
+      disabled,
+      rules,
+      required,
+      fieldProps,
+      component,
+      originComponent,
+      type,
+      desensitization,
+      shouldUpdateDebounce
     }),
     shouldUpdate = _useShouldUpdate.shouldUpdate,
     _show = _useShouldUpdate.show,
@@ -87,7 +94,7 @@ var Render = function Render(props) {
     AutoComponent = _useShouldUpdate.component,
     _desensitization = _useShouldUpdate.desensitization;
   otherFormItemProps.shouldUpdate = shouldUpdate;
-  var namesStr = useMemo(function () {
+  var namesStr = useMemo(() => {
     var _otherProps$names;
     if (!Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names)) {
       return '';
@@ -96,25 +103,25 @@ var Render = function Render(props) {
     if (Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name)) {
       return otherProps === null || otherProps === void 0 ? void 0 : otherProps.name;
     }
-    return (_otherProps$names = otherProps.names) === null || _otherProps$names === void 0 ? void 0 : _otherProps$names.map(function (name) {
+    return (_otherProps$names = otherProps.names) === null || _otherProps$names === void 0 ? void 0 : _otherProps$names.map(name => {
       return Array.isArray(name) ? name.join('_') : name;
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
   var internalRule = useRules({
     names: otherProps.names,
     label: otherFormItemProps.label,
-    labelRequired: labelRequired,
+    labelRequired,
     required: _required,
     rules: _rules,
-    isSelect: isSelect,
-    type: type
+    isSelect,
+    type
   });
 
   /**
    * 基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var valueTypeTransform = function valueTypeTransform() {
+  var valueTypeTransform = () => {
     var _ref = otherProps || {},
       valueType = _ref.valueType;
     // SwitchCheckbox默认YN, 兼容已有组件
@@ -152,14 +159,12 @@ var Render = function Render(props) {
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
   }, internalRule, {
-    required: typeof labelRequired === 'boolean' ? labelRequired : _required || Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
-      return item === null || item === void 0 ? void 0 : item.required;
-    })) || false
+    required: typeof labelRequired === 'boolean' ? labelRequired : _required || Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.some(item => item === null || item === void 0 ? void 0 : item.required)) || false
   }, otherProps.isView && !requiredOnView ? {
     required: false
   } : null, _objectSpread({}, isTrim(type, trim, useProConfig())), // 优先取传进来的，其次取ProConfigProvider配置的
   _objectSpread({}, isUpperCase(type, upperCase)), {
-    validateFirst: validateFirst
+    validateFirst
   },
   // 当某一规则校验不通过时，是否停止剩下的规则的校验
   {
@@ -169,7 +174,7 @@ var Render = function Render(props) {
   // 添加label宽度
   if (labelWidth) {
     otherFormItemProps.labelCol = {
-      flex: "".concat(labelWidth, "px")
+      flex: `${labelWidth}px`
     };
   }
 
@@ -183,10 +188,13 @@ var Render = function Render(props) {
     disabled: lastDisabled,
     desensitization: _desensitization
   });
-  var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
+  var _className = classNames({
+    [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 /*#__PURE__*/_jsx(Form.Item, {
+    return /*#__PURE__*/_jsx(_Form.Item, {
       name: _otherFormItemProps.name || 'proFormItemHidden',
       shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
@@ -195,21 +203,21 @@ var Render = function Render(props) {
       rules: [{
         required: false
       }],
-      children: /*#__PURE__*/_jsx(Input, {})
+      children: /*#__PURE__*/_jsx(_Input, {})
     });
   }
 
   /**
    * 函数新参数组装
    */
-  var functionArgs = function functionArgs(args) {
+  var functionArgs = args => {
     var _otherFormItemProps$n;
-    var _args = _toConsumableArray(args);
+    var _args = [...args];
     var _ref6 = otherProps || {},
       valueType = _ref6.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
-      form: form
+      form
     };
     // 优先处理FormList场景
     if (Array.isArray(_otherFormItemProps.namePath) && _otherFormItemProps !== null && _otherFormItemProps !== void 0 && (_otherFormItemProps$n = _otherFormItemProps.namePath) !== null && _otherFormItemProps$n !== void 0 && _otherFormItemProps$n.length) {
@@ -249,7 +257,7 @@ var Render = function Render(props) {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-    var _args = [].concat(args);
+    var _args = [...args];
 
     // 优先使用onFieldChange
     var changeKey = Object.keys(lastComponentProps).includes('onFieldChange') ? 'onFieldChange' : 'onChange';
@@ -257,12 +265,12 @@ var Render = function Render(props) {
       _args[2] = form;
     }
     if (changeKey === 'onFieldChange') {
-      _args = functionArgs([].concat(args));
+      _args = functionArgs([...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))));
+      ((_changeKey = (_ref7 = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _changeKey === void 0 ? void 0 : _changeKey.call(_ref7, ..._args)) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call(lastComponentProps, ..._args));
       return false;
     }
 
@@ -275,7 +283,7 @@ var Render = function Render(props) {
 
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps !== null && formItemProps !== void 0 && formItemProps.parentNames) {
-      setTimeout(function () {
+      setTimeout(() => {
         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);
@@ -287,14 +295,14 @@ var Render = function Render(props) {
       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 || _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat(_toConsumableArray(_args)));
+    (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 || _lastComponentProps$c2.call(lastComponentProps, ..._args);
   };
   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);
+    var _args = [...args];
     if (lastComponentProps !== null && lastComponentProps !== void 0 && lastComponentProps.debounceWait) {
       // 为了兼容 Input 和 TextArea 的 onChange 事件，需要将 event 对象转换为 value
       if (['Input', 'TextArea'].includes(type)) {
@@ -304,9 +312,9 @@ var Render = function Render(props) {
           }
         };
       }
-      debouncedHandleChange.apply(void 0, _toConsumableArray(_args));
+      debouncedHandleChange(..._args);
     } else {
-      defaultHandleChange.apply(void 0, _toConsumableArray(_args));
+      defaultHandleChange(..._args);
     }
   };
 
@@ -326,14 +334,14 @@ var Render = function Render(props) {
             for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
               args[_key3] = _args3[_key3];
             }
-            _args = functionArgs([].concat(args));
+            _args = functionArgs([...args]);
             _context.t0 = lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur;
             if (!_context.t0) {
               _context.next = 6;
               break;
             }
             _context.next = 6;
-            return lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur.apply(lastComponentProps, _toConsumableArray(_args));
+            return lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur(..._args);
           case 6:
           case "end":
             return _context.stop();
@@ -344,14 +352,14 @@ var Render = function Render(props) {
       return _ref8.apply(this, arguments);
     };
   }();
-  var renderItem = function renderItem() {
+  var 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)), {}, {
       // @ts-ignore
-      otherProps: otherProps,
+      otherProps,
       onChange: handleChange,
       onBlur: handleBlur
     });
@@ -361,55 +369,53 @@ var Render = function Render(props) {
      */
     var internalItemRender = {
       mark: 'pro_table_render',
-      render: function render(inputProps, doms) {
-        return /*#__PURE__*/_jsxs(_Fragment, {
-          children: [/*#__PURE__*/_jsx(Space, {
-            size: 0,
-            style: {
-              marginTop: 8
-            },
-            children: formItemProps.above
-          }), /*#__PURE__*/_jsxs("div", {
-            style: {
-              display: 'flex',
-              alignItems: 'center'
-            },
-            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 && formItemProps.after ? /*#__PURE__*/_jsx("div", {
-              style: {
-                marginInlineStart: 8
-              },
-              children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
-            }) : null]
-          }), /*#__PURE__*/_jsx(Space, {
-            size: 0,
+      render: (inputProps, doms) => /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx(_Space, {
+          size: 0,
+          style: {
+            marginTop: 8
+          },
+          children: formItemProps.above
+        }), /*#__PURE__*/_jsxs("div", {
+          style: {
+            display: 'flex',
+            alignItems: 'center'
+          },
+          children: [formItemProps !== null && formItemProps !== void 0 && formItemProps.before ? /*#__PURE__*/_jsx("div", {
             style: {
-              marginTop: 8
+              marginInlineEnd: 8
             },
-            children: formItemProps.extra
-          }), doms.errorList ? /*#__PURE__*/_jsx("div", {
-            className: "ant-form-item-additional",
+            children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.before
+          }) : null, doms.input, formItemProps !== null && formItemProps !== void 0 && formItemProps.after ? /*#__PURE__*/_jsx("div", {
             style: {
-              minHeight: '16px'
+              marginInlineStart: 8
             },
-            children: doms.errorList
+            children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
           }) : null]
-        });
-      }
+        }), /*#__PURE__*/_jsx(_Space, {
+          size: 0,
+          style: {
+            marginTop: 8
+          },
+          children: formItemProps.extra
+        }), doms.errorList ? /*#__PURE__*/_jsx("div", {
+          className: "ant-form-item-additional",
+          style: {
+            minHeight: '16px'
+          },
+          children: doms.errorList
+        }) : null]
+      })
     };
     // 自定义组件移除otherProps参数
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : /*#__PURE__*/_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, [...lastComponentPropsFilter, 'debounceWait'])), {}, {
       otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
-        show: show,
+        show,
         disabled: lastDisabled,
-        required: required
+        required
       }),
       onChange: handleChange,
       onBlur: handleBlur
@@ -424,13 +430,18 @@ var Render = function Render(props) {
 
     // 表单提示
     if (tooltip) {
-      _otherFormItemProps.tooltip = {
-        title: isString(tooltip) ? tooltip : tooltip.title,
-        icon: isString(tooltip) ? /*#__PURE__*/_jsx(ReactSVG, {
+      _otherFormItemProps.tooltip = isString(tooltip) ? {
+        title: tooltip,
+        icon: /*#__PURE__*/_jsx(ReactSVG, {
+          className: "pro-icon-tip",
+          src: tipSvg
+        })
+      } : _objectSpread({
+        icon: /*#__PURE__*/_jsx(ReactSVG, {
           className: "pro-icon-tip",
           src: tipSvg
-        }) : tooltip.icon
-      };
+        })
+      }, tooltip);
     }
 
     // 需要过滤掉的form_item的key
@@ -441,14 +452,14 @@ var Render = function Render(props) {
       colProps = _objectSpread(_objectSpread({}, colProps), {}, {
         span: lessMode ? colProps.span : 24 // 默认占一行
       });
-      return /*#__PURE__*/_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: /*#__PURE__*/_jsx(Form.List, _objectSpread(_objectSpread({
+        children: /*#__PURE__*/_jsx(_Form.List, _objectSpread(_objectSpread({
           name: _otherFormItemProps.name
         }, omit(_otherFormItemProps, ['rules'])), {}, {
-          children: function children(fields, operation, meta) {
+          children: (fields, operation, meta) => {
             return /*#__PURE__*/_jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, lastComponentPropsFilter)), {}, {
               otherProps: otherProps,
               fields: fields,
@@ -467,9 +478,17 @@ var Render = function Render(props) {
       });
     }
     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(name => name.slice(prefixLength));
+      }
       child = /*#__PURE__*/_jsx(ChangedWrapper, {
         name: formItemProps.name,
-        names: otherProps.names,
+        names: nextNames,
         namesStr: namesStr,
         diffConfig: diffConfig,
         form: form,
@@ -484,7 +503,7 @@ var Render = function Render(props) {
         children: child
       });
     }
-    return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+    return /*#__PURE__*/_jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
@@ -495,24 +514,22 @@ var Render = function Render(props) {
     children: [_otherFormItemProps.shouldUpdate ?
     /*#__PURE__*/
     // 空标签防止气泡不显示
-    _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, {
+      children: () => renderItem()
+    }) : renderItem(), otherProps !== null && otherProps !== void 0 && (_otherProps$names3 = otherProps.names) !== null && _otherProps$names3 !== void 0 && _otherProps$names3.length ? otherProps.names.map(name => {
+      return /*#__PURE__*/_jsx(_Form.Item, {
         hidden: true,
         name: name,
-        children: /*#__PURE__*/_jsx(Input, {})
+        children: /*#__PURE__*/_jsx(_Input, {})
       }, name);
     }) : null]
   });
   if (formItemProps !== null && formItemProps !== void 0 && formItemProps.parentNames) {
     return FormItem;
   }
-  return /*#__PURE__*/_jsx(Col, _objectSpread(_objectSpread({}, colProps), {}, {
+  return /*#__PURE__*/_jsx(_Col, _objectSpread(_objectSpread({}, colProps), {}, {
     children: FormItem
   }));
 };

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

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