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

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

@@ -1,236 +1,238 @@
-"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
+// src/ProForm/components/render/Render.tsx
+var Render_exports = {};
+__export(Render_exports, {
+  default: () => Render_default
 });
-exports.default = void 0;
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
-var _set2 = _interopRequireDefault(require("lodash/set"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _isString2 = _interopRequireDefault(require("lodash/isString"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _antd = require("antd");
-var _react = _interopRequireWildcard(require("react"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _reactSvg = require("react-svg");
-var _useShouldUpdate2 = _interopRequireDefault(require("../../utils/useShouldUpdate"));
-var _index = require("../../utils/index");
-var _ProConfigProvider = require("../../../ProConfigProvider");
-var _transformNames = _interopRequireDefault(require("../../utils/transformNames"));
-var _valueType = _interopRequireDefault(require("../../utils/valueType"));
-var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
-var _useRules = _interopRequireDefault(require("../../utils/useRules"));
-var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
-var _ChangedWrapper = _interopRequireDefault(require("./ChangedWrapper"));
-var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
-/* eslint-disable prefer-destructuring */
-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); }
-// 这个组件只管渲染, 参数的整理在外部处理
-var Render = function Render(props) {
-  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
-  var component = props.component,
-    originComponent = props.originComponent,
-    _props$formItemProps = props.formItemProps,
-    formItemProps = _props$formItemProps === void 0 ? {} : _props$formItemProps,
-    otherProps = props.otherProps,
-    componentProps = props.componentProps,
-    _props$show = props.show,
-    show = _props$show === void 0 ? true : _props$show,
-    fieldProps = props.fieldProps,
-    form = props.form,
-    disabled = props.disabled,
-    formDisabled = props.formDisabled,
-    type = props.type,
-    isSelect = props.isSelect,
-    onDiff = props.onDiff,
-    requiredOnView = props.requiredOnView,
-    confirm = props.confirm,
-    globalControl = props.globalControl,
-    diffConfig = props.diffConfig,
-    viewRender = props.viewRender,
-    desensitization = props.desensitization;
-  var colProps = props.colProps;
-  // 剔除一些不是FormItem的属性, 防止控制台报warning
-  var labelWidth = formItemProps.labelWidth,
-    hiddenNames = formItemProps.hiddenNames,
-    trim = formItemProps.trim,
-    upperCase = formItemProps.upperCase,
-    className = formItemProps.className,
-    rules = formItemProps.rules,
-    required = formItemProps.required,
-    labelRequired = formItemProps.labelRequired,
-    tooltip = formItemProps.tooltip,
-    _formItemProps$valida = formItemProps.validateFirst,
-    validateFirst = _formItemProps$valida === void 0 ? true : _formItemProps$valida,
-    otherFormItemProps = (0, _objectWithoutProperties2.default)(formItemProps, _excluded);
-  // 更新show & disabled & rules
-  var _useShouldUpdate = (0, _useShouldUpdate2.default)({
-      show: show,
-      formItemProps: formItemProps,
-      form: form,
-      disabled: disabled,
-      rules: rules,
-      required: required,
-      fieldProps: fieldProps,
-      component: component,
-      originComponent: originComponent,
-      type: type,
-      desensitization: desensitization
-    }),
-    shouldUpdate = _useShouldUpdate.shouldUpdate,
-    _show = _useShouldUpdate.show,
-    _disabled = _useShouldUpdate.disabled,
-    _rules = _useShouldUpdate.rules,
-    _required = _useShouldUpdate.required,
-    _fieldProps = _useShouldUpdate.fieldProps,
-    AutoComponent = _useShouldUpdate.component,
-    _desensitization = _useShouldUpdate.desensitization;
+module.exports = __toCommonJS(Render_exports);
+var import_antd = require("antd");
+var import_react = __toESM(require("react"));
+var import_classnames = __toESM(require("classnames"));
+var import_react_svg = require("react-svg");
+var import_lodash = require("lodash");
+var import_useShouldUpdate = __toESM(require("../../utils/useShouldUpdate"));
+var import_utils = require("../../utils/index");
+var import_ProConfigProvider = require("../../../ProConfigProvider");
+var import_transformNames = __toESM(require("../../utils/transformNames"));
+var import_valueType = __toESM(require("../../utils/valueType"));
+var import_tip = __toESM(require("../../../assets/tip.svg"));
+var import_useRules = __toESM(require("../../utils/useRules"));
+var import_ConfirmWrapper = __toESM(require("./ConfirmWrapper"));
+var import_ChangedWrapper = __toESM(require("./ChangedWrapper"));
+var Render = (props) => {
+  var _a;
+  const {
+    component,
+    originComponent,
+    formItemProps = {},
+    otherProps,
+    componentProps,
+    show = true,
+    fieldProps,
+    form,
+    disabled,
+    formDisabled,
+    type,
+    isSelect,
+    onDiff,
+    requiredOnView,
+    confirm,
+    globalControl,
+    diffConfig,
+    viewRender,
+    desensitization,
+    shouldUpdateDebounce
+  } = props;
+  let { colProps } = props;
+  const {
+    labelWidth,
+    hiddenNames,
+    trim,
+    upperCase,
+    className,
+    rules,
+    required,
+    labelRequired,
+    tooltip,
+    validateFirst = true,
+    ...otherFormItemProps
+  } = formItemProps;
+  const {
+    shouldUpdate,
+    show: _show,
+    disabled: _disabled,
+    rules: _rules,
+    required: _required,
+    fieldProps: _fieldProps,
+    component: AutoComponent,
+    desensitization: _desensitization
+  } = (0, import_useShouldUpdate.default)({
+    show,
+    formItemProps,
+    form,
+    disabled,
+    rules,
+    required,
+    fieldProps,
+    component,
+    originComponent,
+    type,
+    desensitization,
+    shouldUpdateDebounce
+  });
   otherFormItemProps.shouldUpdate = shouldUpdate;
-  var namesStr = (0, _react.useMemo)(function () {
-    var _otherProps$names;
-    if (!Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names)) {
-      return '';
+  const namesStr = (0, import_react.useMemo)(() => {
+    var _a2;
+    if (!Array.isArray(otherProps == null ? void 0 : otherProps.names)) {
+      return "";
     }
-    // formList场景 name为数组
-    if (Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name)) {
-      return otherProps === null || otherProps === void 0 ? void 0 : otherProps.name;
+    if (Array.isArray(otherProps == null ? void 0 : otherProps.name)) {
+      return otherProps == null ? void 0 : otherProps.name;
     }
-    return (_otherProps$names = otherProps.names) === null || _otherProps$names === void 0 ? void 0 : _otherProps$names.map(function (name) {
-      return Array.isArray(name) ? name.join('_') : name;
-    }).join('-');
-  }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
-  var internalRule = (0, _useRules.default)({
+    return (_a2 = otherProps.names) == null ? void 0 : _a2.map((name) => {
+      return Array.isArray(name) ? name.join("_") : name;
+    }).join("-");
+  }, [otherProps == null ? void 0 : otherProps.names]);
+  const internalRule = (0, import_useRules.default)({
     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 _ref = otherProps || {},
-      valueType = _ref.valueType;
-    // SwitchCheckbox默认YN, 兼容已有组件
-    if (type === 'SwitchCheckbox') {
-      valueType = 'switch';
+  const valueTypeTransform = () => {
+    let { valueType } = otherProps || {};
+    if (type === "SwitchCheckbox") {
+      valueType = "switch";
     }
-    if (type === 'Input') {
-      valueType = valueType || 'trim';
+    if (type === "Input") {
+      valueType = valueType || "trim";
     }
-    // 不存在valueType返回空
     if (!valueType) {
       return {};
     }
-    var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), otherFormItemProps);
-    return (0, _isFunction2.default)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
+    const params = {
+      ...otherProps,
+      ...otherFormItemProps
+    };
+    return (0, import_lodash.isFunction)(import_valueType.default[valueType]) ? import_valueType.default[valueType](params) : {};
   };
-  /**
-   * transform对象
-   * 存在names通过transformNames转换平铺处理
-   * 没有默认走valueType的处理
-   */
-  var transforms = Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names) ? (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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
-  }, 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
-  }, otherProps.isView && !requiredOnView ? {
-    required: false
-  } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
-  (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
-    validateFirst: validateFirst
-  },
-  // 当某一规则校验不通过时，是否停止剩下的规则的校验
-  {
-    disabled: lastDisabled
-  });
-  // 添加label宽度
+  const transforms = Array.isArray(otherProps == null ? void 0 : otherProps.names) ? (0, import_transformNames.default)(
+    { ...otherFormItemProps, ...valueTypeTransform() },
+    // 合并valueType的transform
+    form,
+    otherProps.names,
+    namesStr,
+    otherProps.type
+  ) : valueTypeTransform();
+  const lastDisabled = globalControl ? formDisabled ?? _disabled ?? (_fieldProps == null ? void 0 : _fieldProps.disabled) ?? (componentProps == null ? void 0 : componentProps.disabled) : _disabled ?? (_fieldProps == null ? void 0 : _fieldProps.disabled) ?? (componentProps == null ? void 0 : componentProps.disabled) ?? formDisabled;
+  Object.assign(
+    otherFormItemProps,
+    transforms,
+    { names: otherProps.names },
+    internalRule,
+    {
+      required: typeof labelRequired === "boolean" ? labelRequired : _required || Array.isArray(rules) && (rules == null ? void 0 : rules.some((item) => item == null ? void 0 : item.required)) || false
+    },
+    otherProps.isView && !requiredOnView ? { required: false } : null,
+    { ...(0, import_utils.isTrim)(type, trim, (0, import_ProConfigProvider.useProConfig)()) },
+    // 优先取传进来的，其次取ProConfigProvider配置的
+    { ...(0, import_utils.isUpperCase)(type, upperCase) },
+    { validateFirst },
+    // 当某一规则校验不通过时，是否停止剩下的规则的校验
+    { disabled: lastDisabled }
+  );
   if (labelWidth) {
-    otherFormItemProps.labelCol = {
-      flex: "".concat(labelWidth, "px")
-    };
+    otherFormItemProps.labelCol = { flex: `${labelWidth}px` };
   }
-  /** 移除多余参数，防止透传给formItem报错 */
-  var _otherFormItemProps = (0, _omit2.default)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
-  /**
-   * 最新fieldProps: 更新后的组件Props
-   */
-  var lastComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), _fieldProps), {}, {
+  const _otherFormItemProps = (0, import_lodash.omit)(otherFormItemProps, [
+    "component",
+    "names",
+    "format",
+    "toISOString",
+    "toCSTString",
+    "switchValue",
+    "precision",
+    "clearNotShow",
+    "dependNames"
+  ]);
+  const lastComponentProps = {
+    ...componentProps,
+    ..._fieldProps,
     disabled: lastDisabled,
     desensitization: _desensitization
+  };
+  const _className = (0, import_classnames.default)({
+    [className]: className,
+    "pro-form-item-width-auto": ["Switch"].includes(type)
   });
-  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, 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 (0, _jsxRuntime.jsx)(_antd.Form.Item, {
-      name: _otherFormItemProps.name || 'proFormItemHidden',
-      shouldUpdate: _otherFormItemProps.shouldUpdate,
-      className: _className,
-      noStyle: true,
-      hidden: true,
-      rules: [{
-        required: false
-      }],
-      children: (0, _jsxRuntime.jsx)(_antd.Input, {})
-    });
+    return /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Form.Item,
+      {
+        name: _otherFormItemProps.name || "proFormItemHidden",
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        className: _className,
+        noStyle: true,
+        hidden: true,
+        rules: [{ required: false }]
+      },
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null)
+    );
   }
-  /**
-   * 函数新参数组装
-   */
-  var functionArgs = function functionArgs(args) {
-    var _otherFormItemProps$n;
-    var _args = (0, _toConsumableArray2.default)(args);
-    var _ref6 = otherProps || {},
-      valueType = _ref6.valueType;
+  const functionArgs = (args) => {
+    var _a2, _b;
+    const _args = [...args];
+    const { valueType } = otherProps || {};
     _args[1] = form.getFieldsValue();
     _args[2] = {
-      form: 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)) {
-      var _otherFormItemProps$n2;
+    if (Array.isArray(_otherFormItemProps.namePath) && ((_a2 = _otherFormItemProps == null ? void 0 : _otherFormItemProps.namePath) == null ? void 0 : _a2.length)) {
       _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[((_b = _otherFormItemProps == null ? void 0 : _otherFormItemProps.namePath) == null ? void 0 : _b.length) - 1];
     }
-    // 返回表单元素默认值
     _args[2].extra = args;
-    // 当设置valueType后返回转换后的值
     if (valueType) {
-      _args[2].transformValue = form.getFieldValue(_otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : _otherFormItemProps.name) || undefined;
+      _args[2].transformValue = form.getFieldValue(_otherFormItemProps == null ? void 0 : _otherFormItemProps.name) || void 0;
     }
     _args[2].option = args[1];
     switch (type) {
-      case 'ProCascader':
+      case "ProCascader":
         _args[2].selectedOptions = args[1];
         break;
-      case 'DatePicker':
-      case 'RangePicker':
+      case "DatePicker":
+      case "RangePicker":
         _args[2].dateString = args[1];
         break;
       default:
@@ -238,268 +240,203 @@ var Render = function Render(props) {
     }
     return _args;
   };
-  /**
-   * onChange参数重置 (value, record, { form, index, namePath, option }) => void
-   */
-  var defaultHandleChange = function defaultHandleChange() {
-    var _otherFormItemProps$n3, _lastComponentProps$c2;
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    var _args = [].concat(args);
-    // 优先使用onFieldChange
-    var changeKey = Object.keys(lastComponentProps).includes('onFieldChange') ? 'onFieldChange' : 'onChange';
-    if (changeKey === 'onChange') {
+  const defaultHandleChange = (...args) => {
+    var _a2, _b, _c, _d, _e, _f;
+    let _args = [...args];
+    const changeKey = Object.keys(lastComponentProps).includes("onFieldChange") ? "onFieldChange" : "onChange";
+    if (changeKey === "onChange") {
       _args[2] = form;
     }
-    if (changeKey === 'onFieldChange') {
-      _args = functionArgs([].concat(args));
+    if (changeKey === "onFieldChange") {
+      _args = functionArgs([...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.default.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((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args))));
+    const inList = (_a2 = _otherFormItemProps == null ? void 0 : _otherFormItemProps.namePath) == null ? void 0 : _a2.length;
+    if (import_react.default.isValidElement(AutoComponent)) {
+      ((_c = (_b = AutoComponent == null ? void 0 : AutoComponent.props)[changeKey]) == null ? void 0 : _c.call(_b, ..._args)) || ((_d = lastComponentProps[changeKey]) == null ? void 0 : _d.call(lastComponentProps, ..._args));
       return false;
     }
-    // FormList 和 Group场景 对比值改变的话, 回显到表单上
-    if (inList && changeKey === 'onFieldChange') {
-      var values = form.getFieldsValue();
-      var newValues = (0, _set2.default)(values, _otherFormItemProps.namePath, _args[1]);
+    if (inList && changeKey === "onFieldChange") {
+      const values = form.getFieldsValue();
+      const newValues = (0, import_lodash.set)(values, _otherFormItemProps.namePath, _args[1]);
       form.setFieldsValue(newValues);
     }
-    // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
-    if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
-      setTimeout(function () {
-        var namePath = (0, _index.parseNamePath)(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames);
-        form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(namePath));
+    if (formItemProps == null ? void 0 : formItemProps.parentNames) {
+      setTimeout(() => {
+        const namePath = (0, import_utils.parseNamePath)(formItemProps == null ? void 0 : formItemProps.parentNames);
+        form.setFieldValue(formItemProps == null ? 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 = (0, _index.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) || {});
+    if (["ProTree"].includes(type) && !_args[2].option) {
+      _args[2].option = (0, import_utils.findOptionByValue)(
+        lastComponentProps == null ? void 0 : lastComponentProps.dataSource,
+        (_e = _args == null ? void 0 : _args[0]) == null ? void 0 : _e[0],
+        (lastComponentProps == null ? void 0 : lastComponentProps.fieldNames) || {}
+      );
     }
-    (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args)));
+    (_f = lastComponentProps[changeKey]) == null ? void 0 : _f.call(lastComponentProps, ..._args);
   };
-  var debouncedHandleChange = (0, _debounce2.default)(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) {
-      // 为了兼容 Input 和 TextArea 的 onChange 事件，需要将 event 对象转换为 value
-      if (['Input', 'TextArea'].includes(type)) {
+  const debouncedHandleChange = (0, import_lodash.debounce)(defaultHandleChange, lastComponentProps == null ? void 0 : lastComponentProps.debounceWait);
+  const handleChange = (...args) => {
+    const _args = [...args];
+    if (lastComponentProps == null ? void 0 : lastComponentProps.debounceWait) {
+      if (["Input", "TextArea"].includes(type)) {
         _args[0] = {
           target: {
             value: _args[0].target.value
           }
         };
       }
-      debouncedHandleChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
+      debouncedHandleChange(..._args);
     } else {
-      defaultHandleChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
+      defaultHandleChange(..._args);
     }
   };
-  /**
-   * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
-   */
-  var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator().m(function _callee() {
-      var _len3,
-        args,
-        _key3,
-        _args,
-        _args3 = arguments,
-        _t;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.n) {
-          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;
-              break;
-            }
-            _context.n = 1;
-            return lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur.apply(lastComponentProps, (0, _toConsumableArray2.default)(_args));
-          case 1:
-            return _context.a(2);
-        }
-      }, _callee);
-    }));
-    return function handleBlur() {
-      return _ref7.apply(this, arguments);
-    };
-  }();
-  var renderItem = function renderItem() {
-    // 移除多余字段，group保留onFieldChange
-    var lastComponentPropsFilter = ['onFieldChange', 'disabledStrictly'];
-    // 表单渲染 start
-    var childProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), (0, _omit2.default)(lastComponentProps, lastComponentPropsFilter)), {}, {
+  const handleBlur = async (...args) => {
+    const _args = functionArgs([...args]);
+    (lastComponentProps == null ? void 0 : lastComponentProps.onBlur) && await (lastComponentProps == null ? void 0 : lastComponentProps.onBlur(..._args));
+  };
+  const renderItem = () => {
+    var _a2, _b, _c;
+    const lastComponentPropsFilter = ["onFieldChange", "disabledStrictly"];
+    const childProps = {
+      ...AutoComponent == null ? void 0 : AutoComponent.props,
+      ...(0, import_lodash.omit)(lastComponentProps, lastComponentPropsFilter),
       // @ts-ignore
-      otherProps: otherProps,
+      otherProps,
       onChange: handleChange,
       onBlur: handleBlur
-    });
-    /**
-     * formItem前后值添加
-     */
-    var internalItemRender = {
-      mark: 'pro_table_render',
-      render: function render(inputProps, doms) {
-        return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: [(0, _jsxRuntime.jsx)(_antd.Space, {
-            size: 0,
-            style: {
-              marginTop: 8
-            },
-            children: formItemProps.above
-          }), (0, _jsxRuntime.jsxs)("div", {
-            style: {
-              display: 'flex',
-              alignItems: 'center'
-            },
-            children: [(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.before) ? (0, _jsxRuntime.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) ? (0, _jsxRuntime.jsx)("div", {
-              style: {
-                marginInlineStart: 8
-              },
-              children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
-            }) : null]
-          }), (0, _jsxRuntime.jsx)(_antd.Space, {
-            size: 0,
-            style: {
-              marginTop: 8
-            },
-            children: formItemProps.extra
-          }), doms.errorList ? (0, _jsxRuntime.jsx)("div", {
-            className: "ant-form-item-additional",
-            style: {
-              minHeight: '16px'
-            },
-            children: doms.errorList
-          }) : null]
-        });
-      }
     };
-    // 自定义组件移除otherProps参数
+    const internalItemRender = {
+      mark: "pro_table_render",
+      render: (inputProps, doms) => /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { size: 0, style: { marginTop: 8 } }, formItemProps.above), /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          style: {
+            display: "flex",
+            alignItems: "center"
+          }
+        },
+        (formItemProps == null ? void 0 : formItemProps.before) ? /* @__PURE__ */ import_react.default.createElement("div", { style: { marginInlineEnd: 8 } }, formItemProps == null ? void 0 : formItemProps.before) : null,
+        doms.input,
+        (formItemProps == null ? void 0 : formItemProps.after) ? /* @__PURE__ */ import_react.default.createElement("div", { style: { marginInlineStart: 8 } }, formItemProps == null ? void 0 : formItemProps.after) : null
+      ), /* @__PURE__ */ import_react.default.createElement(import_antd.Space, { size: 0, style: { marginTop: 8 } }, formItemProps.extra), doms.errorList ? /* @__PURE__ */ import_react.default.createElement("div", { className: "ant-form-item-additional", style: { minHeight: "16px" } }, doms.errorList) : null)
+    };
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? (/*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
-      otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
-        show: show,
-        disabled: lastDisabled,
-        required: required
-      }),
-      onChange: handleChange,
-      onBlur: handleBlur
-    }));
+    let child = import_react.default.isValidElement(AutoComponent) ? import_react.default.cloneElement(AutoComponent, childProps) : /* @__PURE__ */ import_react.default.createElement(
+      AutoComponent,
+      {
+        ...(0, import_lodash.omit)(lastComponentProps, [...lastComponentPropsFilter, "debounceWait"]),
+        otherProps: { ...otherProps, show, disabled: lastDisabled, required },
+        onChange: handleChange,
+        onBlur: handleBlur
+      }
+    );
     if (confirm) {
-      child = (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        confirm: confirm
-      }, childProps), {}, {
-        children: child
-      }));
+      child = /* @__PURE__ */ import_react.default.createElement(import_ConfirmWrapper.default, { confirm, ...childProps }, child);
     }
-    // 表单提示
     if (tooltip) {
       _otherFormItemProps.tooltip = {
-        title: (0, _isString2.default)(tooltip) ? tooltip : tooltip.title,
-        icon: (0, _isString2.default)(tooltip) ? (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
-          className: "pro-icon-tip",
-          src: _tip.default
-        }) : tooltip.icon
+        title: (0, import_lodash.isString)(tooltip) ? tooltip : tooltip.title,
+        icon: (0, import_lodash.isString)(tooltip) ? /* @__PURE__ */ import_react.default.createElement(import_react_svg.ReactSVG, { className: "pro-icon-tip", src: import_tip.default }) : tooltip.icon
       };
     }
