@zat-design/sisyphus-react 3.9.0 → 3.9.1-beta.10

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 (77) hide show
  1. package/dist/index.esm.css +71 -37
  2. package/dist/less.esm.css +67 -35
  3. package/es/ProDrawerForm/components/ProDrawer/index.js +3 -1
  4. package/es/ProDrawerForm/components/ProModal/index.js +5 -3
  5. package/es/ProDrawerForm/propsType.d.ts +1 -0
  6. package/es/ProDrawerForm/style/index.less +3 -0
  7. package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +7 -3
  8. package/es/ProEditTable/components/RenderField/index.js +3 -2
  9. package/es/ProEditTable/index.js +23 -16
  10. package/es/ProEditTable/style/index.less +22 -3
  11. package/es/ProEnum/index.js +10 -5
  12. package/es/ProEnum/propsType.d.ts +1 -0
  13. package/es/ProForm/components/base/SwitchCheckbox/index.js +9 -2
  14. package/es/ProForm/components/combination/FormList/index.js +1 -1
  15. package/es/ProForm/components/combination/Group/component/ComRender.d.ts +1 -0
  16. package/es/ProForm/components/combination/Group/component/ComRender.js +12 -1
  17. package/es/ProForm/components/combination/Group/index.js +4 -3
  18. package/es/ProForm/components/combination/ProCascader/index.js +7 -1
  19. package/es/ProForm/components/combination/ProModalSelect/index.js +40 -38
  20. package/es/ProForm/components/render/ChangedWrapper.js +3 -3
  21. package/es/ProForm/components/render/RenderFields.js +3 -2
  22. package/es/ProForm/components/render/propsType.d.ts +1 -0
  23. package/es/ProForm/style/index.less +12 -8
  24. package/es/ProForm/utils/diffOriginal.js +18 -12
  25. package/es/ProTable/components/FormatColumn/index.d.ts +5 -3
  26. package/es/ProTable/components/FormatColumn/index.js +93 -72
  27. package/es/ProTable/components/RenderColumn/index.d.ts +1 -1
  28. package/es/ProTable/components/RenderColumn/index.js +41 -23
  29. package/es/ProTable/components/TableResizable/index.js +1 -5
  30. package/es/ProTable/index.d.ts +6 -5
  31. package/es/ProTable/index.js +4 -6
  32. package/es/ProTable/propsType.d.ts +2 -1
  33. package/es/ProTable/style/index.less +20 -6
  34. package/es/ProTable/utils/index.d.ts +5 -2
  35. package/es/ProTable/utils/index.js +13 -4
  36. package/es/ProTree/components/ProTreeSelect/index.js +32 -13
  37. package/es/style/theme/antd.less +4 -2
  38. package/es/utils/index.d.ts +1 -1
  39. package/es/utils/index.js +4 -1
  40. package/lib/ProDrawerForm/components/ProDrawer/index.js +3 -1
  41. package/lib/ProDrawerForm/components/ProModal/index.js +5 -3
  42. package/lib/ProDrawerForm/propsType.d.ts +1 -0
  43. package/lib/ProDrawerForm/style/index.less +3 -0
  44. package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +5 -1
  45. package/lib/ProEditTable/components/RenderField/index.js +3 -2
  46. package/lib/ProEditTable/index.js +23 -16
  47. package/lib/ProEditTable/style/index.less +22 -3
  48. package/lib/ProEnum/index.js +10 -5
  49. package/lib/ProEnum/propsType.d.ts +1 -0
  50. package/lib/ProForm/components/base/SwitchCheckbox/index.js +9 -2
  51. package/lib/ProForm/components/combination/FormList/index.js +1 -1
  52. package/lib/ProForm/components/combination/Group/component/ComRender.d.ts +1 -0
  53. package/lib/ProForm/components/combination/Group/component/ComRender.js +12 -1
  54. package/lib/ProForm/components/combination/Group/index.js +4 -3
  55. package/lib/ProForm/components/combination/ProCascader/index.js +7 -1
  56. package/lib/ProForm/components/combination/ProModalSelect/index.js +39 -37
  57. package/lib/ProForm/components/render/ChangedWrapper.js +3 -3
  58. package/lib/ProForm/components/render/RenderFields.js +3 -2
  59. package/lib/ProForm/components/render/propsType.d.ts +1 -0
  60. package/lib/ProForm/style/index.less +12 -8
  61. package/lib/ProForm/utils/diffOriginal.js +18 -12
  62. package/lib/ProTable/components/FormatColumn/index.d.ts +5 -3
  63. package/lib/ProTable/components/FormatColumn/index.js +92 -71
  64. package/lib/ProTable/components/RenderColumn/index.d.ts +1 -1
  65. package/lib/ProTable/components/RenderColumn/index.js +41 -23
  66. package/lib/ProTable/components/TableResizable/index.js +0 -4
  67. package/lib/ProTable/index.d.ts +6 -5
  68. package/lib/ProTable/index.js +4 -6
  69. package/lib/ProTable/propsType.d.ts +2 -1
  70. package/lib/ProTable/style/index.less +20 -6
  71. package/lib/ProTable/utils/index.d.ts +5 -2
  72. package/lib/ProTable/utils/index.js +13 -4
  73. package/lib/ProTree/components/ProTreeSelect/index.js +31 -12
  74. package/lib/style/theme/antd.less +4 -2
  75. package/lib/utils/index.d.ts +1 -1
  76. package/lib/utils/index.js +4 -1
  77. package/package.json +2 -2
