@zat-design/sisyphus-react 3.8.3-beta.2 → 3.8.3-beta.21

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 (66) hide show
  1. package/dist/index.esm.css +38 -3
  2. package/dist/less.esm.css +37 -2
  3. package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +83 -20
  4. package/es/ProEditTable/components/RenderField/index.js +6 -2
  5. package/es/ProEditTable/index.js +18 -9
  6. package/es/ProEditTable/propsType.d.ts +3 -6
  7. package/es/ProEditTable/style/index.less +0 -1
  8. package/es/ProEditTable/utils/index.js +10 -3
  9. package/es/ProForm/components/base/InputNumber/index.js +1 -1
  10. package/es/ProForm/components/combination/FormList/components/BlockFields.d.ts +2 -0
  11. package/es/ProForm/components/combination/FormList/components/BlockFields.js +4 -2
  12. package/es/ProForm/components/combination/FormList/components/LineFields.d.ts +2 -0
  13. package/es/ProForm/components/combination/FormList/components/LineFields.js +4 -2
  14. package/es/ProForm/components/combination/FormList/index.js +14 -3
  15. package/es/ProForm/components/combination/Group/index.js +3 -4
  16. package/es/ProForm/components/combination/ProCascader/index.js +21 -14
  17. package/es/ProForm/components/combination/ProModalSelect/index.js +17 -3
  18. package/es/ProForm/components/render/ChangedWrapper.js +29 -10
  19. package/es/ProForm/components/render/Render.js +3 -1
  20. package/es/ProForm/components/render/RenderFields.js +4 -2
  21. package/es/ProForm/propsType.d.ts +3 -0
  22. package/es/ProForm/style/index.less +35 -9
  23. package/es/ProForm/utils/diffOriginal.js +14 -2
  24. package/es/ProTable/components/FormatColumn/index.d.ts +2 -1
  25. package/es/ProTable/components/FormatColumn/index.js +65 -21
  26. package/es/ProTable/components/RenderColumn/index.d.ts +1 -0
  27. package/es/ProTable/components/RenderColumn/index.js +23 -6
  28. package/es/ProTable/index.js +8 -7
  29. package/es/ProTable/propsType.d.ts +4 -0
  30. package/es/ProTable/style/index.less +14 -0
  31. package/es/style/theme/antd.less +1 -1
  32. package/es/utils/index.d.ts +1 -0
  33. package/es/utils/index.js +26 -0
  34. package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +82 -21
  35. package/lib/ProEditTable/components/RenderField/index.js +6 -2
  36. package/lib/ProEditTable/index.js +18 -9
  37. package/lib/ProEditTable/propsType.d.ts +3 -6
  38. package/lib/ProEditTable/style/index.less +0 -1
  39. package/lib/ProEditTable/utils/index.js +10 -3
  40. package/lib/ProForm/components/base/InputNumber/index.js +1 -1
  41. package/lib/ProForm/components/combination/FormList/components/BlockFields.d.ts +2 -0
  42. package/lib/ProForm/components/combination/FormList/components/BlockFields.js +4 -2
  43. package/lib/ProForm/components/combination/FormList/components/LineFields.d.ts +2 -0
  44. package/lib/ProForm/components/combination/FormList/components/LineFields.js +4 -2
  45. package/lib/ProForm/components/combination/FormList/index.js +14 -3
  46. package/lib/ProForm/components/combination/Group/index.js +3 -4
  47. package/lib/ProForm/components/combination/ProCascader/index.js +21 -14
  48. package/lib/ProForm/components/combination/ProModalSelect/index.js +17 -3
  49. package/lib/ProForm/components/render/ChangedWrapper.js +29 -10
  50. package/lib/ProForm/components/render/Render.js +3 -1
  51. package/lib/ProForm/components/render/RenderFields.js +4 -2
  52. package/lib/ProForm/propsType.d.ts +3 -0
  53. package/lib/ProForm/style/index.less +35 -9
  54. package/lib/ProForm/utils/diffOriginal.js +13 -1
  55. package/lib/ProTable/components/FormatColumn/index.d.ts +2 -1
  56. package/lib/ProTable/components/FormatColumn/index.js +65 -21
  57. package/lib/ProTable/components/RenderColumn/index.d.ts +1 -0
  58. package/lib/ProTable/components/RenderColumn/index.js +20 -5
  59. package/lib/ProTable/index.js +8 -7
  60. package/lib/ProTable/propsType.d.ts +4 -0
  61. package/lib/ProTable/style/index.less +14 -0
  62. package/lib/style/theme/antd.less +1 -1
  63. package/lib/utils/index.d.ts +1 -0
  64. package/lib/utils/index.js +28 -1
  65. package/package.json +1 -1
  66. package/.vscode/extensions.json +0 -5
