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

package/dist/index.esm.css

@@ -915,11 +915,6 @@
   background: #fff;
   letter-spacing: 2px;
 }
-.pro-header .pro-header-describe .ant-space .pro-header-describe-value .pro-header-describe-items.pro-header-describe-items-more .pro-header-tag {
-  padding: 0;
-  background: transparent !important;
-  color: #333;
-}
 .pro-header .pro-header-copy {
   display: -webkit-box;
   display: -webkit-flex;

package/dist/less.esm.css

@@ -915,11 +915,6 @@
   background: #fff;
   letter-spacing: 2px;
 }
-.pro-header .pro-header-describe .ant-space .pro-header-describe-value .pro-header-describe-items.pro-header-describe-items-more .pro-header-tag {
-  padding: 0;
-  background: transparent !important;
-  color: #333;
-}
 .pro-header .pro-header-copy {
   display: -webkit-box;
   display: -webkit-flex;

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

@@ -3,6 +3,7 @@ import _Button from "antd/es/button";
 import "antd/es/popconfirm/style";
 import _Popconfirm from "antd/es/popconfirm";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isFunction, omit } from 'lodash';
@@ -22,13 +23,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(_toConsumableArray(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;
@@ -38,7 +46,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
       });
     }
     // 新增超过最大行，禁止操作按钮
