@zat-design/sisyphus-react 3.9.8-beta.1 → 3.9.8-beta.11

package/es/ProTable/components/RenderColumn/index.d.ts

@@ -15,6 +15,8 @@ interface Props {
     isChanged?: boolean;
     /** 新增单元格字段 */
     isAddCell?: boolean;
+    /** 表格透传下来的scroll配置 */
+    scroll?: any;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;

package/es/ProTable/components/RenderColumn/index.js

@@ -29,7 +29,8 @@ var RenderColumn = function RenderColumn(props) {
     _props$toolTipProps = props.toolTipProps,
     toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
     minWidth = props.minWidth,
-    isInNewRowFlag = props.isInNewRowFlag;
+    isInNewRowFlag = props.isInNewRowFlag,
+    scroll = props.scroll;
   var _useSetState = useSetState({
       tooltip: false
     }),
@@ -43,8 +44,9 @@ var RenderColumn = function RenderColumn(props) {
   // 比对场景走的逻辑
   if (!isInNewRowFlag && isBoolean(props === null || props === void 0 ? void 0 : props.isChanged)) {
     var renderNode = value ? node : '-';
+    var isXMaxContent = (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content';
     if (ellipsis || (props === null || props === void 0 ? void 0 : props.isChanged)) {
-      renderNode = _jsx(Text, {
+      renderNode = !isXMaxContent ? _jsx(Text, {
         style: {
           width: currentValue === '-' ? 32.5 : width,
           minWidth: minWidth
@@ -53,6 +55,12 @@ var RenderColumn = function RenderColumn(props) {
           tooltip: false
         },
         children: ellipsis ? currentValue : renderNode
+      }) : _jsx("div", {
+        style: {
+          minWidth: minWidth,
+          width: width
+        },
+        children: ellipsis ? currentValue : renderNode
       });
       if ((props === null || props === void 0 ? void 0 : props.isChanged) === false) {
         return renderNode;

package/es/ProTable/hooks/useAntdTable.js

@@ -11,7 +11,7 @@ import { useCallback, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect } from 'ahooks';
 import { pickBy, isObject, merge, set, isEqual } from 'lodash';
 import { defaultPage } from '../index';
-import { isListResult } from '../utils';
+import { isListResult, removeEmptyKeys } from '../utils';
 import locale, { formatMessage } from '../../locale';
 var useDefaultOptions = function useDefaultOptions(options) {
   var _useState = useState((options === null || options === void 0 ? void 0 : options.page) || defaultPage),
@@ -219,16 +219,17 @@ function useAntdTable(service, options, useRequestOptions) {
       pageNum: 1,
       pageSize: page.pageSize
     };
+    var _values = removeEmptyKeys(values);
     onPageChange(newPage);
     setState({
-      searchValues: values,
+      searchValues: _values,
       allSelected: false,
       selectedRecords: [],
       selectedRowKeys: []
     });
     run(getTransformParams(_objectSpread(_objectSpread({
       page: newPage
-    }, extraFilter), values)));
+    }, extraFilter), _values)));
   }, [extraFilter, page.pageSize, run, getTransformParams]);
   var resetParams = useCallback(function () {
     var page = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initPage;

package/es/ProTable/propsType.d.ts

@@ -46,6 +46,8 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
     isChanged?: boolean | null;
     children?: ProTableColumn[];
+    /** table透传下来的scroll配置 */
+    scroll?: any;
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/es/ProTable/utils/index.d.ts

@@ -29,3 +29,7 @@ export declare const isListResult: (data: {
     [key: string]: any;
 }) => boolean;
 export declare const getRowKey: (rowKey: any, record: any) => any;
+/** 移除对象中的 null , undefined, '' 的key */
+export declare const removeEmptyKeys: (obj: any) => {
+    [k: string]: unknown;
+};

package/es/ProTable/utils/index.js

@@ -1,3 +1,4 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { get, isEqual } from 'lodash';
 import { validate } from '@zat-design/utils';
 var isEmpty = validate.isEmpty;
@@ -70,4 +71,18 @@ export var getRowKey = function getRowKey(rowKey, record) {
     key = (_ref = typeof rowKey === 'function' ? rowKey(record) : record[rowKey]) !== null && _ref !== void 0 ? _ref : key;
   }
   return key;
+};
+/** 移除对象中的 null , undefined, '' 的key */
+export var removeEmptyKeys = function removeEmptyKeys(obj) {
+  // 使用 Object.entries() 将对象转换为键值对数组
+  var entries = Object.entries(obj);
+  // 过滤掉值为 null, undefined, 或 '' 的键值对
+  var filteredEntries = entries.filter(function (_ref2) {
+    var _ref3 = _slicedToArray(_ref2, 2),
+      key = _ref3[0],
+      value = _ref3[1];
+    return !isEmpty(value);
+  });
+  // 使用 Object.fromEntries() 将过滤后的键值对数组转换回对象
+  return Object.fromEntries(filteredEntries);
 };

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
@@ -26,13 +27,20 @@ var ActionButton = function ActionButton(_ref) {
     deletePoConfirmMsg = config.deletePoConfirmMsg,
     mulDeletePoConfirmMsg = config.mulDeletePoConfirmMsg,
     max = config.max,
-    tableLength = config.tableLength;
+    name = config.name,
+    tableLength = config.tableLength,
+    selectedRows = config.selectedRows;
+  var rowNamePath = [].concat((0, _toConsumableArray2.default)(name), [index]);
   // 操作按钮权限控制
   var getShow = function getShow(show) {
     if (typeof show === 'function') {
       return show(record, {
         index: index,
-        form: form
+        form: form,
+        name: name,
+        namePath: rowNamePath,
+        tableLength: tableLength,
+        selectedRows: selectedRows
       });
     }
     return show;
@@ -42,7 +50,11 @@ var ActionButton = function ActionButton(_ref) {
     if (typeof disabled === 'function') {
       return disabled(record, {
         index: index,
-        form: form
+        form: form,
+        name: name,
+        namePath: rowNamePath,
+        tableLength: tableLength,
+        selectedRows: selectedRows
       });
     }
     // 新增超过最大行，禁止操作按钮
@@ -64,14 +76,29 @@ var ActionButton = function ActionButton(_ref) {
   // 其他操作按钮Props
   var actionBtnProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, btnConfig.buttonProps), {}, {
     onClick: function onClick() {
-      btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
+      btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, {
+        index: index,
+        form: form,
+        name: name,
+        namePath: rowNamePath,
+        tableLength: tableLength,
+        selectedRows: selectedRows
+      });
     },
     disabled: getDisabled((_btnConfig$buttonProp3 = btnConfig.buttonProps) === null || _btnConfig$buttonProp3 === void 0 ? void 0 : _btnConfig$buttonProp3.disabled)
   });
   // 当传入函数时，先转成reactNode
   if ((0, _lodash.isFunction)(btnConfig.label)) {
-    btnConfig.label = (0, _jsxRuntime.jsx)(btnConfig.label, {
-      form: form
+    var addIndex = tableLength ? tableLength - 1 : 0;
+    var namePath = [].concat((0, _toConsumableArray2.default)(name), [addIndex]);
+    var addRecord = form.getFieldValue(namePath) || {};
+    btnConfig.label = btnConfig.label(addRecord, {
+      form: form,
+      namePath: namePath,
+      name: name,
+      tableLength: tableLength,
+      selectedRows: selectedRows,
+      index: addIndex
     });
   }
   var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
@@ -81,7 +108,14 @@ var ActionButton = function ActionButton(_ref) {
         placement: "topRight",
         title: deleteMsgMap[btnConfig.type],
         onConfirm: function onConfirm() {
-          btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
+          btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, {
+            index: index,
+            form: form,
+            name: name,
+            namePath: rowNamePath,
+            tableLength: tableLength,
+            selectedRows: selectedRows
+          });
         },
         disabled: isDisabled,
         okText: _locale.default.ProEditTable.confirm,
@@ -101,13 +135,27 @@ var ActionButton = function ActionButton(_ref) {
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
-            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
+            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, {
+              index: index,
+              form: form,
+              name: name,
+              namePath: rowNamePath,
+              tableLength: tableLength,
+              selectedRows: selectedRows
+            });
           }
         }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
-            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
+            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, {
+              index: index,
+              form: form,
+              name: name,
+              namePath: rowNamePath,
+              tableLength: tableLength,
+              selectedRows: selectedRows
+            });
           },
           children: btnConfig.label
         }))

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

@@ -30,7 +30,7 @@ var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _getDefaultProps = require("../../utils/getDefaultProps");
 var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies"];
+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 */
 var RenderField = function RenderField(_ref) {
@@ -64,6 +64,7 @@ var RenderField = function RenderField(_ref) {
     trim = column.trim,
     confirm = column.confirm,
     dependencies = column.dependencies,
+    desensitization = column.desensitization,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -89,6 +90,7 @@ var RenderField = function RenderField(_ref) {
   var _required = required;
   var _valueType = valueType;
   var _disabled = false;
+  var _desensitization = desensitization || [];
   var isCell = mode === 'cell';
   if (isCell) {
     record['is-view'] = !(0, _lodash.isEqual)(cellNamePath, cellName);
@@ -125,6 +127,9 @@ var RenderField = function RenderField(_ref) {
   if ((0, _lodash.isFunction)(valueType)) {
     _valueType = valueType.apply(void 0, rowParams);
   }
+  if ((0, _lodash.isFunction)(desensitization)) {
+    _desensitization = desensitization.apply(void 0, rowParams);
+  }
   // 获取最终的disabled
   _disabled = (0, _tools.getDisabled)({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -136,9 +141,9 @@ var RenderField = function RenderField(_ref) {
   });
   if (typeof isEditable === 'function') {
     isEditable = isEditable.apply(void 0, rowParams);
-    setTimeout(function () {
-      !isEditable && form.validateFields([cellName]);
-    }, 100);
+    // setTimeout(() => {
+    //   !isEditable && form.validateFields([cellName]);
+    // }, 100);
   }
   // 是否只读文本
   var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || (0, _tools.getDisabled)({
@@ -196,21 +201,23 @@ var RenderField = function RenderField(_ref) {
    * 配置valueType时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var valueTypeTransform = (0, _react.useCallback)(function () {
-    var _fieldProps3;
-    // 不存在valueType返回空
-    if (!_valueType) {
-      return {};
-    }
+  var valueTypeTransform = function valueTypeTransform() {
+    var _fieldProps3, _desensitization2;
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
       _valueType = 'switch';
     }
     var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
-      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
+      mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode,
+      desensitization: _desensitization
     });
+    var isDesensit = sessionStorage.getItem(otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey);
+    // 仅查看模式下进行数据脱敏
+    if (((_desensitization2 = _desensitization) === null || _desensitization2 === void 0 ? void 0 : _desensitization2.length) && _disabled && isDesensit === 'ON') {
+      _valueType = 'desensitization';
+    }
     return (0, _lodash.isFunction)(_valueType2.default[_valueType]) ? _valueType2.default[_valueType](params) : {};
-  }, [_valueType]);
+  };
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
     // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
     names = names.map(function (key) {
@@ -524,6 +531,7 @@ var RenderField = function RenderField(_ref) {
     onBlur: _onblur,
     index: index,
     confirm: confirm,
+    desensitization: _desensitization,
     otherProps: {
       form: form,
       names: names,
@@ -532,7 +540,8 @@ var RenderField = function RenderField(_ref) {
       listName: cellName,
       viewEmpty: viewEmpty,
       valueType: _valueType,
-      isView: isView
+      isView: isView,
+      desensitizationKey: otherProps === null || otherProps === void 0 ? void 0 : otherProps.desensitizationKey
     }
   });
   componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange', 'namePath', 'index']);

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

@@ -23,12 +23,9 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbarProps = config.toolbarProps,
     name = config.name,
     virtualKey = config.virtualKey,
-    form = config.form,
     disabled = config.disabled,
-    selectedRows = config.selectedRows,
     tableLength = config.tableLength;
   var virtualName = (0, _tools.getNamePath)(name, virtualKey);
-  var dataSource = form.getFieldValue(name);
   // toolbarProps配置为false 默认不插入
   if (toolbarProps === false || disabled) {
     return null;
@@ -82,29 +79,34 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbar.show = show !== null && show !== void 0 ? show : true;
     toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     toolbar.onEvent = /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
-        var onEvent, result;
+      var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, _ref) {
+        var index, form, name, namePath, tableLength, selectedRows, onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              index = _ref.index, form = _ref.form, name = _ref.name, namePath = _ref.namePath, tableLength = _ref.tableLength, selectedRows = _ref.selectedRows;
               onEvent = onClick || onHandle;
               if (onEvent) {
-                _context.next = 5;
+                _context.next = 6;
                 break;
               }
               result = true;
-              _context.next = 8;
+              _context.next = 9;
               break;
-            case 5:
-              _context.next = 7;
-              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(selectedRows, dataSource, {
+            case 6:
+              _context.next = 8;
+              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(record, {
+                index: index,
                 form: form,
-                namePath: virtualName
+                name: name,
+                namePath: namePath,
+                tableLength: tableLength,
+                selectedRows: selectedRows
               });
-            case 7:
-              result = _context.sent;
             case 8:
-              if (result && type !== 'custom') {
+              result = _context.sent;
+            case 9:
+              if (result !== false && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   index: index,
                   record: record,
@@ -113,14 +115,14 @@ var RenderToolbar = function RenderToolbar(config) {
                   virtualName: virtualName
                 }));
               }
-            case 9:
+            case 10:
             case "end":
               return _context.stop();
           }
         }, _callee);
       }));
       return function (_x, _x2) {
-        return _ref.apply(this, arguments);
+        return _ref2.apply(this, arguments);
       };
     }();
     toolbar.buttonProps = buttonProps;

package/lib/ProEditTable/index.js

@@ -300,7 +300,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   }, [value, config.name]);
   var _columns = (0, _react.useMemo)(function () {
     return (0, _utils.transformColumns)(columns, config);
-  }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
+  }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath, value === null || value === void 0 ? void 0 : value.length]);
   var initDataSource = function initDataSource() {
     var _value$every, _value$some;
     var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {

package/lib/ProEditTable/propsType.d.ts

@@ -11,9 +11,12 @@ import { ProFormValueType, ColumnPropsMap } from '../ProForm/components/render/p
 import { DiffOriginalParams } from '../ProForm/utils/diffOriginal';
 export type ActionType = 'edit' | 'delete' | 'save' | 'cancel' | 'add' | 'mulDelete' | 'custom';
 export type ShowFunction<T> = (record?: T, options?: {
-    index?: number;
-    form?: FormInstance;
-    namePath?: NamePath;
+    index: number;
+    form: FormInstance;
+    name: NamePath;
+    namePath: NamePath;
+    tableLength: number;
+    selectedRows: T[];
 }) => Promise<any> | boolean | void;
 export interface OptionsProps {
     index: number;

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

@@ -4,7 +4,7 @@ export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
-    equalWith?: ({ originValue, originRecord, value, record, index }: {
+    equalWith?: ({ originValue, originRecord, value, record, index, }: {
         originValue: any;
         originRecord: any;
         value: any;

package/lib/ProEditTable/utils/diffOriginal.js

@@ -10,7 +10,20 @@ var isEmpty = _utils.validate.isEmpty;
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
 var filterObject = function filterObject(data) {
-  if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
+  if (!(0, _lodash.isObject)(data) || data === null) return data;
+  // ['1', undefined] ['1', ''] 视为相等
+  if (Array.isArray(data)) {
+    // 数组中全是empty值的话 视为null
+    var isFillNull = true;
+    var arr = data.map(function (item) {
+      if (isEmpty(item)) {
+        return null;
+      }
+      isFillNull = false;
+      return item;
+    });
+    return isFillNull ? null : arr;
+  }
   var resData = {};
   Object.keys(data).forEach(function (key) {
     if (!isEmpty(data[key])) {
@@ -47,25 +60,11 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   }
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
-  // 如果原始值为空 且当前有值的话 认为变更类型是新增
-  if (isEmpty(_originalValue) && !isEmpty(_value)) {
-    return 'add';
-  }
-  if (Array.isArray(_originalValue)) {
-    if ((_originalValue === null || _originalValue === void 0 ? void 0 : _originalValue.length) === (_value === null || _value === void 0 ? void 0 : _value.length)) {
-      var isSame = _originalValue.every(function (valueItem, index) {
-        // 如果两个值有一个不是空值, 则进行深比较
-        if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
-          return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
-        }
-        return true;
-      });
-      return isSame ? 'same' : 'changed';
-    }
-    return 'changed';
-  }
-  if (!isEmpty(_originalValue) || !isEmpty(_value)) {
-    return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
-  }
-  return 'same';
+  var isEmptyVal = isEmpty(_value);
+  var isEmptyOrg = isEmpty(_originalValue);
+  // 都为空视为相等
+  if (isEmptyOrg && isEmptyVal) return 'same';
+  // 如果原始值为空 且当前有值的话 视为新增
+  if (isEmptyOrg && !isEmptyVal) return 'add';
+  return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
 };

package/lib/ProEditTable/utils/index.js

@@ -87,49 +87,54 @@ var getActionColumn = function getActionColumn(config) {
     action.show = show !== null && show !== void 0 ? show : true;
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
+      var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
-        var rowName, _record, onEvent, result;
+        var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
+              index = _ref.index, form = _ref.form, name = _ref.name, namePath = _ref.namePath, tableLength = _ref.tableLength, selectedRows = _ref.selectedRows;
               index = _utils.tools.calc(firstIndex, '+', index);
               rowName = [].concat((0, _toConsumableArray2.default)(virtualRowName), [index]);
               if (!(type === 'save')) {
-                _context.next = 12;
+                _context.next = 13;
                 break;
               }
-              _context.prev = 3;
-              _context.next = 6;
+              _context.prev = 4;
+              _context.next = 7;
               return (0, _tools.customValidate)(validateKeys, form, rowName);
-            case 6:
-              _context.next = 12;
+            case 7:
+              _context.next = 13;
               break;
-            case 8:
-              _context.prev = 8;
-              _context.t0 = _context["catch"](3);
+            case 9:
+              _context.prev = 9;
+              _context.t0 = _context["catch"](4);
               (0, _tools.handleScrollToError)();
               return _context.abrupt("return", Promise.reject(_context.t0));
-            case 12:
+            case 13:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
               if (onEvent) {
-                _context.next = 18;
+                _context.next = 19;
                 break;
               }
               result = true;
-              _context.next = 21;
+              _context.next = 22;
               break;
-            case 18:
-              _context.next = 20;
-              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
+            case 19:
+              _context.next = 21;
+              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, {
                 form: form,
-                namePath: virtualRowName
+                index: index,
+                tableLength: tableLength,
+                name: name,
+                namePath: namePath,
+                selectedRows: selectedRows
               });
-            case 20:
-              result = _context.sent;
             case 21:
+              result = _context.sent;
+            case 22:
               if (result !== false && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [].concat((0, _toConsumableArray2.default)(name), [index]),
@@ -139,14 +144,14 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 22:
+            case 23:
             case "end":
               return _context.stop();
           }
-        }, _callee, null, [[3, 8]]);
+        }, _callee, null, [[4, 9]]);
       }));
       return function (_x, _x2) {
-        return _ref.apply(this, arguments);
+        return _ref2.apply(this, arguments);
       };
     }();
     action.buttonProps = buttonProps;