@@ -53,6 +53,11 @@
53
53
  }
54
54
 
55
55
  &.pro-form-view {
56
+ .pro-group{
57
+ .@{ant-prefix}-space-item, .pro-form-view-container{
58
+ width: max-content;
59
+ }
60
+ }
56
61
  .@{ant-prefix}-form-item-label {
57
62
  label {
58
63
  color: var(--zaui-aide-text, #939599);
@@ -329,6 +334,9 @@
329
334
  border-radius: 4px;
330
335
  background: @zaui-contract-bg !important;
331
336
 
337
+ .@{ant-prefix}-input {
338
+ background: @zaui-contract-bg !important;
339
+ }
332
340
  .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
333
341
  background: @zaui-contract-bg !important;
334
342
  }
@@ -403,6 +411,10 @@
403
411
  border-radius: 4px;
404
412
  background: @zaui-contract-bg-add !important;
405
413
 
414
+ .@{ant-prefix}-input {
415
+ background: @zaui-contract-bg !important;
416
+ }
417
+
406
418
  .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
407
419
  background: @zaui-contract-bg-add !important;
408
420
  }
@@ -473,15 +485,29 @@
473
485
  }
474
486
  }
475
487
 
476
- .changed-tooltip {
477
- .original-value-container {
478
- .ant-space-item:nth-child(1) {
479
- white-space: nowrap;
488
+ .original-value-tootip{
489
+ max-width: 100%;
490
+ width: max-content;
491
+ z-index: 99;
492
+ .changed-tooltip {
493
+ .original-value-container {
494
+ .ant-space-item:nth-child(1) {
495
+ white-space: nowrap;
496
+ }
497
+ .pro-group{
498
+ .ant-space-compact{
499
+ display: block;
500
+ }
501
+ .pro-form-view-container{
502
+ word-break: keep-all;
503
+ }
504
+ }
480
505
  }
481
- }
482
- .current-value-container {
483
- .ant-space-item:nth-child(1) {
484
- white-space: nowrap;
506
+ .current-value-container {
507
+ .ant-space-item:nth-child(1) {
508
+ white-space: nowrap;
509
+ }
485
510
  }
486
511
  }
487
- }
512
+ }
513
+
@@ -6,6 +6,18 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.diffOriginal = void 0;
7
7
  var _lodash = require("lodash");
8
8
  var _utils = require("../../utils");
9
+ // 过滤对象中undefined字段
10
+ // 防止{a: '1'} {a: '1', b: undefined}被认为不相等
11
+ var filterUndefined = function filterUndefined(data) {
12
+ if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
13
+ var resData = {};
14
+ Object.keys(data).forEach(function (key) {
15
+ if (data[key] !== undefined) {
16
+ resData[key] = data[key];
17
+ }
18
+ });
19
+ return resData;
20
+ };
9
21
  var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
10
22
  var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
11
23
  var originalValue = params.originalValue,
@@ -35,7 +47,7 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
35
47
  return isSame ? 'same' : 'changed';
36
48
  }
37
49
  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
38
- return (0, _lodash.isEqual)(value, originalValue) ? 'same' : 'changed';
50
+ return (0, _lodash.isEqual)(filterUndefined(value), filterUndefined(originalValue)) ? 'same' : 'changed';
39
51
  }
40
52
  return 'same';
41
53
  };
@@ -1,6 +1,6 @@
1
1
  import React from 'react';
2
2
  import { ProTableColumn } from '../../propsType';
3
- export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, }: {
3
+ export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, }: {
4
4
  column: ProTableColumn;
5
5
  originalObj: any;
6
6
  dataSourceObj: any;
@@ -9,6 +9,7 @@ export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey
9
9
  wrapToolTipProps?: any;
10
10
  scroll?: any;
11
11
  onUpdateMinWidth?: any;
12
+ isInNewRow?: any;
12
13
  }) => void;
