@zat-design/sisyphus-react 3.9.0-beta.15 → 3.9.0-beta.17

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 (4) hide show
  1. package/es/ProForm/utils/diffOriginal.js +12 -8
  2. package/lib/ProForm/utils/diffOriginal.js +12 -8
  3. package/package.json +1 -1
  4. package/.vscode/extensions.json +0 -5
package/es/ProForm/utils/diffOriginal.js CHANGED
@@ -1,15 +1,17 @@
1
1
  import { isEqual, isFunction, isObject } from 'lodash';
2
2
  import { isEmpty } from '../../utils';
3
3
  // 过滤对象中undefined字段
4
- // 防止{a: '1'} {a: '1', b: undefined}被认为不相等
5
- var filterUndefined = function filterUndefined(data) {
4
+ // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
5
+ var filterObject = function filterObject(data) {
6
6
  if (!isObject(data) || Array.isArray(data) || data === null) return data;
7
7
  var resData = {};
8
8
  Object.keys(data).forEach(function (key) {
9
- if (data[key] !== undefined) {
9
+ if (!isEmpty(data[key])) {
10
10
  resData[key] = data[key];
11
11
  }
12
12
  });
13
+ // 空对象视为null 比较时 null undefined {} [] '' 视为相等
14
+ if (!Object.keys(resData).length) return null;
13
15
  return resData;
14
16
  };
15
17
  var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
@@ -26,12 +28,14 @@ export var diffOriginal = function diffOriginal(params) {
26
28
  }
27
29
  return diffRes;
28
30
  }
31
+ var _value = filterObject(value);
32
+ var _originalValue = filterObject(originalValue);
29
33
  // 如果原始值为空 且当前有值的话 认为变更类型是新增
30
- if (isEmpty(originalValue) && !isEmpty(value)) {
34
+ if (isEmpty(_originalValue) && !isEmpty(_value)) {
31
35
  return 'add';
32
36
  }
33
- if (Array.isArray(originalValue)) {
34
- var isSame = originalValue.every(function (valueItem, index) {
37
+ if (Array.isArray(_originalValue)) {
38
+ var isSame = _originalValue.every(function (valueItem, index) {
35
39
  // 如果两个值有一个不是空值, 则进行深比较
36
40
  if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
37
41
  return isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
@@ -40,8 +44,8 @@ export var diffOriginal = function diffOriginal(params) {
40
44
  });
41
45
  return isSame ? 'same' : 'changed';
42
46
  }
43
- if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
44
- return isEqual(filterUndefined(value), filterUndefined(originalValue)) ? 'same' : 'changed';
47
+ if (!isEmpty(_originalValue) || !isEmpty(_value)) {
48
+ return isEqual(_value, _originalValue) ? 'same' : 'changed';
45
49
  }
46
50
  return 'same';
47
51
  };
package/lib/ProForm/utils/diffOriginal.js CHANGED
@@ -7,15 +7,17 @@ exports.diffOriginal = void 0;
7
7
  var _lodash = require("lodash");
8
8
  var _utils = require("../../utils");
9
9
  // 过滤对象中undefined字段
10
- // 防止{a: '1'} {a: '1', b: undefined}被认为不相等
11
- var filterUndefined = function filterUndefined(data) {
10
+ // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
11
+ var filterObject = function filterObject(data) {
12
12
  if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
13
13
  var resData = {};
14
14
  Object.keys(data).forEach(function (key) {
15
- if (data[key] !== undefined) {
15
+ if (!(0, _utils.isEmpty)(data[key])) {
16
16
  resData[key] = data[key];
17
17
  }
18
18
  });
19
+ // 空对象视为null 比较时 null undefined {} [] '' 视为相等
20
+ if (!Object.keys(resData).length) return null;
19
21
  return resData;
20
22
  };
21
23
  var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
@@ -32,12 +34,14 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
32
34
  }
33
35
  return diffRes;
34
36
  }
37
+ var _value = filterObject(value);
38
+ var _originalValue = filterObject(originalValue);
35
39
  // 如果原始值为空 且当前有值的话 认为变更类型是新增
36
- if ((0, _utils.isEmpty)(originalValue) && !(0, _utils.isEmpty)(value)) {
40
+ if ((0, _utils.isEmpty)(_originalValue) && !(0, _utils.isEmpty)(_value)) {
37
41
  return 'add';
38
42
  }
39
- if (Array.isArray(originalValue)) {
40
- var isSame = originalValue.every(function (valueItem, index) {
43
+ if (Array.isArray(_originalValue)) {
44
+ var isSame = _originalValue.every(function (valueItem, index) {
41
45
  // 如果两个值有一个不是空值, 则进行深比较
42
46
  if (!(0, _utils.isEmpty)(value === null || value === void 0 ? void 0 : value[index]) || !(0, _utils.isEmpty)(valueItem)) {
43
47
  return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
@@ -46,8 +50,8 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
46
50
  });
47
51
  return isSame ? 'same' : 'changed';
48
52
  }
49
- if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
50
- return (0, _lodash.isEqual)(filterUndefined(value), filterUndefined(originalValue)) ? 'same' : 'changed';
53
+ if (!(0, _utils.isEmpty)(_originalValue) || !(0, _utils.isEmpty)(_value)) {
54
+ return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
51
55
  }
52
56
  return 'same';
53
57
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.9.0-beta.15",
3
+ "version": "3.9.0-beta.17",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
package/.vscode/extensions.json DELETED
@@ -1,5 +0,0 @@
1
- {
2
- "recommendations": [
3
- "kisstkondoros.vscode-codemetrics"
4
- ]
5
- }