@zat-design/sisyphus-react 3.6.4-beta.3 → 3.6.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 (7) hide show
  1. package/es/ProEditTable/utils/tools.d.ts +1 -1
  2. package/es/ProEditTable/utils/tools.js +5 -4
  3. package/es/ProForm/index.js +4 -4
  4. package/lib/ProEditTable/utils/tools.d.ts +1 -1
  5. package/lib/ProEditTable/utils/tools.js +5 -4
  6. package/lib/ProForm/index.js +4 -4
  7. package/package.json +1 -1
package/es/ProEditTable/utils/tools.d.ts CHANGED
@@ -25,7 +25,7 @@ export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
25
25
  * @param params 当前列的参数
26
26
  * @param rowDisabled 行禁用参数
27
27
  */
28
- export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled }: any) => any;
28
+ export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled, }: any) => any;
29
29
  /** 表格自动滚动到报错位置
30
30
  */
31
31
  export declare const handleScrollToError: () => void;
package/es/ProEditTable/utils/tools.js CHANGED
@@ -86,6 +86,7 @@ export var onDelete = function onDelete(_ref) {
86
86
  * @param rowDisabled 行禁用参数
87
87
  */
88
88
  export var getDisabled = function getDisabled(_ref2) {
89
+ var _ref3, _column$disabled;
89
90
  var globalControl = _ref2.globalControl,
90
91
  formDisabled = _ref2.formDisabled,
91
92
  column = _ref2.column,
@@ -147,7 +148,7 @@ export var getDisabled = function getDisabled(_ref2) {
147
148
  if (isFunction(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
148
149
  return convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled.apply(columnFieldProps, _toConsumableArray(params)));
149
150
  }
150
- return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled) || convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || convertToBoolean(tabledDisabled);
151
+ return convertToBoolean((_ref3 = (_column$disabled = column === null || column === void 0 ? void 0 : column.disabled) !== null && _column$disabled !== void 0 ? _column$disabled : columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : tabledDisabled);
151
152
  };
152
153
  /** 表格自动滚动到报错位置
153
154
  */
@@ -164,9 +165,9 @@ export var handleScrollToError = function handleScrollToError() {
164
165
  while (previousSibling) {
165
166
  if (previousSibling.nodeType === 1) {
166
167
  var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
167
- var _ref3 = previousSibling.getBoundingClientRect() || {},
168
- _ref3$width = _ref3.width,
169
- width = _ref3$width === void 0 ? 0 : _ref3$width;
168
+ var _ref4 = previousSibling.getBoundingClientRect() || {},
169
+ _ref4$width = _ref4.width,
170
+ width = _ref4$width === void 0 ? 0 : _ref4$width;
170
171
  childOffsetLeft += width;
171
172
  if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
172
173
  childFixedLeft += width;
package/es/ProForm/index.js CHANGED
@@ -229,7 +229,7 @@ var ProForm = function ProForm(props, ref) {
229
229
  otherProps.layout = otherProps.layout || 'vertical';
230
230
  }
231
231
  }
232
- return _jsx(_Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
232
+ return _jsxs(_Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
233
233
  onKeyPress: function onKeyPress(event) {
234
234
  if (!submitOnEnter) return;
235
235
  if (event.key === 'Enter') {
@@ -247,7 +247,7 @@ var ProForm = function ProForm(props, ref) {
247
247
  block: 'center',
248
248
  behavior: 'smooth'
249
249
  },
250
- children: _jsxs(_Row, _objectSpread(_objectSpread({
250
+ children: [_jsxs(_Row, _objectSpread(_objectSpread({
251
251
  gutter: 24
252
252
  }, rowProps), {}, {
253
253
  children: [_jsx(RenderFields, {
@@ -266,8 +266,8 @@ var ProForm = function ProForm(props, ref) {
266
266
  required: required,
267
267
  originalDiffTip: originalDiffTip,
268
268
  globalControl: globalControl
269
- }), children, footerRender()]
270
- }))
269
+ }), footerRender()]
270
+ })), children]
271
271
  }));
272
272
  };
273
273
  // @ts-ignore
package/lib/ProEditTable/utils/tools.d.ts CHANGED
@@ -25,7 +25,7 @@ export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
25
25
  * @param params 当前列的参数
26
26
  * @param rowDisabled 行禁用参数
27
27
  */
28
- export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled }: any) => any;
28
+ export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled, }: any) => any;
29
29
  /** 表格自动滚动到报错位置
30
30
  */
