@zat-design/sisyphus-react 3.9.1 → 3.9.2-beta.1

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 (47) hide show
  1. package/dist/index.esm.css +70 -29
  2. package/dist/less.esm.css +70 -29
  3. package/es/ProDrawerForm/style/index.less +3 -0
  4. package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +2 -1
  5. package/es/ProEditTable/propsType.d.ts +2 -0
  6. package/es/ProEditTable/style/index.less +11 -4
  7. package/es/ProEnum/index.js +5 -3
  8. package/es/ProForm/components/combination/FormList/index.js +1 -1
  9. package/es/ProForm/components/combination/Group/index.js +15 -8
  10. package/es/ProForm/components/combination/Group/propsType.d.ts +2 -0
  11. package/es/ProForm/components/combination/Group/style/index.less +15 -0
  12. package/es/ProForm/components/combination/Group/utils.js +43 -9
  13. package/es/ProForm/components/combination/ProCascader/index.js +7 -1
  14. package/es/ProForm/components/combination/ProModalSelect/index.js +14 -13
  15. package/es/ProForm/components/render/ChangedWrapper.js +2 -1
  16. package/es/ProForm/style/index.less +2 -2
  17. package/es/ProLayout/style/index.less +5 -0
  18. package/es/ProTable/components/FormatColumn/index.js +69 -29
  19. package/es/ProTable/components/RenderColumn/index.d.ts +2 -0
  20. package/es/ProTable/components/RenderColumn/index.js +3 -5
  21. package/es/ProTable/propsType.d.ts +4 -5
  22. package/es/ProTable/style/index.less +35 -17
  23. package/es/ProTable/utils/index.d.ts +2 -0
  24. package/es/ProTable/utils/index.js +16 -3
  25. package/lib/ProDrawerForm/style/index.less +3 -0
  26. package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +2 -1
  27. package/lib/ProEditTable/propsType.d.ts +2 -0
  28. package/lib/ProEditTable/style/index.less +11 -4
  29. package/lib/ProEnum/index.js +5 -3
  30. package/lib/ProForm/components/combination/FormList/index.js +1 -1
  31. package/lib/ProForm/components/combination/Group/index.js +15 -8
  32. package/lib/ProForm/components/combination/Group/propsType.d.ts +2 -0
  33. package/lib/ProForm/components/combination/Group/style/index.less +15 -0
  34. package/lib/ProForm/components/combination/Group/utils.js +44 -9
  35. package/lib/ProForm/components/combination/ProCascader/index.js +7 -1
  36. package/lib/ProForm/components/combination/ProModalSelect/index.js +14 -13
  37. package/lib/ProForm/components/render/ChangedWrapper.js +2 -1
  38. package/lib/ProForm/style/index.less +2 -2
  39. package/lib/ProLayout/style/index.less +5 -0
  40. package/lib/ProTable/components/FormatColumn/index.js +69 -29
  41. package/lib/ProTable/components/RenderColumn/index.d.ts +2 -0
  42. package/lib/ProTable/components/RenderColumn/index.js +3 -5
  43. package/lib/ProTable/propsType.d.ts +4 -5
  44. package/lib/ProTable/style/index.less +35 -17
  45. package/lib/ProTable/utils/index.d.ts +2 -0
  46. package/lib/ProTable/utils/index.js +16 -3
  47. package/package.json +2 -2
@@ -1246,6 +1246,9 @@
1246
1246
  border-radius: var(--zaui-border-radius, 8px) !important;
1247
1247
  background: #E4F2FE;
1248
1248
  }
1249
+ .pro-layout.pro-layout-light .pro-collapse .pro-collapse-panel .pro-collapse-level2-collapse .ant-collapse-header {
1250
+ border-radius: 0 !important;
1251
+ }
1249
1252
  .pro-layout.pro-layout-light .pro-header {
1250
1253
  border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
1251
1254
  }
@@ -1899,42 +1902,67 @@
1899
1902
  .pro-table .ant-table-tbody .ant-table-cell-fix-right {
1900
1903
  background: unset !important;
1901
1904
  }
