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

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

@@ -1,124 +1,118 @@
-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);
+"use strict";
 
-// src/ProForm/components/render/Render.tsx
-var Render_exports = {};
-__export(Render_exports, {
-  default: () => Render_default
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-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
-  } = 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
-  });
+exports.default = void 0;
+require("antd/es/col/style");
+var _col = _interopRequireDefault(require("antd/es/col"));
+require("antd/es/space/style");
+var _space = _interopRequireDefault(require("antd/es/space"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+require("antd/es/form/style");
+var _form = _interopRequireDefault(require("antd/es/form"));
+require("antd/es/input/style");
+var _input = _interopRequireDefault(require("antd/es/input"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireWildcard(require("react"));
+var _classnames = _interopRequireDefault(require("classnames"));
+var _reactSvg = require("react-svg");
+var _lodash = require("lodash");
+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 _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip", "validateFirst"];
+/* eslint-disable prefer-destructuring */
+// 这个组件只管渲染, 参数的整理在外部处理
+var Render = props => {
+  var _ref2, _ref3, _ref4, _ref5, _otherProps$names3;
+  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,
+    shouldUpdateDebounce = props.shouldUpdateDebounce;
+  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,
+      formItemProps,
+      form,
+      disabled,
+      rules,
+      required,
+      fieldProps,
+      component,
+      originComponent,
+      type,
+      desensitization,
+      shouldUpdateDebounce
+    }),
+    shouldUpdate = _useShouldUpdate.shouldUpdate,
+    _show = _useShouldUpdate.show,
+    _disabled = _useShouldUpdate.disabled,
+    _rules = _useShouldUpdate.rules,
+    _required = _useShouldUpdate.required,
+    _fieldProps = _useShouldUpdate.fieldProps,
+    AutoComponent = _useShouldUpdate.component,
+    _desensitization = _useShouldUpdate.desensitization;
   otherFormItemProps.shouldUpdate = shouldUpdate;
-  const namesStr = (0, import_react.useMemo)(() => {
-    var _a2;
-    if (!Array.isArray(otherProps == null ? void 0 : otherProps.names)) {
-      return "";
+  var namesStr = (0, _react.useMemo)(() => {
+    var _otherProps$names;
+    if (!Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names)) {
+      return '';
     }
-    if (Array.isArray(otherProps == null ? void 0 : otherProps.name)) {
-      return otherProps == null ? void 0 : otherProps.name;
+    // formList场景 name为数组
+    if (Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name)) {
+      return otherProps === null || otherProps === void 0 ? void 0 : otherProps.name;
     }
-    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)({
+    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 = (0, _useRules.default)({
     names: otherProps.names,
     label: otherFormItemProps.label,
     labelRequired,
@@ -127,110 +121,131 @@ var Render = (props) => {
     isSelect,
     type
   });
-  const valueTypeTransform = () => {
-    let { valueType } = otherProps || {};
-    if (type === "SwitchCheckbox") {
-      valueType = "switch";
+
+  /**
+   * 基于formItem的normalize与getValueProps进行值类型转换
+   * @returns {}
+   */
+  var valueTypeTransform = () => {
+    var _ref = otherProps || {},
+      valueType = _ref.valueType;
+    // SwitchCheckbox默认YN, 兼容已有组件
+    if (type === 'SwitchCheckbox') {
+      valueType = 'switch';
     }
-    if (type === "Input") {
-      valueType = valueType || "trim";
+    if (type === 'Input') {
+      valueType = valueType || 'trim';
     }
+    // 不存在valueType返回空
     if (!valueType) {
       return {};
     }
-    const params = {
-      ...otherProps,
-      ...otherFormItemProps
-    };
-    return (0, import_lodash.isFunction)(import_valueType.default[valueType]) ? import_valueType.default[valueType](params) : {};
+    var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), otherFormItemProps);
+    return (0, _lodash.isFunction)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
   };
-  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 }
-  );
+
+  /**
+   * 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(item => 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
+  },
+  // 当某一规则校验不通过时，是否停止剩下的规则的校验
+  {
+    disabled: lastDisabled
+  });
+
+  // 添加label宽度
   if (labelWidth) {
-    otherFormItemProps.labelCol = { flex: `${labelWidth}px` };
+    otherFormItemProps.labelCol = {
+      flex: `${labelWidth}px`
+    };
   }
-  const _otherFormItemProps = (0, import_lodash.omit)(otherFormItemProps, [
-    "component",
-    "names",
-    "format",
-    "toISOString",
-    "toCSTString",
-    "switchValue",
-    "precision",
-    "clearNotShow",
-    "dependNames"
-  ]);
-  const lastComponentProps = {
-    ...componentProps,
-    ..._fieldProps,
+
+  /** 移除多余参数，防止透传给formItem报错 */
+  var _otherFormItemProps = (0, _lodash.omit)(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), {}, {
     disabled: lastDisabled,
     desensitization: _desensitization
-  };
-  const _className = (0, import_classnames.default)({
+  });
+  var _className = (0, _classnames.default)({
     [className]: className,
-    "pro-form-item-width-auto": ["Switch"].includes(type)
+    'pro-form-item-width-auto': ['Switch'].includes(type)
   });
   if (formItemProps.hidden === true || _show === false) {
-    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)
-    );
+    // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, {
+      name: _otherFormItemProps.name || 'proFormItemHidden',
+      shouldUpdate: _otherFormItemProps.shouldUpdate,
+      className: _className,
+      noStyle: true,
+      hidden: true,
+      rules: [{
+        required: false
+      }],
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_input.default, {})
+    });
   }
-  const functionArgs = (args) => {
-    var _a2, _b;
-    const _args = [...args];
-    const { valueType } = otherProps || {};
+
+  /**
+   * 函数新参数组装
+   */
+  var functionArgs = args => {
+    var _otherFormItemProps$n;
+    var _args = [...args];
+    var _ref6 = otherProps || {},
+      valueType = _ref6.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form
     };
-    if (Array.isArray(_otherFormItemProps.namePath) && ((_a2 = _otherFormItemProps == null ? void 0 : _otherFormItemProps.namePath) == null ? void 0 : _a2.length)) {
+    // 优先处理FormList场景
+    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[((_b = _otherFormItemProps == null ? void 0 : _otherFormItemProps.namePath) == null ? void 0 : _b.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 ? void 0 : _otherFormItemProps.name) || void 0;
+      _args[2].transformValue = form.getFieldValue(_otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : _otherFormItemProps.name) || undefined;
     }
     _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,47 +253,64 @@ var Render = (props) => {
     }
     return _args;
   };
-  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") {
+
+  /**
+   * 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 = [...args];
+
+    // 优先使用onFieldChange
+    var changeKey = Object.keys(lastComponentProps).includes('onFieldChange') ? 'onFieldChange' : 'onChange';
+    if (changeKey === 'onChange') {
       _args[2] = form;
     }
-    if (changeKey === "onFieldChange") {
+    if (changeKey === 'onFieldChange') {
       _args = functionArgs([...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));
+    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 || (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
+    if ( /*#__PURE__*/_react.default.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(_ref7, ..._args)) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call(lastComponentProps, ..._args));
       return false;
     }
-    if (inList && changeKey === "onFieldChange") {
-      const values = form.getFieldsValue();
-      const newValues = (0, import_lodash.set)(values, _otherFormItemProps.namePath, _args[1]);
+
+    // FormList 和 Group场景 对比值改变的话, 回显到表单上
+    if (inList && changeKey === 'onFieldChange') {
+      var values = form.getFieldsValue();
+      var newValues = (0, _lodash.set)(values, _otherFormItemProps.namePath, _args[1]);
       form.setFieldsValue(newValues);
     }
-    if (formItemProps == null ? void 0 : formItemProps.parentNames) {
+
+    // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
+    if (formItemProps !== null && formItemProps !== 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));
+        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));
         form.validateFields(namePath);
       }, 60);
     }