@@ -1899,32 +1899,54 @@
1899
1899
  .pro-table .ant-table-tbody .ant-table-cell-fix-right {
1900
1900
  background: unset !important;
1901
1901
  }
1902
- .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell {
1903
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
1902
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell,
1903
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell,
1904
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover,
1905
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover {
1904
1906
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1905
1907
  }
1906
- .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell {
1907
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
1908
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell,
1909
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell,
1910
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell,
1911
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell {
1912
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1913
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1914
+ }
1915
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right,
1916
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right,
1917
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell.ant-table-cell-fix-right,
1918
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell.ant-table-cell-fix-right {
1919
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1920
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1921
+ }
1922
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left,
1923
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left,
1924
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell.ant-table-cell-fix-left,
1925
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell.ant-table-cell-fix-left {
1908
1926
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1909
1927
  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1910
1928
  }
1911
- .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
1929
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell,
1930
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .varied-cell {
1912
1931
  margin-left: -8px;
1913
1932
  padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
1914
1933
  background: var(--zaui-contract-bg, #fffaa1) !important;
1915
1934
  border-radius: var(--zaui-border-radius, 8px);
1916
1935
  }
1917
- .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container {
1936
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container,
1937
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container {
1918
1938
  overflow: hidden;
1919
1939
  white-space: nowrap;
1920
1940
  text-overflow: ellipsis;
1921
1941
  }
1922
- .pro-table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
1942
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container,
1943
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
1923
1944
  overflow: hidden;
1924
1945
  white-space: nowrap;
1925
1946
  text-overflow: ellipsis;
1926
1947
  }
1927
- .pro-table tbody.ant-table-tbody .varied-cell.empty-cell {
1948
+ .pro-table .ant-table table tbody.ant-table-tbody .varied-cell.empty-cell,
1949
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .varied-cell.empty-cell {
1928
1950
  width: 24.5px;
1929
1951
  }
1930
1952
  .pro-table .copyable-table-cell .ant-typography {
@@ -2157,6 +2179,9 @@
2157
2179
  .ant-dropdown-placement-bottomLeft .ant-dropdown-menu-vertical.ant-dropdown-menu-light .ant-dropdown-menu-item-only-child:hover {
2158
2180
  background: rgba(0, 106, 255, 0.08);
2159
2181
  }
2182
+ .ant-table .original-value-tooltip {
2183
+ position: fixed;
2184
+ }
2160
2185
  .pro-tooltip {
2161
2186
  cursor: pointer;
2162
2187
  }
@@ -3063,12 +3088,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3063
3088
  .pro-form .pro-form-item-changed .ant-input-number input {
3064
3089
  background: transparent !important;
3065
3090
  }
3066
- .pro-form .pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
3067
- .pro-form .pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
3068
- .pro-form .pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
3069
- .pro-form .pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
3070
- z-index: 9;
3071
- }
3072
3091
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
3073
3092
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3074
3093
  background: var(--zaui-contract-bg, #fffaa1);
@@ -3087,7 +3106,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3087
3106
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
3088
3107
  background: var(--zaui-contract-bg, #fffaa1);
3089
3108
  }
3090
- .pro-form .pro-form-item-changed .ant-checkbox-group {
3109
+ .pro-form .pro-form-item-changed .ant-checkbox-group,
3110
+ .pro-form .pro-form-item-changed .pro-switch-checkbox {
3091
3111
  padding: 5px 0;
3092
3112
  }
3093
3113
  .pro-form .pro-form-item-changed:has(.ant-switch) {
@@ -3106,7 +3126,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3106
3126
  background: var(--zaui-contract-bg-add, #d2fff4) !important;
3107
3127
  }
3108
3128
  .pro-form .pro-form-item-add .ant-input {
3109
- background: var(--zaui-contract-bg, #fffaa1) !important;
3129
+ background: var(--zaui-contract-bg-add, #d2fff4) !important;
3110
3130
  }
3111
3131
  .pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
3112
3132
  background: var(--zaui-contract-bg-add, #d2fff4) !important;
@@ -3123,12 +3143,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3123
3143
  .pro-form .pro-form-item-add .ant-input-number input {
3124
3144
  background: transparent !important;
3125
3145
  }
3126
- .pro-form .pro-form-item-add span.ant-input-affix-wrapper .ant-select-selection-placeholder,
3127
- .pro-form .pro-form-item-add .ant-select .ant-select-selector .ant-select-selection-placeholder,
3128
- .pro-form .pro-form-item-add .ant-picker .ant-select-selection-placeholder,
3129
- .pro-form .pro-form-item-add .ant-input-number .ant-select-selection-placeholder {
3130
- z-index: 9;
3131
- }
3132
3146
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-switch-handle),
3133
3147
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3134
3148
  background: var(--zaui-contract-bg-add, #d2fff4);
@@ -3147,7 +3161,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3147
3161
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
3148
3162
  background: var(--zaui-contract-bg-add, #d2fff4);
3149
3163
  }
3150
- .pro-form .pro-form-item-add .ant-checkbox-group {
3164
+ .pro-form .pro-form-item-add .ant-checkbox-group,
3165
+ .pro-form .pro-form-item-add .pro-switch-checkbox {
3151
3166
  padding: 5px 0;
3152
3167
  }
3153
3168
  .pro-form .pro-form-item-add:has(.ant-switch) {
@@ -3161,25 +3176,26 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3161
3176
  background: var(--zaui-contract-bg-add, #d2fff4);
3162
3177
  border-radius: 4px;
3163
3178
  }
3164
- .original-value-tootip {
3165
- max-width: 100%;
3179
+ .original-value-tooltip {
3166
3180
  width: -webkit-max-content;
3167
3181
  width: -moz-max-content;
3168
3182
  width: max-content;
3169
- z-index: 99;
3170
3183
  }
3171
- .original-value-tootip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
3184
+ .original-value-tooltip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
3172
3185
  white-space: nowrap;
3173
3186
  }
3174
- .original-value-tootip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
3187
+ .original-value-tooltip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
3175
3188
  display: block;
3176
3189
  }
3177
- .original-value-tootip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
3190
+ .original-value-tooltip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
3178
3191
  word-break: keep-all;
3179
3192
  }
3180
- .original-value-tootip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
3193
+ .original-value-tooltip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
3181
3194
  white-space: nowrap;
3182
3195
  }
3196
+ .original-value-tooltip-fixed {
3197
+ position: fixed;
3198
+ }
3183
3199
  .pro-upload .pro-upload-dragger .pro-upload-handle-box {
3184
3200
  padding: var(--zaui-space-size-sm, 8px);
3185
3201
  background: #f8f9fa;
@@ -4238,6 +4254,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4238
4254
  .ant-select-tree-node-content-wrapper:has(.pro-tree-wrap-ellipse) {
4239
4255
  overflow: hidden;
4240
4256
  }
4257
+ .pro-drawer .original-value-tooltip {
4258
+ position: fixed;
4259
+ }
4241
4260
  .pro-drawer .pro-drawer-close {
4242
4261
  position: absolute;
4243
4262
  top: 6px;
@@ -4396,6 +4415,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4396
4415
  .pro-edit-table td[rowspan] {
4397
4416
  vertical-align: middle !important;
4398
4417
  }
4418
+ .pro-edit-table .ant-table-content .ant-table-tbody .pro-form-item-add .pro-form-view-container {
4419
+ padding: 0;
4420
+ border-radius: 0;
4421
+ }
4399
4422
  .pro-edit-table .pro-edit-table-tooltip {
4400
4423
  display: -webkit-inline-box;
4401
4424
  display: -webkit-inline-flex;
@@ -4600,11 +4623,20 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4600
4623
  .pro-edit-table .ant-table-pagination .ant-pagination-options .ant-select.ant-select-in-form-item {
4601
4624
  width: auto;
4602
4625
  }
4603
- .pro-edit-table .is-new-row td,
4604
- .pro-edit-table .is-new-row.ant-table-row:hover td,
4605
- .pro-edit-table .is-new-row .ant-table-cell-row-hover,
4606
- .pro-edit-table .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
4607
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
4626
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td,
4627
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-left,
4628
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-right,
4629
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row td,
4630
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-left,
4631
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-right {
4632
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
4633
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
4634
+ }
4635
+ .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover td,
4636
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row:hover td,
4637
+ .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover,
4638
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
4639
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
4608
4640
  }
4609
4641
  .pro-edit-table-footer {
4610
4642
  margin-top: 12px;
@@ -5617,8 +5649,10 @@ input[type='button'] {
5617
5649
  .ant-table.ant-table-scroll-horizontal table .ant-table-tbody tr td {
5618
5650
  border-bottom: none;
5619
5651
  }
5620
- .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even):hover td {
5621
- background-color: var(--zaui-table-hover-bg, #fafafa);
5652
+ .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even):hover td,
5653
+ .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even):hover td.ant-table-cell-fix-right,
5654
+ .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even):hover td.ant-table-cell-fix-left {
5655
+ background-color: var(--zaui-table-hover-bg, #fafafa) !important;
5622
5656
  }
5623
5657
  .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even) td,
5624
5658
  .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even) td.ant-table-cell-fix-right,
package/dist/less.esm.css CHANGED
@@ -1899,32 +1899,54 @@
1899
1899
  .pro-table .ant-table-tbody .ant-table-cell-fix-right {
1900
1900
  background: unset !important;
1901
1901
  }
1902
- .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell {
1903
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
1902
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell,
1903
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell,
1904
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover,
1905
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover {
1904
1906
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1905
1907
  }
1906
- .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell {
1907
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
1908
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell,
1909
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell,
1910
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell,
1911
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell {
1912
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1913
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1914
+ }
1915
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right,
1916
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right,
1917
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell.ant-table-cell-fix-right,
1918
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell.ant-table-cell-fix-right {
1919
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1920
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1921
+ }
1922
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left,
1923
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left,
1924
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell.ant-table-cell-fix-left,
1925
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell.ant-table-cell-fix-left {
1908
1926
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1909
1927
  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1910
1928
  }
1911
- .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
1929
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell,
1930
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .varied-cell {
1912
1931
  margin-left: -8px;
1913
1932
  padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
1914
1933
  background: var(--zaui-contract-bg, #fffaa1) !important;
1915
1934
  border-radius: var(--zaui-border-radius, 8px);
1916
1935
  }
1917
- .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container {
1936
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container,
1937
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container {
1918
1938
  overflow: hidden;
1919
1939
  white-space: nowrap;
1920
1940
  text-overflow: ellipsis;
1921
1941
  }
1922
- .pro-table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
1942
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container,
1943
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
1923
1944
  overflow: hidden;
1924
1945
  white-space: nowrap;
1925
1946
  text-overflow: ellipsis;
1926
1947
  }
1927
- .pro-table tbody.ant-table-tbody .varied-cell.empty-cell {
1948
+ .pro-table .ant-table table tbody.ant-table-tbody .varied-cell.empty-cell,
1949
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .varied-cell.empty-cell {
1928
1950
  width: 24.5px;
1929
1951
  }
1930
1952
  .pro-table .copyable-table-cell .ant-typography {
@@ -2157,6 +2179,9 @@
2157
2179
  .ant-dropdown-placement-bottomLeft .ant-dropdown-menu-vertical.ant-dropdown-menu-light .ant-dropdown-menu-item-only-child:hover {
2158
2180
  background: rgba(0, 106, 255, 0.08);
2159
2181
  }
2182
+ .ant-table .original-value-tooltip {
2183
+ position: fixed;
2184
+ }
2160
2185
  .pro-tooltip {
2161
2186
  cursor: pointer;
2162
2187
  }
@@ -3063,12 +3088,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3063
3088
  .pro-form .pro-form-item-changed .ant-input-number input {
3064
3089
  background: transparent !important;
3065
3090
  }
3066
- .pro-form .pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
3067
- .pro-form .pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
3068
- .pro-form .pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
3069
- .pro-form .pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
3070
- z-index: 9;
3071
- }
3072
3091
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
3073
3092
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3074
3093
  background: var(--zaui-contract-bg, #fffaa1);
@@ -3087,7 +3106,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3087
3106
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
3088
3107
  background: var(--zaui-contract-bg, #fffaa1);
3089
3108
  }
3090
- .pro-form .pro-form-item-changed .ant-checkbox-group {
3109
+ .pro-form .pro-form-item-changed .ant-checkbox-group,
3110
+ .pro-form .pro-form-item-changed .pro-switch-checkbox {
3091
3111
  padding: 5px 0;
3092
3112
  }
3093
3113
  .pro-form .pro-form-item-changed:has(.ant-switch) {
@@ -3106,7 +3126,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3106
3126
  background: var(--zaui-contract-bg-add, #d2fff4) !important;
3107
3127
  }
3108
3128
  .pro-form .pro-form-item-add .ant-input {
3109
- background: var(--zaui-contract-bg, #fffaa1) !important;
3129
+ background: var(--zaui-contract-bg-add, #d2fff4) !important;
3110
3130
  }
3111
3131
  .pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
3112
3132
  background: var(--zaui-contract-bg-add, #d2fff4) !important;
@@ -3123,12 +3143,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3123
3143
  .pro-form .pro-form-item-add .ant-input-number input {
3124
3144
  background: transparent !important;
3125
3145
  }
3126
- .pro-form .pro-form-item-add span.ant-input-affix-wrapper .ant-select-selection-placeholder,
3127
- .pro-form .pro-form-item-add .ant-select .ant-select-selector .ant-select-selection-placeholder,
3128
- .pro-form .pro-form-item-add .ant-picker .ant-select-selection-placeholder,
3129
- .pro-form .pro-form-item-add .ant-input-number .ant-select-selection-placeholder {
3130
- z-index: 9;
3131
- }
3132
3146
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-switch-handle),
3133
3147
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3134
3148
  background: var(--zaui-contract-bg-add, #d2fff4);
@@ -3147,7 +3161,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3147
3161
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
3148
3162
  background: var(--zaui-contract-bg-add, #d2fff4);
3149
3163
  }
3150
- .pro-form .pro-form-item-add .ant-checkbox-group {
3164
+ .pro-form .pro-form-item-add .ant-checkbox-group,
3165
+ .pro-form .pro-form-item-add .pro-switch-checkbox {
3151
3166
  padding: 5px 0;
3152
3167
  }
3153
3168
  .pro-form .pro-form-item-add:has(.ant-switch) {
@@ -3161,25 +3176,26 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3161
3176
  background: var(--zaui-contract-bg-add, #d2fff4);
3162
3177
  border-radius: 4px;
3163
3178
  }
3164
- .original-value-tootip {
3165
- max-width: 100%;
3179
+ .original-value-tooltip {
3166
3180
  width: -webkit-max-content;
3167
3181
  width: -moz-max-content;
3168
3182
  width: max-content;
3169
- z-index: 99;
3170
3183
  }
3171
- .original-value-tootip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
3184
+ .original-value-tooltip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
3172
3185
  white-space: nowrap;
3173
3186
  }
3174
- .original-value-tootip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
3187
+ .original-value-tooltip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
3175
3188
  display: block;
3176
3189
  }
3177
- .original-value-tootip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
3190
+ .original-value-tooltip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
3178
3191
  word-break: keep-all;
3179
3192
  }
3180
- .original-value-tootip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
3193
+ .original-value-tooltip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
3181
3194
  white-space: nowrap;
3182
3195
  }
3196
+ .original-value-tooltip-fixed {
3197
+ position: fixed;
3198
+ }
3183
3199
  .pro-upload .pro-upload-dragger .pro-upload-handle-box {
3184
3200
  padding: var(--zaui-space-size-sm, 8px);
3185
3201
  background: #f8f9fa;
@@ -4238,6 +4254,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4238
4254
  .ant-select-tree-node-content-wrapper:has(.pro-tree-wrap-ellipse) {
4239
4255
  overflow: hidden;
4240
4256
  }
4257
+ .pro-drawer .original-value-tooltip {
4258
+ position: fixed;
4259
+ }
4241
4260
  .pro-drawer .pro-drawer-close {
4242
4261
  position: absolute;
4243
4262
  top: 6px;
@@ -4396,6 +4415,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4396
4415
  .pro-edit-table td[rowspan] {
4397
4416
  vertical-align: middle !important;
4398
4417
  }
4418
+ .pro-edit-table .ant-table-content .ant-table-tbody .pro-form-item-add .pro-form-view-container {
4419
+ padding: 0;
4420
+ border-radius: 0;
4421
+ }
4399
4422
  .pro-edit-table .pro-edit-table-tooltip {
4400
4423
  display: -webkit-inline-box;
4401
4424
  display: -webkit-inline-flex;
@@ -4600,11 +4623,20 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4600
4623
  .pro-edit-table .ant-table-pagination .ant-pagination-options .ant-select.ant-select-in-form-item {
4601
4624
  width: auto;
4602
4625
  }
4603
- .pro-edit-table .is-new-row td,
4604
- .pro-edit-table .is-new-row.ant-table-row:hover td,
4605
- .pro-edit-table .is-new-row .ant-table-cell-row-hover,
4606
- .pro-edit-table .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
4607
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
4626
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td,
4627
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-left,
4628
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-right,
4629
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row td,
4630
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-left,
4631
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-right {
4632
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
4633
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
4634
+ }
4635
+ .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover td,
4636
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row:hover td,
4637
+ .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover,
4638
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
4639
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
4608
4640
  }
4609
4641
  .pro-edit-table-footer {
4610
4642
  margin-top: 12px;
@@ -36,6 +36,7 @@ var ProDrawer = function ProDrawer(_ref) {
36
36
  onCancel = _ref.onCancel,
37
37
  children = _ref.children,
38
38
  className = _ref.className,
39
+ zIndex = _ref.zIndex,
39
40
  drawerProps = _ref.drawerProps;
40
41
  var ref = useRef(null);
41
42
  var modalRef = useRef(null);
@@ -192,7 +193,8 @@ var ProDrawer = function ProDrawer(_ref) {
192
193
  placement: "right",
193
194
  className: "pro-drawer ".concat(className !== null && className !== void 0 ? className : ''),
194
195
  closable: false,
195
- onClose: onCancel
196
+ onClose: onCancel,
197
+ zIndex: zIndex
196
198
  }, drawerProps), {}, {
197
199
  children: [_jsx("div", {
198
200
  className: "pro-drawer-close",
@@ -35,8 +35,9 @@ var ProModal = function ProModal(_ref) {
35
35
  onCancel = _ref.onCancel,
36
36
  children = _ref.children,
37
37
  className = _ref.className,
38
- modalProps = _ref.modalProps,
39
- extraLeft = _ref.extraLeft;
38
+ extraLeft = _ref.extraLeft,
39
+ zIndex = _ref.zIndex,
40
+ modalProps = _ref.modalProps;
40
41
  var ref = useRef(null);
41
42
  var _ref2 = useScroll((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.parentNode) || {},
42
43
  top = _ref2.top;
@@ -178,7 +179,8 @@ var ProModal = function ProModal(_ref) {
178
179
  closeIcon: _jsx(ReactSVG, {
179
180
  className: "close-icon",
180
181
  src: closeSvg
181
- })
182
+ }),
183
+ zIndex: zIndex
182
184
  }, modalProps), {}, {
183
185
  children: _jsx("div", {
184
186
  ref: ref,
@@ -98,4 +98,5 @@ export interface ProDrawerFormPropsType {
98
98
  */
99
99
  onCloseClean?: boolean;
100
100
  children?: React.ReactNode;
101
+ zIndex?: number;
101
102
  }
@@ -2,6 +2,9 @@
2
2
  @import (reference) '~antd/es/style/themes/index.less';
3
3
 
4
4
  .pro-drawer {
5
+ .original-value-tooltip {
6
+ position: fixed;
7
+ }
5
8
  .pro-drawer-close {
6
9
  position: absolute;
7
10
  top: 6px;
@@ -8,7 +8,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
8
8
  var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
9
9
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
10
10
  import React, { useMemo, useRef } from 'react';
11
- import classNames from 'classnames';
11
+ import classnames from 'classnames';
12
12
  import { get } from 'lodash';
13
13
  import { diffOriginal } from '../../../ProForm/utils/diffOriginal';
14
14
  import { useProConfig } from '../../../ProConfigProvider';
@@ -162,7 +162,11 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
162
162
  };
163
163
  // @ts-ignore
164
164
  var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
165
- var diffClassName = classNames({
165
+ var classNames = classnames({
166
+ 'original-value-tooltip': true,
167
+ 'original-value-tooltip-fixed': true
168
+ });
169
+ var diffClassName = classnames({
166
170
  'pro-form-item-changed': isChanged,
167
171
  'pro-form-item-add': isAdd
168
172
  });
@@ -172,7 +176,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
172
176
  getPopupContainer: function getPopupContainer(trigger) {
173
177
  return scrollFollowParent ? trigger.parentElement : document.body;
174
178
  },
175
- overlayClassName: "original-value-tootip",
179
+ overlayClassName: classNames,
176
180
  placement: "topLeft",
177
181
  autoAdjustOverflow: false,
178
182
  title: _jsxs(_Space, {
@@ -6,7 +6,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
6
6
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
7
7
  import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
8
8
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
9
- var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
9
+ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm"];
10
10
  import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
11
11
  /* eslint-disable prefer-destructuring */
12
12
  /* eslint-disable prefer-const */
@@ -53,6 +53,7 @@ var RenderField = function RenderField(_ref) {
53
53
  _column$rules = column.rules,
54
54
  rules = _column$rules === void 0 ? [] : _column$rules,
55
55
  equalWith = column.equalWith,
56
+ onDiff = column.onDiff,
56
57
  className = column.className,
57
58
  trim = column.trim,
58
59
  confirm = column.confirm,
@@ -555,7 +556,7 @@ var RenderField = function RenderField(_ref) {
555
556
  originalNames: originalNames,
556
557
  originalValues: originalValues,
557
558
  form: form,
558
- equalWith: equalWith,
559
+ equalWith: onDiff || equalWith,
559
560
  type: type,
560
561
  onChange: _onChange,
561
562
  valuePropName: _formItemProps.valuePropName,
@@ -2,6 +2,7 @@ import "antd/es/affix/style";
2
2
  import _Affix from "antd/es/affix";
3
3
  import _typeof from "@babel/runtime/helpers/esm/typeof";
4
4
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
5
+ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
5
6
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
6
7
  import "antd/es/config-provider/style";
7
8
  import _ConfigProvider from "antd/es/config-provider";
@@ -9,7 +10,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
9
10
  import "antd/es/form/style";
10
11
  import _Form from "antd/es/form";
11
12
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
12
- var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
13
+ var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
13
14
  import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
14
15
  import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
15
16
  import { get, isArray, isBoolean } from 'lodash';
@@ -50,7 +51,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
50
51
  max = _ref.max,
51
52
  headerRender = _ref.headerRender,
52
53
  pagination = _ref.pagination,
53
- originalValues = _ref.originalValues,
54
54
  rowKey = _ref.rowKey,
55
55
  rowDisabled = _ref.rowDisabled,
56
56
  rowDraggable = _ref.rowDraggable,
@@ -136,6 +136,25 @@ var ProEditTable = function ProEditTable(_ref, ref) {
136
136
  return getRowKey(item) === getRowKey(record);
137
137
  }));
138
138
  };
139
+ var originalValues = useMemo(function () {
140
+ var _originalArr$every, _originalArr$some;
141
+ // 原始值也需要设置对应的rowkey,后续比对通过rowkey对比
142
+ var originalArr = get(resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues, name);
143
+ 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) {
144
+ return item.rowKey;
145
+ }) : true;
146
+ var isNeedCoverOriginal = originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$some = originalArr.some) === null || _originalArr$some === void 0 ? void 0 : _originalArr$some.call(originalArr, function (item) {
147
+ return item.rowKey !== getRowKey(item);
148
+ });
149
+ // 初始化默认生成row-key
150
+ if ((originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && (!isOriginalAllHasKey || isNeedCoverOriginal)) {
151
+ var _originalArr$forEach;
152
+ originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
153
+ item.rowKey = getRowKey(item);
154
+ });
155
+ }
156
+ return (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) ? _defineProperty({}, name, originalArr) : undefined;
157
+ }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues]);
139
158
  var config = _objectSpread({
140
159
  form: form,
141
160
  mode: mode,
@@ -275,33 +294,21 @@ var ProEditTable = function ProEditTable(_ref, ref) {
275
294
  return transformColumns(columns, config);
276
295
  }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
277
296
  var initDataSource = function initDataSource() {
278
- var _value$every, _originalArr$every, _value$some, _originalArr$some;
297
+ var _value$every, _value$some;
279
298
  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) {
280
299
  return item.rowKey;
281
300
  });
282
- // 原始值也需要设置对应的rowkey,后续比对通过rowkey对比
283
- var originalArr = get(originalValues, name);
284
- 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) {
285
- return item.rowKey;
286
- }) : true;
287
301
  // 检测当前rowkey是否与制定key的值是否一致,不一致,则执行覆盖
288
302
  var isNeedCover = value === null || value === void 0 ? void 0 : (_value$some = value.some) === null || _value$some === void 0 ? void 0 : _value$some.call(value, function (item) {
289
303
  return item.rowKey !== getRowKey(item);
290
304
  });
291
- var isNeedCoverOriginal = originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$some = originalArr.some) === null || _originalArr$some === void 0 ? void 0 : _originalArr$some.call(originalArr, function (item) {
292
- return item.rowKey !== getRowKey(item);
293
- });
294
305
  // 初始化默认生成row-key
295
- if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover) || (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && (!isOriginalAllHasKey || isNeedCoverOriginal)) {
296
- var _originalArr$forEach;
306
+ if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover)) {
297
307
  var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
298
308
  return _objectSpread(_objectSpread({}, item), {}, {
299
309
  rowKey: getRowKey(item)
300
310
  });
301
311
  });
302
- originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
303
- item.rowKey = getRowKey(item);
304
- });
305
312
  onChange(nextValues);
306
313
  if (virtualKey) {
307
314
  form.setFieldValue(virtualRowName, nextValues);