@zat-design/sisyphus-react 3.4.2-beta.24 → 3.4.2-beta.26

package/dist/index.esm.css

@@ -2611,9 +2611,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
       -ms-flex-align: normal;
           align-items: normal;
 }
-.pro-form.ant-form {
-  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
-}
 .pro-form .pro-collapse-level2 .ant-collapse-item {
   margin-bottom: 0 !important;
 }
@@ -2694,7 +2691,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-input-number input {
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: transparent;
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector .ant-select-selection-placeholder,

package/dist/less.esm.css

@@ -2611,9 +2611,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
       -ms-flex-align: normal;
           align-items: normal;
 }
-.pro-form.ant-form {
-  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
-}
 .pro-form .pro-collapse-level2 .ant-collapse-item {
   margin-bottom: 0 !important;
 }
@@ -2694,7 +2691,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-picker input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-input-number input {
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: transparent;
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector .ant-select-selection-placeholder,

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,
@@ -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,9 @@ var RenderField = function RenderField(_ref) {
       isView: isView
     }
   });
+  if (type !== 'Group') {
+    componentProps = omit(componentProps, ['onFieldChange', 'index']);
+  }
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;
@@ -506,11 +511,11 @@ var RenderField = function RenderField(_ref) {
   }
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
   var originalTitle = originalDiffTip ? _jsxs(_Space, {
-    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
+    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 +526,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,
+    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/ProForm/components/combination/Group/index.js

@@ -23,7 +23,9 @@ var Group = function Group(props) {
     id = props.id,
     value = props.value,
     isView = props.isView,
-    onFieldChange = props.onFieldChange;
+    index = props.index,
+    onFieldChange = props.onFieldChange,
+    namePath = props.namePath;
   var _ref = ProForm.useFieldProps() || {},
     names = _ref.names,
     name = _ref.name,
@@ -39,7 +41,8 @@ var Group = function Group(props) {
       }, 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, {
@@ -67,8 +70,11 @@ 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
+      var record = namePath ? form.getFieldValue(namePath) : form.getFieldsValue();
+      onFieldChange(value, record, {
+        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 {
     /**
@@ -24,7 +25,11 @@ export interface GroupProps {
     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/render/Render.js

@@ -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/style/index.less

@@ -31,10 +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;
@@ -135,7 +131,7 @@
         background: @zaui-contract-bg !important;
 
         input {
-          background: @zaui-contract-bg;
+          background: transparent;
         }
         .@{ant-prefix}-select-selection-placeholder {
           z-index: 9;

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,
@@ -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,9 @@ var RenderField = function RenderField(_ref) {
       isView: isView
     }
   });
+  if (type !== 'Group') {
+    componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange', 'index']);
+  }
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;
@@ -509,11 +514,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 +529,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/ProForm/components/combination/Group/index.js

@@ -27,7 +27,9 @@ var Group = function Group(props) {
     id = props.id,
     value = props.value,
     isView = props.isView,
-    onFieldChange = props.onFieldChange;
+    index = props.index,
+    onFieldChange = props.onFieldChange,
+    namePath = props.namePath;
   var _ref = _ProForm.default.useFieldProps() || {},
     names = _ref.names,
     name = _ref.name,
@@ -43,7 +45,8 @@ var Group = function Group(props) {
       }, 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 = (0, _jsxRuntime.jsx)(_antd.Button, {
@@ -71,8 +74,11 @@ 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 ((0, _lodash.isFunction)(onFieldChange) && form.isFieldsTouched(names) && (0, _utils.transformNamesString)(names).includes(touchName)) {
-      onFieldChange(value, form.getFieldsValue(), {
-        form: form
+      var record = namePath ? form.getFieldValue(namePath) : form.getFieldsValue();
+      onFieldChange(value, record, {
+        form: form,
+        namePath: namePath,
+        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 {
     /**
@@ -24,7 +25,11 @@ export interface GroupProps {
     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/render/Render.js

@@ -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/style/index.less

@@ -31,10 +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;
@@ -135,7 +131,7 @@
         background: @zaui-contract-bg !important;
 
         input {
-          background: @zaui-contract-bg;
+          background: transparent;
         }
         .@{ant-prefix}-select-selection-placeholder {
           z-index: 9;

package/package.json

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