-    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) || {}
-      );
+
+    // ProTreeSelect返回option
+    if (['ProTree'].includes(type) && !_args[2].option) {
+      var _args2;
+      _args[2].option = (0, _index.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) || {});
     }
-    (_f = lastComponentProps[changeKey]) == null ? void 0 : _f.call(lastComponentProps, ..._args);
+    (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 || _lastComponentProps$c2.call(lastComponentProps, ..._args);
   };
-  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)) {
+  var debouncedHandleChange = (0, _lodash.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 = [...args];
+    if (lastComponentProps !== null && lastComponentProps !== void 0 && lastComponentProps.debounceWait) {
+      // 为了兼容 Input 和 TextArea 的 onChange 事件，需要将 event 对象转换为 value
+      if (['Input', 'TextArea'].includes(type)) {
         _args[0] = {
           target: {
             value: _args[0].target.value
@@ -290,145 +322,220 @@ var Render = (props) => {
       defaultHandleChange(..._args);
     }
   };
-  const handleBlur = async (...args) => {
-    const _args = functionArgs([...args]);
-    (lastComponentProps == null ? void 0 : lastComponentProps.onBlur) && await (lastComponentProps == null ? void 0 : lastComponentProps.onBlur(..._args));
-  };
-  const renderItem = () => {
-    const lastComponentPropsFilter = ["onFieldChange", "disabledStrictly"];
-    const childProps = {
-      ...AutoComponent == null ? void 0 : AutoComponent.props,
-      ...(0, import_lodash.omit)(lastComponentProps, lastComponentPropsFilter),
+
+  /**
+   * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
+   */
+  var handleBlur = /*#__PURE__*/function () {
+    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+      var _len3,
+        args,
+        _key3,
+        _args,
+        _args3 = arguments;
+      return (0, _regeneratorRuntime2.default)().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([...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(..._args);
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleBlur() {
+      return _ref8.apply(this, arguments);
+    };
+  }();
+  var 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, _lodash.omit)(lastComponentProps, lastComponentPropsFilter)), {}, {
       // @ts-ignore
       otherProps,
       onChange: handleChange,
       onBlur: handleBlur
-    };
-    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",
-        {
+    });
+
+    /**
+     * formItem前后值添加
+     */
+    var internalItemRender = {
+      mark: 'pro_table_render',
+      render: (inputProps, doms) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+          size: 0,
           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)
+            marginTop: 8
+          },
+          children: formItemProps.above
+        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+          style: {
+            display: 'flex',
+            alignItems: 'center'
+          },
+          children: [formItemProps !== null && formItemProps !== void 0 && formItemProps.before ? /*#__PURE__*/(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 && formItemProps.after ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+            style: {
+              marginInlineStart: 8
+            },
+            children: formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.after
+          }) : null]
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+          size: 0,
+          style: {
+            marginTop: 8
+          },
+          children: formItemProps.extra
+        }), doms.errorList ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+          className: "ant-form-item-additional",
+          style: {
+            minHeight: '16px'
+          },
+          children: doms.errorList
+        }) : null]
+      })
     };