31
31
  export declare const handleScrollToError: () => void;
package/lib/ProEditTable/utils/tools.js CHANGED
@@ -93,6 +93,7 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
93
93
  * @param rowDisabled 行禁用参数
94
94
  */
95
95
  var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
96
+ var _ref3, _column$disabled;
96
97
  var globalControl = _ref2.globalControl,
97
98
  formDisabled = _ref2.formDisabled,
98
99
  column = _ref2.column,
@@ -154,7 +155,7 @@ var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
154
155
  if ((0, _lodash.isFunction)(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled)) {
155
156
  return convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled.apply(columnFieldProps, (0, _toConsumableArray2.default)(params)));
156
157
  }
157
- return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled) || convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || convertToBoolean(tabledDisabled);
158
+ return convertToBoolean((_ref3 = (_column$disabled = column === null || column === void 0 ? void 0 : column.disabled) !== null && _column$disabled !== void 0 ? _column$disabled : columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : tabledDisabled);
158
159
  };
159
160
  /** 表格自动滚动到报错位置
160
161
  */
@@ -171,9 +172,9 @@ var handleScrollToError = exports.handleScrollToError = function handleScrollToE
171
172
  while (previousSibling) {
172
173
  if (previousSibling.nodeType === 1) {
173
174
  var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
174
- var _ref3 = previousSibling.getBoundingClientRect() || {},
175
- _ref3$width = _ref3.width,
176
- width = _ref3$width === void 0 ? 0 : _ref3$width;
175
+ var _ref4 = previousSibling.getBoundingClientRect() || {},
176
+ _ref4$width = _ref4.width,
177
+ width = _ref4$width === void 0 ? 0 : _ref4$width;
177
178
  childOffsetLeft += width;
178
179
  if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
179
180
  childFixedLeft += width;
package/lib/ProForm/index.js CHANGED
@@ -230,7 +230,7 @@ var ProForm = function ProForm(props, ref) {
230
230
  otherProps.layout = otherProps.layout || 'vertical';
231
231
  }
232
232
  }
233
- return (0, _jsxRuntime.jsx)(_antd.Form, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
233
+ return (0, _jsxRuntime.jsxs)(_antd.Form, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
234
234
  onKeyPress: function onKeyPress(event) {
235
235
  if (!submitOnEnter) return;
236
236
  if (event.key === 'Enter') {
@@ -248,7 +248,7 @@ var ProForm = function ProForm(props, ref) {
248
248
  block: 'center',
249
249
  behavior: 'smooth'
250
250
  },
251
- children: (0, _jsxRuntime.jsxs)(_antd.Row, (0, _objectSpread2.default)((0, _objectSpread2.default)({
251
+ children: [(0, _jsxRuntime.jsxs)(_antd.Row, (0, _objectSpread2.default)((0, _objectSpread2.default)({
252
252
  gutter: 24
253
253
  }, rowProps), {}, {
254
254
  children: [(0, _jsxRuntime.jsx)(_RenderFields.default, {
@@ -267,8 +267,8 @@ var ProForm = function ProForm(props, ref) {
267
267
  required: required,
268
268
  originalDiffTip: originalDiffTip,
269
269
  globalControl: globalControl
270
- }), children, footerRender()]
271
- }))
270
+ }), footerRender()]
271
+ })), children]
272
272
  }));
273
273
  };
274
274
  // @ts-ignore
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.6.4-beta.3",
3
+ "version": "3.6.4-beta.5",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",