@zat-design/sisyphus-react 3.4.2-beta.3 → 3.4.2-beta.31

package/dist/less.esm.js

@@ -0,0 +1,3 @@
+var undefined$1 = undefined;
+
+export default undefined$1;

package/es/ProConfigProvider/index.js

@@ -18,7 +18,8 @@ var initialState = {
     mode: 'icon',
     mapList: [{
       type: 'view',
-      text: '查看'
+      'text-cn': '查看',
+      'text-en': 'view'
     }]
   }
 };

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

@@ -29,7 +29,7 @@ import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect } from '../../../ProForm/utils';
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4, _componentProps;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -72,7 +72,7 @@ var RenderField = function RenderField(_ref) {
     virtualKey = config.virtualKey,
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
-    originalTip = config.originalTip;
+    originalDiffTip = config.originalDiffTip;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -300,7 +300,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat(_toConsumableArray(namePath), [index]);
-          row = form.getFieldValue(rowPath, true);
+          row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
           orgRow = cloneDeep(row);
           if (!onFieldChange) {
             _context.next = 18;
@@ -345,7 +345,7 @@ var RenderField = function RenderField(_ref) {
           return onChange.apply(void 0, _toConsumableArray(_args));
         case 27:
           // 判断属性是否变动
-          form.setFieldValue(rowPath, row);
+          type !== 'Group' && form.setFieldValue(rowPath, row);
           if (!isEqual(orgRow, row)) {
             diff = difference(row, orgRow) || {};
             validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
@@ -469,9 +469,11 @@ var RenderField = function RenderField(_ref) {
     form: form,
     name: cellName
   }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
+    namePath: [].concat(_toConsumableArray(namePath), [index]),
     disabled: _disabled,
     onChange: _onchange,
     onBlur: _onblur,
+    index: index,
     otherProps: {
       form: form,
       names: names,
@@ -481,6 +483,11 @@ var RenderField = function RenderField(_ref) {
       isView: isView
     }
   });
+  if (type === 'Group') {
+    componentProps.onFieldChange = _onchange;
+  } else {
+    componentProps = omit(componentProps, ['onFieldChange', 'namePath', 'index']);
+  }
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;
@@ -505,12 +512,12 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
-  var originalTitle = originalTip ? _jsxs(_Space, {
-    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
+  var originalTitle = originalDiffTip ? _jsxs(_Space, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
-    }))) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
+    }))) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
@@ -521,15 +528,18 @@ var RenderField = function RenderField(_ref) {
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
-    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
+    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
   })) : _jsx(Container, {
     viewEmpty: viewEmpty
   });
   return _jsx(FieldProvider, {
-    value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
-    children: !originalTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
+    value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
+    children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
       title: originalTitle,
       open: changed ? undefined : false,
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
       children: FormItem
     })
   });

package/es/ProEditTable/index.js

@@ -10,7 +10,7 @@ import _ConfigProvider from "antd/es/config-provider";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip", "rowKey"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray } from 'lodash';
@@ -49,7 +49,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     headerRender = _ref.headerRender,
     pagination = _ref.pagination,
     originalValues = _ref.originalValues,
-    originalTip = _ref.originalTip,
+    originalDiffTip = _ref.originalDiffTip,
     rowKey = _ref.rowKey,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
@@ -151,7 +151,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     tableLength: value === null || value === void 0 ? void 0 : value.length,
     page: page,
     originalValues: originalValues,
-    originalTip: originalTip,
+    originalDiffTip: originalDiffTip,
     prefixCls: prefixCls
   };
   // 编辑行设置下样式

package/es/ProEditTable/propsType.d.ts