13
14
  /**
14
15
  * 查找最近的父级className
@@ -57,7 +57,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
57
57
  diffToolTip = _ref2.diffToolTip,
58
58
  wrapToolTipProps = _ref2.wrapToolTipProps,
59
59
  scroll = _ref2.scroll,
60
- onUpdateMinWidth = _ref2.onUpdateMinWidth;
60
+ onUpdateMinWidth = _ref2.onUpdateMinWidth,
61
+ isInNewRow = _ref2.isInNewRow;
61
62
  var title = column.title,
62
63
  valueType = column.valueType,
63
64
  _column$format = column.format,
@@ -77,7 +78,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
77
78
  originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
78
79
  _column$toolTipProps = column.toolTipProps,
79
80
  toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps,
80
- minWidth = column.minWidth;
81
+ minWidth = column.minWidth,
82
+ onDiff = column.onDiff;
81
83
  // 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
82
84
  var isMaxContentOverFlow = (0, _lodash.isObject)(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
83
85
  calcMinWidth({
@@ -114,7 +116,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
114
116
  }
115
117
  };
116
118
  if (column === null || column === void 0 ? void 0 : column.render) {
117
- if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0) {
119
+ if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0 && !onDiff) {
118
120
  return;
119
121
  }
120
122
  var originalRender = column.render; // 保存原始的 render 方法
@@ -122,12 +124,27 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
122
124
  column.render = function (value, record, index) {
123
125
  var _originalObj$record$r;
124
126
  var isFn = (0, _lodash.isFunction)(originalRender);
125
- var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : undefined;
127
+ var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
126
128
  var originalValue = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
127
- var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_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 : {}, index) : undefined;
129
+ var originalRenderValue = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(originalValue, (_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 : {}, index) : null;
130
+ var isInNewRowFlag = isInNewRow(record);
131
+ var extraDiffFlag = false;
132
+ // 把比对结果告诉我
133
+ if (onDiff) {
134
+ var isDiff = onDiff({
135
+ value: record,
136
+ originValue: originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]
137
+ });
138
+ if (!isDiff) {
139
+ originalValue = null;
140
+ } else {
141
+ originalValue = true;
142
+ extraDiffFlag = true;
143
+ }
144
+ }
128
145
  return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
129
146
  valueType: valueType,
130
- originalValue: originalValue === undefined ? undefined : originalRenderValue,
147
+ originalValue: !originalValue && originalValue !== 0 ? null : extraDiffFlag ? originalRenderValue !== null && originalRenderValue !== void 0 ? originalRenderValue : originalValue : originalRenderValue,
131
148
  ellipsis: ellipsis,
132
149
  width: width,
133
150
  value: _value,
@@ -135,7 +152,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
135
152
  currentValue: _value,
136
153
  originalDiffTip: _originalDiffTip,
137
154
  toolTipProps: _toolTipProps,
138
- minWidth: minWidth
155
+ minWidth: minWidth,
156
+ isInNewRowFlag: isInNewRowFlag
139
157
  });
140
158
  };
141
159
  return;
@@ -177,6 +195,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
177
195
  size: 8,
178
196
  children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
179
197
  });
198
+ var isInNewRowFlag = isInNewRow(record);
180
199
  return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
181
200
  valueType: valueType,
182
201
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -187,7 +206,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
187
206
  currentValue: renderValue,
188
207
  originalDiffTip: _originalDiffTip,
189
208
  toolTipProps: _toolTipProps,
190
- minWidth: minWidth
209
+ minWidth: minWidth,
210
+ isInNewRowFlag: isInNewRowFlag
191
211
  });
192
212
  };
193
213
  // 千分位, 千分位带CNY前缀
@@ -213,6 +233,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
213
233
  children: "-"
214
234
  });
215
235
  }
236
+ var isInNewRowFlag = isInNewRow(record);
216
237
  return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
217
238
  valueType: valueType,
218
239
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -223,7 +244,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
223
244
  currentValue: renderValue,
224
245
  originalDiffTip: _originalDiffTip,
225
246
  toolTipProps: _toolTipProps,
226
- minWidth: minWidth
247
+ minWidth: minWidth,
248
+ isInNewRowFlag: isInNewRowFlag
227
249
  });
228
250
  };
229
251
  } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -272,6 +294,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
272
294
  children: "-"
273
295
  });
274
296
  }
297
+ var isInNewRowFlag = isInNewRow(record);
275
298
  return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
276
299
  valueType: valueType,
277
300
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -282,7 +305,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
282
305
  currentValue: renderValue,
283
306
  originalDiffTip: _originalDiffTip,
284
307
  toolTipProps: _toolTipProps,
285
- minWidth: minWidth
308
+ minWidth: minWidth,
309
+ isInNewRowFlag: isInNewRowFlag
286
310
  });
287
311
  };
288
312
  } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -311,6 +335,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
311
335
  size: 8,
312
336
  children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
313
337
  });
338
+ var isInNewRowFlag = isInNewRow(record);
314
339
  return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
315
340
  valueType: valueType,
316
341
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -321,7 +346,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
321
346
  currentValue: renderValue,
322
347
  originalDiffTip: _originalDiffTip,
323
348
  toolTipProps: _toolTipProps,
324
- minWidth: minWidth
349
+ minWidth: minWidth,
350
+ isInNewRowFlag: isInNewRowFlag
325
351
  });
326
352
  };
327
353
  } else if (precision || prefix || suffix) {
@@ -344,6 +370,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
344
370
  children: "-"
345
371
  });
346
372
  }
373
+ var isInNewRowFlag = isInNewRow(record);
347
374
  return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
348
375
  valueType: valueType,
349
376
  originalValue: originalValue === undefined ? undefined : originalRenderValue,
@@ -354,7 +381,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
354
381
  currentValue: renderValue,
355
382
  originalDiffTip: _originalDiffTip,
356
383
  toolTipProps: _toolTipProps,
357
- minWidth: minWidth
384
+ minWidth: minWidth,
385
+ isInNewRowFlag: isInNewRowFlag
358
386
  });
359
387
  };
360
388
  } else if (valueType === 'address') {
@@ -390,21 +418,32 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
390
418
  code: code,
391
419
  value: originalRealValue
392
420
  });
393
- return (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
421
+ var renderNode = (0, _jsxRuntime.jsx)(_ProForm.default.ProCascader, {
394
422
  className: className,
395
423
  isView: true,
396
424
  mode: "address",
397
425
  code: code,
398
426
  value: realValue,
399
- tooltip: originalValue !== undefined ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
400
- children: ["\u521D\u59CB\u503C\uFF1A", originalRenderValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
401
- children: ["\u5F53\u524D\u503C\uFF1A", renderValue]
402
- }) : undefined]
403
- }) : ellipsis
427
+ tooltip: false
428
+ });
429
+ var isInNewRowFlag = isInNewRow(record);
430
+ return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
431
+ valueType: valueType,
432
+ originalValue: originalRealValue === undefined ? undefined : originalRenderValue,
433
+ ellipsis: ellipsis !== null && ellipsis !== void 0 ? ellipsis : true,
434
+ width: width,
435
+ node: renderNode,
436
+ value: renderValue,
437
+ currentValue: renderValue,
438
+ originalDiffTip: _originalDiffTip,
439
+ toolTipProps: _toolTipProps,
440
+ minWidth: minWidth,
441
+ isInNewRowFlag: isInNewRowFlag
404
442
  });
405
443
  };
406
444
  } else if (copyable) {
407
445
  column.render = function (value, record, index) {
446
+ var isInNewRowFlag = isInNewRow(record);
408
447
  return (0, _jsxRuntime.jsxs)(_antd.Space, {
409
448
  size: 8,
410
449
  children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
@@ -416,7 +455,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
416
455
  value: value,
417
456
  currentValue: value,
418
457
  toolTipProps: _toolTipProps,
419
- minWidth: minWidth
458
+ minWidth: minWidth,
459
+ isInNewRowFlag: isInNewRowFlag
420
460
  }), suffixNode(value, record, index)]
421
461
  });
422
462
  };
@@ -431,6 +471,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
431
471
  children: "-"
432
472
  });
433
473
  }
474
+ var isInNewRowFlag = isInNewRow(record);
434
475
  return (0, _jsxRuntime.jsxs)(_antd.Space, {
435
476
  size: 8,
436
477
  children: [prefixNode(value, record, index), (0, _jsxRuntime.jsx)(_RenderColumn.default, {
@@ -443,7 +484,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
443
484
  currentValue: value || '-',
444
485
  originalDiffTip: _originalDiffTip,
445
486
  toolTipProps: _toolTipProps,
446
- minWidth: minWidth
487
+ minWidth: minWidth,
488
+ isInNewRowFlag: isInNewRowFlag
447
489
  }), suffixNode(value, record, index)]
448
490
  });
449
491
  };
@@ -462,6 +504,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
462
504
  children: "-"
463
505
  });
464
506
  }
507
+ var isInNewRowFlag = isInNewRow(record);
465
508
  return (0, _jsxRuntime.jsx)(_RenderColumn.default, {
466
509
  valueType: valueType,
467
510
  originalValue: originalValue === undefined ? undefined : originalValue || '-',
@@ -472,7 +515,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
472
515
  currentValue: value || '-',
473
516
  originalDiffTip: _originalDiffTip,
474
517
  toolTipProps: _toolTipProps,
475
- minWidth: minWidth
518
+ minWidth: minWidth,
519
+ isInNewRowFlag: isInNewRowFlag
476
520
  });
477
521
  };
478
522
  }
@@ -12,6 +12,7 @@ interface Props {
12
12
  originalValue?: any;
13
13
  toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
14
14
  minWidth?: number;
15
+ isInNewRowFlag?: boolean;
15
16
  }
16
17
  declare const RenderColumn: FC<Props>;
17
18
  export default RenderColumn;
@@ -28,14 +28,15 @@ var RenderColumn = function RenderColumn(props) {
28
28
  originalDiffTip = props.originalDiffTip,
29
29
  _props$toolTipProps = props.toolTipProps,
30
30
  toolTipProps = _props$toolTipProps === void 0 ? {} : _props$toolTipProps,
31
- minWidth = props.minWidth;
31
+ minWidth = props.minWidth,
32
+ isInNewRowFlag = props.isInNewRowFlag;
32
33
  var _useSetState = (0, _ahooks.useSetState)({
33
34
  tooltip: false
34
35
  }),
35
36
  _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
36
37
  tooltip = _useSetState2[0].tooltip,
37
38
  setState = _useSetState2[1];
38
- if (originalValue !== undefined) {
39
+ if ((originalValue || originalValue === 0) && !isInNewRowFlag) {
39
40
  var renderNode = value ? node : '-';
40
41
  if (ellipsis || originalDiffTip) {
41
42
  if (ellipsis) {
@@ -56,9 +57,23 @@ var RenderColumn = function RenderColumn(props) {
56
57
  width: width,
57
58
  minWidth: minWidth
58
59
  },
59
- title: originalDiffTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
60
- children: ["\u521D\u59CB\u503C\uFF1A", originalValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
61
- }) : node,
60
+ overlayClassName: "original-value-tootip",
61
+ title: (0, _jsxRuntime.jsx)(_antd.Space, {
62
+ direction: "vertical",
63
+ className: "changed-tooltip",
64
+ children: originalDiffTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
65
+ children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
66
+ align: "start",
67
+ className: "original-value-container",
68
+ children: ["\u521D\u59CB\u503C\uFF1A", originalValue]
69
+ }), (0, _jsxRuntime.jsx)(_antd.Space, {
70
+ className: "current-value-container",
71
+ children: ellipsis ? (0, _jsxRuntime.jsxs)("span", {
72
+ children: ["\u5F53\u524D\u503C\uFF1A", currentValue]
73
+ }) : null
74
+ })]
75
+ }) : node
76
+ }),
62
77
  getPopupContainer: function getPopupContainer(triggerNode) {
63
78
  return triggerNode.parentNode;
64
79
  }
@@ -190,6 +190,11 @@ function ProTable(props) {
190
190
  setCurColumns(nextColumns);
191
191
  };
192
192
  };
193
+ var _rowClassName = function _rowClassName(record, index) {
194
+ if (originalDataSource && !originalObj.hasOwnProperty((0, _lodash.get)(record, 'rowKey'))) {
195
+ return 'new-cell';
196
+ }
197
+ };
193
198
  var columns = (0, _react.useMemo)(function () {
194
199
  var newColumns = curColumns.map(function (item, index) {
195
200
  var _propsColumnObj$getCo2;
@@ -222,11 +227,12 @@ function ProTable(props) {
222
227
  scroll: _scroll,
223
228
  onUpdateMinWidth: function onUpdateMinWidth(w) {
224
229
  curColumns[index].minWidth = w;
225
- }
230
+ },
231
+ isInNewRow: _rowClassName
226
232
  });
227
233
  });
228
234
  return newColumns;
229
- }, [curColumns, handleResize, _scroll]);
235
+ }, [curColumns, handleResize, _scroll, originalDataSource, originalObj, _rowClassName]);
230
236
  var _columns = (0, _react.useMemo)(function () {
231
237
  return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
232
238
  var show = item.show;
@@ -375,11 +381,6 @@ function ProTable(props) {
375
381
  return _ref7.apply(this, arguments);
376
382
  };
377
383
  }();
378
- var _rowClassName = function _rowClassName(record, index) {
379
- if (originalDataSource && !originalObj.hasOwnProperty((0, _lodash.get)(record, 'rowKey'))) {
380
- return 'new-cell';
381
- }
382
- };
383
384
  var TableComponent = draggable ? _RcTable.DraggableTable : _RcTable.BaseTable;
384
385
  // 标记样式
385
386
  var tagStyle = {
@@ -41,6 +41,10 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
41
41
  toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
42
42
  transform?: (value: any, record?: any) => string[];
43
43
  show?: boolean | (() => boolean);
44
+ onDiff?: ({ value, originValue }: {
45
+ value: any;
46
+ originValue: any;
47
+ }) => boolean;
44
48
  }
45
49
  export interface CreateTreeFromArrayOptions {
46
50
  itemKey?: string;
@@ -272,8 +272,22 @@
272
272
  .@{ant-prefix}-table-cell .varied-cell {
273
273
  margin-left: -8px;
274
274
  padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
275
+
275
276
  background: var(--zaui-contract-bg; #fffaa1) !important;
276
277
  border-radius: var(--zaui-border-radius, 8px);
278
+ .pro-form-view-container {
279
+ overflow: hidden;
280
+ white-space: nowrap;
281
+ text-overflow: ellipsis;
282
+ }
283
+ }
284
+
285
+ .@{ant-prefix}-table-cell .@{ant-prefix}-typography-ellipsis {
286
+ .pro-form-view-container {
287
+ overflow: hidden;
288
+ white-space: nowrap;
289
+ text-overflow: ellipsis;
290
+ }
277
291
  }
278
292
 
279
293
  .varied-cell.empty-cell {
@@ -323,7 +323,7 @@
323
323
  .@{ant-prefix}-table-tbody {
324
324
  .@{ant-prefix}-table-row:nth-child(even) {
325
325
  td {
326
- background: #ffffff !important;
326
+ background: #ffffff;
327
327
  }
328
328
  }
329
329
 
@@ -1,2 +1,3 @@
1
1
  /** 判断一个值是否是空值 */