-    // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName', 'fixed'];
-    if (type === 'FormList') {
+    const filterFormItemKey = [
+      "onFieldChange",
+      "shouldUpdate",
+      "namePath",
+      "isView",
+      "parentNames",
+      "space",
+      "before",
+      "after",
+      "globalControl",
+      "listName",
+      "fixed"
+    ];
+    if (type === "FormList") {
       lastComponentProps.disabled = lastDisabled;
-      var lessMode = lastComponentProps.mode === 'less';
-      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
-        span: lessMode ? colProps.span : 24 // 默认占一行
-      });
-      return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(_otherFormItemProps, filterFormItemKey)), {}, {
-        // @ts-ignore
-        _internalItemRender: internalItemRender,
-        className: _className,
-        children: (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-          name: _otherFormItemProps.name
-        }, (0, _omit2.default)(_otherFormItemProps, ['rules'])), {}, {
-          children: function children(fields, operation, meta) {
-            return (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(lastComponentProps, lastComponentPropsFilter)), {}, {
-              otherProps: otherProps,
-              fields: fields,
-              operation: operation,
-              meta: meta
-            }));
-          }
-        }))
-      }));
+      const lessMode = lastComponentProps.mode === "less";
+      colProps = {
+        ...colProps,
+        span: lessMode ? colProps.span : 24
+        // 默认占一行
+      };
+      return /* @__PURE__ */ import_react.default.createElement(
+        import_antd.Form.Item,
+        {
+          ...(0, import_lodash.omit)(_otherFormItemProps, filterFormItemKey),
+          _internalItemRender: internalItemRender,
+          className: _className
+        },
+        /* @__PURE__ */ import_react.default.createElement(import_antd.Form.List, { name: _otherFormItemProps.name, ...(0, import_lodash.omit)(_otherFormItemProps, ["rules"]) }, (fields, operation, meta) => {
+          return /* @__PURE__ */ import_react.default.createElement(
+            AutoComponent,
+            {
+              ...(0, import_lodash.omit)(lastComponentProps, lastComponentPropsFilter),
+              otherProps,
+              fields,
+              operation,
+              meta
+            }
+          );
+        })
+      );
     }