@@ -60,14 +72,29 @@ var ActionButton = function ActionButton(_ref) {
   // 其他操作按钮Props
   var actionBtnProps = _objectSpread(_objectSpread({}, 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 (isFunction(btnConfig.label)) {
-    btnConfig.label = _jsx(btnConfig.label, {
-      form: form
+    var addIndex = tableLength ? tableLength - 1 : 0;
+    var namePath = [].concat(_toConsumableArray(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);
@@ -77,7 +104,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.ProEditTable.confirm,
@@ -97,13 +131,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
+            });
           }
         }))) : _jsx(_Button, _objectSpread(_objectSpread({}, 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/es/ProEditTable/components/RenderField/index.js

@@ -6,11 +6,11 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
-import React, { useCallback, useEffect } from 'react';
+import React, { useEffect } from 'react';
 import classNames from 'classnames';
 import { cloneDeep, isEqual, debounce, omit, isFunction } from 'lodash';
 import valueTypeMap from '../../../ProForm/utils/valueType';
@@ -57,6 +57,7 @@ var RenderField = function RenderField(_ref) {
     trim = column.trim,
     confirm = column.confirm,
     dependencies = column.dependencies,
+    desensitization = column.desensitization,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -82,6 +83,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'] = !isEqual(cellNamePath, cellName);
@@ -118,6 +120,9 @@ var RenderField = function RenderField(_ref) {
   if (isFunction(valueType)) {
     _valueType = valueType.apply(void 0, rowParams);
   }
+  if (isFunction(desensitization)) {
+    _desensitization = desensitization.apply(void 0, rowParams);
+  }
   // 获取最终的disabled
   _disabled = getDisabled({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -129,9 +134,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 || getDisabled({
@@ -189,21 +194,23 @@ var RenderField = function RenderField(_ref) {
    * 配置valueType时，基于formItem的normalize与getValueProps进行值类型转换
    * @returns {}
    */
-  var valueTypeTransform = useCallback(function () {
-    var _fieldProps3;
-    // 不存在valueType返回空
-    if (!_valueType) {
-      return {};
-    }
+  var valueTypeTransform = function valueTypeTransform() {
+    var _fieldProps3, _desensitization2;
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
       _valueType = 'switch';
     }
     var params = _objectSpread(_objectSpread({}, 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 isFunction(valueTypeMap[_valueType]) ? valueTypeMap[_valueType](params) : {};
-  }, [_valueType]);
+  };
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
     // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
     names = names.map(function (key) {
@@ -517,6 +524,7 @@ var RenderField = function RenderField(_ref) {
     onBlur: _onblur,
     index: index,
     confirm: confirm,
+    desensitization: _desensitization,
     otherProps: {
       form: form,
       names: names,
@@ -525,7 +533,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 = omit(componentProps, ['onFieldChange', 'namePath', 'index']);

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

@@ -17,12 +17,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 = getNamePath(name, virtualKey);
-  var dataSource = form.getFieldValue(name);
   // toolbarProps配置为false 默认不插入
   if (toolbarProps === false || disabled) {
     return null;
@@ -76,29 +73,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 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
-        var onEvent, result;
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
+        var index, form, name, namePath, tableLength, selectedRows, onEvent, result;
         return _regeneratorRuntime().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') {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
                   index: index,
                   record: record,
@@ -107,14 +109,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/es/ProEditTable/index.js

@@ -297,7 +297,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   }, [value, config.name]);
   var _columns = useMemo(function () {
     return 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/es/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/es/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/es/ProEditTable/utils/diffOriginal.js

@@ -4,7 +4,20 @@ var isEmpty = validate.isEmpty;
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
 var filterObject = function filterObject(data) {
-  if (!isObject(data) || Array.isArray(data) || data === null) return data;
+  if (!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])) {
@@ -41,25 +54,11 @@ export var 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 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 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 isEqual(_value, _originalValue) ? 'same' : 'changed';
 };

package/es/ProEditTable/utils/index.js

@@ -83,49 +83,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 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
+      var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().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 _regeneratorRuntime().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 = tools.calc(firstIndex, '+', index);
               rowName = [].concat(_toConsumableArray(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 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);
               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') {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
                   rowName: [].concat(_toConsumableArray(name), [index]),
@@ -135,14 +140,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;
@@ -225,10 +230,10 @@ export var transformColumns = function transformColumns() {
     if (typeof columnTitle === 'string') {
       item.originTitle = columnTitle;
       if (tooltip) {
-        var _ref2 = tooltip || {},
-          tooltipTitle = _ref2.title,
-          icon = _ref2.icon,
-          resetProps = _objectWithoutProperties(_ref2, _excluded2);
+        var _ref3 = tooltip || {},
+          tooltipTitle = _ref3.title,
+          icon = _ref3.icon,
+          resetProps = _objectWithoutProperties(_ref3, _excluded2);
         item.title = _jsxs("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
           children: [before, columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
@@ -388,13 +393,13 @@ export var transformColumns = function transformColumns() {
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
     Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
-        var _item, key, value, _ref4, service, option;
+      var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
+        var _item, key, value, _ref5, service, option;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _item = _slicedToArray(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;
@@ -414,7 +419,7 @@ export var 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/es/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/es/ProEditTable/utils/tools.js

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

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

@@ -27,7 +27,10 @@ var Group = function Group(props) {
     onChange = props.onChange,
     otherProps = props.otherProps,
     id = props.id,
-    isParentView = props.isView;
+    isParentView = props.isView,
+    formDisabled = props.disabled;
+  var _ref = otherProps || {},
+    desensitizationKey = _ref.desensitizationKey;
   var contextProps = ProForm.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -52,7 +55,9 @@ var Group = function Group(props) {
     form: form,
     index: index,
     value: value,
-    groupProps: props
+    groupProps: props,
+    formDisabled: formDisabled,
+    desensitizationKey: desensitizationKey
   });
   var columns = insertSeparator(columnsProps, space);
   var _className = classnames(_defineProperty({

package/es/ProForm/components/combination/Group/propsType.d.ts

@@ -50,4 +50,5 @@ export type GroupColumnProps<Values = any> = {
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
     valuePropName?: string;
     getValueProps?: (value: any) => Record<string, unknown>;
+    desensitization?: [number, number] | ReactiveFunction<Values, [number, number]>;
 } & ColumnPropsMap & FormItemProps;

package/es/ProForm/components/combination/Group/utils.d.ts

@@ -31,6 +31,7 @@ interface Params {
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
     fieldProps?: boolean | ReactiveFunction<any, boolean>;
     name?: NamePath;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
 }
 /** 计算响应式参数的值 */
 export declare const getReactiveProps: (params: Params) => {
@@ -38,10 +39,12 @@ export declare const getReactiveProps: (params: Params) => {
     show: boolean;
     component: any;
     fieldProps: boolean;
+    desensitization: [number, number];
 };
-type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString'> & {
+type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString' | 'disabled' | 'desensitization'> & {
     type?: any;
     mode?: string;
+    desensitizationKey?: string;
 };
 /** 获取当前字段的转换函数 */
 export declare const getValueTypeTrans: (params: ValueTypeGetterParams) => any;
@@ -56,6 +59,8 @@ interface ColumnsTransformerParams {
     namePath?: InternalNamePath;
     form: FormInstance;
     index?: number;
+    formDisabled?: boolean;
+    desensitizationKey?: string;
     groupProps: GroupProps;
 }
 /** 转换columns */