2
2
  export declare const isEmpty: (value: any) => boolean;
3
+ export declare const useFocus: (element: Element) => boolean;
@@ -1,9 +1,12 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
3
4
  Object.defineProperty(exports, "__esModule", {
4
5
  value: true
5
6
  });
6
- exports.isEmpty = void 0;
7
+ exports.useFocus = exports.isEmpty = void 0;
8
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
9
+ var _react = require("react");
7
10
  var EMPTY_VALUE = [undefined, null, ''];
8
11
  /** 判断一个值是否是空值 */
9
12
  var isEmpty = exports.isEmpty = function isEmpty(value) {
@@ -16,4 +19,28 @@ var isEmpty = exports.isEmpty = function isEmpty(value) {
16
19
  });
17
20
  }
18
21
  return false;
22
+ };
23
+ var useFocus = exports.useFocus = function useFocus(element) {
24
+ var _useState = (0, _react.useState)(false),
25
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
26
+ focus = _useState2[0],
27
+ setFocus = _useState2[1];
28
+ (0, _react.useEffect)(function () {
29
+ if (!element) return;
30
+ element.addEventListener('focus', function () {
31
+ setFocus(true);
32
+ }, true);
33
+ element.addEventListener('blur', function () {
34
+ setFocus(false);
35
+ }, true);
36
+ return function () {
37
+ element.removeEventListener('focus', function () {
38
+ setFocus(true);
39
+ }, true);
40
+ element.removeEventListener('blur', function () {
41
+ setFocus(false);
42
+ }, true);
43
+ };
44
+ }, [element]);
45
+ return focus;
19
46
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.8.3-beta.2",
3
+ "version": "3.8.3-beta.21",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -1,5 +0,0 @@
1
- {
2
- "recommendations": [
3
- "kisstkondoros.vscode-codemetrics"
4
- ]
5
- }