@zat-design/sisyphus-react 4.5.9 → 4.5.10-beta.2

package/es/ProEditTable/components/RenderField/index.js

@@ -1,18 +1,24 @@
-import _get from "lodash/get";
-import _isFunction from "lodash/isFunction";
-import _omit from "lodash/omit";
-import _debounce from "lodash/debounce";
-import _isEqual from "lodash/isEqual";
-import _cloneDeep from "lodash/cloneDeep";
-/* eslint-disable prefer-destructuring */
-/* eslint-disable prefer-const */
-import React, { useEffect, useCallback, useMemo, memo, useRef } from 'react';
-import { Form } from 'antd';
-import classNames from 'classnames';
+import { Fragment, jsx } from "react/jsx-runtime";
+import React, { useEffect, useCallback, useMemo, memo, useRef } from "react";
+import { Form } from "antd";
+import classNames from "classnames";
+import cloneDeep from "lodash/cloneDeep";
+import isEqual from "lodash/isEqual";
+import debounce from "lodash/debounce";
+import omit from "lodash/omit";
+import isFunction from "lodash/isFunction";
+import get from "lodash/get";
 import { compatStartTransition } from "../../../utils";
 import valueTypeMap from "../../../ProForm/utils/valueType";
 import transformMap from "../../utils/transform";
-import { getNamePath, difference, getDisabled, isRecordShallowEqual, resolveChangedFields, syncGroupCombinedValues } from "../../utils/tools";
+import {
+  getNamePath,
+  difference,
+  getDisabled,
+  isRecordShallowEqual,
+  resolveChangedFields,
+  syncGroupCombinedValues
+} from "../../utils/tools";
 import * as componentMap from "../../../ProForm/components";
 import { useProConfig } from "../../../ProConfigProvider";
 import Container from "../../../ProForm/components/Container";
@@ -25,15 +31,14 @@ import ConfirmWrapper from "../../../ProForm/components/render/ConfirmWrapper";
 import { getDefaultProps } from "../../utils/getDefaultProps";
 import ListChangedWrapper from "./ListChangedWrapper";
 import useShouldUpdateForTable from "../../utils/useShouldUpdateForTable";
