@zat-design/sisyphus-react 3.11.5-beta.1 → 3.11.5-beta.1.1

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

@@ -67,7 +67,7 @@ var Row = function Row(props) {
   }));
 };
 var DndWrapper = function DndWrapper(_ref2) {
-  var _value$;
+  var _value$, _value$map;
   var draggable = _ref2.draggable,
     value = _ref2.value,
     onChange = _ref2.onChange,
@@ -78,15 +78,16 @@ var DndWrapper = function DndWrapper(_ref2) {
     var active = event.active,
       over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
+      var _value$findIndex, _value$findIndex2;
       if (onDrag) {
         var nextList = onDrag(event, value);
         onChange(nextList);
         return;
       }
-      var activeIndex = value.findIndex(function (i) {
+      var activeIndex = value === null || value === void 0 ? void 0 : (_value$findIndex = value.findIndex) === null || _value$findIndex === void 0 ? void 0 : _value$findIndex.call(value, function (i) {
         return i.rowKey === active.id;
       });
-      var overIndex = value.findIndex(function (i) {
+      var overIndex = value === null || value === void 0 ? void 0 : (_value$findIndex2 = value.findIndex) === null || _value$findIndex2 === void 0 ? void 0 : _value$findIndex2.call(value, function (i) {
         return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
       });
       var nextValue = arrayMove(value, activeIndex, overIndex);
@@ -96,8 +97,8 @@ var DndWrapper = function DndWrapper(_ref2) {
   return draggable && !disabled ? _jsx(DndContext, {
     onDragEnd: onDragEnd,
     children: _jsx(SortableContext, {
-      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
-        return i.rowKey;
+      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value === null || value === void 0 ? void 0 : (_value$map = value.map) === null || _value$map === void 0 ? void 0 : _value$map.call(value, function (i) {
+        return i === null || i === void 0 ? void 0 : i.rowKey;
       }) : [],
       strategy: verticalListSortingStrategy,
       children: children

package/es/ProEditTable/index.js

@@ -122,10 +122,10 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     className: className
   });
   var getRowKey = function getRowKey(record) {
-    var key = record.rowKey || getRandom();
+    var key = (record === null || record === void 0 ? void 0 : record.rowKey) || getRandom();
     if (rowKey) {
       var _ref3;
-      key = (_ref3 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
+      key = (_ref3 = typeof rowKey === 'function' ? rowKey(record) : record === null || record === void 0 ? void 0 : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
     }
     return key;
   };
@@ -240,7 +240,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
-    var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
+    var isEdit = !virtualKey || editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey);
     var className = isEdit ? 'is-editing' : '';
     if (getIsNew(record)) {
       return "is-new-row ".concat(className);
@@ -342,7 +342,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     });
     // 初始化默认生成row-key
     if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover)) {
-      var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
+      var _value$map;
+      var nextValues = value === null || value === void 0 ? void 0 : (_value$map = value.map) === null || _value$map === void 0 ? void 0 : _value$map.call(value, function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           rowKey: getRowKey(item)
         });

package/es/ProEditTable/utils/config.js

@@ -50,7 +50,7 @@ export var actions = {
     }
     var nextEditingKeys = _toConsumableArray(editingKeys);
     // 开启编辑状态
-    nextEditingKeys.push(record.rowKey);
+    nextEditingKeys.push(record === null || record === void 0 ? void 0 : record.rowKey);
     // 编辑时赋值编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
       record.isEditing = true;
@@ -65,6 +65,7 @@ export var actions = {
   },
   save: function () {
     var _save = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
+      var _editingKeys$filter;
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -75,8 +76,9 @@ export var actions = {
             record = _objectSpread(_objectSpread(_objectSpread({}, record), form.getFieldValue(virtualRowName)), updateData);
             delete record.addFlag; // 删除第一次新增的标记
             // 关闭当前保存行的编辑状态
-            nextEditingKeys = editingKeys.filter(function (key) {
-              return key !== record.rowKey;
+            nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter = editingKeys.filter) === null || _editingKeys$filter === void 0 ? void 0 : _editingKeys$filter.call(editingKeys, function (key) {
+              var _record;
+              return key !== ((_record = record) === null || _record === void 0 ? void 0 : _record.rowKey);
             }); // 保存后取消编辑状态，供validator做保存校验
             if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
               record.isEditing = true;
@@ -102,6 +104,7 @@ export var actions = {
     return save;
   }(),
   cancel: function cancel(_ref3) {
+    var _editingKeys$filter2;
     var name = _ref3.name,
       record = _ref3.record,
       editingKeys = _ref3.editingKeys,
@@ -109,8 +112,8 @@ export var actions = {
       form = _ref3.form,
       virtualRowName = _ref3.virtualRowName,
       virtualKey = _ref3.virtualKey;
-    var nextEditingKeys = editingKeys.filter(function (key) {
-      return key !== record.rowKey;
+    var nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter2 = editingKeys.filter) === null || _editingKeys$filter2 === void 0 ? void 0 : _editingKeys$filter2.call(editingKeys, function (key) {
+      return key !== (record === null || record === void 0 ? void 0 : record.rowKey);
     });
     // 保存后取消编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
@@ -127,7 +130,7 @@ export var actions = {
         name: name,
         form: form,
         virtualKey: virtualKey,
-        selectedRowKeys: [record.rowKey]
+        selectedRowKeys: [record === null || record === void 0 ? void 0 : record.rowKey]
       });
     } else {
       // 防止value引用不变, 值不更新 - (自定义组件)
@@ -154,12 +157,13 @@ export var actions = {
       name: name,
       form: form,
       virtualKey: virtualKey,
-      selectedRowKeys: [record.rowKey]
+      selectedRowKeys: [record === null || record === void 0 ? void 0 : record.rowKey]
     });
     if (virtualKey) {
+      var _editingKeys$filter3;
       // 关闭编辑状态
-      var nextEditingKeys = editingKeys.filter(function (key) {
-        return key === record.rowKey;
+      var nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter3 = editingKeys.filter) === null || _editingKeys$filter3 === void 0 ? void 0 : _editingKeys$filter3.call(editingKeys, function (key) {
+        return key === (record === null || record === void 0 ? void 0 : record.rowKey);
       });
       setState({
         editingKeys: nextEditingKeys

package/es/ProEditTable/utils/index.js

@@ -174,7 +174,7 @@ var getActionColumn = function getActionColumn(config) {
               config: config,
               btnConfig: btnConfig
             }))
-          }, "".concat(record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
+          }, "".concat(record === null || record === void 0 ? void 0 : record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
         })
       });
     }
@@ -277,9 +277,9 @@ export var transformColumns = function transformColumns() {
       item.className = _toConsumableArray(new Set(item.className.split(' '))).join(' ');
     }
     var _render = function _render(text, record, index) {
-      var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
+      var isEditing = !virtualKey || editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey) || record.addFlag;
       var namePath = isArray(name) ? name : [name];
-      if (virtualKey && editingKeys.includes(record.rowKey)) {
+      if (virtualKey && editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey)) {
         namePath = getNamePath(name, virtualKey);
       }
       var columnNamePath = isArray(columnName) ? columnName : [columnName];

package/es/ProEditTable/utils/tools.js

@@ -65,7 +65,7 @@ export var onDelete = function onDelete(_ref) {
   // 正常的form数据流处理
   var dataSource = form.getFieldValue(name);
   dataSource = dataSource.filter(function (row) {
-    return !selectedRowKeys.includes(row.rowKey);
+    return !selectedRowKeys.includes(row === null || row === void 0 ? void 0 : row.rowKey);
   });
   form.setFieldValue(name, dataSource);
   // 单行模式数据流处理 重置中间正在编辑状态单行数据
@@ -75,7 +75,7 @@ export var onDelete = function onDelete(_ref) {
     var virtualList = form.getFieldValue(namePath);
     if ((_virtualList = virtualList) === null || _virtualList === void 0 ? void 0 : _virtualList.length) {
       virtualList = virtualList.filter(function (row) {
-        return !selectedRowKeys.includes(row.rowKey);
+        return !selectedRowKeys.includes(row === null || row === void 0 ? void 0 : row.rowKey);
       });
       form.setFieldValue(namePath, virtualList);
     }

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

@@ -74,7 +74,7 @@ var Row = function Row(props) {
   }));
 };
 var DndWrapper = function DndWrapper(_ref2) {
-  var _value$;
+  var _value$, _value$map;
   var draggable = _ref2.draggable,
     value = _ref2.value,
     onChange = _ref2.onChange,
@@ -85,15 +85,16 @@ var DndWrapper = function DndWrapper(_ref2) {
     var active = event.active,
       over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
+      var _value$findIndex, _value$findIndex2;
       if (onDrag) {
         var nextList = onDrag(event, value);
         onChange(nextList);
         return;
       }
-      var activeIndex = value.findIndex(function (i) {
+      var activeIndex = value === null || value === void 0 ? void 0 : (_value$findIndex = value.findIndex) === null || _value$findIndex === void 0 ? void 0 : _value$findIndex.call(value, function (i) {
         return i.rowKey === active.id;
       });
-      var overIndex = value.findIndex(function (i) {
+      var overIndex = value === null || value === void 0 ? void 0 : (_value$findIndex2 = value.findIndex) === null || _value$findIndex2 === void 0 ? void 0 : _value$findIndex2.call(value, function (i) {
         return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
       });
       var nextValue = (0, _sortable.arrayMove)(value, activeIndex, overIndex);
@@ -103,8 +104,8 @@ var DndWrapper = function DndWrapper(_ref2) {
   return draggable && !disabled ? (0, _jsxRuntime.jsx)(_core.DndContext, {
     onDragEnd: onDragEnd,
     children: (0, _jsxRuntime.jsx)(_sortable.SortableContext, {
-      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value.map(function (i) {
-        return i.rowKey;
+      items: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value === null || value === void 0 ? void 0 : (_value$map = value.map) === null || _value$map === void 0 ? void 0 : _value$map.call(value, function (i) {
+        return i === null || i === void 0 ? void 0 : i.rowKey;
       }) : [],
       strategy: _sortable.verticalListSortingStrategy,
       children: children

package/lib/ProEditTable/index.js

@@ -125,10 +125,10 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     className: className
   });
   var getRowKey = function getRowKey(record) {
-    var key = record.rowKey || (0, _tools.getRandom)();
+    var key = (record === null || record === void 0 ? void 0 : record.rowKey) || (0, _tools.getRandom)();
     if (rowKey) {
       var _ref3;
-      key = (_ref3 = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
+      key = (_ref3 = typeof rowKey === 'function' ? rowKey(record) : record === null || record === void 0 ? void 0 : record[rowKey]) !== null && _ref3 !== void 0 ? _ref3 : key;
     }
     return key;
   };
@@ -243,7 +243,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
-    var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
+    var isEdit = !virtualKey || editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey);
     var className = isEdit ? 'is-editing' : '';
     if (getIsNew(record)) {
       return "is-new-row ".concat(className);
@@ -345,7 +345,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     });
     // 初始化默认生成row-key
     if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover)) {
-      var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
+      var _value$map;
+      var nextValues = value === null || value === void 0 ? void 0 : (_value$map = value.map) === null || _value$map === void 0 ? void 0 : _value$map.call(value, function (item) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
           rowKey: getRowKey(item)
         });

package/lib/ProEditTable/utils/config.js

@@ -56,7 +56,7 @@ var actions = exports.actions = {
     }
     var nextEditingKeys = (0, _toConsumableArray2.default)(editingKeys);
     // 开启编辑状态
-    nextEditingKeys.push(record.rowKey);
+    nextEditingKeys.push(record === null || record === void 0 ? void 0 : record.rowKey);
     // 编辑时赋值编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
       record.isEditing = true;
@@ -71,6 +71,7 @@ var actions = exports.actions = {
   },
   save: function () {
     var _save = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
+      var _editingKeys$filter;
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -81,8 +82,9 @@ var actions = exports.actions = {
             record = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, record), form.getFieldValue(virtualRowName)), updateData);
             delete record.addFlag; // 删除第一次新增的标记
             // 关闭当前保存行的编辑状态
-            nextEditingKeys = editingKeys.filter(function (key) {
-              return key !== record.rowKey;
+            nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter = editingKeys.filter) === null || _editingKeys$filter === void 0 ? void 0 : _editingKeys$filter.call(editingKeys, function (key) {
+              var _record;
+              return key !== ((_record = record) === null || _record === void 0 ? void 0 : _record.rowKey);
             }); // 保存后取消编辑状态，供validator做保存校验
             if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
               record.isEditing = true;
@@ -108,6 +110,7 @@ var actions = exports.actions = {
     return save;
   }(),
   cancel: function cancel(_ref3) {
+    var _editingKeys$filter2;
     var name = _ref3.name,
       record = _ref3.record,
       editingKeys = _ref3.editingKeys,
@@ -115,8 +118,8 @@ var actions = exports.actions = {
       form = _ref3.form,
       virtualRowName = _ref3.virtualRowName,
       virtualKey = _ref3.virtualKey;
-    var nextEditingKeys = editingKeys.filter(function (key) {
-      return key !== record.rowKey;
+    var nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter2 = editingKeys.filter) === null || _editingKeys$filter2 === void 0 ? void 0 : _editingKeys$filter2.call(editingKeys, function (key) {
+      return key !== (record === null || record === void 0 ? void 0 : record.rowKey);
     });
     // 保存后取消编辑状态，供validator做保存校验
     if (nextEditingKeys === null || nextEditingKeys === void 0 ? void 0 : nextEditingKeys.length) {
@@ -133,7 +136,7 @@ var actions = exports.actions = {
         name: name,
         form: form,
         virtualKey: virtualKey,
-        selectedRowKeys: [record.rowKey]
+        selectedRowKeys: [record === null || record === void 0 ? void 0 : record.rowKey]
       });
     } else {
       // 防止value引用不变, 值不更新 - (自定义组件)
@@ -160,12 +163,13 @@ var actions = exports.actions = {
       name: name,
       form: form,
       virtualKey: virtualKey,
-      selectedRowKeys: [record.rowKey]
+      selectedRowKeys: [record === null || record === void 0 ? void 0 : record.rowKey]
     });
     if (virtualKey) {
+      var _editingKeys$filter3;
       // 关闭编辑状态
-      var nextEditingKeys = editingKeys.filter(function (key) {
-        return key === record.rowKey;
+      var nextEditingKeys = editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$filter3 = editingKeys.filter) === null || _editingKeys$filter3 === void 0 ? void 0 : _editingKeys$filter3.call(editingKeys, function (key) {
+        return key === (record === null || record === void 0 ? void 0 : record.rowKey);
       });
       setState({
         editingKeys: nextEditingKeys

package/lib/ProEditTable/utils/index.js

@@ -178,7 +178,7 @@ var getActionColumn = function getActionColumn(config) {
               config: config,
               btnConfig: btnConfig
             }))
-          }, "".concat(record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
+          }, "".concat(record === null || record === void 0 ? void 0 : record.rowKey, "-").concat(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type));
         })
       });
     }
@@ -281,9 +281,9 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       item.className = (0, _toConsumableArray2.default)(new Set(item.className.split(' '))).join(' ');
     }
     var _render = function _render(text, record, index) {
-      var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
+      var isEditing = !virtualKey || editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey) || record.addFlag;
       var namePath = (0, _lodash.isArray)(name) ? name : [name];
-      if (virtualKey && editingKeys.includes(record.rowKey)) {
+      if (virtualKey && editingKeys.includes(record === null || record === void 0 ? void 0 : record.rowKey)) {
         namePath = (0, _tools.getNamePath)(name, virtualKey);
       }
       var columnNamePath = (0, _lodash.isArray)(columnName) ? columnName : [columnName];

package/lib/ProEditTable/utils/tools.js

@@ -74,7 +74,7 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
   // 正常的form数据流处理
   var dataSource = form.getFieldValue(name);
   dataSource = dataSource.filter(function (row) {
-    return !selectedRowKeys.includes(row.rowKey);
+    return !selectedRowKeys.includes(row === null || row === void 0 ? void 0 : row.rowKey);
   });
   form.setFieldValue(name, dataSource);
   // 单行模式数据流处理 重置中间正在编辑状态单行数据
@@ -84,7 +84,7 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
     var virtualList = form.getFieldValue(namePath);
     if ((_virtualList = virtualList) === null || _virtualList === void 0 ? void 0 : _virtualList.length) {
       virtualList = virtualList.filter(function (row) {
-        return !selectedRowKeys.includes(row.rowKey);
+        return !selectedRowKeys.includes(row === null || row === void 0 ? void 0 : row.rowKey);
       });
       form.setFieldValue(namePath, virtualList);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.11.5-beta.1",
+  "version": "3.11.5-beta.1.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",