@zat-design/sisyphus-react 3.4.2-beta.9 → 3.4.3

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

@@ -32,7 +32,7 @@ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "e
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 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,
@@ -88,7 +88,7 @@ var RenderField = function RenderField(_ref) {
   type = ((_type = type) === null || _type === void 0 ? void 0 : (_type$replace = _type.replace) === null || _type$replace === void 0 ? void 0 : _type$replace.call(_type, type[0], type[0].toUpperCase())) || 'Input';
   // 单行正在编辑时，临时生成一套formItem用来存储中间值，点击取消时候重置回上一次状态
   var namePath = (0, _tools.getNamePath)(name, virtualKey);
-  var rowData = (0, _lodash.get)(form.getFieldsValue(), [].concat((0, _toConsumableArray2.default)(namePath), [index])) || record || {};
+  var rowData = form.getFieldValue([].concat((0, _toConsumableArray2.default)(namePath), [index])) || record || {};
   var currentValue = dataIndex ? rowData === null || rowData === void 0 ? void 0 : rowData[dataIndex] : null;
   // 第三个参数
   var options = {
@@ -213,7 +213,7 @@ var RenderField = function RenderField(_ref) {
     if (valueType) {
       transform = valueTypeTransform();
     }
-    return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), transform), form, names, namesStr);
+    return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), transform), form, names, namesStr, type);
   };
   if (!_editRender && typeof type === 'string') {
     var _componentMap$type;
@@ -303,7 +303,7 @@ var RenderField = function RenderField(_ref) {
           }
           _args = [].concat(args);
           rowPath = [].concat((0, _toConsumableArray2.default)(namePath), [index]);
-          row = form.getFieldValue(rowPath, true);
+          row = type === 'Group' ? _args[1] : form.getFieldValue(rowPath, true);
           orgRow = (0, _lodash.cloneDeep)(row);
           if (!onFieldChange) {
             _context.next = 18;
@@ -348,7 +348,7 @@ var RenderField = function RenderField(_ref) {
           return onChange.apply(void 0, (0, _toConsumableArray2.default)(_args));
         case 27:
           // 判断属性是否变动
-          form.setFieldValue(rowPath, row);
+          type !== 'Group' && form.setFieldValue(rowPath, row);
           if (!(0, _lodash.isEqual)(orgRow, row)) {
             diff = (0, _tools.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) {
@@ -472,9 +472,11 @@ var RenderField = function RenderField(_ref) {
     form: form,
     name: cellName
   }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
+    namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index]),
     disabled: _disabled,
     onChange: _onchange,
     onBlur: _onblur,
+    index: index,
     otherProps: {
       form: form,
       names: names,
@@ -484,6 +486,11 @@ var RenderField = function RenderField(_ref) {
       isView: isView
     }
   });
+  if (type === 'Group') {
+    componentProps.onFieldChange = _onchange;
+  } else {
+    componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange', 'namePath', 'index']);
+  }
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;
@@ -509,11 +516,11 @@ var RenderField = function RenderField(_ref) {
   }
   var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
   var originalTitle = originalDiffTip ? (0, _jsxRuntime.jsxs)(_antd.Space, {
-    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
-    }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+    }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
@@ -524,15 +531,18 @@ var RenderField = function RenderField(_ref) {
   }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
-    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))
+    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
+    value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
     children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: originalTitle,
       open: changed ? undefined : false,
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
       children: FormItem
     })
   });

package/lib/ProEditTable/utils/config.js

@@ -196,11 +196,6 @@ var actions = exports.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 = (0, _toConsumableArray2.default)(editingKeys); // 开启编辑状态
@@ -210,6 +205,11 @@ var actions = exports.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/lib/ProEditTable/utils/index.js