-import { OMIT_FORM_ITEM_AND_DOM_KEYS, arePropsEqual, hasRowFunctionDependency, mergeOnFieldChangeRow } from "./tools";
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-const RenderField = ({
-  text: value,
-  record,
-  index,
-  column,
-  config
-}) => {
+import {
+  OMIT_FORM_ITEM_AND_DOM_KEYS,
+  arePropsEqual,
+  hasRowFunctionDependency,
+  mergeOnFieldChangeRow
+} from "./tools";
+const RenderField = ({ text: value, record, index, column, config }) => {
+  var _a, _b, _c;
   let {
     type,
     valueType,
@@ -70,7 +75,7 @@ const RenderField = ({
     originalValues,
     namePath: formNamePath,
     rowDisabled,
-    validateTrigger = ['onChange', 'onBlur', 'onSubmit'],
+    validateTrigger = ["onChange", "onBlur", "onSubmit"],
     otherProps,
     diffConfig,
     getIsNew,
@@ -86,230 +91,175 @@ const RenderField = ({
   let lastDisabled = false;
   let lastDesensitization = desensitization || [];
   let lastComponent = component || editRender;
-  const isSingleMode = mode === 'single';
-
-  // type类型 首字母转大写
-  type = type?.replace?.(type[0], type[0].toUpperCase()) || 'Input';
+  const isSingleMode = mode === "single";
+  type = ((_a = type == null ? void 0 : type.replace) == null ? void 0 : _a.call(type, type[0], type[0].toUpperCase())) || "Input";
   const fallbackType = type;
-  const hasCustomComponent = 'component' in column || 'editRender' in column;
-
-  // 自定义组件时 防止默认值影像后续判断
-  if ('component' in column) {
+  const hasCustomComponent = "component" in column || "editRender" in column;
+  if ("component" in column) {
     type = null;
   }
-
-  // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   const namePathKey = useMemo(() => {
     const path = getNamePath(name, virtualKey);
-    return Array.isArray(path) ? path.join('.') : String(path);
+    return Array.isArray(path) ? path.join(".") : String(path);
   }, [name, virtualKey]);
   const namePath = useMemo(() => getNamePath(name, virtualKey), [namePathKey, name, virtualKey]);
   const rowNamePath = useMemo(() => [...namePath, index], [namePath, index]);
   const rowData = form.getFieldValue(rowNamePath) || record || {};
-
-  // Form.Item shouldUpdate 可能在 RenderField 外层未重渲染时多次执行 render props。
-  // 缓存本次外层渲染期间的最新行计算结果，避免同一行版本重复调用动态配置函数。
-  const shouldUpdateStateCacheRef = useRef(undefined);
-  shouldUpdateStateCacheRef.current = undefined;
-  let currentValue = dataIndex ? rowData?.[dataIndex] : null;
-
-  // 构建新的参数格式（与 ProForm 保持一致）
-  const reactiveParams = useMemo(() => ({
-    form,
-    index,
-    namePath: rowNamePath
-  }), [form, index, rowNamePath]);
-
-  // 保留 options 用于 viewRender 和 formatArgs（兼容旧格式）
-  const options = useMemo(() => ({
-    index,
-    form,
-    name: column?.name,
-    namePath: rowNamePath
-  }), [index, column?.name, rowNamePath, form]);
-
-  // 行参数 - 使用useMemo优化（新格式：values, { form, index, namePath }）
+  const shouldUpdateStateCacheRef = useRef(void 0);
+  shouldUpdateStateCacheRef.current = void 0;
+  let currentValue = dataIndex ? rowData == null ? void 0 : rowData[dataIndex] : null;
+  const reactiveParams = useMemo(
+    () => ({
+      form,
+      index,
+      namePath: rowNamePath
+    }),
+    [form, index, rowNamePath]
+  );
+  const options = useMemo(
+    () => ({
+      index,
+      form,
+      name: column == null ? void 0 : column.name,
+      namePath: rowNamePath
+    }),
+    [index, column == null ? void 0 : column.name, rowNamePath, form]
+  );
   const rowParams = useMemo(() => [rowData, reactiveParams], [rowData, reactiveParams]);
-
-  // 使用 hook 处理动态属性（带选择性防抖）
   const dynamicProps = useShouldUpdateForTable({
     rowParams,
     column,
     shouldUpdateDebounce
   });
-
-  // required & rules & fieldProps & disabled & valueType 函数化处理
-  // 优先使用 hook 返回的值，fallback 到原始值
-  if (_isFunction(required)) {
+  if (isFunction(required)) {
     lastRequired = dynamicProps.required ?? required(rowData, reactiveParams);
   }
-  if (_isFunction(fieldProps)) {
+  if (isFunction(fieldProps)) {
     lastFieldProps = dynamicProps.fieldProps ?? fieldProps(rowData, reactiveParams);
   }
-  if (_isFunction(rules)) {
+  if (isFunction(rules)) {
     lastRules = dynamicProps.rules ?? rules(rowData, reactiveParams);
   }
-  if (_isFunction(valueType)) {
+  if (isFunction(valueType)) {
     lastValueType = dynamicProps.valueType ?? valueType(currentValue, rowData, {
       index,
       form,
       namePath: rowNamePath,
-      name: column?.name
+      name: column == null ? void 0 : column.name
     });
   }
-  if (_isFunction(desensitization)) {
+  if (isFunction(desensitization)) {
     lastDesensitization = dynamicProps.desensitization ?? desensitization(rowData, reactiveParams);
   }
-
-  // 获取最终的disabled
   lastDisabled = getDisabled({
-    globalControl: otherProps?.globalControl,
-    formDisabled: otherProps?.formDisabled,
+    globalControl: otherProps == null ? void 0 : otherProps.globalControl,
+    formDisabled: otherProps == null ? void 0 : otherProps.formDisabled,
     column,
-    tabledDisabled: config?.disabled,
+    tabledDisabled: config == null ? void 0 : config.disabled,
     columnFieldProps: lastFieldProps,
     params: rowParams
   });
-
-  // isEditable 处理 - 优先使用 hook 返回的值
-  if (_isFunction(isEditable)) {
+  if (isFunction(isEditable)) {
     isEditable = dynamicProps.isEditable ?? isEditable(rowData, reactiveParams);
   }
-
-  // component 处理 - 优先使用 hook 返回的值
-  if (_isFunction(lastComponent)) {
+  if (isFunction(lastComponent)) {
     lastComponent = dynamicProps.componentResolved ? dynamicProps.component : lastComponent(rowData, reactiveParams);
   }
-
-  // 更新 lastEditRender 为处理后的 lastComponent
   const lastEditRender = lastComponent;
-
-  // 是否只读文本
-  const isView = !isEditable || record?.['is-view'] || config.isView || virtualKey && !isEditing || getDisabled({
-    globalControl: otherProps?.globalControl,
-    formDisabled: otherProps?.formDisabled,
+  const isView = !isEditable || (record == null ? void 0 : record["is-view"]) || config.isView || virtualKey && !isEditing || getDisabled({
+    globalControl: otherProps == null ? void 0 : otherProps.globalControl,
+    formDisabled: otherProps == null ? void 0 : otherProps.formDisabled,
     column,
-    tabledDisabled: config?.disabled,
+    tabledDisabled: config == null ? void 0 : config.disabled,
     columnFieldProps: lastFieldProps,
     params: rowParams,
-    rowDisabled: rowDisabled || 'empty'
+    rowDisabled: rowDisabled || "empty"
   });
-
-  // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
   const baseName = isView ? name : namePath;
-
-  // 多态：可能是内置组件类型、自定义 component，或已渲染的 ReactElement（lastEditRender），保留显式 any
   let TargetComponent;
-  const fallbackTargetComponent = typeof fallbackType === 'string' ? componentMap[fallbackType] : undefined;
+  const fallbackTargetComponent = typeof fallbackType === "string" ? componentMap[fallbackType] : void 0;
   const invalidComponentWarnedRef = useRef(false);
-  const resolveEditTargetComponent = candidate => {
-    if ( /*#__PURE__*/React.isValidElement(candidate)) {
+  const resolveEditTargetComponent = (candidate) => {
+    if (React.isValidElement(candidate)) {
       invalidComponentWarnedRef.current = false;
       return candidate;
     }
-    if (hasCustomComponent && !invalidComponentWarnedRef.current && process.env.NODE_ENV !== 'production') {
-      const columnName = dataIndex ?? column?.name ?? title ?? originTitle ?? 'unknown';
-      console.warn('[ProEditTable] component 必须返回合法的 ReactElement，已回退到内置组件。', {
-        column: Array.isArray(columnName) ? columnName.join('.') : String(columnName),
+    if (hasCustomComponent && !invalidComponentWarnedRef.current && true) {
+      const columnName = dataIndex ?? (column == null ? void 0 : column.name) ?? title ?? originTitle ?? "unknown";
+      console.warn("[ProEditTable] component 必须返回合法的 ReactElement，已回退到内置组件。", {
+        column: Array.isArray(columnName) ? columnName.join(".") : String(columnName),
         received: candidate
       });
       invalidComponentWarnedRef.current = true;
     }
     return fallbackTargetComponent;
   };
-
-  // 将Hooks调用移到组件顶层
   const proConfig = useProConfig();
-
-  // 设置校验规则 - 不在此处过滤 isView，由 getFieldItem 内根据 latestIsView 动态决定是否应用规则
   const internalRule = useRules({
     names,
-    label: label,
+    label,
     labelRequired,
     required: lastRequired,
     rules: lastRules,
     isSelect: isSelect({
-      dataSource: lastFieldProps?.dataSource,
+      dataSource: lastFieldProps == null ? void 0 : lastFieldProps.dataSource,
       type
     }),
     type
   });
-
-  // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 lastFieldProps 内部参数
-  const formItemChildProps = {
-    ...lastFieldProps
-  };
-
-  // 使用useMemo优化defaultProps计算
-  const defaultProps = useMemo(() => getDefaultProps({
-    name,
-    namePath: formNamePath ? cellName.slice(formNamePath?.length - 1) : cellName,
-    type: column?.type,
-    fieldProps: column?.fieldProps
-  }), [name, formNamePath, cellName, column?.type, column?.fieldProps]);
-
-  // 允许formItem的属性放在column最外层 - 使用useMemo优化（剔除会透传到 DOM 的字段）
-  const lastFormItemProps = useMemo(() => ({
-    ...defaultProps,
-    ..._omit(resetProps, OMIT_FORM_ITEM_AND_DOM_KEYS),
-    ...internalRule,
-    validateTrigger
-    // 注意：当 hasFunctionDependency 时会设置 shouldUpdate，shouldUpdate 与 dependencies 互斥，不透传 dependencies
-  }), [defaultProps, resetProps, internalRule, validateTrigger]);
-
-  // 当这些函数类型存在时，自动添加 shouldUpdate
-  // 因为这些函数依赖行数据，当行数据变化时需要重新计算
-  // 扩展到所有模式（single/multiple/cell），统一行为
-  // 注意：需要检查原始的 component/editRender，而不是处理后的 lastComponent
+  const formItemChildProps = { ...lastFieldProps };
+  const defaultProps = useMemo(
+    () => getDefaultProps({
+      name,
+      namePath: formNamePath ? cellName.slice((formNamePath == null ? void 0 : formNamePath.length) - 1) : cellName,
+      type: column == null ? void 0 : column.type,
+      fieldProps: column == null ? void 0 : column.fieldProps
+    }),
+    [name, formNamePath, cellName, column == null ? void 0 : column.type, column == null ? void 0 : column.fieldProps]
+  );
+  const lastFormItemProps = useMemo(
+    () => ({
+      ...defaultProps,
+      ...omit(resetProps, OMIT_FORM_ITEM_AND_DOM_KEYS),
+      ...internalRule,
+      validateTrigger
+      // 注意：当 hasFunctionDependency 时会设置 shouldUpdate，shouldUpdate 与 dependencies 互斥，不透传 dependencies
+    }),
+    [defaultProps, resetProps, internalRule, validateTrigger]
+  );
   const hasFunctionDependency = hasRowFunctionDependency(column);
-
-  // 移除 isSingleMode 限制，让所有模式都支持响应式更新
-  // 性能优化已通过 useShouldUpdateForTable hook 的缓存和防抖机制实现
   if (hasFunctionDependency) {
-    // 使用 shouldUpdate 监听同一行的数据变化；shouldUpdate 与 dependencies 互斥，始终优先 shouldUpdate
     lastFormItemProps.shouldUpdate = (prevValues, currentValues) => {
-      const prevRow = _get(prevValues, rowNamePath);
-      const currentRow = _get(currentValues, rowNamePath);
-      // 如果行数据发生变化，则重新渲染
-      return !_isEqual(prevRow, currentRow);
+      const prevRow = get(prevValues, rowNamePath);
+      const currentRow = get(currentValues, rowNamePath);
+      return !isEqual(prevRow, currentRow);
     };
   }
-  if (['Switch', 'SwitchCheckbox'].includes(type)) {
-    lastFormItemProps.valuePropName = 'checked';
-    lastValueType = 'switch';
+  if (["Switch", "SwitchCheckbox"].includes(type)) {
+    lastFormItemProps.valuePropName = "checked";
+    lastValueType = "switch";
   }
-
-  /**
-   * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
-   * @returns {}
-   */
   const defaultTransform = useCallback(() => {
-    const types = ['DatePicker', 'RangePicker'];
+    var _a2, _b2;
+    const types = ["DatePicker", "RangePicker"];
     if (!lastValueType && types.includes(type)) {
-      return transformMap?.[type]?.(lastFieldProps || {});
+      return (_b2 = (_a2 = transformMap) == null ? void 0 : _a2[type]) == null ? void 0 : _b2.call(_a2, lastFieldProps || {});
     }
     return {};
   }, [lastValueType, type, lastFieldProps]);
-
-  /**
-   * 配置valueType时，基于formItem的normalize与getValueProps进行值类型转换
-   * @returns {}
-   */
   const valueTypeTransform = useCallback(() => {
-    // SwitchCheckbox默认YN, 兼容已有组件
-    if (type === 'SwitchCheckbox') {
-      lastValueType = 'switch';
+    if (type === "SwitchCheckbox") {
+      lastValueType = "switch";
     }
     const params = {
       ...column,
-      mode: lastFieldProps?.mode
+      mode: lastFieldProps == null ? void 0 : lastFieldProps.mode
     };
     const valueTypeKey = lastValueType;
-    return _isFunction(valueTypeMap[valueTypeKey]) ? valueTypeMap[valueTypeKey](params) : {};
-  }, [type, lastValueType, column, lastFieldProps?.mode]);
-  if (names?.length) {
-    // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
-    names = names.map(key => {
+    return isFunction(valueTypeMap[valueTypeKey]) ? valueTypeMap[valueTypeKey](params) : {};
+  }, [type, lastValueType, column, lastFieldProps == null ? void 0 : lastFieldProps.mode]);
+  if (names == null ? void 0 : names.length) {
+    names = names.map((key) => {
       if (Array.isArray(key)) {
         return [...baseName, index, ...key];
       }
@@ -319,210 +269,188 @@ const RenderField = ({
   let originalName = cellName;
   let originalNames = names;
   if (virtualKey) {
-    originalName = [...name, ...cellName?.slice?.(name.length)];
-    originalNames = names?.map?.(item => {
-      return [...name, ...item?.slice?.(name.length)];
+    originalName = [...name, ...(_b = cellName == null ? void 0 : cellName.slice) == null ? void 0 : _b.call(cellName, name.length)];
+    originalNames = (_c = names == null ? void 0 : names.map) == null ? void 0 : _c.call(names, (item) => {
+      var _a2;
+      return [...name, ...(_a2 = item == null ? void 0 : item.slice) == null ? void 0 : _a2.call(item, name.length)];
     });
   }
-
-  /**
-   * 配置names时，基于formItem的normalize与getValueProps进行值类型转换
-   * @returns {}
-   */
   const namesTransform = useCallback(() => {
-    if (!names?.length) {
+    if (!(names == null ? void 0 : names.length)) {
       return valueTypeTransform();
     }
     const namesStr = [...baseName, index, dataIndex];
-    return transformNames({
-      ...lastFormItemProps,
-      ...valueTypeTransform()
-    }, form, names, namesStr, type);
+    return transformNames(
+      {
+        ...lastFormItemProps,
+        ...valueTypeTransform()
+      },
+      form,
+      names,
+      namesStr,
+      type
+    );
   }, [names, baseName, index, dataIndex, lastFormItemProps, type]);
   TargetComponent = fallbackTargetComponent;
   if (isEditable && isEditing && hasCustomComponent) {
     TargetComponent = resolveEditTargetComponent(lastEditRender);
   }
-
-  // 查看模式
   if (isView) {
-    // 存在viewRender覆盖默认值
-    if (typeof viewRender === 'function') {
-      const latestCurrentValue = dataIndex ? rowData?.[dataIndex] : value;
+    if (typeof viewRender === "function") {
+      const latestCurrentValue = dataIndex ? rowData == null ? void 0 : rowData[dataIndex] : value;
       const View = viewRender(latestCurrentValue, rowData || {}, options);
-      TargetComponent = /*#__PURE__*/_jsx(Container, {
-        viewEmpty: viewEmpty,
-        children: View
-      });
+      TargetComponent = /* @__PURE__ */ jsx(Container, { viewEmpty, children: View });
     }
-    if ( /*#__PURE__*/React.isValidElement(viewRender)) {
+    if (React.isValidElement(viewRender)) {
       TargetComponent = viewRender;
     }
   }
-  const onChange = formItemChildProps?.onChange;
-  const onFieldChange = formItemChildProps?.onFieldChange;
-  const onBlur = formItemChildProps?.onBlur;
-
-  // 使用useCallback优化formatArgs函数
-  const formatArgs = useCallback((...args) => {
-    const rawArgs = args?.length === 1 && Array.isArray(args?.[0]) ? args?.[0] : args;
-    const nextArgs = [];
-    nextArgs[0] = rawArgs?.[0];
-    // 返回表单元素默认值
-    nextArgs[2] = {
-      ...options,
-      extra: rawArgs
-    };
-    switch (type) {
-      case 'ProSelect':
-      case 'ProModalSelect':
-      case 'ProEnum':
-        nextArgs[2].option = rawArgs?.[1];
-        break;
-      case 'ProCascader':
-        nextArgs[2].selectedOptions = rawArgs?.[1];
-        break;
-      case 'DatePicker':
-      case 'RangePicker':
-        nextArgs[2].dateString = rawArgs?.[1];
-        break;
-      default:
-        break;
-    }
-    return nextArgs;
-  }, [options, type]);
-
-  // 使用useCallback优化debounceValidate函数
-  const debounceValidate = useCallback((validateFieldKeys = []) => {
-    setTimeout(() => {
-      // 行内联动被动触发的重校验：只校验、不滚动到报错位置（全局/主动保存校验仍会滚动）
-      // @ts-ignore 内部选项
-      form.validateFields(validateFieldKeys, {
-        recursive: true,
-        __skipScrollOnError: true
-      });
-    }, 100);
-  }, [form]);
-
-  // 使用 useRef 保存防抖函数
-  const debounceRef = useRef(null);
-
-  // 使用 useCallback 创建稳定的 onChange 函数
-  const handleChange = useCallback(async (...args) => {
-    const executeChange = async (...innerArgs) => {
-      // 虚拟表格：用户编辑本单元格 → 清掉旧的常驻报错，提交时再以最新值统一重校
-      if (virtual && errorStore && record?.rowKey != null) {
-        errorStore.clearCell(record.rowKey, String(column?.dataIndex));
+  const onChange = formItemChildProps == null ? void 0 : formItemChildProps.onChange;
+  const onFieldChange = formItemChildProps == null ? void 0 : formItemChildProps.onFieldChange;
+  const onBlur = formItemChildProps == null ? void 0 : formItemChildProps.onBlur;
+  const formatArgs = useCallback(
+    (...args) => {
+      const rawArgs = (args == null ? void 0 : args.length) === 1 && Array.isArray(args == null ? void 0 : args[0]) ? args == null ? void 0 : args[0] : args;
+      const nextArgs = [];
+      nextArgs[0] = rawArgs == null ? void 0 : rawArgs[0];
+      nextArgs[2] = {
+        ...options,
+        extra: rawArgs
+      };
+      switch (type) {
+        case "ProSelect":
+        case "ProModalSelect":
+        case "ProEnum":
+          nextArgs[2].option = rawArgs == null ? void 0 : rawArgs[1];
+          break;
+        case "ProCascader":
+          nextArgs[2].selectedOptions = rawArgs == null ? void 0 : rawArgs[1];
+          break;
+        case "DatePicker":
+        case "RangePicker":
+          nextArgs[2].dateString = rawArgs == null ? void 0 : rawArgs[1];
+          break;
+        default:
+          break;
       }
-      let callArgs = [...innerArgs];
-      const rowPath = rowNamePath;
-      if (!onFieldChange && !onChange) {
-        if (dependencies?.length) {
-          const validateFieldKeys = dependencies?.map?.(key => [...rowPath, key]);
-          setTimeout(() => {
-            // 依赖字段联动重校验：只校验、不滚动
-            // @ts-ignore 内部选项
-            form.validateFields(validateFieldKeys, {
-              __skipScrollOnError: true
-            });
-          }, 100);
+      return nextArgs;
+    },
+    [options, type]
+  );
+  const debounceValidate = useCallback(
+    (validateFieldKeys = []) => {
+      setTimeout(() => {
+        form.validateFields(validateFieldKeys, { recursive: true, __skipScrollOnError: true });
+      }, 100);
+    },
+    [form]
+  );
+  const debounceRef = useRef(null);
+  const handleChange = useCallback(
+    async (...args) => {
+      const executeChange = async (...innerArgs) => {
+        var _a2, _b2, _c2;
+        if (virtual && errorStore && (record == null ? void 0 : record.rowKey) != null) {
+          errorStore.clearCell(record.rowKey, String(column == null ? void 0 : column.dataIndex));
         }
-        return;
-      }
-      const row = form.getFieldValue(rowPath, true);
-      const orgRow = _cloneDeep(row);
-      if (onFieldChange) {
-        callArgs = formatArgs(innerArgs);
-        callArgs[1] = row;
-        TargetComponent?.props?.onFieldChange && (await TargetComponent.props.onFieldChange(...callArgs));
-        onFieldChange && (await onFieldChange(...callArgs));
-
-        // 原地修改 row 会改变 store 内的对象，但不会通知 Form 和只读单元格重新渲染。
-        // 只通知相对回调前真正变化的子字段，避免整行回写覆盖回调内显式 setFieldValue 的新值。
-        const latestStoreRow = form.getFieldValue(rowPath, true) || {};
-        const nextStoreRow = mergeOnFieldChangeRow(orgRow, row, latestStoreRow);
-        if (nextStoreRow !== latestStoreRow) {
-          // ProEditTable 注册在整个列表路径上，子行写入不会通知该 Form.Item。
-          // 以最新列表为底只替换当前行，确保其他行与显式 store 写入不被覆盖。
-          const latestList = form.getFieldValue(namePath, true) || [];
-          const nextList = [...latestList];
-          nextList[index] = nextStoreRow;
-          form.setFieldValue(namePath, nextList);
+        let callArgs = [...innerArgs];
+        const rowPath = rowNamePath;
+        if (!onFieldChange && !onChange) {
+          if (dependencies == null ? void 0 : dependencies.length) {
+            const validateFieldKeys = (_a2 = dependencies == null ? void 0 : dependencies.map) == null ? void 0 : _a2.call(dependencies, (key) => [...rowPath, key]);
+            setTimeout(() => {
+              form.validateFields(validateFieldKeys, { __skipScrollOnError: true });
+            }, 100);
+          }
+          return;
         }
-
-        // 延后读取通知后的最新 store，统一处理联动校验与行刷新。
-        setTimeout(() => {
-          const rowAfter = form.getFieldValue(rowPath, true) ?? row;
-          if (validateTrigger && validateTrigger.includes('onChange')) {
-            if (!_isEqual(orgRow, rowAfter)) {
+        const row = form.getFieldValue(rowPath, true);
+        const orgRow = cloneDeep(row);
+        if (onFieldChange) {
+          callArgs = formatArgs(innerArgs);
+          callArgs[1] = row;
+          ((_b2 = TargetComponent == null ? void 0 : TargetComponent.props) == null ? void 0 : _b2.onFieldChange) && await TargetComponent.props.onFieldChange(...callArgs);
+          onFieldChange && await onFieldChange(...callArgs);
+          const latestStoreRow = form.getFieldValue(rowPath, true) || {};
+          const nextStoreRow = mergeOnFieldChangeRow(orgRow, row, latestStoreRow);
+          if (nextStoreRow !== latestStoreRow) {
+            const latestList = form.getFieldValue(namePath, true) || [];
+            const nextList = [...latestList];
+            nextList[index] = nextStoreRow;
+            form.setFieldValue(namePath, nextList);
+          }
+          setTimeout(() => {
+            const rowAfter = form.getFieldValue(rowPath, true) ?? row;
+            if (validateTrigger && validateTrigger.includes("onChange")) {
+              if (!isEqual(orgRow, rowAfter)) {
+                const diff = difference(rowAfter, orgRow) || {};
+                const changedKeys = Object.keys(diff);
+                syncGroupCombinedValues(form, rowPath, changedKeys, columns);
+                const changedFields = resolveChangedFields(changedKeys, columns);
+                if (virtual && errorStore && (record == null ? void 0 : record.rowKey) != null) {
+                  changedFields.forEach((id) => errorStore.clearCell(record.rowKey, id));
+                }
+                const validateFieldKeys = changedFields.map((id) => [...rowPath, id]).concat(dependencies || []);
+                if (validateFieldKeys == null ? void 0 : validateFieldKeys.length) {
+                  debounceValidate(validateFieldKeys);
+                }
+              }
+            }
+            if (!isEqual(orgRow, rowAfter)) {
+              compatStartTransition(() => {
+                setState({
+                  forceUpdate: {
+                    rowKey: record == null ? void 0 : record.rowKey
+                  }
+                });
+              });
+            }
+          }, 0);
+        } else {
+          callArgs = callArgs.concat([row, index, form]);
+          ((_c2 = TargetComponent == null ? void 0 : TargetComponent.props) == null ? void 0 : _c2.onChange) && await TargetComponent.props.onChange(...callArgs);
+          onChange && await onChange(...callArgs);
+          const rowAfter = row;
+          form.setFieldValue(rowPath, rowAfter);
+          if (validateTrigger && validateTrigger.includes("onChange")) {
+            if (!isEqual(orgRow, rowAfter)) {
               const diff = difference(rowAfter, orgRow) || {};
               const changedKeys = Object.keys(diff);
-              // 联动回填只写了子键，names 组合列的合并字段值未同步 → 先按子键组合写回，确保校验读到最新值
               syncGroupCombinedValues(form, rowPath, changedKeys, columns);
-              // 把变更子键映射回所属列字段名（names 组合列 → 合并名），否则 group 列重校验路径对不上、旧报错不清
               const changedFields = resolveChangedFields(changedKeys, columns);
-              // 虚拟表格：联动改写到的列同步清掉常驻报错，避免滚动重挂载后回填旧错
-              if (virtual && errorStore && record?.rowKey != null) {
-                changedFields.forEach(id => errorStore.clearCell(record.rowKey, id));
+              if (virtual && errorStore && (record == null ? void 0 : record.rowKey) != null) {
+                changedFields.forEach((id) => errorStore.clearCell(record.rowKey, id));
               }
-              const validateFieldKeys = changedFields.map(id => [...rowPath, id]).concat(dependencies || []);
-              if (validateFieldKeys?.length) {
+              const validateFieldKeys = changedFields.map((id) => [...rowPath, id]).concat(dependencies || []);
+              if (validateFieldKeys == null ? void 0 : validateFieldKeys.length) {
                 debounceValidate(validateFieldKeys);
               }
             }
           }
-          if (!_isEqual(orgRow, rowAfter)) {
-            compatStartTransition(() => {
-              setState({
-                forceUpdate: {
-                  rowKey: record?.rowKey
-                }
-              });
-            });
-          }
-        }, 0);
-      } else {
-        callArgs = callArgs.concat([row, index, form]);
-        TargetComponent?.props?.onChange && (await TargetComponent.props.onChange(...callArgs));
-        onChange && (await onChange(...callArgs));
-        const rowAfter = row;
-        form.setFieldValue(rowPath, rowAfter);
-        if (validateTrigger && validateTrigger.includes('onChange')) {
-          if (!_isEqual(orgRow, rowAfter)) {
-            const diff = difference(rowAfter, orgRow) || {};
-            const changedKeys = Object.keys(diff);
-            // 联动回填只写了子键，names 组合列的合并字段值未同步 → 先按子键组合写回，确保校验读到最新值
-            syncGroupCombinedValues(form, rowPath, changedKeys, columns);
-            // 把变更子键映射回所属列字段名（names 组合列 → 合并名），否则 group 列重校验路径对不上、旧报错不清
-            const changedFields = resolveChangedFields(changedKeys, columns);
-            if (virtual && errorStore && record?.rowKey != null) {
-              changedFields.forEach(id => errorStore.clearCell(record.rowKey, id));
-            }
-            const validateFieldKeys = changedFields.map(id => [...rowPath, id]).concat(dependencies || []);
-            if (validateFieldKeys?.length) {
-              debounceValidate(validateFieldKeys);
-            }
-          }
         }
+      };
+      if (onFieldChange) {
+        await executeChange(...args);
+        return;
       }
-    };
-
-    // onFieldChange 立即执行，不走防抖
-    // 表格行数据变化会导致组件卸载重建，防抖回调会在 cleanup 中被取消
-    if (onFieldChange) {
-      await executeChange(...args);
-      return;
-    }
-
-    // 没有 onFieldChange 时，使用防抖处理 onChange
-    if (!debounceRef.current) {
-      debounceRef.current = _debounce(executeChange, 300);
-    }
-    // 调用防抖函数
-    debounceRef.current(...args);
-  }, [namePath, index, dependencies, formatArgs, onChange, onFieldChange, form, setState, TargetComponent, validateTrigger]);
-
-  // 在组件卸载时清理防抖函数
+      if (!debounceRef.current) {
+        debounceRef.current = debounce(executeChange, 300);
+      }
+      debounceRef.current(...args);
+    },
+    [
+      namePath,
+      index,
+      dependencies,
+      formatArgs,
+      onChange,
+      onFieldChange,
+      form,
+      setState,
+      TargetComponent,
+      validateTrigger
+    ]
+  );
   useEffect(() => {
     return () => {
       if (debounceRef.current) {
@@ -530,120 +458,138 @@ const RenderField = ({
       }
     };
   }, []);
-
-  // 虚拟表格：单元格（重新）挂载时，回填 errorStore 中已存储的真实报错，实现报错常驻。
-  // 虚拟滚动会卸载视口外行的 Field 实体导致 antd 报错丢失，重新挂载后由此恢复红字。
   useEffect(() => {
-    if (!virtual || !errorStore || record?.rowKey == null) {
+    if (!virtual || !errorStore || (record == null ? void 0 : record.rowKey) == null) {
       return;
     }
-    const cellKey = String(column?.dataIndex);
+    const cellKey = String(column == null ? void 0 : column.dataIndex);
     const errs = errorStore.get(record.rowKey, cellKey);
-    if (errs?.length) {
-      const fieldName = formNamePath ? cellName.slice(formNamePath?.length - 1) : cellName;
-      form.setFields([{
-        name: fieldName,
-        errors: errs
-      }]);
-    }
-    // 仅在挂载或行/列标识变化时回填
-  }, [virtual, record?.rowKey, column?.dataIndex]);
-
-  // 使用useCallback优化handleBlur函数
-  const handleBlur = useCallback(async (...args) => {
-    if (!onBlur) {
-      return;
-    }
-    let callArgs = formatArgs(...args);
-    const rowPath = rowNamePath;
-    const row = form.getFieldValue(rowPath, true);
-    const orgRow = _cloneDeep(row);
-    callArgs[1] = row;
-    TargetComponent?.props?.onBlur && (await TargetComponent.props.onBlur(...callArgs));
-    onBlur && (await onBlur(...callArgs));
-    // 判断属性是否变动
-    form.setFieldValue(rowPath, row);
-    if (validateTrigger && validateTrigger.includes('onBlur')) {
-      if (!_isEqual(orgRow, row)) {
-        const diff = difference(row, orgRow) || {};
-        const validateFieldKeys = Object.keys(diff)?.map?.(key => [...rowPath, key]).concat(dependencies || []);
-        if (validateFieldKeys?.length) {
-          debounceValidate(validateFieldKeys);
-        }
+    if (errs == null ? void 0 : errs.length) {
+      const fieldName = formNamePath ? cellName.slice((formNamePath == null ? void 0 : formNamePath.length) - 1) : cellName;
+      form.setFields([{ name: fieldName, errors: errs }]);
+    }
+  }, [virtual, record == null ? void 0 : record.rowKey, column == null ? void 0 : column.dataIndex]);
+  const handleBlur = useCallback(
+    async (...args) => {
+      var _a2, _b2, _c2;
+      if (!onBlur) {
+        return;
       }
-    }
-    // 单行编辑时需要 强制更新视图，仅对当前行打标记
-    compatStartTransition(() => {
-      setState({
-        forceUpdate: {
-          rowKey: record?.rowKey
+      let callArgs = formatArgs(...args);
+      const rowPath = rowNamePath;
+      const row = form.getFieldValue(rowPath, true);
+      const orgRow = cloneDeep(row);
+      callArgs[1] = row;
+      ((_a2 = TargetComponent == null ? void 0 : TargetComponent.props) == null ? void 0 : _a2.onBlur) && await TargetComponent.props.onBlur(...callArgs);
+      onBlur && await onBlur(...callArgs);
+      form.setFieldValue(rowPath, row);
+      if (validateTrigger && validateTrigger.includes("onBlur")) {
+        if (!isEqual(orgRow, row)) {
+          const diff = difference(row, orgRow) || {};
+          const validateFieldKeys = (_c2 = (_b2 = Object.keys(diff)) == null ? void 0 : _b2.map) == null ? void 0 : _c2.call(_b2, (key) => [...rowPath, key]).concat(dependencies || []);
+          if (validateFieldKeys == null ? void 0 : validateFieldKeys.length) {
+            debounceValidate(validateFieldKeys);
+          }
         }
+      }
+      compatStartTransition(() => {
+        setState({
+          forceUpdate: {
+            rowKey: record == null ? void 0 : record.rowKey
+          }
+        });
       });
-    });
-  }, [onBlur, formatArgs, namePath, index, form, TargetComponent, validateTrigger, debounceValidate, cellName, setState]);
-
-  // 使用useMemo优化componentProps对象
-  let componentProps = useMemo(() => ({
-    form,
-    name: cellName,
-    ...lastFieldProps,
-    ...TargetComponent?.props,
-    namePath: rowNamePath,
-    disabled: lastDisabled,
-    onChange: handleChange,
-    onBlur: handleBlur,
-    index,
-    confirm,
-    desensitization: lastDesensitization,
-    otherProps: {
+    },
+    [
+      onBlur,
+      formatArgs,
+      namePath,
+      index,
       form,
-      names,
+      TargetComponent,
+      validateTrigger,
+      debounceValidate,
+      cellName,
+      setState
+    ]
+  );
+  let componentProps = useMemo(
+    () => ({
+      form,
+      name: cellName,
+      ...lastFieldProps,
+      ...TargetComponent == null ? void 0 : TargetComponent.props,
       namePath: rowNamePath,
-      name: originalName,
-      listName: cellName,
-      // 用于下拉框去重消费，保持和formlist一致
+      disabled: lastDisabled,
+      onChange: handleChange,
+      onBlur: handleBlur,
+      index,
+      confirm,
+      desensitization: lastDesensitization,
+      otherProps: {
+        form,
+        names,
+        namePath: rowNamePath,
+        name: originalName,
+        listName: cellName,
+        // 用于下拉框去重消费，保持和formlist一致
+        viewEmpty,
+        valueType: lastValueType,
+        isView,
+        desensitizationKey: otherProps == null ? void 0 : otherProps.desensitizationKey,
+        source: "ProEditTable"
+      }
+    }),
+    [
+      cellName,
+      lastFieldProps,
+      TargetComponent == null ? void 0 : TargetComponent.props,
+      namePath,
+      index,
+      lastDisabled,
+      handleChange,
+      handleBlur,
+      confirm,
+      lastDesensitization,
+      names,
+      originalName,
       viewEmpty,
-      valueType: lastValueType,
+      lastValueType,
       isView,
-      desensitizationKey: otherProps?.desensitizationKey,
-      source: 'ProEditTable'
-    }
-  }), [cellName, lastFieldProps, TargetComponent?.props, namePath, index, lastDisabled, handleChange, handleBlur, confirm, lastDesensitization, names, originalName, viewEmpty, lastValueType, isView, otherProps?.desensitizationKey]);
-  componentProps = _omit(componentProps, ['onFieldChange', 'namePath', 'index',
-  // precision 是 InputNumber 的有效 fieldProps，仅在真正渲染原生 DOM 时过滤
-  ...OMIT_FORM_ITEM_AND_DOM_KEYS.filter(key => key !== 'precision')]);
-  if (['Switch', 'SwitchCheckbox'].includes(type)) {
-    lastFormItemProps.valuePropName = 'checked';
+      otherProps == null ? void 0 : otherProps.desensitizationKey
+    ]
+  );
+  componentProps = omit(componentProps, [
+    "onFieldChange",
+    "namePath",
+    "index",
+    // precision 是 InputNumber 的有效 fieldProps，仅在真正渲染原生 DOM 时过滤
+    ...OMIT_FORM_ITEM_AND_DOM_KEYS.filter((key) => key !== "precision")
+  ]);
+  if (["Switch", "SwitchCheckbox"].includes(type)) {
+    lastFormItemProps.valuePropName = "checked";
   }
-
-  // 可编辑表格默认关闭scrollFollowParent
-  if (['Select', 'ProSelect', 'ProEnum'].includes(type)) {
+  if (["Select", "ProSelect", "ProEnum"].includes(type)) {
     componentProps.scrollFollowParent = false;
   }
-
-  // 使用useMemo优化最终的formItemProps - 修复Hooks使用规则
   const finalFormItemProps = useMemo(() => {
     const defaultTransformProps = defaultTransform();
     const namesTransformProps = namesTransform();
-    const trimProps = isTrim(type, trim, proConfig); // 使用顶层调用的proConfig
-
-    const transformNormalize = namesTransformProps?.normalize ?? defaultTransformProps?.normalize;
-    const userNormalize = lastFormItemProps?.normalize;
-    const transformGetValueProps = namesTransformProps?.getValueProps ?? defaultTransformProps?.getValueProps;
-    const userGetValueProps = lastFormItemProps?.getValueProps;
-    const finalNormalize = transformNormalize && userNormalize ? (value, prevValue, allValues, isDiffMode) => {
-      // 用户 normalize 需要拿到组件原始值（如 DatePicker 的 dayjs）
-      const userValue = userNormalize(value, prevValue, allValues, isDiffMode);
-      // 保持用户优先：用户有明确返回值时直接使用，不再强制走内置转换
-      if (userValue !== undefined) {
+    const trimProps = isTrim(type, trim, proConfig);
+    const transformNormalize = (namesTransformProps == null ? void 0 : namesTransformProps.normalize) ?? (defaultTransformProps == null ? void 0 : defaultTransformProps.normalize);
+    const userNormalize = lastFormItemProps == null ? void 0 : lastFormItemProps.normalize;
+    const transformGetValueProps = (namesTransformProps == null ? void 0 : namesTransformProps.getValueProps) ?? (defaultTransformProps == null ? void 0 : defaultTransformProps.getValueProps);
+    const userGetValueProps = lastFormItemProps == null ? void 0 : lastFormItemProps.getValueProps;
+    const finalNormalize = transformNormalize && userNormalize ? (value2, prevValue, allValues, isDiffMode) => {
+      const userValue = userNormalize(value2, prevValue, allValues, isDiffMode);
+      if (userValue !== void 0) {
         return userValue;
       }
-      // 仅在用户未返回时，回退到内置 transform 逻辑
-      return transformNormalize(value, prevValue, allValues, isDiffMode);
+      return transformNormalize(value2, prevValue, allValues, isDiffMode);
     } : userNormalize || transformNormalize;
-    const finalGetValueProps = transformGetValueProps && userGetValueProps ? (value, ...args) => {
-      const transformValueProps = transformGetValueProps(value, ...args) || {};
-      const nextValue = Object.prototype.hasOwnProperty.call(transformValueProps, 'value') ? transformValueProps.value : value;
+    const finalGetValueProps = transformGetValueProps && userGetValueProps ? (value2, ...args) => {
+      const transformValueProps = transformGetValueProps(value2, ...args) || {};
+      const nextValue = Object.prototype.hasOwnProperty.call(transformValueProps, "value") ? transformValueProps.value : value2;
       const userValueProps = userGetValueProps(nextValue, ...args) || {};
       return {
         ...transformValueProps,
@@ -659,16 +605,13 @@ const RenderField = ({
       getValueProps: finalGetValueProps
     };
   }, [lastFormItemProps, defaultTransform, namesTransform, type, trim, proConfig]);
-
-  // rules 的 isView 过滤已移至 getFieldItem 内处理（支持 shouldUpdate 模式下的动态 isEditable）
-
-  const cellClassName = useMemo(() => classNames({
-    [className]: className
-  }), [className]);
-
-  // shouldUpdate 模式下重新获取最新行数据并重算所有响应式属性，返回最新渲染状态（不修改外层闭包）
+  const cellClassName = useMemo(
+    () => classNames({
+      [className]: className
+    }),
+    [className]
+  );
   const recalcShouldUpdateState = () => {
-    // 重新获取最新的行数据（shouldUpdate 触发时，通过 getFieldValue 拿到最新值）
     const latestRowData = form.getFieldValue(rowNamePath) || record || {};
     const latestReactiveParams = {
       form,
@@ -680,54 +623,49 @@ const RenderField = ({
     if (cachedState && isRecordShallowEqual(cachedState.rowSnapshot, latestRowData)) {
       return cachedState.result;
     }
-
-    // 初次 render props 会与外层 RenderField 使用同一行数据，直接复用 hook 已计算结果。
     const canReuseCurrentState = isRecordShallowEqual(latestRowData, dynamicProps.rowSnapshot);
     let latestFieldProps = canReuseCurrentState ? lastFieldProps : fieldProps || {};
-    if (!canReuseCurrentState && _isFunction(fieldProps)) {
+    if (!canReuseCurrentState && isFunction(fieldProps)) {
       latestFieldProps = fieldProps(latestRowData, latestReactiveParams);
     }
     let latestRequired = canReuseCurrentState ? lastRequired : required;
-    if (!canReuseCurrentState && _isFunction(required)) {
+    if (!canReuseCurrentState && isFunction(required)) {
       latestRequired = required(latestRowData, latestReactiveParams);
     }
     let latestRules = canReuseCurrentState ? lastRules : rules;
-    if (!canReuseCurrentState && _isFunction(rules)) {
+    if (!canReuseCurrentState && isFunction(rules)) {
       latestRules = rules(latestRowData, latestReactiveParams);
     }
     let latestDesensitization = canReuseCurrentState ? lastDesensitization : desensitization || [];
-    if (!canReuseCurrentState && _isFunction(desensitization)) {
+    if (!canReuseCurrentState && isFunction(desensitization)) {
       latestDesensitization = desensitization(latestRowData, latestReactiveParams);
     }
     let latestComponent = canReuseCurrentState ? lastComponent : component || editRender;
-    if (!canReuseCurrentState && _isFunction(latestComponent)) {
+    if (!canReuseCurrentState && isFunction(latestComponent)) {
       latestComponent = latestComponent(latestRowData, latestReactiveParams);
     }
     let latestIsEditable = canReuseCurrentState ? isEditable : column.isEditable ?? true;
-    if (!canReuseCurrentState && _isFunction(column.isEditable)) {
+    if (!canReuseCurrentState && isFunction(column.isEditable)) {
       latestIsEditable = column.isEditable(latestRowData, latestReactiveParams);
     }
     let latestValueType = canReuseCurrentState ? lastValueType : valueType;
-    if (!canReuseCurrentState && _isFunction(valueType)) {
-      const latestCurrentValue = dataIndex ? latestRowData?.[dataIndex] : null;
+    if (!canReuseCurrentState && isFunction(valueType)) {
+      const latestCurrentValue = dataIndex ? latestRowData == null ? void 0 : latestRowData[dataIndex] : null;
       latestValueType = valueType(latestCurrentValue, latestRowData, {
         index,
         form,
         namePath: rowNamePath,
-        name: column?.name
+        name: column == null ? void 0 : column.name
       });
     }
     const latestDisabled = canReuseCurrentState ? lastDisabled : getDisabled({
-      globalControl: otherProps?.globalControl,
-      formDisabled: otherProps?.formDisabled,
+      globalControl: otherProps == null ? void 0 : otherProps.globalControl,
+      formDisabled: otherProps == null ? void 0 : otherProps.formDisabled,
       column,
-      tabledDisabled: config?.disabled,
+      tabledDisabled: config == null ? void 0 : config.disabled,
       columnFieldProps: latestFieldProps,
       params: latestRowParams
     });
-
-    // 更新 componentProps 中的所有响应式属性
-    // latestTargetComponent 稍后计算，此处先占位；最终会在下方合并 latestTargetComponent?.props
     let latestComponentProps = {
       ...componentProps,
       ...latestFieldProps,
@@ -738,37 +676,28 @@ const RenderField = ({
       onBlur: handleBlur
     };
     let latestTargetComponent = canReuseCurrentState ? TargetComponent : fallbackTargetComponent;
-
-    // 然后处理自定义 component
-    const latestIsView = !latestIsEditable || record?.['is-view'] || config.isView || virtualKey && !isEditing || getDisabled({
-      globalControl: otherProps?.globalControl,
-      formDisabled: otherProps?.formDisabled,
+    const latestIsView = !latestIsEditable || (record == null ? void 0 : record["is-view"]) || config.isView || virtualKey && !isEditing || getDisabled({
+      globalControl: otherProps == null ? void 0 : otherProps.globalControl,
+      formDisabled: otherProps == null ? void 0 : otherProps.formDisabled,
       column,
-      tabledDisabled: config?.disabled,
+      tabledDisabled: config == null ? void 0 : config.disabled,
       columnFieldProps: latestFieldProps,
       params: latestRowParams,
-      rowDisabled: rowDisabled || 'empty'
+      rowDisabled: rowDisabled || "empty"
     });
     if (!canReuseCurrentState && latestIsEditable && isEditing && hasCustomComponent) {
       latestTargetComponent = resolveEditTargetComponent(latestComponent);
     }
-
-    // 查看模式
     if (!canReuseCurrentState && latestIsView) {
-      if (typeof viewRender === 'function') {
-        const latestCurrentValue = dataIndex ? latestRowData?.[dataIndex] : value;
+      if (typeof viewRender === "function") {
+        const latestCurrentValue = dataIndex ? latestRowData == null ? void 0 : latestRowData[dataIndex] : value;
         const View = viewRender(latestCurrentValue, latestRowData || {}, options);
-        latestTargetComponent = /*#__PURE__*/_jsx(Container, {
-          viewEmpty: viewEmpty,
-          children: View
-        });
+        latestTargetComponent = /* @__PURE__ */ jsx(Container, { viewEmpty, children: View });
       }
-      if ( /*#__PURE__*/React.isValidElement(viewRender)) {
+      if (React.isValidElement(viewRender)) {
         latestTargetComponent = viewRender;
       }
     }
-
-    // shouldUpdate 触发时外层 componentProps.otherProps.isView 是旧快照，需用最新值覆盖
     latestComponentProps = {
       ...latestComponentProps,
       otherProps: {
@@ -777,13 +706,9 @@ const RenderField = ({
         valueType: latestValueType
       }
     };
-
-    // componentProps 里展开了外层旧 TargetComponent?.props（如 { formType: "Input" }），
-    // 用 latestTargetComponent?.props 覆盖，确保不会被旧 cloneElement props 污染
-    if ( /*#__PURE__*/React.isValidElement(latestTargetComponent)) {
+    if (React.isValidElement(latestTargetComponent)) {
       const elementProps = latestTargetComponent.props;
-      // 确保 props 是对象类型才进行展开
-      if (elementProps && typeof elementProps === 'object') {
+      if (elementProps && typeof elementProps === "object") {
         latestComponentProps = {
           ...latestComponentProps,
           ...elementProps,
@@ -802,16 +727,11 @@ const RenderField = ({
       effectiveFieldProps: latestFieldProps
     };
     shouldUpdateStateCacheRef.current = {
-      rowSnapshot: {
-        ...latestRowData
-      },
+      rowSnapshot: { ...latestRowData },
       result
     };
     return result;
   };
-
-  // 根据 latestIsView 和最新 required/rules 构建正确的 Form.Item props
-  // 解决 shouldUpdate 触发时外层 finalFormItemProps 是旧闭包（rules 基于旧 isView 计算）的问题
   const buildActiveFormItemProps = ({
     latestIsView,
     shouldUpdateMode,
@@ -820,99 +740,82 @@ const RenderField = ({
     effectiveFieldProps
   }) => {
     if (latestIsView) {
-      // 查看模式：移除 rules 不做校验
-      return _omit(finalFormItemProps, ['rules']);
+      return omit(finalFormItemProps, ["rules"]);
     }
     if (shouldUpdateMode) {
-      // shouldUpdate 模式下 finalFormItemProps 是旧闭包，需用最新 effectiveRequired/effectiveRules 重建 rules
       const activeRules = Array.isArray(effectiveRules) ? [...effectiveRules] : [];
-      const hasRequiredRule = activeRules.some(r => r?.required === true);
+      const hasRequiredRule = activeRules.some((r) => (r == null ? void 0 : r.required) === true);
       if (effectiveRequired && !hasRequiredRule) {
         const isSelectVal = isSelect({
-          dataSource: effectiveFieldProps?.dataSource,
+          dataSource: effectiveFieldProps == null ? void 0 : effectiveFieldProps.dataSource,
           type
         });
         activeRules.push({
           required: true,
-          message: `${isSelectVal ? locale.ProForm.selectPlaceHolder : locale.ProForm.inputPlaceholder}${label || ''}`
+          message: `${isSelectVal ? locale.ProForm.selectPlaceHolder : locale.ProForm.inputPlaceholder}${label || ""}`
         });
       }
       return {
         ...finalFormItemProps,
-        rules: activeRules.length > 0 ? activeRules : [{
-          required: false
-        }]
+        rules: activeRules.length > 0 ? activeRules : [{ required: false }]
       };
     }
     return finalFormItemProps;
   };
-
-  // 组装字段组件：DOM 透传字段过滤、克隆/创建目标元素、原始值对比包裹（ListChangedWrapper）、确认弹窗包裹（ConfirmWrapper）
-  const assembleFieldComponent = finalComponentProps => {
-    // 当 viewRender 存在时，需要排除 finalComponentProps 中的 children，避免覆盖 Container 的 children
-    let propsForTarget = isView && typeof viewRender === 'function' ? _omit(finalComponentProps, ['children']) : finalComponentProps;
-    // 当目标为原生 DOM 元素（如 viewRender 返回 <div>）时，剔除 disabled、toCSTString 等，避免 React 警告
-    const isTargetDomElement = /*#__PURE__*/React.isValidElement(TargetComponent) && typeof TargetComponent.type === 'string';
+  const assembleFieldComponent = (finalComponentProps) => {
+    let propsForTarget = isView && typeof viewRender === "function" ? omit(finalComponentProps, ["children"]) : finalComponentProps;
+    const isTargetDomElement = React.isValidElement(TargetComponent) && typeof TargetComponent.type === "string";
     if (isTargetDomElement) {
-      propsForTarget = _omit(propsForTarget, ['disabled', ...OMIT_FORM_ITEM_AND_DOM_KEYS]);
+      propsForTarget = omit(propsForTarget, ["disabled", ...OMIT_FORM_ITEM_AND_DOM_KEYS]);
     }
-    // 当 TargetComponent 未定义时，使用空的占位组件避免渲染错误
     let FieldComponent = null;
-    if ( /*#__PURE__*/React.isValidElement(TargetComponent)) {
-      FieldComponent = /*#__PURE__*/React.cloneElement(TargetComponent, propsForTarget);
+    if (React.isValidElement(TargetComponent)) {
+      FieldComponent = React.cloneElement(TargetComponent, propsForTarget);
     } else if (TargetComponent) {
-      FieldComponent = /*#__PURE__*/_jsx(TargetComponent, {
-        ...propsForTarget
-      });
+      FieldComponent = /* @__PURE__ */ jsx(TargetComponent, { ...propsForTarget });
     } else {
-      FieldComponent = /*#__PURE__*/_jsx(_Fragment, {});
+      FieldComponent = /* @__PURE__ */ jsx(Fragment, {});
     }
     if (originalValues && !getIsNew(record)) {
-      FieldComponent = /*#__PURE__*/_jsx(ListChangedWrapper, {
-        name: cellName,
-        names: names,
-        namesStr: [...baseName, index, dataIndex],
-        rowKeyPath: [...baseName, index, 'rowKey'],
-        originalName: originalName,
-        originalNames: originalNames,
-        originalValues: originalValues,
-        form: form,
-        onDiff: onDiff,
-        type: type,
-        onChange: handleChange,
-        onBlur: handleBlur,
-        valuePropName: finalFormItemProps.valuePropName,
-        normalize: finalFormItemProps.normalize,
-        getValueProps: finalFormItemProps.getValueProps,
-        viewRender: viewRender,
-        diffConfig: diffConfig,
-        index: index,
-        children: FieldComponent
-      });
+      FieldComponent = /* @__PURE__ */ jsx(
+        ListChangedWrapper,
+        {
+          name: cellName,
+          names,
+          namesStr: [...baseName, index, dataIndex],
+          rowKeyPath: [...baseName, index, "rowKey"],
+          originalName,
+          originalNames,
+          originalValues,
+          form,
+          onDiff,
+          type,
+          onChange: handleChange,
+          onBlur: handleBlur,
+          valuePropName: finalFormItemProps.valuePropName,
+          normalize: finalFormItemProps.normalize,
+          getValueProps: finalFormItemProps.getValueProps,
+          viewRender,
+          diffConfig,
+          index,
+          children: FieldComponent
+        }
+      );
     }
-    if (finalComponentProps?.confirm) {
-      FieldComponent = /*#__PURE__*/_jsx(ConfirmWrapper, {
-        ...finalComponentProps,
-        children: FieldComponent
-      });
+    if (finalComponentProps == null ? void 0 : finalComponentProps.confirm) {
+      FieldComponent = /* @__PURE__ */ jsx(ConfirmWrapper, { ...finalComponentProps, children: FieldComponent });
     }
     return FieldComponent;
   };
-
-  // 使用useCallback优化getFieldItem函数
   const getFieldItem = (shouldUpdateMode = false) => {
-    // 如果处于 shouldUpdate 模式，需要重新获取最新的行数据并重新计算依赖值
     let finalComponentProps = componentProps;
-    // shouldUpdate 模式下会被更新为最新值，供外层 FieldProvider 消费
     let latestIsView = isView;
-    // 用于在 shouldUpdate 模式下重建正确的 Form.Item rules（外层 finalFormItemProps 是旧闭包）
     let effectiveRequired = lastRequired;
     let effectiveRules = lastRules;
     let effectiveFieldProps = lastFieldProps;
     if (shouldUpdateMode) {
       const recomputed = recalcShouldUpdateState();
       finalComponentProps = recomputed.finalComponentProps;
-      // shouldUpdate 模式下用重算结果覆盖外层 TargetComponent，供下方组装逻辑消费
       TargetComponent = recomputed.targetComponent;
       latestIsView = recomputed.latestIsView;
       effectiveRequired = recomputed.effectiveRequired;
@@ -927,52 +830,52 @@ const RenderField = ({
       effectiveFieldProps
     });
     const FieldComponent = assembleFieldComponent(finalComponentProps);
-    let FormItem = TargetComponent ? /*#__PURE__*/_jsx(Form.Item, {
-      validateFirst: true,
-      ..._omit(activeFinalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', 'disabled', lastFormItemProps.shouldUpdate ? 'shouldUpdate' : null]),
-      // 移除非必要字段，但保留 dependencies
-      className: cellClassName,
-      name: formNamePath ? cellName.slice(formNamePath?.length - 1) : cellName,
-      children: FieldComponent
-    }) : /*#__PURE__*/_jsx(Container, {
-      viewEmpty: viewEmpty
-    });
-    if (type === 'FormList' && !hasCustomComponent && TargetComponent) {
-      FormItem = /*#__PURE__*/_jsx(Form.List, {
-        name: formNamePath ? cellName.slice(formNamePath?.length - 1) : cellName,
-        ..._omit(activeFinalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name']),
-        children: (fields, operation, meta) => /*#__PURE__*/_jsx(TargetComponent, {
-          ...finalComponentProps,
-          otherProps: otherProps,
-          fields: fields,
-          operation: operation,
-          meta: meta
-        })
-      });
+    let FormItem = TargetComponent ? /* @__PURE__ */ jsx(
+      Form.Item,
+      {
+        validateFirst: true,
+        ...omit(activeFinalFormItemProps, [
+          "render",
+          "key",
+          "width",
+          "hiddenNames",
+          "name",
+          "onCell",
+          "disabled",
+          lastFormItemProps.shouldUpdate ? "shouldUpdate" : null
+        ]),
+        className: cellClassName,
+        name: formNamePath ? cellName.slice((formNamePath == null ? void 0 : formNamePath.length) - 1) : cellName,
+        children: FieldComponent
+      }
+    ) : /* @__PURE__ */ jsx(Container, { viewEmpty });
+    if (type === "FormList" && !hasCustomComponent && TargetComponent) {
+      FormItem = /* @__PURE__ */ jsx(
+        Form.List,
+        {
+          name: formNamePath ? cellName.slice((formNamePath == null ? void 0 : formNamePath.length) - 1) : cellName,
+          ...omit(activeFinalFormItemProps, ["render", "key", "width", "hiddenNames", "name"]),
+          children: (fields, operation, meta) => /* @__PURE__ */ jsx(
+            TargetComponent,
+            {
+              ...finalComponentProps,
+              otherProps,
+              fields,
+              operation,
+              meta
+            }
+          )
+        }
+      );
     }
-    // shouldUpdateMode 返回元组，将 latestIsView 暴露给外层用于更新 FieldProvider context
     return shouldUpdateMode ? [FormItem, latestIsView] : FormItem;
   };
-  return /*#__PURE__*/_jsx(_Fragment, {
-    children: finalFormItemProps.shouldUpdate ? /*#__PURE__*/_jsx(Form.Item, {
-      noStyle: true,
-      shouldUpdate: finalFormItemProps.shouldUpdate,
-      children: () => {
-        // shouldUpdate 触发时外层组件可能因 memo 未重渲染，FieldProvider context 是旧快照
-        // 从 getFieldItem(true) 的元组返回值获取 latestIsView，更新 context 确保 Input 组件读到最新 isView
-        const [formItem, latestIsView] = getFieldItem(true);
-        return /*#__PURE__*/_jsx(FieldProvider, {
-          value: {
-            ...componentProps?.otherProps,
-            isView: latestIsView
-          },
-          children: formItem
-        });
-      }
-    }) : /*#__PURE__*/_jsx(FieldProvider, {
-      value: componentProps?.otherProps || {},
-      children: getFieldItem()
-    })
-  });
+  return /* @__PURE__ */ jsx(Fragment, { children: finalFormItemProps.shouldUpdate ? /* @__PURE__ */ jsx(Form.Item, { noStyle: true, shouldUpdate: finalFormItemProps.shouldUpdate, children: () => {
+    const [formItem, latestIsView] = getFieldItem(true);
+    return /* @__PURE__ */ jsx(FieldProvider, { value: { ...componentProps == null ? void 0 : componentProps.otherProps, isView: latestIsView }, children: formItem });
+  } }) : /* @__PURE__ */ jsx(FieldProvider, { value: (componentProps == null ? void 0 : componentProps.otherProps) || {}, children: getFieldItem() }) });
+};
+var RenderField_default = memo(RenderField, arePropsEqual);
+export {
+  RenderField_default as default
 };
-export default /*#__PURE__*/memo(RenderField, arePropsEqual);