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

package/es/ProEditTable/index.js

@@ -1,4 +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"];
+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"];
 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; }
@@ -426,12 +427,15 @@ var ProEditTable = (_ref, ref) => {
   var TableComponent = draggable ? DraggableTable : BaseTable;
 
   // 给每个 record 附加编辑状态标识，让 shouldCellUpdate 能检测到状态变化
+  // draggable 时同时注入 _dragIndex，供 shouldCellUpdate 感知行位置变化（拖拽后同一行数据不变但位置变了）
   var enrichedValue = useMemo(() => {
-    if (!virtualKey) return value;
-    return value === null || value === void 0 ? void 0 : value.map(record => _objectSpread(_objectSpread({}, record), {}, {
+    if (!virtualKey && !draggable) return value;
+    return value === null || value === void 0 ? void 0 : value.map((record, idx) => _objectSpread(_objectSpread(_objectSpread({}, record), virtualKey ? {
       _isEditing: editingKeys.includes(record.rowKey) || record._addFlag
-    }));
-  }, [value, virtualKey, editingKeys]);
+    } : {}), draggable ? {
+      _dragIndex: idx
+    } : {}));
+  }, [value, virtualKey, editingKeys, draggable]);
   var tableProps = useMemo(() => ({
     rowKey,
     value: enrichedValue,
@@ -454,12 +458,22 @@ var ProEditTable = (_ref, ref) => {
     locale,
     handlePageChange
   }), [_className, _columns, _rowClassName, disabled, editingKeys, formatMessage, handlePageChange, headerRender, isHideCheckBox, locale, page, pagination, renderRowSelection, rowDraggable, rowKey, scroll, _summary, tableRef, enrichedValue, virtualKey]);
+
+  // 拖拽排序后，enrichedValue 中含 _dragIndex（内部字段），需清除后再传给外部 onChange
+  var handleDragChange = useCallback(newValue => {
+    var cleanValue = newValue === null || newValue === void 0 ? void 0 : newValue.map(_ref6 => {
+      var _ = _ref6._dragIndex,
+        rest = _objectWithoutProperties(_ref6, _excluded2);
+      return rest;
+    });
+    onChange === null || onChange === void 0 || onChange(cleanValue);
+  }, [onChange]);
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(ConfigProvider, {
       renderEmpty: value !== null && value !== void 0 && value.length ? undefined : emptyDom,
       children: /*#__PURE__*/_jsx(TableComponent, _objectSpread(_objectSpread({}, resetProps), {}, {
         draggableProps: {
-          onChange,
+          onChange: draggable ? handleDragChange : onChange,
           onDrag,
           onDragEnd,
           draggable

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

@@ -18,7 +18,7 @@ export declare const defaultToolbarKeys: string[];
 export declare const actions: {
     edit: ({ record, editingKeys, setState, form, virtualRowName, virtualKey, onlyOneLineMsg }: any) => boolean;
     save: ({ record, editingKeys, setState, form, rowName, virtualRowName, result }: any) => Promise<void>;
-    cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey }: any) => void;
+    cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey, rowName }: any) => void;
     delete: ({ name, record, editingKeys, setState, form, virtualKey, onlyOneLineMsg }: any) => boolean;
     add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, prefixCls, page, handlePageChange, }: any) => Promise<boolean>;
     mulDelete: ({ form, name, virtualKey, setState, selectedRowKeys, editingKeys }: any) => void;

package/es/ProEditTable/utils/config.js

@@ -111,7 +111,8 @@ export var actions = {
       setState = _ref3.setState,
       form = _ref3.form,
       virtualRowName = _ref3.virtualRowName,
-      virtualKey = _ref3.virtualKey;
+      virtualKey = _ref3.virtualKey,
+      rowName = _ref3.rowName;
     var nextEditingKeys = editingKeys.filter(key => key !== record.rowKey);
     // 保存后取消编辑状态，供validator做保存校验
     if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
@@ -131,9 +132,10 @@ export var actions = {
         selectedRowKeys: [record.rowKey]
       });
     } else {
-      // 防止value引用不变, 值不更新 - (自定义组件)
+      // 取消时使用主 form 原始行数据重置虚拟 form，避免编辑值残留
+      var originalRecord = form.getFieldValue(rowName);
       var values = form.getFieldsValue();
-      set(values, virtualRowName, record);
+      set(values, virtualRowName, originalRecord !== null && originalRecord !== void 0 ? originalRecord : record);
       form.setFieldsValue(values);
     }
   },

package/es/ProEditTable/utils/index.js

@@ -413,6 +413,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;
         }
+        // 拖拽排序时，行数据不变但位置（_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;
+        }
         // 单行编辑模式下，需要检测编辑状态变化
         if (virtualKey && (record === null || record === void 0 ? void 0 : record._isEditing) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._isEditing)) {
           return true;

package/lib/ProEditTable/index.js

@@ -17,7 +17,8 @@ var _empty = _interopRequireDefault(require("../assets/empty.png"));
 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"];
+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"];
 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; }
