@zat-design/sisyphus-react 3.8.0-beta.17 → 3.8.0-beta.19

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/components/RenderField/ListChangedWrapper.js +1 -1
  2. package/es/ProEditTable/components/RenderField/index.js +0 -2
  3. package/es/ProEditTable/index.js +8 -4
  4. package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +1 -1
  5. package/lib/ProEditTable/components/RenderField/index.js +0 -2
  6. package/lib/ProEditTable/index.js +8 -4
  7. package/package.json +1 -1
package/es/ProEditTable/components/RenderField/ListChangedWrapper.js CHANGED
@@ -87,7 +87,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
87
87
  var namePath = toNamePath(namesStr || name);
88
88
  var originalNamePath = toNamePath(originalName);
89
89
  var originalNamePaths = originalNames && toNamePaths(originalNames);
90
- var isWatch = originalValues;
90
+ var isWatch = Boolean(originalValues);
91
91
  var originalValue = isWatch ? getOriginalValue({
92
92
  namePath: namePath,
93
93
  originalName: originalNamePath,
package/es/ProEditTable/components/RenderField/index.js CHANGED
@@ -70,8 +70,6 @@ var RenderField = function RenderField(_ref) {
70
70
  viewEmpty = config.viewEmpty,
71
71
  originalValues = config.originalValues,
72
72
  formNamePath = config.namePath,
73
- _config$originalDiffT = config.originalDiffTip,
74
- originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
75
73
  rowDisabled = config.rowDisabled,
76
74
  _config$validateTrigg = config.validateTrigger,
77
75
  validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
package/es/ProEditTable/index.js CHANGED
@@ -276,19 +276,23 @@ var ProEditTable = function ProEditTable(_ref, ref) {
276
276
  return transformColumns(columns, config);
277
277
  }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
278
278
  useEffect(function () {
279
- var _value$every;
279
+ var _value$every, _originalArr$every;
280
280
  var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {
281
281
  return item.rowKey;
282
282
  });
283
+ // 原始值也需要设置对应的rowkey，后续比对通过rowkey对比
284
+ var originalArr = get(originalValues, name);
285
+ var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
286
+ return item.rowKey;
287
+ }) : true;
283
288
  // 初始化默认生成row-key
284
- if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey) {
289
+ if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey || (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && !isOriginalAllHasKey) {
285
290
  var _originalArr$forEach;
286
291
  var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
287
292
  return _objectSpread(_objectSpread({}, item), {}, {
288
293
  rowKey: getRowKey(item)
289
294
  });
290
295
  });
291
- var originalArr = get(originalValues, name);
292
296
  originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
293
297
  item.rowKey = getRowKey(item);
294
298
  });
@@ -297,7 +301,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
297
301
  form.setFieldValue(virtualRowName, nextValues);
298
302
  }
299
303
  }
300
- }, [value]);
304
+ }, [value, originalValues]);
301
305
  useImperativeHandle((resetProps === null || resetProps === void 0 ? void 0 : resetProps.ref) || ref, function () {
302
306
  return {
303
307
  getInternalState: function getInternalState() {
package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js CHANGED
@@ -92,7 +92,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
92
92
  var namePath = toNamePath(namesStr || name);
93
93
  var originalNamePath = toNamePath(originalName);
94
94
  var originalNamePaths = originalNames && toNamePaths(originalNames);
95
- var isWatch = originalValues;
95
+ var isWatch = Boolean(originalValues);
96
96
  var originalValue = isWatch ? getOriginalValue({
97
97
  namePath: namePath,
98
98
  originalName: originalNamePath,
package/lib/ProEditTable/components/RenderField/index.js CHANGED
@@ -77,8 +77,6 @@ var RenderField = function RenderField(_ref) {
77
77
  viewEmpty = config.viewEmpty,
78
78
  originalValues = config.originalValues,
79
79
  formNamePath = config.namePath,
80
- _config$originalDiffT = config.originalDiffTip,
81
- originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
82
80
  rowDisabled = config.rowDisabled,
83
81
  _config$validateTrigg = config.validateTrigger,
84
82
  validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
package/lib/ProEditTable/index.js CHANGED
@@ -279,19 +279,23 @@ var ProEditTable = function ProEditTable(_ref, ref) {
279
279
  return (0, _utils.transformColumns)(columns, config);
280
280
  }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
281
281
  (0, _react.useEffect)(function () {
282
- var _value$every;
282
+ var _value$every, _originalArr$every;
283
283
  var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {
284
284
  return item.rowKey;
285
285
  });
286
+ // 原始值也需要设置对应的rowkey，后续比对通过rowkey对比
287
+ var originalArr = (0, _lodash.get)(originalValues, name);
288
+ var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
289
+ return item.rowKey;
290
+ }) : true;
286
291
  // 初始化默认生成row-key
287
- if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey) {
292
+ if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey || (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && !isOriginalAllHasKey) {
288
293
  var _originalArr$forEach;
289
294
  var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
290
295
  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
291
296
  rowKey: getRowKey(item)
292
297
  });
293
298
  });
294
- var originalArr = (0, _lodash.get)(originalValues, name);
295
299
  originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
296
300
  item.rowKey = getRowKey(item);
297
301
  });
@@ -300,7 +304,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
300
304
  form.setFieldValue(virtualRowName, nextValues);
301
305
  }
302
306
  }
303
- }, [value]);
307
+ }, [value, originalValues]);
304
308
  (0, _react.useImperativeHandle)((resetProps === null || resetProps === void 0 ? void 0 : resetProps.ref) || ref, function () {
305
309
  return {
306
310
  getInternalState: function getInternalState() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.8.0-beta.17",
3
+ "version": "3.8.0-beta.19",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",