+    // 自定义组件移除otherProps参数
     if (originComponent) {
       delete childProps.otherProps;
     }
-    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
-      }
-    );
+    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? ( /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [...lastComponentPropsFilter, 'debounceWait'])), {}, {
+      otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
+        show,
+        disabled: lastDisabled,
+        required
+      }),
+      onChange: handleChange,
+      onBlur: handleBlur
+    }));
     if (confirm) {
-      child = /* @__PURE__ */ import_react.default.createElement(import_ConfirmWrapper.default, { confirm, ...childProps }, child);
+      child = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        confirm: confirm
+      }, childProps), {}, {
+        children: child
+      }));
     }
+
+    // 表单提示
     if (tooltip) {
-      _otherFormItemProps.tooltip = {
-        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
-      };
+      _otherFormItemProps.tooltip = (0, _lodash.isString)(tooltip) ? {
+        title: tooltip,
+        icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
+          className: "pro-icon-tip",
+          src: _tip.default
+        })
+      } : (0, _objectSpread2.default)({
+        icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
+          className: "pro-icon-tip",
+          src: _tip.default
+        })
+      }, tooltip);
     }
-    const filterFormItemKey = [
-      "onFieldChange",
-      "shouldUpdate",
-      "namePath",
-      "isView",
-      "parentNames",
-      "space",
-      "before",
-      "after",
-      "globalControl",
-      "listName",
-      "fixed"
-    ];
-    if (type === "FormList") {
+
+    // 需要过滤掉的form_item的key
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName', 'fixed'];
+    if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
-      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
-            }
-          );
-        })
-      );
+      var lessMode = lastComponentProps.mode === 'less';
+      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+        span: lessMode ? colProps.span : 24 // 默认占一行
+      });
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+        // @ts-ignore
+        _internalItemRender: internalItemRender,
+        className: _className,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          name: _otherFormItemProps.name
+        }, (0, _lodash.omit)(_otherFormItemProps, ['rules'])), {}, {
+          children: (fields, operation, meta) => {
+            return /*#__PURE__*/(0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, lastComponentPropsFilter)), {}, {
+              otherProps: otherProps,
+              fields: fields,
+              operation: operation,
+              meta: meta
+            }));
+          }
+        }))
+      }));
     }