@@ -130,7 +130,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @description       原始数据源，是否tooltip显示
      * @default           -
      */
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     /**
      * @description       可编辑表格的类型，单行、多行、单元格编辑
      * @default           false

package/es/ProEditTable/utils/config.js

@@ -190,11 +190,6 @@ export var actions = {
               addData.isEditing = true;
             }
             insertType === 'before' ? nextData.unshift(addData) : nextData.push(addData);
-            form.setFieldValue(name, nextData);
-            (_tableRef$current$que = tableRef.current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
-              top: 10000,
-              behavior: 'smooth'
-            });
             // 当单选情况下，存储正在编辑值
             if (virtualKey) {
               nextEditingKeys = _toConsumableArray(editingKeys); // 开启编辑状态
@@ -204,6 +199,11 @@ export var actions = {
                 editingKeys: nextEditingKeys
               });
             }
+            form.setFieldValue(name, nextData);
+            (_tableRef$current$que = tableRef.current.querySelector(".".concat(prefixCls, "-table-body"))) === null || _tableRef$current$que === void 0 ? void 0 : (_tableRef$current$que2 = _tableRef$current$que.scrollTo) === null || _tableRef$current$que2 === void 0 ? void 0 : _tableRef$current$que2.call(_tableRef$current$que, {
+              top: insertType === 'before' ? -10000 : 10000,
+              behavior: 'smooth'
+            });
             _context2.next = 14;
             return form.validateFields([name]);
           case 14:

package/es/ProEditTable/utils/index.js

@@ -85,40 +85,77 @@ var getActionColumn = function getActionColumn(config) {
               index = tools.calc(firstIndex, '+', index);
               rowName = [].concat(_toConsumableArray(virtualRowName), [index]);
               if (!(type === 'save')) {
-                _context.next = 5;
+                _context.next = 12;
                 break;
               }
-              _context.next = 5;
+              _context.prev = 3;
+              _context.next = 6;
               return customValidate(validateKeys, form, rowName);
-            case 5:
+            case 6:
+              _context.next = 12;
+              break;
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](3);
+              setTimeout(function () {
+                var errorDom = document.querySelector('.ant-form-item-has-error');
+                if (errorDom) {
+                  var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
+                  var tableCell = errorDom.closest('.ant-table-cell');
+                  if (tableBody && tableCell) {
+                    var previousSibling = tableCell.previousElementSibling;
+                    var childOffsetLeft = 0;
+                    var childFixedLeft = 0;
+                    while (previousSibling) {
+                      if (previousSibling.nodeType === 1) {
+                        var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
+                        var _ref2 = previousSibling.getBoundingClientRect() || {},
+                          _ref2$width = _ref2.width,
+                          width = _ref2$width === void 0 ? 0 : _ref2$width;
+                        childOffsetLeft += width;
+                        if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
+                          childFixedLeft += width;
+                        }
+                      }
+                      previousSibling = previousSibling.previousElementSibling;
+                    }
+                    tableBody.scrollTo({
+                      left: childOffsetLeft - childFixedLeft,
+                      behavior: 'smooth'
+                    });
+                  }
+                }
+              }, 0);
+              return _context.abrupt("return", Promise.reject(_context.t0));
+            case 12:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
-              _context.next = 9;
+              _context.next = 16;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
                 form: form,
                 namePath: virtualRowName
               });
-            case 9:
-              _context.t1 = _yield$onEvent = _context.sent;
-              _context.t0 = _context.t1 !== null;
-              if (!_context.t0) {
-                _context.next = 13;
+            case 16:
+              _context.t2 = _yield$onEvent = _context.sent;
+              _context.t1 = _context.t2 !== null;
+              if (!_context.t1) {
+                _context.next = 20;
                 break;
               }
-              _context.t0 = _yield$onEvent !== void 0;
-            case 13:
-              if (!_context.t0) {
-                _context.next = 17;
+              _context.t1 = _yield$onEvent !== void 0;
+            case 20:
+              if (!_context.t1) {
+                _context.next = 24;
                 break;
               }
-              _context.t2 = _yield$onEvent;
-              _context.next = 18;
+              _context.t3 = _yield$onEvent;
+              _context.next = 25;
               break;
-            case 17:
-              _context.t2 = true;
-            case 18:
-              result = _context.t2;
+            case 24:
+              _context.t3 = true;
+            case 25:
+              result = _context.t3;
               if (result && type !== 'custom') {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
                   rowName: [].concat(_toConsumableArray(name), [index]),
@@ -128,11 +165,11 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 20:
+            case 27:
             case "end":
               return _context.stop();
           }
-        }, _callee);
+        }, _callee, null, [[3, 8]]);
       }));
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
@@ -210,10 +247,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({
@@ -280,7 +317,7 @@ export var transformColumns = function transformColumns() {
       (_item$fieldProps3 = item.fieldProps) === null || _item$fieldProps3 === void 0 ? true : delete _item$fieldProps3.useRequest;
     }
     var _render = function _render(text, record, index) {
-      var isEditing = !virtualKey || editingKeys.includes(record.rowKey);
+      var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
       var namePath = isArray(name) ? name : [name];
       if (virtualKey && editingKeys.includes(record.rowKey)) {
         namePath = getNamePath(name, virtualKey);
@@ -365,13 +402,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;
@@ -391,7 +428,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/ProEnum/components/Group.d.ts

@@ -2,6 +2,8 @@ import { ProEnum } from '../propsType';
 interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
     fieldValue: string;
     fieldLabel: string;
+    disabled?: boolean;
+    allowClear?: boolean;
 }
 declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/es/ProEnum/components/Group.js

@@ -8,7 +8,10 @@ var Group = function Group(props) {
     onChange = props.onChange,
     dataSource = props.dataSource,
     fieldValue = props.fieldValue,
-    fieldLabel = props.fieldLabel;
+    fieldLabel = props.fieldLabel,
+    disabled = props.disabled,
+    _props$allowClear = props.allowClear,
+    allowClear = _props$allowClear === void 0 ? true : _props$allowClear;
   var idx = useRef(-1);
   var _useSetState = useSetState({
       checked: ''
@@ -20,13 +23,28 @@ var Group = function Group(props) {
     setState({
       checked: value
     });
-  }, [value]);
-  var handleClick = function handleClick(val, index) {
-    setState({
-      checked: val
+    var index = dataSource.findIndex(function (item) {
+      return item[fieldValue] === value;
     });
     idx.current = index;
-    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+  }, [value]);
+  var handleClick = function handleClick(val, index) {
+    if (state.checked === val) {
+      if (!allowClear) {
+        return false;
+      }
+      setState({
+        checked: ''
+      });
+      onChange === null || onChange === void 0 ? void 0 : onChange('');
+      idx.current = -1;
+    } else {
+      setState({
+        checked: val
+      });
+      idx.current = index;
+      onChange === null || onChange === void 0 ? void 0 : onChange(val);
+    }
   };
   if (dataSource.length === 0) {
     return _jsx("span", {
@@ -34,11 +52,11 @@ var Group = function Group(props) {
     });
   }
   return _jsx("div", {
-    className: "pro-enum-group-root",
+    className: classNames('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
     children: dataSource.map(function (item, index) {
       return _jsx("div", {
         onClick: function onClick() {
-          if (!item.disabled) {
+          if (!item.disabled && !disabled) {
             handleClick(item[fieldValue], index);
           }
         },

package/es/ProEnum/index.js

@@ -41,7 +41,8 @@ var ProEnum = function ProEnum(props) {
     enumProps = _objectWithoutProperties(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
+    viewEmpty = _ref.viewEmpty,
+    disabled = _ref.disabled;
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -207,13 +208,13 @@ var ProEnum = function ProEnum(props) {
           dataSource: list
         });
       case 'Group':
-        return _jsx(ProEnumGroup, {
+        return _jsx(ProEnumGroup, _objectSpread(_objectSpread({}, enumProps), {}, {
           value: value,
           onChange: onChange,
           fieldLabel: label,
           fieldValue: fieldValue,
           dataSource: list
-        });
+        }));
       default:
         return null;
     }

package/es/ProEnum/style/index.less

@@ -7,12 +7,17 @@
     flex-direction: row;
     flex-wrap: wrap;
   }
+  &-group-root-disabled {
+    color: rgba(0, 0, 0, 0.25);
+    .pro-enum-group-item{
+      cursor: not-allowed !important;
+    }
+  }
   &-tag-item {
     display: flex;
     align-items: center;
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
-    margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
     padding: var(--zaui-space-size-xs) 10px;
     background-color: #f5f5f5;
     border-radius: var(--zaui-space-size-xs);
@@ -38,8 +43,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
-      padding: var(--zaui-space-size-sm) var(--zaui-space-border);
+      padding: 6px var(--zaui-space-border);
       line-height: 18px;
       background-color: #f1f3f6ff;
       border: 1px solid transparent;
@@ -72,6 +76,7 @@
 
     .pro-enum-group-item-selected {
       color: var(--zaui-brand);
+      background: #fff;
       border: 1px solid var(--zaui-brand);
       &::after {
         background: transparent;
@@ -88,4 +93,8 @@
       cursor: not-allowed;
     }
   }
+
+  &-group-root-disabled {
+    opacity: 0.7;
+  }
 }

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

@@ -43,15 +43,17 @@ var FormList = function FormList(props, ref) {
         names: item === null || item === void 0 ? void 0 : item.names,
         prefixNamePath: namePath
       })] : [fieldName].concat(_toConsumableArray(toArray(item.name)));
-      return _objectSpread(_objectSpread({}, item), {}, {
+      var column = _objectSpread(_objectSpread({}, item), {}, {
         name: _name,
         names: (item === null || item === void 0 ? void 0 : item.names) ? item.names.map(function (nameItem) {
-          return [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
+          // 传给Group的names会被渲染成真实FormItem 不能传完整name
+          return item.type === 'Group' ? [fieldName].concat(_toConsumableArray(toArray(nameItem))) : [].concat(_toConsumableArray(namePath), _toConsumableArray(toArray(nameItem)));
         }) : item.names,
         index: fieldName,
         namePath: namePath,
         label: mode === 'less' ? undefined : item.label
       });
+      return column;
     });
   }, [columns]);
   useImperativeHandle(ref, function () {

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

@@ -22,7 +22,10 @@ var Group = function Group(props) {
     } : _props$space,
     id = props.id,
     value = props.value,
-    onFieldChange = props.onFieldChange;
+    isView = props.isView,
+    index = props.index,
+    onFieldChange = props.onFieldChange,
+    namePath = props.namePath;
   var _ref = ProForm.useFieldProps() || {},
     names = _ref.names,
     name = _ref.name,
@@ -36,8 +39,10 @@ var Group = function Group(props) {
       return _objectSpread(_objectSpread({
         disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
+        isView: isView !== null && isView !== void 0 ? isView : item.isView,
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
-        parentNames: id
+        parentNames: id,
+        namePath: namePath
       });
     });
     var node = _jsx(_Button, {
@@ -65,8 +70,10 @@ var Group = function Group(props) {
     var touchName = ((_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) || '';
     // 模拟change,初始化不执行onFieldChange
     if (isFunction(onFieldChange) && form.isFieldsTouched(names) && transformNamesString(names).includes(touchName)) {
-      onFieldChange(value, form.getFieldsValue(), {
-        form: form
+      onFieldChange(value, namePath ? form.getFieldValue(namePath, true) : form.getFieldsValue(), {
+        form: form,
+        namePath: namePath,
+        index: index
       });
     }
   }, [value]);

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import { RowProps, SpaceProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
+import { NamePath } from 'antd/lib/form/interface';
 import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
 export interface SpaceType extends SpaceProps {
     /**
@@ -23,7 +24,12 @@ export interface GroupProps {
     value?: any;
     id?: string;
     disabled?: boolean | (() => void);
+    isView?: boolean;
+    namePath?: NamePath;
+    index?: number;
     onFieldChange?: (value: any[] | null, record: any, { form, }: {
         form: FormInstance;
+        namePath?: NamePath;
+        index?: number;
     }) => any;
 }

package/es/ProForm/components/combination/ProTimeLimit/style/index.less

@@ -6,7 +6,7 @@
     ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(
       .@{ant-prefix}-input-borderless
     ).@{ant-prefix}-input {
-    background: @zaui-base-bg;
+    // background: @zaui-base-bg;
     border-color: var(--ant-error-color);
   }
   .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(

package/es/ProForm/components/render/Render.js

@@ -52,7 +52,7 @@ var Render = function Render(props) {
     originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalTip = props.originalTip,
+    originalDiffTip = props.originalDiffTip,
     confirm = props.confirm,
     globalControl = props.globalControl;
   var colProps = props.colProps;
@@ -434,7 +434,7 @@ var Render = function Render(props) {
       });
     }
     // 不渲染tooltip
-    if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;
     }
     var title = _jsxs(_Space, {
@@ -447,6 +447,9 @@ var Render = function Render(props) {
     return _jsx(_Tooltip, {
       title: title,
       visible: changed ? undefined : false,
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
       children: formItem
     });
   };

package/es/ProForm/components/render/RenderFields.d.ts

@@ -17,7 +17,7 @@ interface Props<T = any> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | (() => boolean);
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;

package/es/ProForm/components/render/RenderFields.js

@@ -25,7 +25,7 @@ var RenderFields = function RenderFields(props) {
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalTip = props.originalTip,
+    originalDiffTip = props.originalDiffTip,
     globalControl = props.globalControl;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
@@ -176,7 +176,8 @@ var RenderFields = function RenderFields(props) {
       form: form,
       type: _type,
       hiddenNames: column.hiddenNames,
-      colProps: _colProps
+      colProps: _colProps,
+      mode: componentProps.mode
     };
     if (outerClearNotShow !== false && show === false && (column === null || column === void 0 ? void 0 : column.name) && form.getFieldValue(column === null || column === void 0 ? void 0 : column.name)) {
       setTimeout(function () {
@@ -205,7 +206,7 @@ var RenderFields = function RenderFields(props) {
         originalValues: originalValues,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalTip: originalTip,
+        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));