@@ -104,7 +104,30 @@ var getActionColumn = function getActionColumn(config) {
               setTimeout(function () {
                 var errorDom = document.querySelector('.ant-form-item-has-error');
                 if (errorDom) {
-                  errorDom.scrollIntoViewIfNeeded(true);
+                  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));
@@ -228,10 +251,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)({
@@ -383,13 +406,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;
@@ -409,7 +432,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/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/lib/ProEnum/components/Group.js

@@ -15,7 +15,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 = (0, _react.useRef)(-1);
   var _useSetState = (0, _ahooks.useSetState)({
       checked: ''
@@ -27,13 +30,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 (0, _jsxRuntime.jsx)("span", {
@@ -41,11 +59,11 @@ var Group = function Group(props) {
     });
   }
   return (0, _jsxRuntime.jsx)("div", {
-    className: "pro-enum-group-root",
+    className: (0, _classnames.default)('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
     children: dataSource.map(function (item, index) {
       return (0, _jsxRuntime.jsx)("div", {
         onClick: function onClick() {
-          if (!item.disabled) {
+          if (!item.disabled && !disabled) {
             handleClick(item[fieldValue], index);
           }
         },

package/lib/ProEnum/index.js

@@ -42,7 +42,8 @@ var ProEnum = function ProEnum(props) {
     enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
+    viewEmpty = _ref.viewEmpty,
+    disabled = _ref.disabled;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -208,13 +209,13 @@ var ProEnum = function ProEnum(props) {
           dataSource: list
         });
       case 'Group':
-        return (0, _jsxRuntime.jsx)(_Group.default, {
+        return (0, _jsxRuntime.jsx)(_Group.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
           value: value,
           onChange: onChange,
           fieldLabel: label,
           fieldValue: fieldValue,
           dataSource: list
-        });
+        }));
       default:
         return null;
     }

package/lib/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);
@@ -71,8 +76,8 @@
 
     .pro-enum-group-item-selected {
       color: var(--zaui-brand);
-      border: 1px solid 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/lib/ProForm/components/combination/FormList/index.js

@@ -47,17 +47,20 @@ var FormList = function FormList(props, ref) {
       // names的name处理
       var _name = Array.isArray(item === null || item === void 0 ? void 0 : item.names) ? [fieldName, (0, _utils2.namesPathTransform)({
         names: item === null || item === void 0 ? void 0 : item.names,
-        prefixNamePath: namePath
+        prefixNamePath: namePath,
+        type: item.type
       })] : [fieldName].concat((0, _toConsumableArray2.default)((0, _utils.toArray)(item.name)));
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+      var column = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         name: _name,
         names: (item === null || item === void 0 ? void 0 : item.names) ? item.names.map(function (nameItem) {
-          return [].concat((0, _toConsumableArray2.default)(namePath), (0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem)));
+          // 传给Group的names会被渲染成真实FormItem 不能传完整name
+          return item.type === 'Group' ? [fieldName].concat((0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem))) : [].concat((0, _toConsumableArray2.default)(namePath), (0, _toConsumableArray2.default)((0, _utils.toArray)(nameItem)));
         }) : item.names,
         index: fieldName,
         namePath: namePath,
         label: mode === 'less' ? undefined : item.label
       });
+      return column;
     });
   }, [columns]);
   (0, _react.useImperativeHandle)(ref, function () {

package/lib/ProForm/components/combination/FormList/utils.d.ts

@@ -4,7 +4,8 @@
  * @param prefixNamePath formList的name前缀
  * @returns list_0_min-list_0_max
  */
-export declare const namesPathTransform: ({ names, prefixNamePath, }: {
+export declare const namesPathTransform: ({ names, prefixNamePath, type, }: {
     names: any[];
     prefixNamePath: any[];
+    type: string;
 }) => string;

package/lib/ProForm/components/combination/FormList/utils.js

@@ -12,12 +12,14 @@ exports.namesPathTransform = void 0;
  */
 var namesPathTransform = exports.namesPathTransform = function namesPathTransform(_ref) {
   var names = _ref.names,
-    prefixNamePath = _ref.prefixNamePath;
-  if (!Array.isArray(names) || !Array.isArray(prefixNamePath)) {
+    prefixNamePath = _ref.prefixNamePath,
+    type = _ref.type;
+  if (!Array.isArray(names) || type !== 'Group' && !Array.isArray(prefixNamePath)) {
     return '';
   }
+  var _prefixNamePath = type === 'Group' ? '' : prefixNamePath;
   var newNamePath = names.map(function (val) {
-    return prefixNamePath.concat(val);
+    return _prefixNamePath.concat(val);
   });
   return newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.map(function (name) {
     return Array.isArray(name) ? name.join('_') : name;

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

@@ -26,11 +26,16 @@ 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.default.useFieldProps() || {},
     names = _ref.names,
     name = _ref.name,
-    form = _ref.form;
+    form = _ref.form,
+    _namePath = _ref.namePath;
+  var newNamePath = namePath || _namePath || [];
   if (!Array.isArray(names)) {
     console.error('Warning: Composite form components whose type is Group must be configured with names');
   }
@@ -40,8 +45,10 @@ var Group = function Group(props) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({
         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: newNamePath
       });
     });
     var node = (0, _jsxRuntime.jsx)(_antd.Button, {
@@ -63,14 +70,23 @@ var Group = function Group(props) {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
+  // 用于formList场景下names移除掉了前缀，需要再次合并回来
+  var _names = names.map(function (item) {
+    if ((0, _lodash.isNumber)(item === null || item === void 0 ? void 0 : item[0])) {
+      return (0, _lodash.union)(newNamePath, item);
+    }
+    return item;
+  });
   (0, _ahooks.useDeepCompareEffect)(function () {
     var _document, _document$activeEleme;
     // 焦点激活的表单
     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 ((0, _lodash.isFunction)(onFieldChange) && form.isFieldsTouched(names) && (0, _utils.transformNamesString)(names).includes(touchName)) {
-      onFieldChange(value, form.getFieldsValue(), {
-        form: form
+    if ((0, _lodash.isFunction)(onFieldChange) && form.isFieldsTouched(_names) && (0, _utils.transformNamesString)(_names).includes(touchName)) {
+      onFieldChange(value, (newNamePath === null || newNamePath === void 0 ? void 0 : newNamePath.length) ? form.getFieldValue(newNamePath, true) : form.getFieldsValue(), {
+        form: form,
+        namePath: newNamePath,
+        index: index
       });
     }
   }, [value]);

package/lib/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/lib/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/lib/ProForm/components/render/ConfirmWrapper.js

@@ -39,7 +39,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       return;
     }
     if ((0, _lodash.isObject)(confirmProps)) {
-      _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), confirmProps), {}, {
+      _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
         onOk: function onOk() {
           var _confirmProps$onOk;
           for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {

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

@@ -148,7 +148,7 @@ var Render = function Render(props) {
    */
   var transforms = Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names) ? (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherFormItemProps), valueTypeTransform()),
   // 合并valueType的transform
-  form, otherProps.names, namesStr) : valueTypeTransform();
+  form, otherProps.names, namesStr, otherProps.type) : valueTypeTransform();
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
@@ -445,6 +445,9 @@ var Render = function Render(props) {
     return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: title,
       visible: changed ? undefined : false,
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
       children: formItem
     });
   };

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

@@ -184,7 +184,9 @@ var RenderFields = function RenderFields(props) {
       form: form,
       type: _type,
       hiddenNames: column.hiddenNames,
-      colProps: _colProps
+      colProps: _colProps,
+      mode: componentProps.mode,
+      namePath: column.namePath
     };
     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 () {

package/lib/ProForm/propsType.d.ts

@@ -39,6 +39,8 @@ export interface ProFormOtherProps {
     disabled: boolean;
     show?: boolean | (() => boolean);
     required?: boolean | (() => boolean);
+    mode?: string;
+    namePath?: any[] | string | number;
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;

package/lib/ProForm/style/index.less

@@ -31,16 +31,6 @@
     }
   }
 
-  &.@{ant-prefix}-form {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-  }
-
-  .pro-collapse-level2 {
-    .@{ant-prefix}-collapse-item {
-      margin-bottom: 0 !important;
-    }
-  }
-
   .@{ant-prefix}-form-item-control-input {
     flex-grow: 1;
     max-width: 100%;
@@ -135,7 +125,7 @@
         background: @zaui-contract-bg !important;
 
         input {
-          background: @zaui-contract-bg;
+          background: transparent;
         }
         .@{ant-prefix}-select-selection-placeholder {
           z-index: 9;
@@ -147,8 +137,22 @@
         border-radius: 4px;
       }
 
-      // 查看模式 修改容器样式
-      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      // 地址组件
+      .@{ant-prefix}-form-item-control-input-content {
+        & > .pro-address {
+          .ant-select-selector,
+          .ant-input-affix-wrapper,
+          .ant-input-disabled {
+            background: @zaui-contract-bg;
+          }
+        }
+        & > .ant-input-group {
+          .forever-checkbox {
+            background: @zaui-contract-bg;
+          }
+        }
+      }
+
       .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;

package/lib/ProForm/utils/transformNames.d.ts

@@ -6,5 +6,5 @@ interface TransformProps extends FormItemProps {
     namePath: any[];
 }
 type TransformFun = 'normalize' | 'getValueProps' | 'shouldUpdate' | 'name';
-declare const transformNames: (formItem: TransformProps, form: FormInstance, names: NamePath[], fieldName: string) => Pick<TransformProps, TransformFun>;
+declare const transformNames: (formItem: TransformProps, form: FormInstance, names: NamePath[], fieldName: string, type?: string) => Pick<TransformProps, TransformFun>;
 export default transformNames;

package/lib/ProForm/utils/transformNames.js

@@ -6,17 +6,24 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _lodash = require("lodash");
 var _transformValue2 = require("./transformValue");
-var transformNames = function transformNames(formItem, form, names, fieldName) {
+var transformNames = function transformNames(formItem, form, names, fieldName, type) {
+  var _names2, _names3, _names3$;
   var _ref = formItem || {},
     normalize = _ref.normalize,
     getValueProps = _ref.getValueProps,
     _shouldUpdate2 = _ref.shouldUpdate;
-  if (!(names === null || names === void 0 ? void 0 : names.length)) {
+  var _names = names;
+  if (!((_names2 = _names) === null || _names2 === void 0 ? void 0 : _names2.length)) {
     return {};
   }
   // 当在formList场景下，给transformValue函数的setFiledProps的name, 需要全namePath
   var _fieldName = Array.isArray(formItem === null || formItem === void 0 ? void 0 : formItem.name) ? (0, _lodash.union)(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, formItem === null || formItem === void 0 ? void 0 : formItem.name) : fieldName;
-  var _transformValue = (0, _transformValue2.transformValue)(names, form, _fieldName, normalize, getValueProps),
+  if (type === 'Group' && (0, _lodash.isNumber)((_names3 = _names) === null || _names3 === void 0 ? void 0 : (_names3$ = _names3[0]) === null || _names3$ === void 0 ? void 0 : _names3$[0])) {
+    _names = _names.map(function (item) {
+      return (0, _lodash.union)(formItem === null || formItem === void 0 ? void 0 : formItem.namePath, item);
+    });
+  }
+  var _transformValue = (0, _transformValue2.transformValue)(_names, form, _fieldName, normalize, getValueProps),
     _normalize = _transformValue.normalize,
     _getValueProps = _transformValue.getValueProps,
     _shouldUpdate = _transformValue.shouldUpdate;

package/lib/ProForm/utils/useListChanged.js

@@ -32,6 +32,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
     var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
     var rowValue = form.getFieldValue(rowValueNamePath);
+    if (!rowValue) return undefined;
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = (0, _lodash.get)(originalValues, originalName.slice(0, rowKeyPath.length - 2));