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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/index.esm.css +0 -3
  2. package/dist/less.esm.css +0 -3
  3. package/es/ProEditTable/components/RenderField/index.js +9 -5
  4. package/es/ProForm/style/index.less +0 -4
  5. package/lib/ProEditTable/components/RenderField/index.js +9 -5
  6. package/lib/ProForm/style/index.less +0 -4
  7. package/package.json +1 -1
package/dist/index.esm.css CHANGED
@@ -2611,9 +2611,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
2611
2611
  -ms-flex-align: normal;
2612
2612
  align-items: normal;
2613
2613
  }
2614
- .pro-form.ant-form {
2615
- margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
2616
- }
2617
2614
  .pro-form .pro-collapse-level2 .ant-collapse-item {
2618
2615
  margin-bottom: 0 !important;
2619
2616
  }
package/dist/less.esm.css CHANGED
@@ -2611,9 +2611,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
2611
2611
  -ms-flex-align: normal;
2612
2612
  align-items: normal;
2613
2613
  }
2614
- .pro-form.ant-form {
2615
- margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
2616
- }
2617
2614
  .pro-form .pro-collapse-level2 .ant-collapse-item {
2618
2615
  margin-bottom: 0 !important;
2619
2616
  }
package/es/ProEditTable/components/RenderField/index.js CHANGED
@@ -29,7 +29,7 @@ import { useListChanged } from '../../../ProForm/utils/useListChanged';
29
29
  import useRules from '../../../ProForm/utils/useRules';
30
30
  import { isSelect } from '../../../ProForm/utils';
31
31
  var RenderField = function RenderField(_ref) {
32
- var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4;
32
+ var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4, _componentProps;
33
33
  var value = _ref.text,
34
34
  record = _ref.record,
35
35
  index = _ref.index,
@@ -469,6 +469,7 @@ var RenderField = function RenderField(_ref) {
469
469
  form: form,
470
470
  name: cellName
471
471
  }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
472
+ namePath: [].concat(_toConsumableArray(namePath), [index]),
472
473
  disabled: _disabled,
473
474
  onChange: _onchange,
474
475
  onBlur: _onblur,
@@ -481,6 +482,9 @@ var RenderField = function RenderField(_ref) {
481
482
  isView: isView
482
483
  }
483
484
  });
485
+ if (type !== 'Group') {
486
+ componentProps = omit(componentProps, ['onFieldChange']);
487
+ }
484
488
  // 单元格编辑时，设置各个单元格disabled属性
485
489
  if (isCell) {
486
490
  record["".concat(dataIndex, "-Disabled")] = _disabled;
@@ -506,11 +510,11 @@ var RenderField = function RenderField(_ref) {
506
510
  }
507
511
  var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
508
512
  var originalTitle = originalDiffTip ? _jsxs(_Space, {
509
- children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
513
+ children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
510
514
  isView: true,
511
515
  value: originalValue,
512
516
  checked: type === 'Switch' ? originalValue : undefined
513
- }))) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
517
+ }))) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
514
518
  isView: true,
515
519
  value: originalValue,
516
520
  checked: type === 'Switch' ? originalValue : undefined
@@ -521,12 +525,12 @@ var RenderField = function RenderField(_ref) {
521
525
  }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
522
526
  className: _className,
523
527
  name: cellName,
524
- children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
528
+ children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
525
529
  })) : _jsx(Container, {
526
530
  viewEmpty: viewEmpty
527
531
  });
528
532
  return _jsx(FieldProvider, {
529
- value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
533
+ value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
530
534
  children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
531
535
  title: originalTitle,
532
536
  open: changed ? undefined : false,
package/es/ProForm/style/index.less CHANGED
@@ -31,10 +31,6 @@
31
31
  }
32
32
  }
33
33
 
34
- &.@{ant-prefix}-form {
35
- margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
36
- }
37
-
38
34
  .pro-collapse-level2 {
39
35
  .@{ant-prefix}-collapse-item {
40
36
  margin-bottom: 0 !important;
package/lib/ProEditTable/components/RenderField/index.js CHANGED
@@ -32,7 +32,7 @@ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "e
32
32
  /* eslint-disable prefer-destructuring */
33
33
  /* eslint-disable prefer-const */
34
34
  var RenderField = function RenderField(_ref) {
35
- var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4;
35
+ var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4, _componentProps;
36
36
  var value = _ref.text,
37
37
  record = _ref.record,
38
38
  index = _ref.index,
@@ -472,6 +472,7 @@ var RenderField = function RenderField(_ref) {
472
472
  form: form,
473
473
  name: cellName
474
474
  }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
475
+ namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index]),
475
476
  disabled: _disabled,
476
477
  onChange: _onchange,
477
478
  onBlur: _onblur,
@@ -484,6 +485,9 @@ var RenderField = function RenderField(_ref) {
484
485
  isView: isView
485
486
  }
486
487
  });
488
+ if (type !== 'Group') {
489
+ componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange']);
490
+ }
487
491
  // 单元格编辑时，设置各个单元格disabled属性
488
492
  if (isCell) {
489
493
  record["".concat(dataIndex, "-Disabled")] = _disabled;
@@ -509,11 +513,11 @@ var RenderField = function RenderField(_ref) {
509
513
  }
510
514
  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
511
515
  var originalTitle = originalDiffTip ? (0, _jsxRuntime.jsxs)(_antd.Space, {
512
- 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'])), {}, {
516
+ children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
513
517
  isView: true,
514
518
  value: originalValue,
515
519
  checked: type === 'Switch' ? originalValue : undefined
516
- }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
520
+ }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
517
521
  isView: true,
518
522
  value: originalValue,
519
523
  checked: type === 'Switch' ? originalValue : undefined
@@ -524,12 +528,12 @@ var RenderField = function RenderField(_ref) {
524
528
  }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
525
529
  className: _className,
526
530
  name: cellName,
527
- 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'])))
531
+ children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
528
532
  })) : (0, _jsxRuntime.jsx)(_Container.default, {
529
533
  viewEmpty: viewEmpty
530
534
  });
531
535
  return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
532
- value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
536
+ value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
533
537
  children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
534
538
  title: originalTitle,
535
539
  open: changed ? undefined : false,
package/lib/ProForm/style/index.less CHANGED
@@ -31,10 +31,6 @@
31
31
  }
32
32
  }
33
33
 
34
- &.@{ant-prefix}-form {
35
- margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
36
- }
37
-
38
34
  .pro-collapse-level2 {
39
35
  .@{ant-prefix}-collapse-item {
40
36
  margin-bottom: 0 !important;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.4.2-beta.24",
3
+ "version": "3.4.2-beta.25",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",