@zat-design/sisyphus-react 4.0.0-beta.9 → 4.0.1

package/lib/ProEditTable/components/RcTable/DraggableTable.js

@@ -1,13 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _core = require("@dnd-kit/core");
@@ -18,10 +14,20 @@ var _ProIcon = _interopRequireDefault(require("../../../ProIcon"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["disabled", "children"],
   _excluded2 = ["tableProps", "draggableProps"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var Row = props => {
   var disabled = props.disabled,
     children = props.children,
-    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+    restProps = _objectWithoutProperties(props, _excluded);
   var data = (0, _sortable.useSortable)({
     id: props['data-row-key'],
     disabled
@@ -32,8 +38,8 @@ var Row = props => {
     transform = data.transform,
     transition = data.transition,
     isDragging = data.isDragging;
-  var style = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.style), {}, {
-    transform: _utilities.CSS.Transform.toString(transform && (0, _objectSpread2.default)((0, _objectSpread2.default)({}, transform), {}, {
+  var style = _objectSpread(_objectSpread({}, props.style), {}, {
+    transform: _utilities.CSS.Transform.toString(transform && _objectSpread(_objectSpread({}, transform), {}, {
       scaleY: 1
     })),
     transition
@@ -41,7 +47,7 @@ var Row = props => {
     position: 'relative',
     zIndex: 2
   } : {});
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)("tr", (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)("tr", _objectSpread(_objectSpread(_objectSpread({}, restProps), {}, {
     ref: setNodeRef,
     style: style
   }, attributes), {}, {
@@ -57,7 +63,7 @@ var Row = props => {
         return /*#__PURE__*/_react.default.cloneElement(child, {
           children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
             className: `pro-edit-table-drag-wrapper${props['data-hide'] ? ' no-check' : ''}`,
-            children: [isDrag ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
+            children: [isDrag ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProIcon.default, _objectSpread({
               className: "drag-icon",
               style: {
                 touchAction: 'none',
@@ -113,7 +119,7 @@ var DraggableTable = _ref3 => {
   var _value$2;
   var tableProps = _ref3.tableProps,
     draggableProps = _ref3.draggableProps,
-    resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
+    resetProps = _objectWithoutProperties(_ref3, _excluded2);
   var rowKey = tableProps.rowKey,
     value = tableProps.value,
     headerRender = tableProps.headerRender,
@@ -157,7 +163,7 @@ var DraggableTable = _ref3 => {
     }
     return null;
   }, [scroll]);
-  var nextTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  var nextTableProps = _objectSpread(_objectSpread({
     className,
     columns,
     rowClassName,
@@ -176,7 +182,7 @@ var DraggableTable = _ref3 => {
     dataSource: value !== null && value !== void 0 && (_value$2 = value[0]) !== null && _value$2 !== void 0 && _value$2.rowKey ? value : []
   }, resetProps), {}, {
     rowKey: rowKey || 'rowKey',
-    pagination: pagination ? (0, _objectSpread2.default)({
+    pagination: pagination ? _objectSpread({
       current: page.pageNum,
       pageSize: page.pageSize,
       showSizeChanger: false,
@@ -204,7 +210,7 @@ var DraggableTable = _ref3 => {
     children: [headerRender ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "pro-edit-table-header",
       children: typeof headerRender === 'function' ? headerRender() : headerRender
-    }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Table, (0, _objectSpread2.default)({
+    }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Table, _objectSpread({
       ref: tableRef
     }, nextTableProps))]
   });

package/lib/ProEditTable/components/RcTable/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -17,4 +16,5 @@ Object.defineProperty(exports, "DraggableTable", {
   }
 });
 var _BaseTable = _interopRequireDefault(require("./BaseTable"));
-var _DraggableTable = _interopRequireDefault(require("./DraggableTable"));
+var _DraggableTable = _interopRequireDefault(require("./DraggableTable"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -1,13 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -17,6 +13,16 @@ var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "onDiff", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var toNamePath = name => {
   if (Array.isArray(name)) {
     return name;
@@ -96,7 +102,7 @@ var ListChangedWrapper = props => {
     viewRender = props.viewRender,
     diffConfig = props.diffConfig,
     index = props.index,
-    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+    rest = _objectWithoutProperties(props, _excluded);
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
   var _ref3 = diffConfig || {},
@@ -168,7 +174,7 @@ var ListChangedWrapper = props => {
         return Number.isNaN(num) ? item : num;
       });
     }
-    return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children), {}, {
+    return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread({}, children), {}, {
       // @ts-ignore
       isView: true,
       [valuePropName]: processedValue,
@@ -176,7 +182,9 @@ var ListChangedWrapper = props => {
     })) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
-    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
+    // 过滤掉 disabled，避免传递到 div 等不支持 disabled 的元素
+    var filteredRest = (0, _lodash.omit)(rest, ['disabled']);
+    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread({}, children.props), filteredRest));
   }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -208,7 +216,7 @@ var ListChangedWrapper = props => {
     placement: "topLeft",
     autoAdjustOverflow: false,
     title: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
-      direction: "vertical",
+      orientation: "vertical",
       className: "changed-tooltip",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "start",
@@ -216,15 +224,17 @@ var ListChangedWrapper = props => {
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
       }), _showEllipse && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         className: "current-value-container",
-        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest), {}, {
+        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), (0, _lodash.omit)(rest, ['disabled'])), {}, {
+          // 过滤掉 disabled，避免传递到不支持 disabled 的元素
           isView: true
         })) : undefined]
       })]
     }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
-      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest), {}, {
-        otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
+      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), (0, _lodash.omit)(rest, ['disabled'])), {}, {
+        // 过滤掉 disabled，避免传递到不支持 disabled 的元素
+        otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })
       })) : undefined

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

@@ -1,15 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
@@ -33,6 +27,19 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies", "desensitization"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var RenderField = _ref => {
   var _type, _type$replace, _fieldProps2, _fieldProps4, _names, _TargetComponent5, _componentProps2;
   var value = _ref.text,
@@ -65,7 +72,7 @@ var RenderField = _ref => {
     confirm = column.confirm,
     dependencies = column.dependencies,
     desensitization = column.desensitization,
-    resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
+    resetProps = _objectWithoutProperties(column, _excluded);
   var mode = config.mode,
     cellName = config.cellName,
     cellNamePath = config.cellNamePath,
@@ -111,16 +118,23 @@ var RenderField = _ref => {
   var rowData = form.getFieldValue([...namePath, index]) || record || {};
   var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
 
-  // 第三个参数 - 使用useMemo优化
+  // 构建新的参数格式（与 ProForm 保持一致）
+  var reactiveParams = (0, _react.useMemo)(() => ({
+    form,
+    index,
+    namePath: [...namePath, index]
+  }), [form, index, namePath]);
+
+  // 保留 options 用于 viewRender 和 formatArgs（兼容旧格式）
   var options = (0, _react.useMemo)(() => ({
     index,
     form,
     name: column === null || column === void 0 ? void 0 : column.name,
     namePath: [...namePath, index]
-  }), [index, column === null || column === void 0 ? void 0 : column.name, namePath]);
+  }), [index, column === null || column === void 0 ? void 0 : column.name, namePath, form]);
 
-  // 行参数 - 使用useMemo优化
-  var rowParams = (0, _react.useMemo)(() => [currentValue, rowData, options], [currentValue, rowData, options]);
+  // 行参数 - 使用useMemo优化（新格式：values, { form, index, namePath }）
+  var rowParams = (0, _react.useMemo)(() => [rowData, reactiveParams], [rowData, reactiveParams]);
 
   // 使用 hook 处理动态属性（带选择性防抖）
   var dynamicProps = (0, _useShouldUpdateForTable.default)({
@@ -133,23 +147,28 @@ var RenderField = _ref => {
   // 优先使用 hook 返回的值，fallback 到原始值
   if ((0, _lodash.isFunction)(required)) {
     var _dynamicProps$require;
-    _required = (_dynamicProps$require = dynamicProps.required) !== null && _dynamicProps$require !== void 0 ? _dynamicProps$require : required(...rowParams);
+    _required = (_dynamicProps$require = dynamicProps.required) !== null && _dynamicProps$require !== void 0 ? _dynamicProps$require : required(rowData, reactiveParams);
   }
   if ((0, _lodash.isFunction)(fieldProps)) {
     var _dynamicProps$fieldPr;
-    _fieldProps = (_dynamicProps$fieldPr = dynamicProps.fieldProps) !== null && _dynamicProps$fieldPr !== void 0 ? _dynamicProps$fieldPr : fieldProps(...rowParams);
+    _fieldProps = (_dynamicProps$fieldPr = dynamicProps.fieldProps) !== null && _dynamicProps$fieldPr !== void 0 ? _dynamicProps$fieldPr : fieldProps(rowData, reactiveParams);
   }
   if ((0, _lodash.isFunction)(rules)) {
     var _dynamicProps$rules;
-    _rules = (_dynamicProps$rules = dynamicProps.rules) !== null && _dynamicProps$rules !== void 0 ? _dynamicProps$rules : rules(...rowParams);
+    _rules = (_dynamicProps$rules = dynamicProps.rules) !== null && _dynamicProps$rules !== void 0 ? _dynamicProps$rules : rules(rowData, reactiveParams);
   }
   if ((0, _lodash.isFunction)(valueType)) {
     var _dynamicProps$valueTy;
-    _valueType = (_dynamicProps$valueTy = dynamicProps.valueType) !== null && _dynamicProps$valueTy !== void 0 ? _dynamicProps$valueTy : valueType(...rowParams);
+    _valueType = (_dynamicProps$valueTy = dynamicProps.valueType) !== null && _dynamicProps$valueTy !== void 0 ? _dynamicProps$valueTy : valueType(currentValue, rowData, {
+      index,
+      form,
+      namePath: [...namePath, index],
+      name: column === null || column === void 0 ? void 0 : column.name
+    });
   }
   if ((0, _lodash.isFunction)(desensitization)) {
     var _dynamicProps$desensi;
-    _desensitization = (_dynamicProps$desensi = dynamicProps.desensitization) !== null && _dynamicProps$desensi !== void 0 ? _dynamicProps$desensi : desensitization(...rowParams);
+    _desensitization = (_dynamicProps$desensi = dynamicProps.desensitization) !== null && _dynamicProps$desensi !== void 0 ? _dynamicProps$desensi : desensitization(rowData, reactiveParams);
   }
 
   // 获取最终的disabled
@@ -165,7 +184,7 @@ var RenderField = _ref => {
   // isEditable 处理 - 优先使用 hook 返回的值
   if ((0, _lodash.isFunction)(isEditable)) {
     var _dynamicProps$isEdita;
-    isEditable = (_dynamicProps$isEdita = dynamicProps.isEditable) !== null && _dynamicProps$isEdita !== void 0 ? _dynamicProps$isEdita : isEditable(...rowParams);
+    isEditable = (_dynamicProps$isEdita = dynamicProps.isEditable) !== null && _dynamicProps$isEdita !== void 0 ? _dynamicProps$isEdita : isEditable(rowData, reactiveParams);
   }
 
   // 是否只读文本
@@ -201,7 +220,7 @@ var RenderField = _ref => {
   });
 
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
-  var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
+  var formItemChildProps = _objectSpread({}, _fieldProps);
 
   // 使用useMemo优化defaultProps计算
   var defaultProps = (0, _react.useMemo)(() => (0, _getDefaultProps.getDefaultProps)({
@@ -212,7 +231,7 @@ var RenderField = _ref => {
   }), [name, formNamePath, cellName, column === null || column === void 0 ? void 0 : column.type, column === null || column === void 0 ? void 0 : column.fieldProps]);
 
   // 允许formItem的属性放在column最外层 - 使用useMemo优化
-  var _formItemProps = (0, _react.useMemo)(() => (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule), {}, {
+  var _formItemProps = (0, _react.useMemo)(() => _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule), {}, {
     validateTrigger
   }), [defaultProps, resetProps, internalRule, validateTrigger]);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
@@ -243,7 +262,7 @@ var RenderField = _ref => {
     if (type === 'SwitchCheckbox') {
       _valueType = 'switch';
     }
-    var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
+    var params = _objectSpread(_objectSpread({}, column), {}, {
       mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
     return (0, _lodash.isFunction)(_valueType2.default[_valueType]) ? _valueType2.default[_valueType](params) : {};
@@ -278,7 +297,7 @@ var RenderField = _ref => {
       return valueTypeTransform();
     }
     var namesStr = [...baseName, index, dataIndex];
-    return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), valueTypeTransform()), form, names, namesStr, type);
+    return (0, _transformNames.default)(_objectSpread(_objectSpread({}, _formItemProps), valueTypeTransform()), form, names, namesStr, type);
   }, [names, baseName, index, dataIndex, _formItemProps, type]);
   if (!_editRender && typeof type === 'string') {
     var _componentMap$type;
@@ -322,7 +341,7 @@ var RenderField = _ref => {
     var nextArgs = [];
     nextArgs[0] = _args[0];
     // 返回表单元素默认值
-    nextArgs[2] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, options), {}, {
+    nextArgs[2] = _objectSpread(_objectSpread({}, options), {}, {
       extra: _args
     });
     switch (type) {
@@ -358,14 +377,14 @@ var RenderField = _ref => {
   var debounceRef = (0, _react.useRef)(null);
 
   // 使用 useCallback 创建稳定的 onChange 函数
-  var _onChange = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+  var _onChange = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var _args3 = arguments;
-    return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           // 如果防抖函数不存在，创建一个新的防抖函数
           if (!debounceRef.current) {
-            debounceRef.current = (0, _lodash.debounce)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+            debounceRef.current = (0, _lodash.debounce)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
               var _len2,
                 innerArgs,
                 _key2,
@@ -382,7 +401,7 @@ var RenderField = _ref => {
                 diff,
                 _validateFieldKeys,
                 _args2 = arguments;
-              return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
                     for (_len2 = _args2.length, innerArgs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
@@ -492,7 +511,7 @@ var RenderField = _ref => {
   }, []);
 
   // 使用useCallback优化_onblur函数
-  var _onblur = (0, _react.useCallback)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+  var _onblur = (0, _react.useCallback)( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
     var _TargetComponent3;
     var _len3,
       args,
@@ -506,7 +525,7 @@ var RenderField = _ref => {
       diff,
       validateFieldKeys,
       _args4 = arguments;
-    return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           if (onBlur) {
@@ -579,7 +598,7 @@ var RenderField = _ref => {
   // 使用useMemo优化componentProps对象
   var componentProps = (0, _react.useMemo)(() => {
     var _TargetComponent4;
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+    return _objectSpread(_objectSpread(_objectSpread({
       form,
       name: cellName
     }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
@@ -600,7 +619,8 @@ var RenderField = _ref => {
         viewEmpty,
         valueType: _valueType,
         isView,
-        desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey
+        desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey,
+        source: 'ProEditTable'
       }
     });
   }, [cellName, _fieldProps, (_TargetComponent5 = TargetComponent) === null || _TargetComponent5 === void 0 ? void 0 : _TargetComponent5.props, namePath, index, _disabled, _onChange, _onblur, confirm, _desensitization, names, originalName, viewEmpty, _valueType, isView, otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey]);
@@ -628,7 +648,7 @@ var RenderField = _ref => {
 
   // 使用useMemo优化最终的formItemProps - 修复Hooks使用规则
   var finalFormItemProps = (0, _react.useMemo)(() => {
-    return Object.assign(_formItemProps, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultTransform()), namesTransform()), (0, _utils2.isTrim)(type, trim, proConfig)));
+    return Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), namesTransform()), (0, _utils2.isTrim)(type, trim, proConfig)));
   }, [_formItemProps, defaultTransform, namesTransform, type, trim, proConfig]);
 
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
@@ -643,7 +663,7 @@ var RenderField = _ref => {
   var getFieldItem = (0, _react.useCallback)(() => {
     var _componentProps;
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
+    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, _objectSpread({}, componentProps));
     if (originalValues && !getIsNew(record)) {
       FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
         name: cellName,
@@ -668,11 +688,11 @@ var RenderField = _ref => {
       });
     }
     if ((_componentProps = componentProps) !== null && _componentProps !== void 0 && _componentProps.confirm) {
-      FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+      FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConfirmWrapper.default, _objectSpread(_objectSpread({}, componentProps), {}, {
         children: FieldComponent
       }));
     }
-    FormItem = TargetComponent ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    FormItem = TargetComponent ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
     }, (0, _lodash.omit)(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
       // 移除非必要字段
@@ -683,10 +703,10 @@ var RenderField = _ref => {
       viewEmpty: viewEmpty
     });
     if (type === 'FormList') {
-      FormItem = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      FormItem = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.List, _objectSpread(_objectSpread({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
       }, (0, _lodash.omit)(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-        children: (fields, operation, meta) => /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+        children: (fields, operation, meta) => /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
           otherProps: otherProps,
           fields: fields,
           operation: operation,
@@ -697,7 +717,7 @@ var RenderField = _ref => {
     return FormItem;
   }, [TargetComponent, componentProps, originalValues, record, cellName, names, baseName, index, dataIndex, originalName, originalNames, type, finalFormItemProps, viewRender, diffConfig, _className, formNamePath, viewEmpty, otherProps, getIsNew]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
+    value: ((_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps) || {},
     children: finalFormItemProps.shouldUpdate ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, {
       noStyle: true,
       shouldUpdate: finalFormItemProps.shouldUpdate,
@@ -717,18 +737,24 @@ var _default = exports.default = /*#__PURE__*/(0, _react.memo)(RenderField, (pre
     nextIndex = nextProps.index,
     nextColumn = nextProps.column,
     nextConfig = nextProps.config;
-  var prevRowParams = [prevText, prevRecord, {
-    index: prevIndex,
+
+  // 构建新的参数格式（与 ProForm 保持一致）
+  var prevNamePath = (0, _tools.getNamePath)(prevConfig === null || prevConfig === void 0 ? void 0 : prevConfig.name, prevConfig === null || prevConfig === void 0 ? void 0 : prevConfig.virtualKey);
+  var nextNamePath = (0, _tools.getNamePath)(nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.name, nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.virtualKey);
+  var prevReactiveParams = {
     form: prevConfig === null || prevConfig === void 0 ? void 0 : prevConfig.form,
-    name: prevConfig === null || prevConfig === void 0 ? void 0 : prevConfig.name
-  }];
-  var nextRowParams = [nextText, nextRecord, {
-    index: nextIndex,
+    index: prevIndex,
+    namePath: [...prevNamePath, prevIndex]
+  };
+  var nextReactiveParams = {
     form: nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.form,
-    name: nextConfig === null || nextConfig === void 0 ? void 0 : nextConfig.name
-  }];
+    index: nextIndex,
+    namePath: [...nextNamePath, nextIndex]
+  };
+  var prevRowParams = [prevRecord, prevReactiveParams];
+  var nextRowParams = [nextRecord, nextReactiveParams];
   if ((0, _lodash.isFunction)(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.disabled) && (0, _lodash.isFunction)(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.disabled)) {
-    if ((prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.disabled(...prevRowParams)) !== (nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.disabled(...nextRowParams))) {
+    if ((prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.disabled(prevRecord, prevReactiveParams)) !== (nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.disabled(nextRecord, nextReactiveParams))) {
       return false;
     }
   }
@@ -739,18 +765,18 @@ var _default = exports.default = /*#__PURE__*/(0, _react.memo)(RenderField, (pre
   }
 
   // 通用函数比较方法
-  var compareFunctionResult = (prevColumn, nextColumn, prevRowParams, nextRowParams, functionName) => {
+  var compareFunctionResult = (prevColumn, nextColumn, prevValues, nextValues, prevReactiveParams, nextReactiveParams, functionName) => {
     var prevFunc = prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn[functionName];
     var nextFunc = nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn[functionName];
     if ((0, _lodash.isFunction)(prevFunc) && (0, _lodash.isFunction)(nextFunc)) {
-      return (0, _lodash.isEqualWith)(prevFunc(...prevRowParams), nextFunc(...nextRowParams), _utils.customEqualForFunction);
+      return (0, _lodash.isEqualWith)(prevFunc(prevValues, prevReactiveParams), nextFunc(nextValues, nextReactiveParams), _utils.customEqualForFunction);
     }
     return true; // 如果不是函数或只有一个是函数，认为相等
   };
 
   // 使用简化后的比较逻辑
-  var functionFields = ['rules', 'component', 'desensitization', 'isEditable'];
-  if (functionFields.some(field => !compareFunctionResult(prevColumn, nextColumn, prevRowParams, nextRowParams, field))) {
+  var functionFields = ['rules', 'component', 'desensitization', 'isEditable', 'required'];
+  if (functionFields.some(field => !compareFunctionResult(prevColumn, nextColumn, prevRecord, nextRecord, prevReactiveParams, nextReactiveParams, field))) {
     return false;
   }