@zat-design/sisyphus-react 3.4.4-beta.2 → 3.4.4-beta.4

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 (9) hide show
  1. package/es/ProEditTable/components/RenderField/index.js +3 -2
  2. package/es/ProEditTable/index.js +2 -1
  3. package/es/ProEditTable/utils/index.js +7 -1
  4. package/es/ProForm/components/combination/FormList/index.js +5 -5
  5. package/lib/ProEditTable/components/RenderField/index.js +3 -2
  6. package/lib/ProEditTable/index.js +2 -1
  7. package/lib/ProEditTable/utils/index.js +7 -1
  8. package/lib/ProForm/components/combination/FormList/index.js +5 -5
  9. package/package.json +3 -3
package/es/ProEditTable/components/RenderField/index.js CHANGED
@@ -74,7 +74,8 @@ var RenderField = function RenderField(_ref) {
74
74
  originalValues = config.originalValues,
75
75
  formNamePath = config.namePath,
76
76
  _config$originalDiffT = config.originalDiffTip,
77
- originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT;
77
+ originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
78
+ rowDisabled = config.rowDisabled;
78
79
  var _fieldProps = fieldProps || formItemProps || {};
79
80
  var _rules = rules || [];
80
81
  var _required = required;
@@ -99,7 +100,7 @@ var RenderField = function RenderField(_ref) {
99
100
  isEditable = isEditable(currentValue, rowData, options);
100
101
  }
101
102
  // 是否只读文本
102
- var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing;
103
+ var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || (rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled(record));
103
104
  // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
104
105
  var baseName = isView ? name : namePath;
105
106
  var TargetComponent;
package/es/ProEditTable/index.js CHANGED
@@ -160,7 +160,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
160
160
  page: page,
161
161
  originalValues: originalValues,
162
162
  originalDiffTip: originalDiffTip,
163
- prefixCls: prefixCls
163
+ prefixCls: prefixCls,
164
+ rowDisabled: rowDisabled
164
165
  };
165
166
  // 编辑行设置下样式
166
167
  var _rowClassName = function _rowClassName(record) {
package/es/ProEditTable/utils/index.js CHANGED
@@ -32,7 +32,8 @@ var getActionColumn = function getActionColumn(config) {
32
32
  validateKeys = config.validateKeys,
33
33
  actionWidth = config.actionWidth,
34
34
  actionProps = config.actionProps,
35
- page = config.page;
35
+ page = config.page,
36
+ rowDisabled = config.rowDisabled;
36
37
  var pageNum = tools.calc(page.pageNum, '-', 1);
37
38
  var firstIndex = tools.calc(pageNum, '*', page.pageSize);
38
39
  // actionProps配置为false 默认不插入
@@ -184,6 +185,11 @@ var getActionColumn = function getActionColumn(config) {
184
185
  fixed: 'right',
185
186
  width: actionWidth || (virtualKey ? '120px' : '60px'),
186
187
  render: function render(text, record, index) {
188
+ var _rowDisabled;
189
+ var _disabled = (_rowDisabled = rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled(record)) !== null && _rowDisabled !== void 0 ? _rowDisabled : false;
190
+ if (_disabled) {
191
+ return '';
192
+ }
187
193
  return _jsx(_Space, {
188
194
  size: "middle",
189
195
  children: actionBtns.map(function (btnConfig) {
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/lib/ProEditTable/components/RenderField/index.js CHANGED
@@ -77,7 +77,8 @@ var RenderField = function RenderField(_ref) {
77
77
  originalValues = config.originalValues,
78
78
  formNamePath = config.namePath,
79
79
  _config$originalDiffT = config.originalDiffTip,
80
- originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT;
80
+ originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
81
+ rowDisabled = config.rowDisabled;
81
82
  var _fieldProps = fieldProps || formItemProps || {};
82
83
  var _rules = rules || [];
83
84
  var _required = required;
@@ -102,7 +103,7 @@ var RenderField = function RenderField(_ref) {
102
103
  isEditable = isEditable(currentValue, rowData, options);
103
104
  }
104
105
  // 是否只读文本
105
- var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing;
106
+ var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || (rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled(record));
106
107
  // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
107
108
  var baseName = isView ? name : namePath;
108
109
  var TargetComponent;
package/lib/ProEditTable/index.js CHANGED
@@ -163,7 +163,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
163
163
  page: page,
164
164
  originalValues: originalValues,
165
165
  originalDiffTip: originalDiffTip,
166
- prefixCls: prefixCls
166
+ prefixCls: prefixCls,
167
+ rowDisabled: rowDisabled
167
168
  };
168
169
  // 编辑行设置下样式
169
170
  var _rowClassName = function _rowClassName(record) {
package/lib/ProEditTable/utils/index.js CHANGED
@@ -36,7 +36,8 @@ var getActionColumn = function getActionColumn(config) {
36
36
  validateKeys = config.validateKeys,
37
37
  actionWidth = config.actionWidth,
38
38
  actionProps = config.actionProps,
39
- page = config.page;
39
+ page = config.page,
40
+ rowDisabled = config.rowDisabled;
40
41
  var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
41
42
  var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);
42
43
  // actionProps配置为false 默认不插入
@@ -188,6 +189,11 @@ var getActionColumn = function getActionColumn(config) {
188
189
  fixed: 'right',
189
190
  width: actionWidth || (virtualKey ? '120px' : '60px'),
190
191
  render: function render(text, record, index) {
192
+ var _rowDisabled;
193
+ var _disabled = (_rowDisabled = rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled(record)) !== null && _rowDisabled !== void 0 ? _rowDisabled : false;
194
+ if (_disabled) {
195
+ return '';
196
+ }
191
197
  return (0, _jsxRuntime.jsx)(_antd.Space, {
192
198
  size: "middle",
193
199
  children: actionBtns.map(function (btnConfig) {
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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.4.4-beta.2",
3
+ "version": "3.4.4-beta.4",
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",