@zat-design/sisyphus-react 3.4.4-beta.3 → 3.4.4-beta.5

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/ProForm/components/combination/FormList/index.js +5 -5
  2. package/es/ProForm/components/render/Render.js +2 -2
  3. package/lib/ProForm/components/combination/FormList/index.js +5 -5
  4. package/lib/ProForm/components/render/Render.js +2 -2
  5. package/package.json +3 -3
package/es/ProForm/components/combination/FormList/index.js CHANGED
@@ -23,7 +23,8 @@ var FormList = function FormList(props, ref) {
23
23
  mode = _props$mode === void 0 ? 'line' : _props$mode,
24
24
  meta = props.meta,
25
25
  _props$span = props.span,
26
- span = _props$span === void 0 ? 8 : _props$span;
26
+ span = _props$span === void 0 ? 8 : _props$span,
27
+ disabled = props.disabled;
27
28
  var _fields = fields.map(function (item) {
28
29
  return _objectSpread(_objectSpread({}, item), {}, {
29
30
  key: String(item.key)
@@ -32,8 +33,7 @@ var FormList = function FormList(props, ref) {
32
33
  var _ref = ProForm.useFieldProps() || {},
33
34
  form = _ref.form,
34
35
  name = _ref.name,
35
- isView = _ref.isView,
36
- disabled = _ref.disabled;
36
+ isView = _ref.isView;
37
37
  var errors = meta.errors;
38
38
  var _namePath = toArray(name);
39
39
  var processColumns = useCallback(function (fieldName, namePath) {
@@ -89,7 +89,7 @@ var FormList = function FormList(props, ref) {
89
89
  var _columns = processColumns(index, namePath);
90
90
  return mode === 'block' ? _jsx(BlockFields, _objectSpread(_objectSpread({}, props), {}, {
91
91
  columns: _columns,
92
- disabled: disabled || (props === null || props === void 0 ? void 0 : props.disabled),
92
+ disabled: disabled,
93
93
  isView: isView,
94
94
  namePath: namePath,
95
95
  index: index,
@@ -103,7 +103,7 @@ var FormList = function FormList(props, ref) {
103
103
  }, props), {}, {
104
104
  mode: mode,
105
105
  columns: _columns,
106
- disabled: disabled || (props === null || props === void 0 ? void 0 : props.disabled),
106
+ disabled: disabled,
107
107
  isView: isView,
108
108
  namePath: namePath,
109
109
  index: index,
package/es/ProForm/components/render/Render.js CHANGED
@@ -155,9 +155,9 @@ var Render = function Render(props) {
155
155
  Object.assign(otherFormItemProps, transforms, {
156
156
  names: otherProps.names
157
157
  }, internalRule, {
158
- required: typeof labelRequired === 'boolean' ? labelRequired : _required || (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
158
+ required: typeof labelRequired === 'boolean' ? labelRequired : _required || Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
159
159
  return item === null || item === void 0 ? void 0 : item.required;
160
- }))
160
+ })) || false
161
161
  }, otherProps.isView && !requiredOnView ? {
162
162
  required: false
163
163
  } : null, _objectSpread({}, isTrim(type, trim, useProConfig())), // 优先取传进来的，其次取ProConfigProvider配置的
package/lib/ProForm/components/combination/FormList/index.js CHANGED
@@ -29,7 +29,8 @@ var FormList = function FormList(props, ref) {
29
29
  mode = _props$mode === void 0 ? 'line' : _props$mode,
30
30
  meta = props.meta,
31
31
  _props$span = props.span,
32
- span = _props$span === void 0 ? 8 : _props$span;
32
+ span = _props$span === void 0 ? 8 : _props$span,
33
+ disabled = props.disabled;
33
34
  var _fields = fields.map(function (item) {
34
35
  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
35
36
  key: String(item.key)
@@ -38,8 +39,7 @@ var FormList = function FormList(props, ref) {
38
39
  var _ref = _ProForm.default.useFieldProps() || {},
39
40
  form = _ref.form,
40
41
  name = _ref.name,
41
- isView = _ref.isView,
42
- disabled = _ref.disabled;
42
+ isView = _ref.isView;
43
43
  var errors = meta.errors;
44
44
  var _namePath = (0, _utils.toArray)(name);
45
45
  var processColumns = (0, _react.useCallback)(function (fieldName, namePath) {
@@ -95,7 +95,7 @@ var FormList = function FormList(props, ref) {
95
95
  var _columns = processColumns(index, namePath);
96
96
  return mode === 'block' ? (0, _jsxRuntime.jsx)(_BlockFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
97
97
  columns: _columns,
98
- disabled: disabled || (props === null || props === void 0 ? void 0 : props.disabled),
98
+ disabled: disabled,
99
99
  isView: isView,
100
100
  namePath: namePath,
101
101
  index: index,
@@ -109,7 +109,7 @@ var FormList = function FormList(props, ref) {
109
109
  }, props), {}, {
110
110
  mode: mode,
111
111
  columns: _columns,
112
- disabled: disabled || (props === null || props === void 0 ? void 0 : props.disabled),
112
+ disabled: disabled,
113
113
  isView: isView,
114
114
  namePath: namePath,
115
115
  index: index,
package/lib/ProForm/components/render/Render.js CHANGED
@@ -153,9 +153,9 @@ var Render = function Render(props) {
153
153
  Object.assign(otherFormItemProps, transforms, {
154
154
  names: otherProps.names
155
155
  }, internalRule, {
156
- required: typeof labelRequired === 'boolean' ? labelRequired : _required || (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
156
+ required: typeof labelRequired === 'boolean' ? labelRequired : _required || Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
157
157
  return item === null || item === void 0 ? void 0 : item.required;
158
- }))
158
+ })) || false
159
159
  }, otherProps.isView && !requiredOnView ? {
160
160
  required: false
161
161
  } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.4.4-beta.3",
3
+ "version": "3.4.4-beta.5",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -58,8 +58,6 @@
58
58
  "@dnd-kit/sortable": "^7.0.2",
59
59
  "@dnd-kit/utilities": "^3.2.1",
60
60
  "@pansy/react-watermark": "^3.1.13",
61
- "@testing-library/jest-dom": "^6.2.0",
62
- "@testing-library/react": "^12.1.5",
63
61
  "@zat-design/utils": "^1.1.16",
64
62
  "ahooks": "3.7.4",
65
63
  "antd": "4.24.8",
@@ -79,6 +77,8 @@
79
77
  "devDependencies": {
80
78
  "@commitlint/cli": "^12.1.1",
81
79
  "@commitlint/config-conventional": "^12.1.1",
80
+ "@testing-library/jest-dom": "6.2.0",
81
+ "@testing-library/react": "12.1.5",
82
82
  "@types/classnames": "^2.3.1",
83
83
  "@types/jest": "^29.5.11",
84
84
  "@types/lodash": "^4.14.171",