@zat-design/sisyphus-react 3.10.0 → 3.10.1-beta.1

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 (5) hide show
  1. package/es/ProEditTable/components/RenderField/index.js +3 -1
  2. package/es/ProForm/components/render/Render.js +16 -11
  3. package/lib/ProEditTable/components/RenderField/index.js +3 -1
  4. package/lib/ProForm/components/render/Render.js +16 -11
  5. package/package.json +1 -1
package/es/ProEditTable/components/RenderField/index.js CHANGED
@@ -173,7 +173,9 @@ var RenderField = function RenderField(_ref) {
173
173
  fieldProps: column === null || column === void 0 ? void 0 : column.fieldProps
174
174
  });
175
175
  // 允许formItem的属性放在column最外层
176
- var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule);
176
+ var _formItemProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule), {}, {
177
+ validateTrigger: validateTrigger
178
+ });
177
179
  if (['Switch', 'SwitchCheckbox'].includes(type)) {
178
180
  _formItemProps.valuePropName = 'checked';
179
181
  _valueType = 'switch';
package/es/ProForm/components/render/Render.js CHANGED
@@ -424,17 +424,22 @@ var Render = function Render(props) {
424
424
  colProps = _objectSpread(_objectSpread({}, colProps), {}, {
425
425
  span: lessMode ? colProps.span : 24 // 默认占一行
426
426
  });
427
- return _jsx(_Form.List, _objectSpread(_objectSpread({
428
- name: _otherFormItemProps.name
429
- }, omit(_otherFormItemProps, ['rules'])), {}, {
430
- children: function children(fields, operation, meta) {
431
- return _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, lastComponentPropsFilter)), {}, {
432
- otherProps: otherProps,
433
- fields: fields,
434
- operation: operation,
435
- meta: meta
436
- }));
437
- }
427
+ return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, [].concat(filterFormItemKey, ['name', 'names']))), {}, {
428
+ // @ts-ignore
429
+ _internalItemRender: internalItemRender,
430
+ className: _className,
431
+ children: _jsx(_Form.List, _objectSpread(_objectSpread({
432
+ name: _otherFormItemProps.name
433
+ }, omit(_otherFormItemProps, ['rules'])), {}, {
434
+ children: function children(fields, operation, meta) {
435
+ return _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, lastComponentPropsFilter)), {}, {
436
+ otherProps: otherProps,
437
+ fields: fields,
438
+ operation: operation,
439
+ meta: meta
440
+ }));
441
+ }
442
+ }))
438
443
  }));
439
444
  }
440
445
  // 默认占据一行
package/lib/ProEditTable/components/RenderField/index.js CHANGED
@@ -180,7 +180,9 @@ var RenderField = function RenderField(_ref) {
180
180
  fieldProps: column === null || column === void 0 ? void 0 : column.fieldProps
181
181
  });
182
182
  // 允许formItem的属性放在column最外层
183
- var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule);
183
+ var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule), {}, {
184
+ validateTrigger: validateTrigger
185
+ });
184
186
  if (['Switch', 'SwitchCheckbox'].includes(type)) {
185
187
  _formItemProps.valuePropName = 'checked';
186
188
  _valueType = 'switch';
package/lib/ProForm/components/render/Render.js CHANGED
@@ -424,17 +424,22 @@ var Render = function Render(props) {
424
424
  colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
425
425
  span: lessMode ? colProps.span : 24 // 默认占一行
426
426
  });
427
- return (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
428
- name: _otherFormItemProps.name
429
- }, (0, _lodash.omit)(_otherFormItemProps, ['rules'])), {}, {
430
- children: function children(fields, operation, meta) {
431
- return (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, lastComponentPropsFilter)), {}, {
432
- otherProps: otherProps,
433
- fields: fields,
434
- operation: operation,
435
- meta: meta
436
- }));
437
- }
427
+ return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, [].concat(filterFormItemKey, ['name', 'names']))), {}, {
428
+ // @ts-ignore
429
+ _internalItemRender: internalItemRender,
430
+ className: _className,
431
+ children: (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
432
+ name: _otherFormItemProps.name
433
+ }, (0, _lodash.omit)(_otherFormItemProps, ['rules'])), {}, {
434
+ children: function children(fields, operation, meta) {
435
+ return (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, lastComponentPropsFilter)), {}, {
436
+ otherProps: otherProps,
437
+ fields: fields,
438
+ operation: operation,
439
+ meta: meta
440
+ }));
441
+ }
442
+ }))
438
443
  }));
439
444
  }
440
445
  // 默认占据一行
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.10.0",
3
+ "version": "3.10.1-beta.1",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",