1902
- .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell {
1903
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
1905
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell,
1906
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell,
1907
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover,
1908
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover {
1904
1909
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1905
1910
  }
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;
1911
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell,
1912
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell,
1913
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell,
1914
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell {
1908
1915
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1909
1916
  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1910
1917
  }
1911
- .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right {
1912
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
1918
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right,
1919
+ .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,
1920
+ .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,
1921
+ .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 {
1913
1922
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1914
1923
  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1915
1924
  }
1916
- .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left {
1917
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
1925
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left,
1926
+ .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,
1927
+ .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,
1928
+ .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 {
1918
1929
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1919
1930
  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1920
1931
  }
1921
- .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
1932
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell,
1933
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .varied-cell {
1922
1934
  margin-left: -8px;
1923
1935
  padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
1924
- background: var(--zaui-contract-bg, #fffaa1) !important;
1936
+ background-color: var(--zaui-contract-bg, #fffaa1) !important;
1937
+ border-radius: var(--zaui-border-radius, 8px);
1938
+ }
1939
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container,
1940
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container {
1941
+ overflow: hidden;
1942
+ white-space: nowrap;
1943
+ text-overflow: ellipsis;
1944
+ }
1945
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .add-cell,
1946
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .add-cell {
1947
+ margin-left: -8px;
1948
+ padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
1949
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1925
1950
  border-radius: var(--zaui-border-radius, 8px);
1926
1951
  }
1927
- .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container {
1952
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .add-cell .pro-form-view-container,
1953
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .add-cell .pro-form-view-container {
1928
1954
  overflow: hidden;
1929
1955
  white-space: nowrap;
1930
1956
  text-overflow: ellipsis;
1931
1957
  }
1932
- .pro-table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
1958
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container,
1959
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
1933
1960
  overflow: hidden;
1934
1961
  white-space: nowrap;
1935
1962
  text-overflow: ellipsis;
1936
1963
  }
1937
- .pro-table tbody.ant-table-tbody .varied-cell.empty-cell {
1964
+ .pro-table .ant-table table tbody.ant-table-tbody .varied-cell.empty-cell,
1965
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .varied-cell.empty-cell {
1938
1966
  width: 24.5px;
1939
1967
  }
1940
1968
  .pro-table .copyable-table-cell .ant-typography {
@@ -2167,6 +2195,9 @@
2167
2195
  .ant-dropdown-placement-bottomLeft .ant-dropdown-menu-vertical.ant-dropdown-menu-light .ant-dropdown-menu-item-only-child:hover {
2168
2196
  background: rgba(0, 106, 255, 0.08);
2169
2197
  }
2198
+ .ant-table .original-value-tooltip {
2199
+ position: fixed;
2200
+ }
2170
2201
  .pro-tooltip {
2171
2202
  cursor: pointer;
2172
2203
  }
@@ -2639,6 +2670,17 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
2639
2670
  border-start-end-radius: 4px;
2640
2671
  border-end-end-radius: 4px;
2641
2672
  }
2673
+ .pro-group .ant-space-compact .pro-select .ant-select .ant-select-selector {
2674
+ border-radius: 0 !important;
2675
+ }
2676
+ .pro-group .ant-space-compact .pro-select:first-child .ant-select .ant-select-selector {
2677
+ border-start-start-radius: 4px !important;
2678
+ border-end-start-radius: 4px !important;
2679
+ }
2680
+ .pro-group .ant-space-compact .pro-select:last-child .ant-select .ant-select-selector {
2681
+ border-start-end-radius: 4px !important;
2682
+ border-end-end-radius: 4px!important;
2683
+ }
2642
2684
  .pro-group .ant-space-compact .ant-select .ant-select-selector {
2643
2685
  border-start-end-radius: 0;
2644
2686
  border-end-end-radius: 0;
@@ -3073,12 +3115,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3073
3115
  .pro-form .pro-form-item-changed .ant-input-number input {
3074
3116
  background: transparent !important;
3075
3117
  }
3076
- .pro-form .pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
3077
- .pro-form .pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
3078
- .pro-form .pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
3079
- .pro-form .pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
3080
- z-index: 9;
3081
- }
3082
3118
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
3083
3119
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3084
3120
  background: var(--zaui-contract-bg, #fffaa1);
@@ -3134,12 +3170,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3134
3170
  .pro-form .pro-form-item-add .ant-input-number input {
3135
3171
  background: transparent !important;
3136
3172
  }
3137
- .pro-form .pro-form-item-add span.ant-input-affix-wrapper .ant-select-selection-placeholder,
3138
- .pro-form .pro-form-item-add .ant-select .ant-select-selector .ant-select-selection-placeholder,
3139
- .pro-form .pro-form-item-add .ant-picker .ant-select-selection-placeholder,
3140
- .pro-form .pro-form-item-add .ant-input-number .ant-select-selection-placeholder {
3141
- z-index: 9;
3142
- }
3143
3173
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-switch-handle),
3144
3174
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3145
3175
  background: var(--zaui-contract-bg-add, #d2fff4);
@@ -4251,6 +4281,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4251
4281
  .ant-select-tree-node-content-wrapper:has(.pro-tree-wrap-ellipse) {
4252
4282
  overflow: hidden;
4253
4283
  }
4284
+ .pro-drawer .original-value-tooltip {
4285
+ position: fixed;
4286
+ }
4254
4287
  .pro-drawer .pro-drawer-close {
4255
4288
  position: absolute;
4256
4289
  top: 6px;
@@ -4617,12 +4650,20 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4617
4650
  .pro-edit-table .ant-table-pagination .ant-pagination-options .ant-select.ant-select-in-form-item {
4618
4651
  width: auto;
4619
4652
  }
4620
- .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row td {
4621
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
4653
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td,
4654
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-left,
4655
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-right,
4656
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row td,
4657
+ .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,
4658
+ .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 {
4659
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
4660
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
4622
4661
  }
4623
4662
  .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover td,
4624
- .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
4625
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
4663
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row:hover td,
4664
+ .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover,
4665
+ .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 {
4666
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
4626
4667
  }
4627
4668
  .pro-edit-table-footer {
4628
4669
  margin-top: 12px;
package/dist/less.esm.css CHANGED
@@ -1246,6 +1246,9 @@
1246
1246
  border-radius: var(--zaui-border-radius, 8px) !important;
1247
1247
  background: #E4F2FE;
1248
1248
  }
1249
+ .pro-layout.pro-layout-light .pro-collapse .pro-collapse-panel .pro-collapse-level2-collapse .ant-collapse-header {
1250
+ border-radius: 0 !important;
1251
+ }
1249
1252
  .pro-layout.pro-layout-light .pro-header {
1250
1253
  border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
1251
1254
  }
@@ -1899,42 +1902,67 @@
1899
1902
  .pro-table .ant-table-tbody .ant-table-cell-fix-right {
1900
1903
  background: unset !important;
1901
1904
  }
1902
- .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell {
1903
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
1905
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell,
1906
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell,
1907
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover,
1908
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover {
1904
1909
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1905
1910
  }
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;
1911
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell,
1912
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell,
1913
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell,
1914
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody tr.ant-table-row.new-cell:hover td.ant-table-cell {
1908
1915
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1909
1916
  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1910
1917
  }
1911
- .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right {
1912
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
1918
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right,
1919
+ .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,
1920
+ .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,
1921
+ .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 {
1913
1922
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1914
1923
  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1915
1924
  }
1916
- .pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left {
1917
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
1925
+ .pro-table .ant-table table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left,
1926
+ .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,
1927
+ .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,
1928
+ .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 {
1918
1929
  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1919
1930
  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
1920
1931
  }
1921
- .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
1932
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell,
1933
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .varied-cell {
1922
1934
  margin-left: -8px;
1923
1935
  padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
1924
- background: var(--zaui-contract-bg, #fffaa1) !important;
1936
+ background-color: var(--zaui-contract-bg, #fffaa1) !important;
1937
+ border-radius: var(--zaui-border-radius, 8px);
1938
+ }
1939
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container,
1940
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container {
1941
+ overflow: hidden;
1942
+ white-space: nowrap;
1943
+ text-overflow: ellipsis;
1944
+ }
1945
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .add-cell,
1946
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .add-cell {
1947
+ margin-left: -8px;
1948
+ padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
1949
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
1925
1950
  border-radius: var(--zaui-border-radius, 8px);
1926
1951
  }
1927
- .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container {
1952
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .add-cell .pro-form-view-container,
1953
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .add-cell .pro-form-view-container {
1928
1954
  overflow: hidden;
1929
1955
  white-space: nowrap;
1930
1956
  text-overflow: ellipsis;
1931
1957
  }
1932
- .pro-table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
1958
+ .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container,
1959
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
1933
1960
  overflow: hidden;
1934
1961
  white-space: nowrap;
1935
1962
  text-overflow: ellipsis;
1936
1963
  }
1937
- .pro-table tbody.ant-table-tbody .varied-cell.empty-cell {
1964
+ .pro-table .ant-table table tbody.ant-table-tbody .varied-cell.empty-cell,
1965
+ .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .varied-cell.empty-cell {
1938
1966
  width: 24.5px;
1939
1967
  }
1940
1968
  .pro-table .copyable-table-cell .ant-typography {
@@ -2167,6 +2195,9 @@
2167
2195
  .ant-dropdown-placement-bottomLeft .ant-dropdown-menu-vertical.ant-dropdown-menu-light .ant-dropdown-menu-item-only-child:hover {
2168
2196
  background: rgba(0, 106, 255, 0.08);
2169
2197
  }
2198
+ .ant-table .original-value-tooltip {
2199
+ position: fixed;
2200
+ }
2170
2201
  .pro-tooltip {
2171
2202
  cursor: pointer;
2172
2203
  }
@@ -2639,6 +2670,17 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
2639
2670
  border-start-end-radius: 4px;
2640
2671
  border-end-end-radius: 4px;
2641
2672
  }
2673
+ .pro-group .ant-space-compact .pro-select .ant-select .ant-select-selector {
2674
+ border-radius: 0 !important;
2675
+ }
2676
+ .pro-group .ant-space-compact .pro-select:first-child .ant-select .ant-select-selector {
2677
+ border-start-start-radius: 4px !important;
2678
+ border-end-start-radius: 4px !important;
2679
+ }
2680
+ .pro-group .ant-space-compact .pro-select:last-child .ant-select .ant-select-selector {
2681
+ border-start-end-radius: 4px !important;
2682
+ border-end-end-radius: 4px!important;
2683
+ }
2642
2684
  .pro-group .ant-space-compact .ant-select .ant-select-selector {
2643
2685
  border-start-end-radius: 0;
2644
2686
  border-end-end-radius: 0;
@@ -3073,12 +3115,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3073
3115
  .pro-form .pro-form-item-changed .ant-input-number input {
3074
3116
  background: transparent !important;
3075
3117
  }
3076
- .pro-form .pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
3077
- .pro-form .pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
3078
- .pro-form .pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
3079
- .pro-form .pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
3080
- z-index: 9;
3081
- }
3082
3118
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
3083
3119
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3084
3120
  background: var(--zaui-contract-bg, #fffaa1);
@@ -3134,12 +3170,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3134
3170
  .pro-form .pro-form-item-add .ant-input-number input {
3135
3171
  background: transparent !important;
3136
3172
  }
3137
- .pro-form .pro-form-item-add span.ant-input-affix-wrapper .ant-select-selection-placeholder,
3138
- .pro-form .pro-form-item-add .ant-select .ant-select-selector .ant-select-selection-placeholder,
3139
- .pro-form .pro-form-item-add .ant-picker .ant-select-selection-placeholder,
3140
- .pro-form .pro-form-item-add .ant-input-number .ant-select-selection-placeholder {
3141
- z-index: 9;
3142
- }
3143
3173
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-switch-handle),
3144
3174
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3145
3175
  background: var(--zaui-contract-bg-add, #d2fff4);
@@ -4251,6 +4281,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4251
4281
  .ant-select-tree-node-content-wrapper:has(.pro-tree-wrap-ellipse) {
4252
4282
  overflow: hidden;
4253
4283
  }
4284
+ .pro-drawer .original-value-tooltip {
4285
+ position: fixed;
4286
+ }
4254
4287
  .pro-drawer .pro-drawer-close {
4255
4288
  position: absolute;
4256
4289
  top: 6px;
@@ -4617,12 +4650,20 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
4617
4650
  .pro-edit-table .ant-table-pagination .ant-pagination-options .ant-select.ant-select-in-form-item {
4618
4651
  width: auto;
4619
4652
  }
4620
- .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row td {
4621
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
4653
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td,
4654
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-left,
4655
+ .pro-edit-table .ant-table table .ant-table-tbody .is-new-row.ant-table-row td.ant-table-cell-fix-right,
4656
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row td,
4657
+ .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,
4658
+ .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 {
4659
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
4660
+ border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
4622
4661
  }
4623
4662
  .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover td,
4624
- .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
4625
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
4663
+ .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row:hover td,
4664
+ .pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover,
4665
+ .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 {
4666
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
4626
4667
  }
4627
4668
  .pro-edit-table-footer {
4628
4669
  margin-top: 12px;
@@ -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;
@@ -118,7 +118,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
118
118
  var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
119
119
  var diffType = useMemo(function () {
120
120
  if (!isWatch || noChange) return 'same';
121
- var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
121
+ var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
122
+ : props[valuePropName];
122
123
  return diffOriginal({
123
124
  value: _value,
124
125
  originalValue: originalValue,
@@ -8,6 +8,7 @@ import type { ColumnType, TableProps } from 'antd/es/table';
8
8
  import type { FormInstance, FormItemProps } from 'antd/es/form';
9
9
  import type { FunctionArgs, ProRule } from '../ProForm/propsType';
10
10
  import { ProFormValueType, ColumnPropsMap } from '../ProForm/components/render/propsType';
11
+ import { DiffOriginalParams } from '../ProForm/utils/diffOriginal';
11
12
  export type ActionType = 'edit' | 'delete' | 'save' | 'cancel' | 'add' | 'mulDelete' | 'custom';
12
13
  export type ShowFunction<T> = (record?: T, options?: {
13
14
  index?: number;
@@ -105,6 +106,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
105
106
  hiddenNames?: NamePath[] | NamePath[][];
106
107
  rules?: ProRule[] | RulesFn<T>;
107
108
  confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
109
+ onDiff?: DiffOriginalParams['equalWith'];
108
110
  [key: string]: any;
109
111
  }
110
112
  export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
@@ -290,12 +290,19 @@
290
290
  }
291
291
  }
292
292
 
293
- .@{ant-prefix}-table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row td{
294
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
293
+ .@{ant-prefix}-table table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row td,
294
+ .@{ant-prefix}-table table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row td.@{ant-prefix}-table-cell-fix-left,
295
+ .@{ant-prefix}-table table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row td.@{ant-prefix}-table-cell-fix-right,
296
+ .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row td,
297
+ .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row td.@{ant-prefix}-table-cell-fix-left,
298
+ .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row td.@{ant-prefix}-table-cell-fix-right{
299
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
300
+ border-bottom: 1px solid var(--zaui-form-control-line,#dcdcdc) ;
295
301
  }
296
- .@{ant-prefix}-table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row:hover{
302
+ .@{ant-prefix}-table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row:hover,
303
+ .@{ant-prefix}-table.@{ant-prefix}-table-scroll-horizontal table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row:hover{
297
304
  td, .@{ant-prefix}-table-cell-row-hover {
298
- background: var(--zaui-contract-bg-add, #d2fff4) !important;
305
+ background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
299
306
  }
300
307
  }
301
308
  }
@@ -27,8 +27,9 @@ import getEnumLabel from './utils/getEnumLabel';
27
27
  import useEnum from './hooks/useEnum';
28
28
  import locale from '../locale';
29
29
  import './style/index.less';
30
+ import { useFieldProps } from '../ProForm/utils/useFieldProps';
30
31
  var ProEnum = function ProEnum(props) {
31
- var _enumProps$showCodeNa;
32
+ var _otherProps$isView, _enumProps$showCodeNa;
32
33
  var code = props.code,
33
34
  _props$type = props.type,
34
35
  type = _props$type === void 0 ? 'ProSelect' : _props$type,
@@ -43,8 +44,9 @@ var ProEnum = function ProEnum(props) {
43
44
  enumProps = _objectWithoutProperties(props, _excluded);
44
45
  var _ref = otherProps || {},
45
46
  viewEmpty = _ref.viewEmpty;
46
- var _isView = isView !== undefined && isView !== null ? isView : otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
47
47
  var _defalutValue = props === null || props === void 0 ? void 0 : props.defaultValue;
48
+ var _useFieldProps = useFieldProps(),
49
+ configIsView = _useFieldProps.isView;
48
50
  var _ref2 = useProConfig('ProEnum') || {},
49
51
  fieldNames = _ref2.fieldNames,
50
52
  _ref2$clear = _ref2.clear,
@@ -53,6 +55,7 @@ var ProEnum = function ProEnum(props) {
53
55
  cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
54
56
  showCodeName = _ref2.showCodeName,
55
57
  resProps = _objectWithoutProperties(_ref2, _excluded2);
58
+ var _isView = isView !== undefined && isView !== null ? isView : (_otherProps$isView = otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView) !== null && _otherProps$isView !== void 0 ? _otherProps$isView : configIsView;
56
59
  enumProps.showCodeName = (_enumProps$showCodeNa = enumProps.showCodeName) !== null && _enumProps$showCodeNa !== void 0 ? _enumProps$showCodeNa : showCodeName;
57
60
  var label = 'label';
58
61
  var fieldValue = 'value';
@@ -228,7 +231,6 @@ var ProEnum = function ProEnum(props) {
228
231
  if (!code && !dataSource && !useRequest) {
229
232
  var _locale$ProEnum4;
230
233
  _message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
231
- // return;
232
234
  }
233
235
  var transToLabel = function transToLabel(value) {
234
236
  var list = dataList && dataList.length ? dataList : enumLists;
@@ -43,7 +43,7 @@ var FormList = function FormList(props, ref) {
43
43
  var _namePath = toArray(name);
44
44
  var orgValues = get(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
45
45
  var _diffConfig = _objectSpread(_objectSpread({}, diffConfig), {}, {
46
- originalValues: isDiffAll ? orgValues || [] : orgValues
46
+ originalValues: (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) && isDiffAll ? orgValues || [] : orgValues
47
47
  });
48
48
  var processColumns = useCallback(function (fieldName, namePath) {
49
49
  return columns.map(function (item) {
@@ -70,23 +70,30 @@ var Group = function Group(props) {
70
70
  id: id,
71
71
  children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
72
72
  children: columns.map(function (column, index) {
73
- return _jsx(ComRender, _objectSpread(_objectSpread({
73
+ column.otherProps = otherProps;
74
+ // 自定义间隔移除对于参数
75
+ if (column === null || column === void 0 ? void 0 : column.separator) {
76
+ delete column.separator;
77
+ delete column.otherProps;
78
+ }
79
+ return _jsx(ComRender, _objectSpread({
74
80
  contextProps: contextProps,
75
81
  isView: isParentView || isView
76
- }, column), {}, {
77
- otherProps: otherProps
78
- }), column.name);
82
+ }, column), column.name || index);
79
83
  })
80
84
  }) : _jsx(_Space, _objectSpread(_objectSpread({
81
85
  align: "start"
82
86
  }, omit(space, ['separator', 'compact'])), {}, {
83
87
  children: columns.map(function (column, index) {
84
- return _jsx(ComRender, _objectSpread(_objectSpread({
88
+ column.otherProps = otherProps;
89
+ if (column === null || column === void 0 ? void 0 : column.separator) {
90
+ delete column.separator;
91
+ delete column.otherProps;
92
+ }
93
+ return _jsx(ComRender, _objectSpread({
85
94
  contextProps: contextProps,
86
95
  isView: isParentView || isView
87
- }, column), {}, {
88
- otherProps: otherProps
89
- }), column.name);
96
+ }, column), column.name || index);
90
97
  })
91
98
  }))
92
99
  });
@@ -12,6 +12,8 @@ export interface SpaceType extends SpaceProps {
12
12
  * 分隔符
13
13
  */
14
14
  separator?: string | React.ReactNode;
15
+ /** 分隔符插入位置 */
16
+ separatorIndex?: number | number[];
15
17
  /** 间隔距离 */
16
18
  size?: number;
17
19
  }
@@ -104,6 +104,21 @@
104
104
  }
105
105
  }
106
106
 
107
+ .pro-select {
108
+ .@{ant-prefix}-select .@{ant-prefix}-select-selector{
109
+ border-radius: 0 !important;
110
+ }
111
+ &:first-child .@{ant-prefix}-select .@{ant-prefix}-select-selector {
112
+ border-start-start-radius: 4px !important;
113
+ border-end-start-radius: 4px !important;
114
+ }
115
+
116
+ &:last-child .@{ant-prefix}-select .@{ant-prefix}-select-selector {
117
+ border-start-end-radius: 4px !important;
118
+ border-end-end-radius: 4px!important;
119
+ }
120
+ }
121
+
107
122
  .@{ant-prefix}-select {
108
123
  .@{ant-prefix}-select-selector {
109
124
  .border-radius(0, 0, 0, 0);
@@ -4,8 +4,10 @@ import _typeof from "@babel/runtime/helpers/esm/typeof";
4
4
  import "antd/es/button/style";
5
5
  import _Button from "antd/es/button";
6
6
  import { jsx as _jsx } from "react/jsx-runtime";
7
+ /* eslint-disable no-lonely-if */
7
8
  import { useRef } from 'react';
8
9
  import { cloneDeep, isEqual, isFunction } from 'lodash';
10
+ import { validate } from '@zat-design/utils';
9
11
  import valueTypeMap from '../../../utils/valueType';
10
12
  import { useDeepCompareMemo } from '../../../utils/useDeepCompareMemo';
11
13
  import { difference } from '../../../../ProEditTable/utils/tools';
@@ -18,20 +20,52 @@ export var insertSeparator = function insertSeparator(columns, space) {
18
20
  if (!(space === null || space === void 0 ? void 0 : space.separator)) {
19
21
  return columns;
20
22
  }
23
+ var separatorIndexs = function () {
24
+ var reuslt = [];
25
+ if (validate.isEmpty(space === null || space === void 0 ? void 0 : space.separatorIndex)) {
26
+ return reuslt;
27
+ }
28
+ // 如果 index 是数字,将其转换为数组
29
+ if (typeof (space === null || space === void 0 ? void 0 : space.separatorIndex) === 'number') {
30
+ reuslt.push(space.separatorIndex);
31
+ }
32
+ if (Array.isArray(space.separatorIndex)) {
33
+ reuslt = reuslt.concat(space.separatorIndex);
34
+ }
35
+ return reuslt;
36
+ }();
21
37
  return columns.reduce(function (result, current, index, array) {
22
38
  // 将当前元素添加到结果数组中
23
39
  result.push(current);
24
- // 如果当前元素不是最后一个元素,则添加间隔符
25
- if (index < array.length - 1) {
26
- result.push({
27
- component: _jsx(_Button, {
28
- className: "group-separator",
29
- children: space.separator
30
- }),
31
- fieldProps: {
32
- disabled: true
40
+ if (separatorIndexs === null || separatorIndexs === void 0 ? void 0 : separatorIndexs.length) {
41
+ separatorIndexs.forEach(function (separatorIndex) {
42
+ if (index === separatorIndex) {
43
+ result.push({
44
+ separator: true,
45
+ component: _jsx(_Button, {
46
+ className: "group-separator",
47
+ children: space.separator
48
+ }),
49
+ fieldProps: {
50
+ disabled: true
51
+ }
52
+ });
33
53
  }
34
54
  });
55
+ } else {
56
+ // 如果当前元素不是最后一个元素,则添加间隔符
57
+ if (index < array.length - 1) {
58
+ result.push({
59
+ separator: true,
60
+ component: _jsx(_Button, {
61
+ className: "group-separator",
62
+ children: space.separator
63
+ }),
64
+ fieldProps: {
65
+ disabled: true
66
+ }
67
+ });
68
+ }
35
69
  }
36
70
  return result;
37
71
  }, []);
@@ -35,11 +35,17 @@ var _filterDataSource = function filterDataSource(dataSource, level, fieldNames)
35
35
  });
36
36
  };
37
37
  var getViewLabel = function getViewLabel(_ref) {
38
+ var _value2;
38
39
  var dataSource = _ref.dataSource,
39
40
  value = _ref.value;
41
+ var _value = value;
40
42
  var viewLabel = [];
43
+ // fix: value是string类型,需要转为数组
44
+ if (_value && !Array.isArray(_value)) {
45
+ _value = [value];
46
+ }
41
47
  // 根据dataSource得到label数组,查看模式展示需要
42
- value === null || value === void 0 ? void 0 : value.forEach(function (value, index) {
48
+ (_value2 = _value) === null || _value2 === void 0 ? void 0 : _value2.forEach(function (value, index) {
43
49
  var _dataSource;
44
50
  var temp = (_dataSource = dataSource) === null || _dataSource === void 0 ? void 0 : _dataSource.find(function (item) {
45
51
  return (item === null || item === void 0 ? void 0 : item.value) === value;