@zat-design/sisyphus-react 4.1.3-beta.6 → 4.1.3-beta.7

package/es/ProEditTable/index.js

@@ -1,5 +1,5 @@
 var _excluded = ["value", "onChange", "onDrag", "onDragEnd", "className", "columns", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"],
-  _excluded2 = ["_dragIndex"];
+  _excluded2 = ["_dragIndex", "_rowIndex"];
 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; }
@@ -427,14 +427,16 @@ var ProEditTable = (_ref, ref) => {
   var TableComponent = draggable ? DraggableTable : BaseTable;
 
   // 给每个 record 附加编辑状态标识，让 shouldCellUpdate 能检测到状态变化
-  // draggable 时同时注入 _dragIndex，供 shouldCellUpdate 感知行位置变化（拖拽后同一行数据不变但位置变了）
+  // 始终注入 _rowIndex，供 shouldCellUpdate 感知行位置变化（增删行后同一行数据不变但位置变了）
+  // draggable 时同时注入 _dragIndex
   var enrichedValue = useMemo(() => {
-    if (!virtualKey && !draggable) return value;
-    return value === null || value === void 0 ? void 0 : value.map((record, idx) => _objectSpread(_objectSpread(_objectSpread({}, record), virtualKey ? {
+    return value === null || value === void 0 ? void 0 : value.map((record, idx) => _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, record), virtualKey ? {
       _isEditing: editingKeys.includes(record.rowKey) || record._addFlag
     } : {}), draggable ? {
       _dragIndex: idx
-    } : {}));
+    } : {}), {}, {
+      _rowIndex: idx
+    }));
   }, [value, virtualKey, editingKeys, draggable]);
   var tableRowKey = useMemo(() => buildTableRowKey(rowKey), [rowKey]);
   var tableProps = useMemo(() => ({
@@ -461,10 +463,12 @@ var ProEditTable = (_ref, ref) => {
     handlePageChange
   }), [_className, _columns, _rowClassName, disabled, editingKeys, formatMessage, handlePageChange, headerRender, isHideCheckBox, locale, page, pagination, renderRowSelection, rowDraggable, rowKey, tableRowKey, scroll, _summary, tableRef, enrichedValue, virtualKey]);
 
-  // 拖拽排序后，enrichedValue 中含 _dragIndex（内部字段），需清除后再传给外部 onChange
+  // 拖拽排序后，enrichedValue 中含 _dragIndex/_rowIndex（内部字段），需清除后再传给外部 onChange
   var handleDragChange = useCallback(newValue => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var cleanValue = newValue === null || newValue === void 0 ? void 0 : newValue.map(_ref6 => {
-      var _ = _ref6._dragIndex,
+      var _d = _ref6._dragIndex,
+        _r = _ref6._rowIndex,
         rest = _objectWithoutProperties(_ref6, _excluded2);
       return rest;
     });

package/es/ProEditTable/utils/index.js

@@ -407,6 +407,10 @@ export var transformColumns = function transformColumns() {
         if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) {
           return true;
         }
+        // 行位置变化时（增删其他行导致 index 移位），需强制重渲染以更新 Form.Item name 路径
+        if ((record === null || record === void 0 ? void 0 : record._rowIndex) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._rowIndex)) {
+          return true;
+        }
         // 拖拽排序时，行数据不变但位置（_dragIndex）变化，需强制重渲染以更新 cellName（Form.Item name）
         if ((record === null || record === void 0 ? void 0 : record._dragIndex) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._dragIndex)) {
           return true;

package/lib/ProEditTable/index.js

@@ -18,7 +18,7 @@ var _locale = _interopRequireWildcard(require("../locale"));
 var _RcTable = require("./components/RcTable");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["value", "onChange", "onDrag", "onDragEnd", "className", "columns", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"],
-  _excluded2 = ["_dragIndex"];
+  _excluded2 = ["_dragIndex", "_rowIndex"];
 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; }
@@ -434,14 +434,16 @@ var ProEditTable = (_ref, ref) => {
   var TableComponent = draggable ? _RcTable.DraggableTable : _RcTable.BaseTable;
 
   // 给每个 record 附加编辑状态标识，让 shouldCellUpdate 能检测到状态变化
-  // draggable 时同时注入 _dragIndex，供 shouldCellUpdate 感知行位置变化（拖拽后同一行数据不变但位置变了）
+  // 始终注入 _rowIndex，供 shouldCellUpdate 感知行位置变化（增删行后同一行数据不变但位置变了）
+  // draggable 时同时注入 _dragIndex
   var enrichedValue = (0, _react.useMemo)(() => {
-    if (!virtualKey && !draggable) return value;
-    return value === null || value === void 0 ? void 0 : value.map((record, idx) => _objectSpread(_objectSpread(_objectSpread({}, record), virtualKey ? {
+    return value === null || value === void 0 ? void 0 : value.map((record, idx) => _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, record), virtualKey ? {
       _isEditing: editingKeys.includes(record.rowKey) || record._addFlag
     } : {}), draggable ? {
       _dragIndex: idx
-    } : {}));
+    } : {}), {}, {
+      _rowIndex: idx
+    }));
   }, [value, virtualKey, editingKeys, draggable]);
   var tableRowKey = (0, _react.useMemo)(() => (0, _tools.buildTableRowKey)(rowKey), [rowKey]);
   var tableProps = (0, _react.useMemo)(() => ({
@@ -468,10 +470,12 @@ var ProEditTable = (_ref, ref) => {
     handlePageChange
   }), [_className, _columns, _rowClassName, disabled, editingKeys, _locale.formatMessage, handlePageChange, headerRender, isHideCheckBox, _locale.default, page, pagination, renderRowSelection, rowDraggable, rowKey, tableRowKey, scroll, _summary, tableRef, enrichedValue, virtualKey]);
 
-  // 拖拽排序后，enrichedValue 中含 _dragIndex（内部字段），需清除后再传给外部 onChange
+  // 拖拽排序后，enrichedValue 中含 _dragIndex/_rowIndex（内部字段），需清除后再传给外部 onChange
   var handleDragChange = (0, _react.useCallback)(newValue => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var cleanValue = newValue === null || newValue === void 0 ? void 0 : newValue.map(_ref6 => {
-      var _ = _ref6._dragIndex,
+      var _d = _ref6._dragIndex,
+        _r = _ref6._rowIndex,
         rest = _objectWithoutProperties(_ref6, _excluded2);
       return rest;
     });

package/lib/ProEditTable/utils/index.js

@@ -413,6 +413,10 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) {
           return true;
         }
+        // 行位置变化时（增删其他行导致 index 移位），需强制重渲染以更新 Form.Item name 路径
+        if ((record === null || record === void 0 ? void 0 : record._rowIndex) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._rowIndex)) {
+          return true;
+        }
         // 拖拽排序时，行数据不变但位置（_dragIndex）变化，需强制重渲染以更新 cellName（Form.Item name）
         if ((record === null || record === void 0 ? void 0 : record._dragIndex) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._dragIndex)) {
           return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.1.3-beta.6",
+  "version": "4.1.3-beta.7",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",