@@ -229,10 +234,10 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     if (typeof columnTitle === 'string') {
       item.originTitle = columnTitle;
       if (tooltip) {
-        var _ref2 = tooltip || {},
-          tooltipTitle = _ref2.title,
-          icon = _ref2.icon,
-          resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
+        var _ref3 = tooltip || {},
+          tooltipTitle = _ref3.title,
+          icon = _ref3.icon,
+          resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
         item.title = (0, _jsxRuntime.jsxs)("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
           children: [before, columnTitle, (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
@@ -392,13 +397,13 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
     Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
-        var _item, key, value, _ref4, service, option;
+      var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
+        var _item, key, value, _ref5, service, option;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _item = (0, _slicedToArray2.default)(item, 2), key = _item[0], value = _item[1];
-              _ref4 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref4.service, option = _ref4.option;
+              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
               if (!service) {
                 _context2.next = 8;
                 break;
@@ -418,7 +423,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         }, _callee2);
       }));
       return function (_x3) {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }())).then(function (res) {
       res.forEach(function (item) {

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

@@ -7,7 +7,7 @@ export declare const customValidate: (validateKeys: any, form: any, rowName: any
  * @returns string
  */
 export declare const splitNames: (names: any[]) => any;
-export declare const getNamePath: (name: any, virtualKey: any) => any;
+export declare const getNamePath: (name: any, virtualKey: any) => any[];
 export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
     name: any;
     form: any;

package/lib/ProEditTable/utils/tools.js

@@ -53,7 +53,7 @@ var splitNames = exports.splitNames = function splitNames(names) {
 };
 // 获取中间formItem的name
 var getNamePath = exports.getNamePath = function getNamePath(name, virtualKey) {
-  var nextName = (0, _lodash.cloneDeep)(name);
+  var nextName = (0, _lodash.cloneDeep)(Array.isArray(name) ? name : [name]);
   var lastValue = nextName[nextName.length - 1];
   nextName[nextName.length - 1] = "".concat(lastValue).concat(virtualKey ? "-".concat(virtualKey) : '');
   return nextName;