@zat-design/sisyphus-react 3.13.6-beta.6 → 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.
- package/es/ProTable/components/FormatColumn/index.js +4 -4
- package/es/ProTable/propsType.d.ts +2 -2
- package/es/ProTable/utils/index.js +2 -2
- package/lib/ProTable/components/FormatColumn/index.js +4 -4
- package/lib/ProTable/propsType.d.ts +2 -2
- package/lib/ProTable/utils/index.js +2 -2
- package/package.json +1 -1
@@ -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
|
-
|
134
|
-
|
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
|
-
|
171
|
-
|
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
|
@@ -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,
|
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,
|
195
|
+
viewRender?: ({ value, record, index, originValue, originRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
|
196
196
|
/**
|
197
197
|
* 是否已更改
|
198
198
|
* @description 标记列值是否已变更
|
@@ -30,8 +30,8 @@ export var getOriginalValue = function getOriginalValue(value, record, originalO
|
|
30
30
|
isAddCell: null
|
31
31
|
};
|
32
32
|
}
|
33
|
-
var
|
34
|
-
var originalValue = get(
|
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,
|
@@ -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
|
-
|
140
|
-
|
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
|
-
|
177
|
-
|
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
|
@@ -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,
|
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,
|
195
|
+
viewRender?: ({ value, record, index, originValue, originRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
|
196
196
|
/**
|
197
197
|
* 是否已更改
|
198
198
|
* @description 标记列值是否已变更
|
@@ -37,8 +37,8 @@ var getOriginalValue = exports.getOriginalValue = function getOriginalValue(valu
|
|
37
37
|
isAddCell: null
|
38
38
|
};
|
39
39
|
}
|
40
|
-
var
|
41
|
-
var originalValue = (0, _lodash.get)(
|
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,
|