@@ -433,12 +434,15 @@ var ProEditTable = (_ref, ref) => {
   var TableComponent = draggable ? _RcTable.DraggableTable : _RcTable.BaseTable;
 
   // 给每个 record 附加编辑状态标识，让 shouldCellUpdate 能检测到状态变化
+  // draggable 时同时注入 _dragIndex，供 shouldCellUpdate 感知行位置变化（拖拽后同一行数据不变但位置变了）
   var enrichedValue = (0, _react.useMemo)(() => {
-    if (!virtualKey) return value;
-    return value === null || value === void 0 ? void 0 : value.map(record => _objectSpread(_objectSpread({}, record), {}, {
+    if (!virtualKey && !draggable) return value;
+    return value === null || value === void 0 ? void 0 : value.map((record, idx) => _objectSpread(_objectSpread(_objectSpread({}, record), virtualKey ? {
       _isEditing: editingKeys.includes(record.rowKey) || record._addFlag
-    }));
-  }, [value, virtualKey, editingKeys]);
+    } : {}), draggable ? {
+      _dragIndex: idx
+    } : {}));
+  }, [value, virtualKey, editingKeys, draggable]);
   var tableProps = (0, _react.useMemo)(() => ({
     rowKey,
     value: enrichedValue,
@@ -461,12 +465,22 @@ var ProEditTable = (_ref, ref) => {
     locale: _locale.default,
     handlePageChange
   }), [_className, _columns, _rowClassName, disabled, editingKeys, _locale.formatMessage, handlePageChange, headerRender, isHideCheckBox, _locale.default, page, pagination, renderRowSelection, rowDraggable, rowKey, scroll, _summary, tableRef, enrichedValue, virtualKey]);
+
+  // 拖拽排序后，enrichedValue 中含 _dragIndex（内部字段），需清除后再传给外部 onChange
+  var handleDragChange = (0, _react.useCallback)(newValue => {
+    var cleanValue = newValue === null || newValue === void 0 ? void 0 : newValue.map(_ref6 => {
+      var _ = _ref6._dragIndex,
+        rest = _objectWithoutProperties(_ref6, _excluded2);
+      return rest;
+    });
+    onChange === null || onChange === void 0 || onChange(cleanValue);
+  }, [onChange]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider, {
       renderEmpty: value !== null && value !== void 0 && value.length ? undefined : emptyDom,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(TableComponent, _objectSpread(_objectSpread({}, resetProps), {}, {
         draggableProps: {
-          onChange,
+          onChange: draggable ? handleDragChange : onChange,
           onDrag,
           onDragEnd,
           draggable

package/lib/ProEditTable/utils/config.d.ts

@@ -18,7 +18,7 @@ export declare const defaultToolbarKeys: string[];
 export declare const actions: {
     edit: ({ record, editingKeys, setState, form, virtualRowName, virtualKey, onlyOneLineMsg }: any) => boolean;
     save: ({ record, editingKeys, setState, form, rowName, virtualRowName, result }: any) => Promise<void>;
-    cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey }: any) => void;
+    cancel: ({ name, record, editingKeys, setState, form, virtualRowName, virtualKey, rowName }: any) => void;
     delete: ({ name, record, editingKeys, setState, form, virtualKey, onlyOneLineMsg }: any) => boolean;
     add: ({ result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, prefixCls, page, handlePageChange, }: any) => Promise<boolean>;
     mulDelete: ({ form, name, virtualKey, setState, selectedRowKeys, editingKeys }: any) => void;

package/lib/ProEditTable/utils/config.js

@@ -118,7 +118,8 @@ var actions = exports.actions = {
       setState = _ref3.setState,
       form = _ref3.form,
       virtualRowName = _ref3.virtualRowName,
-      virtualKey = _ref3.virtualKey;
+      virtualKey = _ref3.virtualKey,
+      rowName = _ref3.rowName;
     var nextEditingKeys = editingKeys.filter(key => key !== record.rowKey);
     // 保存后取消编辑状态，供validator做保存校验
     if (nextEditingKeys !== null && nextEditingKeys !== void 0 && nextEditingKeys.length) {
@@ -138,9 +139,10 @@ var actions = exports.actions = {
         selectedRowKeys: [record.rowKey]
       });
     } else {
-      // 防止value引用不变, 值不更新 - (自定义组件)
+      // 取消时使用主 form 原始行数据重置虚拟 form，避免编辑值残留
+      var originalRecord = form.getFieldValue(rowName);
       var values = form.getFieldsValue();
-      (0, _lodash.set)(values, virtualRowName, record);
+      (0, _lodash.set)(values, virtualRowName, originalRecord !== null && originalRecord !== void 0 ? originalRecord : record);
       form.setFieldsValue(values);
     }
   },

package/lib/ProEditTable/utils/index.js

@@ -419,6 +419,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;
         }
+        // 拖拽排序时，行数据不变但位置（_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;
+        }
         // 单行编辑模式下，需要检测编辑状态变化
         if (virtualKey && (record === null || record === void 0 ? void 0 : record._isEditing) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._isEditing)) {
           return true;

package/package.json

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