@zat-design/sisyphus-react 3.13.6-beta.5 → 3.13.6-beta.7

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 (11) hide show
  1. package/es/ProDownload/utils.js +1 -1
  2. package/es/ProTable/components/FormatColumn/index.js +4 -4
  3. package/es/ProTable/hooks/useAntdTable.js +6 -1
  4. package/es/ProTable/propsType.d.ts +2 -2
  5. package/es/ProTable/utils/index.js +2 -2
  6. package/lib/ProDownload/utils.js +1 -1
  7. package/lib/ProTable/components/FormatColumn/index.js +4 -4
  8. package/lib/ProTable/hooks/useAntdTable.js +4 -1
  9. package/lib/ProTable/propsType.d.ts +2 -2
  10. package/lib/ProTable/utils/index.js +2 -2
  11. package/package.json +1 -1
package/es/ProDownload/utils.js CHANGED
@@ -117,7 +117,7 @@ export var DownloadRequest = /*#__PURE__*/function () {
117
117
  _message.error("".concat(locale.ProDownload.errorMessage));
118
118
  return _context.abrupt("return", Promise.reject("".concat(locale.ProDownload.errorMessage)));
119
119
  case 7:
120
- if (!((_data === null || _data === void 0 ? void 0 : _data.status) !== 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
120
+ if (!((_data === null || _data === void 0 ? void 0 : _data.status) > 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
121
121
  _context.next = 12;
122
122
  break;
123
123
  }
package/es/ProTable/components/FormatColumn/index.js CHANGED
@@ -130,8 +130,8 @@ export var formatColumn = function formatColumn(_ref2) {
130
130
  if (isFunction(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
131
131
  var _originalObj$record$r;
132
132
  var diffResult = otherProps.viewRender({
133
- originalValue: originalValue,
134
- originalRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
133
+ originValue: originalValue,
134
+ originRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
135
135
  value: value,
136
136
  record: record,
137
137
  index: index
@@ -167,8 +167,8 @@ export var formatColumn = function formatColumn(_ref2) {
167
167
  if (isFunction(onDiff)) {
168
168
  var _originalObj$record$r2;
169
169
  var _diffResult = onDiff({
170
- originalValue: originalValue,
171
- originalRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
170
+ originValue: originalValue,
171
+ originRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
172
172
  value: value,
173
173
  record: record,
174
174
  index: index
package/es/ProTable/hooks/useAntdTable.js CHANGED
@@ -4,6 +4,8 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
4
4
  import "antd/es/message/style";
5
5
  import _message from "antd/es/message";
6
6
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
7
+ import "antd/es/form/style";
8
+ import _Form from "antd/es/form";
7
9
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
8
10
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
9
11
  var _excluded = ["page", "filters", "sorter"];
@@ -50,7 +52,7 @@ function useAntdTable(service, options, useRequestOptions) {
50
52
  searchValues = _useSetState2$.searchValues,
51
53
  setState = _useSetState2[1];
52
54
  var _useDefaultOptions = useDefaultOptions(options),
53
- form = _useDefaultOptions.form,
55
+ _form = _useDefaultOptions.form,
54
56
  page = _useDefaultOptions.page,
55
57
  extraParams = _useDefaultOptions.extraParams,
56
58
  rowKey = _useDefaultOptions.rowKey,
@@ -66,6 +68,9 @@ function useAntdTable(service, options, useRequestOptions) {
66
68
  transformParams = _useDefaultOptions.transformParams,
67
69
  transformResponse = _useDefaultOptions.transformResponse,
68
70
  disabled = _useDefaultOptions.disabled;
71
+ var _Form$useForm = _Form.useForm(_form),
72
+ _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
73
+ form = _Form$useForm2[0];
69
74
  var _ref = useRequestOptions || {},
70
75
  defaultParams = _ref.defaultParams;
71
76
  var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
package/es/ProTable/propsType.d.ts CHANGED
@@ -186,13 +186,13 @@ export interface ProTableColumnType extends Omit<ColumnType<any>, 'dataIndex'> {
186
186
  * @description 自定义如何比较数据差异，触发条件必须写render
187
187
  * @default undefined
188
188
  */
189
- onDiff?: ({ value, record, index, originalValue, originalRecord }: any) => any;
189
+ onDiff?: ({ value, record, index, originValue, originRecord }: any) => any;
190
190
  /**
191
191
  * 自定义比对渲染
192
192
  * @description 用于开启比对时，自定义 render 渲染初始值，触发条件必须写render
193
193
  * @default undefined
194
194
  */
195
- viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
195
+ viewRender?: ({ value, record, index, originValue, originRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
196
196
  /**
197
197
  * 是否已更改
198
198
  * @description 标记列值是否已变更
package/es/ProTable/utils/index.js CHANGED
@@ -30,8 +30,8 @@ export var getOriginalValue = function getOriginalValue(value, record, originalO
30
30
  isAddCell: null
31
31
  };
32
32
  }
33
- var originalRecord = get(originalObj, get(record, rowKey));
34
- var originalValue = get(originalRecord, dataIndex);
33
+ var originRecord = get(originalObj, get(record, rowKey));
34
+ var originalValue = get(originRecord, dataIndex);
35
35
  if (isEmpty(originalValue) && !isEmpty(value)) {
36
36
  return {
37
37
  originalValue: originalValue,
package/lib/ProDownload/utils.js CHANGED
@@ -126,7 +126,7 @@ var DownloadRequest = exports.DownloadRequest = /*#__PURE__*/function () {
126
126
  _antd.message.error("".concat(_locale.default.ProDownload.errorMessage));
127
127
  return _context.abrupt("return", Promise.reject("".concat(_locale.default.ProDownload.errorMessage)));
128
128
  case 7:
129
- if (!((_data === null || _data === void 0 ? void 0 : _data.status) !== 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
129
+ if (!((_data === null || _data === void 0 ? void 0 : _data.status) > 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
130
130
  _context.next = 12;
131
131
  break;
132
132
  }
package/lib/ProTable/components/FormatColumn/index.js CHANGED
@@ -136,8 +136,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
136
136
  if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender)) {
137
137
  var _originalObj$record$r;
138
138
  var diffResult = otherProps.viewRender({
139
- originalValue: originalValue,
140
- originalRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
139
+ originValue: originalValue,
140
+ originRecord: (_originalObj$record$r = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r !== void 0 ? _originalObj$record$r : {},
141
141
  value: value,
142
142
  record: record,
143
143
  index: index
@@ -173,8 +173,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
173
173
  if ((0, _lodash.isFunction)(onDiff)) {
174
174
  var _originalObj$record$r2;
175
175
  var _diffResult = onDiff({
176
- originalValue: originalValue,
177
- originalRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
176
+ originValue: originalValue,
177
+ originRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
178
178
  value: value,
179
179
  record: record,
180
180
  index: index
package/lib/ProTable/hooks/useAntdTable.js CHANGED
@@ -57,7 +57,7 @@ function useAntdTable(service, options, useRequestOptions) {
57
57
  searchValues = _useSetState2$.searchValues,
58
58
  setState = _useSetState2[1];
59
59
  var _useDefaultOptions = useDefaultOptions(options),
60
- form = _useDefaultOptions.form,
60
+ _form = _useDefaultOptions.form,
61
61
  page = _useDefaultOptions.page,
62
62
  extraParams = _useDefaultOptions.extraParams,
63
63
  rowKey = _useDefaultOptions.rowKey,
@@ -73,6 +73,9 @@ function useAntdTable(service, options, useRequestOptions) {
73
73
  transformParams = _useDefaultOptions.transformParams,
74
74
  transformResponse = _useDefaultOptions.transformResponse,
75
75
  disabled = _useDefaultOptions.disabled;
76
+ var _Form$useForm = _antd.Form.useForm(_form),
77
+ _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
78
+ form = _Form$useForm2[0];
76
79
  var _ref = useRequestOptions || {},
77
80
  defaultParams = _ref.defaultParams;
78
81
  var defaultParam = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
package/lib/ProTable/propsType.d.ts CHANGED
@@ -186,13 +186,13 @@ export interface ProTableColumnType extends Omit<ColumnType<any>, 'dataIndex'> {
186
186
  * @description 自定义如何比较数据差异，触发条件必须写render
187
187
  * @default undefined
188
188
  */
189
- onDiff?: ({ value, record, index, originalValue, originalRecord }: any) => any;
189
+ onDiff?: ({ value, record, index, originValue, originRecord }: any) => any;
190
190
  /**
191
191
  * 自定义比对渲染
192
192
  * @description 用于开启比对时，自定义 render 渲染初始值，触发条件必须写render
193
193
  * @default undefined
194
194
  */
195
- viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
195
+ viewRender?: ({ value, record, index, originValue, originRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
196
196
  /**
197
197
  * 是否已更改
198
198
  * @description 标记列值是否已变更
package/lib/ProTable/utils/index.js CHANGED
@@ -37,8 +37,8 @@ var getOriginalValue = exports.getOriginalValue = function getOriginalValue(valu
37
37
  isAddCell: null
38
38
  };
39
39
  }
40
- var originalRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
41
- var originalValue = (0, _lodash.get)(originalRecord, dataIndex);
40
+ var originRecord = (0, _lodash.get)(originalObj, (0, _lodash.get)(record, rowKey));
41
+ var originalValue = (0, _lodash.get)(originRecord, dataIndex);
42
42
  if (isEmpty(originalValue) && !isEmpty(value)) {
43
43
  return {
44
44
  originalValue: originalValue,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.13.6-beta.5",
3
+ "version": "3.13.6-beta.7",
4
4
  "license": "MIT",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",