@zat-design/sisyphus-react 4.1.3-beta.2 → 4.1.3-beta.5

package/es/ProEditTable/components/RcTable/BaseTable.js

@@ -24,6 +24,7 @@ var BaseTable = _ref => {
   var tableProps = _ref.tableProps,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   var rowKey = tableProps.rowKey,
+    tableRowKey = tableProps.tableRowKey,
     value = tableProps.value,
     headerRender = tableProps.headerRender,
     tableRef = tableProps.tableRef,
@@ -78,7 +79,7 @@ var BaseTable = _ref => {
       onClick: () => {}
     })
   }, resetProps), {}, {
-    rowKey: rowKey || 'rowKey',
+    rowKey: tableRowKey,
     summary,
     pagination: pagination ? _objectSpread(_objectSpread({
       showSizeChanger: true,

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

@@ -117,6 +117,7 @@ var DraggableTable = _ref3 => {
     draggableProps = _ref3.draggableProps,
     resetProps = _objectWithoutProperties(_ref3, _excluded2);
   var rowKey = tableProps.rowKey,
+    tableRowKey = tableProps.tableRowKey,
     value = tableProps.value,
     headerRender = tableProps.headerRender,
     tableRef = tableProps.tableRef,
@@ -173,7 +174,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',
+    rowKey: tableRowKey,
     pagination: pagination ? _objectSpread({
       current: page.pageNum,
       pageSize: page.pageSize,

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

@@ -1,4 +1,10 @@
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies", "desensitization"];
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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); }); }; }
@@ -26,6 +32,7 @@ import transformNames from "../../../ProForm/utils/transformNames";
 import { FieldProvider } from "../../../ProForm/utils/useFieldProps";
 import useRules from "../../../ProForm/utils/useRules";
 import { isSelect, isTrim } from "../../../ProForm/utils";
+import locale from "../../../locale";
 import ConfirmWrapper from "../../../ProForm/components/render/ConfirmWrapper";
 import { getDefaultProps } from "../../utils/getDefaultProps";
 import ListChangedWrapper from "./ListChangedWrapper";
@@ -37,7 +44,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 var OMIT_FORM_ITEM_AND_DOM_KEYS = ['format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames', 'shouldCellUpdate' // 表格内部性能优化属性，不应传递给 Form.Item
 ];
 var RenderField = _ref => {
-  var _type, _type$replace, _fieldProps2, _fieldProps4, _names, _TargetComponent5, _componentProps2;
+  var _type, _type$replace, _fieldProps2, _fieldProps4, _names, _TargetComponent5, _componentProps3;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -209,13 +216,13 @@ var RenderField = _ref => {
   // 将Hooks调用移到组件顶层
   var proConfig = useProConfig();
 
-  // 设置校验规则 - 修复Hooks使用规则
+  // 设置校验规则 - 不在此处过滤 isView，由 getFieldItem 内根据 latestIsView 动态决定是否应用规则
   var internalRule = useRules({
     names,
     label: label,
     labelRequired,
-    required: !isView && _required,
-    rules: !isView ? _rules : [],
+    required: _required,
+    rules: _rules,
     isSelect: isSelect({
       dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type
@@ -252,7 +259,7 @@ var RenderField = _ref => {
   // required 是函数
   isFunction(rules) ||
   // rules 是函数
-  isFunction(isEditable) ||
+  isFunction(column === null || column === void 0 ? void 0 : column.isEditable) ||
   // isEditable 是函数
   isFunction(component) ||
   // component 是函数
@@ -749,10 +756,8 @@ var RenderField = _ref => {
     });
   }, [_formItemProps, defaultTransform, namesTransform, type, trim, proConfig]);
 
-  // 编辑&保存模式，在查看状态下移除表单的rules不做校验
-  if (isView) {
-    delete finalFormItemProps.rules;
-  }
+  // rules 的 isView 过滤已移至 getFieldItem 内处理（支持 shouldUpdate 模式下的动态 isEditable）
+
   var _className = useMemo(() => classNames({
     [className]: className
   }), [className]);
@@ -763,6 +768,12 @@ var RenderField = _ref => {
     var shouldUpdateMode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     // 如果处于 shouldUpdate 模式，需要重新获取最新的行数据并重新计算依赖值
     var finalComponentProps = componentProps;
+    // shouldUpdate 模式下会被更新为最新值，供外层 FieldProvider 消费
+    var latestIsView = isView;
+    // 用于在 shouldUpdate 模式下重建正确的 Form.Item rules（外层 finalFormItemProps 是旧闭包）
+    var effectiveRequired = _required;
+    var effectiveRules = _rules;
+    var effectiveFieldProps = _fieldProps;
     if (shouldUpdateMode) {
       var _column$isEditable2;
       // 重新获取最新的行数据（shouldUpdate 触发时，通过 getFieldValue 拿到最新值）
@@ -792,6 +803,11 @@ var RenderField = _ref => {
         latestRules = rules(latestRowData, latestReactiveParams);
       }
 
+      // 同步到外层变量，用于后续构建 activeFinalFormItemProps
+      effectiveRequired = latestRequired;
+      effectiveRules = latestRules;
+      effectiveFieldProps = latestFieldProps;
+
       // 重新计算 desensitization
       var latestDesensitization = desensitization || [];
       if (isFunction(desensitization)) {
@@ -841,7 +857,7 @@ var RenderField = _ref => {
       }
 
       // 然后处理自定义 component
-      var latestIsView = !latestIsEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || getDisabled({
+      latestIsView = !latestIsEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || getDisabled({
         globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
         formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
         column,
@@ -876,6 +892,13 @@ var RenderField = _ref => {
       // 使用重新计算的 TargetComponent
       TargetComponent = latestTargetComponent;
 
+      // shouldUpdate 触发时外层 componentProps.otherProps.isView 是旧快照，需用最新值覆盖
+      finalComponentProps = _objectSpread(_objectSpread({}, finalComponentProps), {}, {
+        otherProps: _objectSpread(_objectSpread({}, finalComponentProps.otherProps), {}, {
+          isView: latestIsView
+        })
+      });
+
       // componentProps 里展开了外层旧 TargetComponent?.props（如 { formType: "Input" }），
       // 用 latestTargetComponent?.props 覆盖，确保不会被旧 cloneElement props 污染
       if ( /*#__PURE__*/React.isValidElement(latestTargetComponent)) {
@@ -890,6 +913,34 @@ var RenderField = _ref => {
         }
       }
     }
+
+    // 根据 latestIsView 和最新的 required/rules 构建正确的 Form.Item props
+    // 解决 shouldUpdate 触发时外层 finalFormItemProps 是旧闭包（rules 基于旧 isView 计算）的问题
+    var activeFinalFormItemProps = finalFormItemProps;
+    if (latestIsView) {
+      // 查看模式：移除 rules 不做校验
+      activeFinalFormItemProps = omit(finalFormItemProps, ['rules']);
+    } else if (shouldUpdateMode) {
+      // shouldUpdate 模式下 finalFormItemProps 是旧闭包，需用最新 effectiveRequired/effectiveRules 重建 rules
+      var activeRules = Array.isArray(effectiveRules) ? [...effectiveRules] : [];
+      var hasRequiredRule = activeRules.some(r => (r === null || r === void 0 ? void 0 : r.required) === true);
+      if (effectiveRequired && !hasRequiredRule) {
+        var _effectiveFieldProps;
+        var _isSelectVal = isSelect({
+          dataSource: (_effectiveFieldProps = effectiveFieldProps) === null || _effectiveFieldProps === void 0 ? void 0 : _effectiveFieldProps.dataSource,
+          type
+        });
+        activeRules.push({
+          required: true,
+          message: `${_isSelectVal ? locale.ProForm.selectPlaceHolder : locale.ProForm.inputPlaceholder}${label || ''}`
+        });
+      }
+      activeFinalFormItemProps = _objectSpread(_objectSpread({}, finalFormItemProps), {}, {
+        rules: activeRules.length > 0 ? activeRules : [{
+          required: false
+        }]
+      });
+    }
     var FormItem = null;
     // 当 viewRender 存在时，需要排除 finalComponentProps 中的 children，避免覆盖 Container 的 children
     var propsForTarget = isView && typeof viewRender === 'function' ? omit(finalComponentProps, ['children']) : finalComponentProps;
@@ -937,7 +988,7 @@ var RenderField = _ref => {
     }
     FormItem = TargetComponent ? /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
-    }, omit(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', 'disabled', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, omit(activeFinalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', 'disabled', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
       // 移除非必要字段，但保留 dependencies
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
@@ -948,7 +999,7 @@ var RenderField = _ref => {
     if (type === 'FormList') {
       FormItem = /*#__PURE__*/_jsx(Form.List, _objectSpread(_objectSpread({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
-      }, omit(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      }, omit(activeFinalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
         children: (fields, operation, meta) => /*#__PURE__*/_jsx(TargetComponent, _objectSpread(_objectSpread({}, finalComponentProps), {}, {
           otherProps: otherProps,
           fields: fields,
@@ -957,15 +1008,32 @@ var RenderField = _ref => {
         }))
       }));
     }
-    return FormItem;
+    // shouldUpdateMode 返回元组，将 latestIsView 暴露给外层用于更新 FieldProvider context
+    return shouldUpdateMode ? [FormItem, latestIsView] : FormItem;
   };
-  return /*#__PURE__*/_jsx(FieldProvider, {
-    value: ((_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps) || {},
+  return /*#__PURE__*/_jsx(_Fragment, {
     children: finalFormItemProps.shouldUpdate ? /*#__PURE__*/_jsx(Form.Item, {
       noStyle: true,
       shouldUpdate: finalFormItemProps.shouldUpdate,
-      children: () => getFieldItem(true)
-    }) : getFieldItem()
+      children: () => {
+        var _componentProps2;
+        // shouldUpdate 触发时外层组件可能因 memo 未重渲染，FieldProvider context 是旧快照
+        // 从 getFieldItem(true) 的元组返回值获取 latestIsView，更新 context 确保 Input 组件读到最新 isView
+        var _ref5 = getFieldItem(true),
+          _ref6 = _slicedToArray(_ref5, 2),
+          formItem = _ref6[0],
+          latestIsView = _ref6[1];
+        return /*#__PURE__*/_jsx(FieldProvider, {
+          value: _objectSpread(_objectSpread({}, (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps), {}, {
+            isView: latestIsView
+          }),
+          children: formItem
+        });
+      }
+    }) : /*#__PURE__*/_jsx(FieldProvider, {
+      value: ((_componentProps3 = componentProps) === null || _componentProps3 === void 0 ? void 0 : _componentProps3.otherProps) || {},
+      children: getFieldItem()
+    })
   });
 };
 export default /*#__PURE__*/memo(RenderField, (prevProps, nextProps) => {

package/es/ProEditTable/index.js

@@ -22,7 +22,7 @@ import { useLocalStorageState, useSetState } from 'ahooks';
 import { ConfigProvider, Form, Affix } from 'antd';
 import classnames from 'classnames';
 import { transformColumns } from "./utils";
-import { getRandom, getNamePath, handleScrollToError, onPageCheck } from "./utils/tools";
+import { getRandom, getNamePath, handleScrollToError, onPageCheck, buildTableRowKey } from "./utils/tools";
 import { Validator, Summary, RenderToolbar } from "./components";
 import ProForm from "../ProForm";
 import Empty from "../assets/empty.png";
@@ -436,8 +436,10 @@ var ProEditTable = (_ref, ref) => {
       _dragIndex: idx
     } : {}));
   }, [value, virtualKey, editingKeys, draggable]);
+  var tableRowKey = useMemo(() => buildTableRowKey(rowKey), [rowKey]);
   var tableProps = useMemo(() => ({
     rowKey,
+    tableRowKey,
     value: enrichedValue,
     headerRender,
     tableRef,
@@ -457,7 +459,7 @@ var ProEditTable = (_ref, ref) => {
     formatMessage,
     locale,
     handlePageChange
-  }), [_className, _columns, _rowClassName, disabled, editingKeys, formatMessage, handlePageChange, headerRender, isHideCheckBox, locale, page, pagination, renderRowSelection, rowDraggable, rowKey, scroll, _summary, tableRef, enrichedValue, virtualKey]);
+  }), [_className, _columns, _rowClassName, disabled, editingKeys, formatMessage, handlePageChange, headerRender, isHideCheckBox, locale, page, pagination, renderRowSelection, rowDraggable, rowKey, tableRowKey, scroll, _summary, tableRef, enrichedValue, virtualKey]);
 
   // 拖拽排序后，enrichedValue 中含 _dragIndex（内部字段），需清除后再传给外部 onChange
   var handleDragChange = useCallback(newValue => {

package/es/ProEditTable/style/index.less

@@ -433,4 +433,16 @@
       }
     }
   }
+  table .@{ant-prefix}-table-tbody{
+    td.@{ant-prefix}-table-selection-column {
+      padding-left: 38px;
+    }
+  }
+}
+
+.pro-edit-table{
+  .pro-tree-modal .pro-tree-modal-isView .pro-enum-input-addonAfter{
+    border: none;
+    padding-left: 0;
+  }
 }

package/es/ProEditTable/utils/index.js

@@ -284,14 +284,8 @@ export var transformColumns = function transformColumns() {
 
     var required = isBoolean(item.required) ? item.required : false;
     if (isFunction(item.required)) {
-      var namePath = getNamePath(name, virtualKey);
-      var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
-      var rowData = form.getFieldValue([...namePathArray, index]) || {};
-      required = item.required(rowData[columnName], rowData, {
-        form,
-        index,
-        namePath: [...namePathArray, index]
-      });
+      // 列配置预处理阶段没有稳定行上下文，required 函数交给 RenderField 内按行计算
+      required = false;
     }
 
     // 样式处理

package/es/ProEditTable/utils/tools.d.ts

@@ -6,6 +6,13 @@ import { NamePath } from 'antd/es/form/interface';
  * @returns 随机字符串
  */
 export declare const getRandom: () => string;
+/**
+ * 构建 AntD Table 的 rowKey 函数，支持字符串/函数两种形式，
+ * 当用户指定字段值无效时（新增行尚未填写业务 key），自动降级到内部 record.rowKey。
+ * @param rowKey 用户传入的 rowKey prop
+ * @returns AntD Table 可用的 rowKey 字符串或函数
+ */
+export declare const buildTableRowKey: (rowKey?: string | number | symbol | ((record: any) => any)) => (record: any) => string;
 /**
  * 深层次对比两个对象且取出来差异值
  * @param object 比较对象

package/es/ProEditTable/utils/tools.js

@@ -21,6 +21,23 @@ export var getRandom = () => {
   return Math.random().toString(36).slice(-6);
 };
 
+/**
+ * 构建 AntD Table 的 rowKey 函数，支持字符串/函数两种形式，
+ * 当用户指定字段值无效时（新增行尚未填写业务 key），自动降级到内部 record.rowKey。
+ * @param rowKey 用户传入的 rowKey prop
+ * @returns AntD Table 可用的 rowKey 字符串或函数
+ */
+export var buildTableRowKey = rowKey => {
+  return record => {
+    if (!rowKey) return String(record.rowKey || '');
+    var userKey = typeof rowKey === 'function' ? rowKey(record) : record[rowKey];
+    if (userKey != null && !Number.isNaN(userKey) && userKey !== '') {
+      return String(userKey);
+    }
+    return String(record.rowKey || '');
+  };
+};
+
 /**
  * 深层次对比两个对象且取出来差异值
  * @param object 比较对象

package/es/ProForm/components/combination/FormList/index.js

@@ -43,11 +43,15 @@ var FormList = (props, ref) => {
     name = _ref.name,
     isView = _ref.isView,
     diffConfig = _ref.diffConfig,
-    namePath = _ref.namePath;
+    namePath = _ref.namePath,
+    source = _ref.source;
   var _useProConfig = useProConfig('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
   var errors = meta.errors;
-  var _namePath = namePath ? [...namePath.slice(0, -1), ...toArray(name)] : toArray(name);
+
+  // 当 FormList 作为 ProEditTable 的列时，otherProps 中的 name 是完整绝对路径（如 ['bindClauseCategoryList', 0, 'test']）
+  // 此时直接使用 toArray(name) 作为 _namePath，避免公式拼接导致前缀重复
+  var _namePath = source === 'ProEditTable' ? toArray(name) : namePath ? [...namePath.slice(0, -1), ...toArray(name)] : toArray(name);
   var orgValues = get(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
   var _diffConfig = _objectSpread(_objectSpread({}, diffConfig), {}, {
     originalValues: diffConfig !== null && diffConfig !== void 0 && diffConfig.originalValues && isDiffAll ? orgValues || [] : orgValues

package/es/ProForm/style/index.less

@@ -11,6 +11,24 @@
 @import '../components/combination/Container/style/index.less';
 
 .pro-form {
+  .pro-container{
+    .pro-collapse {
+      .pro-collapse-panel{
+        .@{ant-prefix}-collapse-header{
+          border-radius:var(--zaui-border-radius, 8px) !important;
+        }
+        &.@{ant-prefix}-collapse-item-active{
+          .@{ant-prefix}-collapse-header{
+            border-radius:var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
+          }
+        }
+      }
+    }
+    .pro-collapse-content{
+      margin: 0;
+      border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+    }
+  }
   .@{ant-prefix}-input-disabled {
    border-radius: 6px !important;
   }

package/es/ProLayout/components/TabsManager/style/index.less

@@ -70,9 +70,6 @@
   }
 
   &-content {
-    flex: 1;
-    overflow-y: auto;
-    min-height: 0; // 重要：允许 flex 子元素缩小到内容以下
 
     .tab-pane {
       &.hidden {

package/es/ProSelect/index.js

@@ -263,6 +263,41 @@ export var ProSelect = (props, ref) => {
     };
     return isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('、');
   };
+
+  // 必须在早期 return 之前声明，确保每次渲染 hooks 调用数量一致（React Rules of Hooks）
+  var defaultFilterOption = useCallback((input, option) => {
+    var _ref5, _option$searchText;
+    if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
+    var optionLabel = (_ref5 = (_option$searchText = option === null || option === void 0 ? void 0 : option.searchText) !== null && _option$searchText !== void 0 ? _option$searchText : option === null || option === void 0 ? void 0 : option.title) !== null && _ref5 !== void 0 ? _ref5 : option === null || option === void 0 ? void 0 : option.label;
+    return String(optionLabel !== null && optionLabel !== void 0 ? optionLabel : '').toLowerCase().includes(input.toLowerCase());
+  }, []);
+  var mergedShowSearch = useMemo(() => {
+    var defaultConfig = {
+      enabled: true,
+      filterOption: isFunction(_onSearch) ? false : defaultFilterOption,
+      onSearch: searchValue => {
+        _onSearch === null || _onSearch === void 0 || _onSearch(searchValue, _objectSpread({}, fetchFunctionRef.current));
+      }
+    };
+    var customShowSearch = selectProps.showSearch;
+    if (customShowSearch === false) {
+      return _objectSpread(_objectSpread({}, defaultConfig), {}, {
+        enabled: false
+      });
+    }
+    if (customShowSearch === true || customShowSearch == null) {
+      return defaultConfig;
+    }
+    if (isObject(customShowSearch)) {
+      var _customShowSearch$fil, _customShowSearch$onS;
+      return _objectSpread(_objectSpread(_objectSpread({}, defaultConfig), customShowSearch), {}, {
+        enabled: true,
+        filterOption: (_customShowSearch$fil = customShowSearch.filterOption) !== null && _customShowSearch$fil !== void 0 ? _customShowSearch$fil : defaultConfig.filterOption,
+        onSearch: (_customShowSearch$onS = customShowSearch.onSearch) !== null && _customShowSearch$onS !== void 0 ? _customShowSearch$onS : defaultConfig.onSearch
+      });
+    }
+    return defaultConfig;
+  }, [_onSearch, defaultFilterOption, selectProps.showSearch]);
   if (isView || props.isView) {
     if (Array.isArray(value)) {
       // 如果设置了maxTagCount且超出数量，需要截断显示
@@ -347,9 +382,9 @@ export var ProSelect = (props, ref) => {
     };
   };
   var selectOptionRender = option => {
-    var _option$data2, _ref5, _ref6, _option$data$searchTe, _option$data3, _option$data4;
+    var _option$data2, _ref6, _ref7, _option$data$searchTe, _option$data3, _option$data4;
     var currentRecord = (option === null || option === void 0 || (_option$data2 = option.data) === null || _option$data2 === void 0 ? void 0 : _option$data2.record) || (option === null || option === void 0 ? void 0 : option.record);
-    var text = (_ref5 = (_ref6 = (_option$data$searchTe = option === null || option === void 0 || (_option$data3 = option.data) === null || _option$data3 === void 0 ? void 0 : _option$data3.searchText) !== null && _option$data$searchTe !== void 0 ? _option$data$searchTe : option === null || option === void 0 || (_option$data4 = option.data) === null || _option$data4 === void 0 ? void 0 : _option$data4.title) !== null && _ref6 !== void 0 ? _ref6 : option === null || option === void 0 ? void 0 : option.label) !== null && _ref5 !== void 0 ? _ref5 : '';
+    var text = (_ref6 = (_ref7 = (_option$data$searchTe = option === null || option === void 0 || (_option$data3 = option.data) === null || _option$data3 === void 0 ? void 0 : _option$data3.searchText) !== null && _option$data$searchTe !== void 0 ? _option$data$searchTe : option === null || option === void 0 || (_option$data4 = option.data) === null || _option$data4 === void 0 ? void 0 : _option$data4.title) !== null && _ref7 !== void 0 ? _ref7 : option === null || option === void 0 ? void 0 : option.label) !== null && _ref6 !== void 0 ? _ref6 : '';
     if (!currentRecord) {
       return /*#__PURE__*/_jsx(TooltipOption, {
         title: String(text),
@@ -365,39 +400,6 @@ export var ProSelect = (props, ref) => {
       })
     });
   };
-  var defaultFilterOption = useCallback((input, option) => {
-    var _ref7, _option$searchText;
-    if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
-    var optionLabel = (_ref7 = (_option$searchText = option === null || option === void 0 ? void 0 : option.searchText) !== null && _option$searchText !== void 0 ? _option$searchText : option === null || option === void 0 ? void 0 : option.title) !== null && _ref7 !== void 0 ? _ref7 : option === null || option === void 0 ? void 0 : option.label;
-    return String(optionLabel !== null && optionLabel !== void 0 ? optionLabel : '').toLowerCase().includes(input.toLowerCase());
-  }, []);
-  var mergedShowSearch = useMemo(() => {
-    var defaultConfig = {
-      enabled: true,
-      filterOption: isFunction(_onSearch) ? false : defaultFilterOption,
-      onSearch: searchValue => {
-        _onSearch === null || _onSearch === void 0 || _onSearch(searchValue, _objectSpread({}, fetchFunctionRef.current));
-      }
-    };
-    var customShowSearch = selectProps.showSearch;
-    if (customShowSearch === false) {
-      return _objectSpread(_objectSpread({}, defaultConfig), {}, {
-        enabled: false
-      });
-    }
-    if (customShowSearch === true || customShowSearch == null) {
-      return defaultConfig;
-    }
-    if (isObject(customShowSearch)) {
-      var _customShowSearch$fil, _customShowSearch$onS;
-      return _objectSpread(_objectSpread(_objectSpread({}, defaultConfig), customShowSearch), {}, {
-        enabled: true,
-        filterOption: (_customShowSearch$fil = customShowSearch.filterOption) !== null && _customShowSearch$fil !== void 0 ? _customShowSearch$fil : defaultConfig.filterOption,
-        onSearch: (_customShowSearch$onS = customShowSearch.onSearch) !== null && _customShowSearch$onS !== void 0 ? _customShowSearch$onS : defaultConfig.onSearch
-      });
-    }
-    return defaultConfig;
-  }, [_onSearch, defaultFilterOption, selectProps.showSearch]);
   var handleChange = (value, _option) => {
     // option/其第一层子节点是react节点且是labelInValue就拿record
     var option = _option;

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

@@ -29,6 +29,7 @@ var BaseTable = _ref => {
   var tableProps = _ref.tableProps,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   var rowKey = tableProps.rowKey,
+    tableRowKey = tableProps.tableRowKey,
     value = tableProps.value,
     headerRender = tableProps.headerRender,
     tableRef = tableProps.tableRef,
@@ -83,7 +84,7 @@ var BaseTable = _ref => {
       onClick: () => {}
     })
   }, resetProps), {}, {
-    rowKey: rowKey || 'rowKey',
+    rowKey: tableRowKey,
     summary,
     pagination: pagination ? _objectSpread(_objectSpread({
       showSizeChanger: true,

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

@@ -125,6 +125,7 @@ var DraggableTable = _ref3 => {
     draggableProps = _ref3.draggableProps,
     resetProps = _objectWithoutProperties(_ref3, _excluded2);
   var rowKey = tableProps.rowKey,
+    tableRowKey = tableProps.tableRowKey,
     value = tableProps.value,
     headerRender = tableProps.headerRender,
     tableRef = tableProps.tableRef,
@@ -181,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',
+    rowKey: tableRowKey,
     pagination: pagination ? _objectSpread({
       current: page.pageNum,
       pageSize: page.pageSize,