-    if (["ProCollapse", "Container"].includes(type)) {
-      colProps = {
-        ...colProps,
-        span: 24
-        // 默认占一行
-      };
+
+    //  默认占据一行
+    if (['ProCollapse', 'Container'].includes(type)) {
+      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+        span: 24 // 默认占一行
+      });
     }
-    if (diffConfig == null ? void 0 : diffConfig.originalValues) {
-      child = /* @__PURE__ */ import_react.default.createElement(
-        import_ChangedWrapper.default,
-        {
-          name: formItemProps.name,
-          names: otherProps.names,
-          namesStr,
-          diffConfig,
-          form,
-          onDiff,
-          type,
-          onChange: handleChange,
-          onBlur: handleBlur,
-          valuePropName: _otherFormItemProps.valuePropName,
-          normalize: _otherFormItemProps.normalize,
-          getValueProps: _otherFormItemProps.getValueProps,
-          viewRender
-        },
-        child
-      );
+    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__*/(0, _jsxRuntime.jsx)(_ChangedWrapper.default, {
+        name: formItemProps.name,
+        names: nextNames,
+        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
+      });
     }
-    return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Form.Item,
-      {
-        ...(0, import_lodash.omit)(_otherFormItemProps, filterFormItemKey),
-        _internalItemRender: internalItemRender,
-        className: _className
-      },
-      child
-    );
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_form.default.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+      // @ts-ignore
+      _internalItemRender: internalItemRender,
+      className: _className,
+      children: child
+    }));
   };
-  const FormItem = /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, _otherFormItemProps.shouldUpdate ? (
+  var FormItem = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [_otherFormItemProps.shouldUpdate ?
+    /*#__PURE__*/
     // 空标签防止气泡不显示
-    /* @__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) {
+    (0, _jsxRuntime.jsx)(_form.default.Item, {
+      shouldUpdate: _otherFormItemProps.shouldUpdate,
+      noStyle: true,
+      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__*/(0, _jsxRuntime.jsx)(_form.default.Item, {
+        hidden: true,
+        name: name,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_input.default, {})
+      }, name);
+    }) : null]
+  });
+  if (formItemProps !== null && formItemProps !== void 0 && formItemProps.parentNames) {
     return FormItem;
   }
-  return /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { ...colProps }, FormItem);
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_col.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+    children: FormItem
+  }));
 };
-var Render_default = Render;
+var _default = exports.default = Render;