-    //  默认占据一行
-    if (['ProCollapse', 'Container'].includes(type)) {
-      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
-        span: 24 // 默认占一行
-      });
+    if (["ProCollapse", "Container"].includes(type)) {
+      colProps = {
+        ...colProps,
+        span: 24
+        // 默认占一行
+      };
     }
-    if (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) {
-      child = (0, _jsxRuntime.jsx)(_ChangedWrapper.default, {
-        name: formItemProps.name,
-        names: otherProps.names,
-        namesStr: namesStr,
-        diffConfig: diffConfig,
-        form: form,
-        onDiff: onDiff,
-        type: type,
-        onChange: handleChange,
-        onBlur: handleBlur,
-        valuePropName: _otherFormItemProps.valuePropName,
-        normalize: _otherFormItemProps.normalize,
-        getValueProps: _otherFormItemProps.getValueProps,
-        viewRender: viewRender,
-        children: child
-      });
+    if (diffConfig == null ? void 0 : diffConfig.originalValues) {
+      let nextNames = otherProps.names;
+      if (((_a2 = otherProps == null ? void 0 : otherProps.namePath) == null ? void 0 : _a2.length) && ((_b = otherProps.names) == null ? void 0 : _b.length)) {
+        const prefixLength = ((_c = otherProps == null ? void 0 : otherProps.namePath) == null ? void 0 : _c.length) - 1;
+        nextNames = otherProps.names.map((name) => name.slice(prefixLength));
+      }
+      child = /* @__PURE__ */ import_react.default.createElement(
+        import_ChangedWrapper.default,
+        {
+          name: formItemProps.name,
+          names: nextNames,
+          namesStr,
+          diffConfig,
+          form,
+          onDiff,
+          type,
+          onChange: handleChange,
+          onBlur: handleBlur,
+          valuePropName: _otherFormItemProps.valuePropName,
+          normalize: _otherFormItemProps.normalize,
+          getValueProps: _otherFormItemProps.getValueProps,
+          viewRender
+        },
+        child
+      );
     }
-    return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _omit2.default)(_otherFormItemProps, filterFormItemKey)), {}, {
-      // @ts-ignore
-      _internalItemRender: internalItemRender,
-      className: _className,
-      children: child
-    }));
+    return /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Form.Item,
+      {
+        ...(0, import_lodash.omit)(_otherFormItemProps, filterFormItemKey),
+        _internalItemRender: internalItemRender,
+        className: _className
+      },
+      child
+    );
   };
-  var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [_otherFormItemProps.shouldUpdate ?
+  const FormItem = /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, _otherFormItemProps.shouldUpdate ? (
     // 空标签防止气泡不显示
-    (0, _jsxRuntime.jsx)(_antd.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 (0, _jsxRuntime.jsx)(_antd.Form.Item, {
-        hidden: true,
-        name: name,
-        children: (0, _jsxRuntime.jsx)(_antd.Input, {})
-      }, name);
-    }) : null]
-  });
-  if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
+    /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { shouldUpdate: _otherFormItemProps.shouldUpdate, noStyle: true }, () => renderItem())
+  ) : renderItem(), ((_a = otherProps == null ? void 0 : otherProps.names) == null ? void 0 : _a.length) ? otherProps.names.map((name) => {
+    return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name, key: name }, /* @__PURE__ */ import_react.default.createElement(import_antd.Input, null));
+  }) : null);
+  if (formItemProps == null ? void 0 : formItemProps.parentNames) {
     return FormItem;
   }
-  return (0, _jsxRuntime.jsx)(_antd.Col, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
-    children: FormItem
-  }));
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { ...colProps }, FormItem);
 };
-var _default = exports.default = Render;
+var Render_default = Render;