@zat-design/sisyphus-react 3.8.0-beat.1 → 3.8.0-beat.11

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 (90) hide show
  1. package/dist/index.esm.css +7 -51
  2. package/dist/less.esm.css +7 -51
  3. package/es/ProAction/index.js +1 -1
  4. package/es/ProDownload/index.js +3 -3
  5. package/es/ProDownload/utils.js +3 -3
  6. package/es/ProDrawerForm/components/ProDrawer/index.js +4 -4
  7. package/es/ProDrawerForm/components/ProModal/index.js +3 -3
  8. package/es/ProEditLabel/index.js +3 -3
  9. package/es/ProEditTable/components/ActionButton/index.js +3 -3
  10. package/es/ProEditTable/components/RenderField/ListChangedWrapper.js +7 -4
  11. package/es/ProEditTable/components/RenderField/index.js +7 -5
  12. package/es/ProEditTable/components/RenderToolbar/index.js +1 -1
  13. package/es/ProEditTable/utils/config.js +2 -2
  14. package/es/ProEditTable/utils/index.js +5 -5
  15. package/es/ProEditTable/utils/tools.js +1 -1
  16. package/es/ProEnum/hooks/useEnumRequest.js +2 -2
  17. package/es/ProEnum/index.js +1 -1
  18. package/es/ProForm/components/combination/FormList/components/ActionButton.js +2 -2
  19. package/es/ProForm/components/combination/FormList/components/BlockTitle.js +1 -1
  20. package/es/ProForm/components/combination/FormList/components/ToolbarButton.js +1 -1
  21. package/es/ProForm/components/combination/FormList/utils.js +1 -1
  22. package/es/ProForm/components/combination/Group/component/ComRender.js +1 -1
  23. package/es/ProForm/components/combination/ProCascader/index.js +6 -3
  24. package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +1 -1
  25. package/es/ProForm/components/combination/ProModalSelect/index.js +12 -6
  26. package/es/ProForm/components/combination/ProModalSelect/propsType.d.ts +1 -0
  27. package/es/ProForm/components/combination/ProNumberRange/index.js +51 -47
  28. package/es/ProForm/components/combination/ProNumberRange/style/index.less +51 -56
  29. package/es/ProForm/components/old/ProAddress/index.js +1 -1
  30. package/es/ProForm/components/render/ChangedWrapper.js +4 -2
  31. package/es/ProForm/components/render/ConfirmWrapper.js +1 -1
  32. package/es/ProForm/components/render/Render.js +4 -3
  33. package/es/ProForm/index.js +1 -1
  34. package/es/ProForm/utils/useForm.js +1 -1
  35. package/es/ProStep/components/Listener/index.js +1 -1
  36. package/es/ProStep/index.js +3 -3
  37. package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +2 -2
  38. package/es/ProTable/hooks/useAntdTable.js +3 -3
  39. package/es/ProTable/index.js +2 -2
  40. package/es/ProTree/components/ProTree.js +1 -1
  41. package/es/ProTree/components/ProTreeSelect/index.js +13 -0
  42. package/es/ProTree/components/Tree.js +1 -1
  43. package/es/ProUpload/components/ImageRender.js +1 -1
  44. package/es/ProViewer/index.js +2 -2
  45. package/es/old/ProEditableTable/index.js +4 -4
  46. package/lib/ProAction/index.js +1 -1
  47. package/lib/ProDownload/index.js +3 -3
  48. package/lib/ProDownload/utils.js +3 -3
  49. package/lib/ProDrawerForm/components/ProDrawer/index.js +4 -4
  50. package/lib/ProDrawerForm/components/ProModal/index.js +3 -3
  51. package/lib/ProEditLabel/index.js +3 -3
  52. package/lib/ProEditTable/components/ActionButton/index.js +3 -3
  53. package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js +7 -4
  54. package/lib/ProEditTable/components/RenderField/index.js +7 -5
  55. package/lib/ProEditTable/components/RenderToolbar/index.js +1 -1
  56. package/lib/ProEditTable/utils/config.js +2 -2
  57. package/lib/ProEditTable/utils/index.js +5 -5
  58. package/lib/ProEditTable/utils/tools.js +1 -1
  59. package/lib/ProEnum/hooks/useEnumRequest.js +2 -2
  60. package/lib/ProEnum/index.js +1 -1
  61. package/lib/ProForm/components/combination/FormList/components/ActionButton.js +2 -2
  62. package/lib/ProForm/components/combination/FormList/components/BlockTitle.js +1 -1
  63. package/lib/ProForm/components/combination/FormList/components/ToolbarButton.js +1 -1
  64. package/lib/ProForm/components/combination/FormList/utils.js +1 -1
  65. package/lib/ProForm/components/combination/Group/component/ComRender.js +1 -1
  66. package/lib/ProForm/components/combination/ProCascader/index.js +6 -3
  67. package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js +1 -1
  68. package/lib/ProForm/components/combination/ProModalSelect/index.js +12 -6
  69. package/lib/ProForm/components/combination/ProModalSelect/propsType.d.ts +1 -0
  70. package/lib/ProForm/components/combination/ProNumberRange/index.js +45 -45
  71. package/lib/ProForm/components/combination/ProNumberRange/style/index.less +51 -56
  72. package/lib/ProForm/components/old/ProAddress/index.js +1 -1
  73. package/lib/ProForm/components/render/ChangedWrapper.js +4 -2
  74. package/lib/ProForm/components/render/ConfirmWrapper.js +1 -1
  75. package/lib/ProForm/components/render/Render.js +4 -3
  76. package/lib/ProForm/index.js +1 -1
  77. package/lib/ProForm/utils/useForm.js +1 -1
  78. package/lib/ProStep/components/Listener/index.js +1 -1
  79. package/lib/ProStep/index.js +3 -3
  80. package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js +2 -2
  81. package/lib/ProTable/hooks/useAntdTable.js +3 -3
  82. package/lib/ProTable/index.js +2 -2
  83. package/lib/ProTree/components/ProTree.js +1 -1
  84. package/lib/ProTree/components/ProTreeSelect/index.js +13 -0
  85. package/lib/ProTree/components/Tree.js +1 -1
  86. package/lib/ProUpload/components/ImageRender.js +1 -1
  87. package/lib/ProViewer/index.js +2 -2
  88. package/lib/old/ProEditableTable/index.js +4 -4
  89. package/package.json +3 -4
  90. package/.vscode/extensions.json +0 -5
@@ -2339,8 +2339,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
2339
2339
  .pro-number-range .range-split {
2340
2340
  width: 32px !important;
2341
2341
  text-align: center !important;
2342
- border-right: 0px;
2343
- border-left: 0px;
2344
2342
  pointer-events: none;
2345
2343
  }
2346
2344
  .pro-number-range .range-split.ant-input[disabled] {
@@ -2349,60 +2347,18 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
2349
2347
  .pro-number-range .ant-input-number-status-error:not(.ant-input-number-disabled):not( .ant-input-number-borderless).ant-input-number {
2350
2348
  border-color: var(--zaui-danger, #ff5050) !important;
2351
2349
  }
2352
- .pro-number-range .ant-input-status-error.range-split {
2353
- color: var(--zaui-danger, #ff5050) !important;
2350
+ .pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-split,
2351
+ .pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-before,
2352
+ .pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-after {
2354
2353
  border-color: var(--zaui-danger, #ff5050);
2355
2354
  }
2356
- .pro-number-range .ant-input-rtl.range-right {
2357
- border-right-width: 0;
2358
- }
2359
- .pro-number-range .ant-input-rtl.range-right:hover,
2360
- .pro-number-range .ant-input-rtl.range-right:focus {
2361
- border-right-width: 1px;
2362
- }
2363
2355
  .pro-number-range .ant-form-item {
2364
2356
  margin-bottom: 0;
2365
2357
  }
2366
- .pro-number-range .range-left,
2367
- .pro-number-range .range-right {
2368
- width: calc(50% - 16px);
2369
- text-align: center;
2370
- -webkit-transition: none;
2371
- transition: none;
2372
- }
2373
- .pro-number-range .range-left .range-left,
2374
- .pro-number-range .range-right .range-left {
2375
- width: calc(100% + 2px) !important;
2376
- }
2377
- .pro-number-range .range-left .ant-input-number {
2378
- border-right: none;
2379
- }
2380
- .pro-number-range .range-right .ant-input-number {
2381
- border-left: none;
2382
- }
2383
- .pro-number-range .range-right .range-right {
2384
- width: 100%;
2385
- border-top-left-radius: 0;
2386
- border-bottom-left-radius: 0;
2387
- }
2388
- .pro-number-range.ant-input-group.ant-input-group-compact > *:not(:last-child) {
2389
- margin-right: 0;
2390
- }
2391
- .pro-number-range > *:first-child {
2392
- border-top-right-radius: 0 !important;
2393
- border-bottom-right-radius: 0 !important;
2394
- }
2395
- .pro-number-range > *:first-child > .ant-select-selector {
2396
- border-top-right-radius: 0 !important;
2397
- border-bottom-right-radius: 0 !important;
2398
- }
2399
- .pro-number-range > *:last-child {
2400
- border-top-left-radius: 0 !important;
2401
- border-bottom-left-radius: 0 !important;
2402
- }
2403
- .pro-number-range > *:last-child > .ant-select-selector {
2404
- border-top-left-radius: 0 !important;
2405
- border-bottom-left-radius: 0 !important;
2358
+ .pro-number-range .range-addon-before,
2359
+ .pro-number-range .range-addon-after {
2360
+ color: var(--zaui-disabled-text);
2361
+ pointer-events: none;
2406
2362
  }
2407
2363
  .pro-modal-select .ant-input-group-wrapper .close-icon,
2408
2364
  .pro-tree-modal .ant-input-group-wrapper .close-icon {
package/dist/less.esm.css CHANGED
@@ -2339,8 +2339,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
2339
2339
  .pro-number-range .range-split {
2340
2340
  width: 32px !important;
2341
2341
  text-align: center !important;
2342
- border-right: 0px;
2343
- border-left: 0px;
2344
2342
  pointer-events: none;
2345
2343
  }
2346
2344
  .pro-number-range .range-split.ant-input[disabled] {
@@ -2349,60 +2347,18 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
2349
2347
  .pro-number-range .ant-input-number-status-error:not(.ant-input-number-disabled):not( .ant-input-number-borderless).ant-input-number {
2350
2348
  border-color: var(--zaui-danger, #ff5050) !important;
2351
2349
  }
2352
- .pro-number-range .ant-input-status-error.range-split {
2353
- color: var(--zaui-danger, #ff5050) !important;
2350
+ .pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-split,
2351
+ .pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-before,
2352
+ .pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-after {
2354
2353
  border-color: var(--zaui-danger, #ff5050);
2355
2354
  }
2356
- .pro-number-range .ant-input-rtl.range-right {
2357
- border-right-width: 0;
2358
- }
2359
- .pro-number-range .ant-input-rtl.range-right:hover,
2360
- .pro-number-range .ant-input-rtl.range-right:focus {
2361
- border-right-width: 1px;
2362
- }
2363
2355
  .pro-number-range .ant-form-item {
2364
2356
  margin-bottom: 0;
2365
2357
  }
2366
- .pro-number-range .range-left,
2367
- .pro-number-range .range-right {
2368
- width: calc(50% - 16px);
2369
- text-align: center;
2370
- -webkit-transition: none;
2371
- transition: none;
2372
- }
2373
- .pro-number-range .range-left .range-left,
2374
- .pro-number-range .range-right .range-left {
2375
- width: calc(100% + 2px) !important;
2376
- }
2377
- .pro-number-range .range-left .ant-input-number {
2378
- border-right: none;
2379
- }
2380
- .pro-number-range .range-right .ant-input-number {
2381
- border-left: none;
2382
- }
2383
- .pro-number-range .range-right .range-right {
2384
- width: 100%;
2385
- border-top-left-radius: 0;
2386
- border-bottom-left-radius: 0;
2387
- }
2388
- .pro-number-range.ant-input-group.ant-input-group-compact > *:not(:last-child) {
2389
- margin-right: 0;
2390
- }
2391
- .pro-number-range > *:first-child {
2392
- border-top-right-radius: 0 !important;
2393
- border-bottom-right-radius: 0 !important;
2394
- }
2395
- .pro-number-range > *:first-child > .ant-select-selector {
2396
- border-top-right-radius: 0 !important;
2397
- border-bottom-right-radius: 0 !important;
2398
- }
2399
- .pro-number-range > *:last-child {
2400
- border-top-left-radius: 0 !important;
2401
- border-bottom-left-radius: 0 !important;
2402
- }
2403
- .pro-number-range > *:last-child > .ant-select-selector {
2404
- border-top-left-radius: 0 !important;
2405
- border-bottom-left-radius: 0 !important;
2358
+ .pro-number-range .range-addon-before,
2359
+ .pro-number-range .range-addon-after {
2360
+ color: var(--zaui-disabled-text);
2361
+ pointer-events: none;
2406
2362
  }
2407
2363
  .pro-modal-select .ant-input-group-wrapper .close-icon,
2408
2364
  .pro-tree-modal .ant-input-group-wrapper .close-icon {
@@ -40,7 +40,7 @@ var ProAction = function ProAction(props) {
40
40
  servicesArray = state.servicesArray;
41
41
  var length = config.length;
42
42
  var _onActionRun = /*#__PURE__*/function () {
43
- var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(currentIndex, array) {
43
+ var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(currentIndex, array) {
44
44
  var _actionProps$useReque, _options$onSuccess, _newServicesArray$cur, _newServicesArray$cur2, _newServicesArray$cur3, _actionProps$onAction, _actionProps$continue;
45
45
  var actionProps, newServicesArray, _ref2, service, options, transformResponse, res, data, open, _newServicesArray$cur4, _newServicesArray$cur5, _newServicesArray$cur6, list, errorTitle, isContinue;
46
46
  return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -37,7 +37,7 @@ var ProDownload = function ProDownload(props) {
37
37
  onErrorConfig = _ref.onError;
38
38
  defaultProps.headers = _objectSpread(_objectSpread({}, headers), defaultProps.headers);
39
39
  var handDownload = /*#__PURE__*/function () {
40
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
40
+ var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
41
41
  var _params;
42
42
  return _regeneratorRuntime().wrap(function _callee$(_context) {
43
43
  while (1) switch (_context.prev = _context.next) {
@@ -131,7 +131,7 @@ var ProDownload = function ProDownload(props) {
131
131
  return _jsx(_Button, _objectSpread(_objectSpread({
132
132
  className: cls,
133
133
  onClick: function () {
134
- var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
134
+ var _onClick = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
135
135
  var res;
136
136
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
137
137
  while (1) switch (_context3.prev = _context3.next) {
@@ -146,7 +146,7 @@ var ProDownload = function ProDownload(props) {
146
146
  _context3.next = 13;
147
147
  break;
148
148
  }
149
- if (!(beforeDownload instanceof /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
149
+ if (!(beforeDownload instanceof /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
150
150
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
151
151
  while (1) switch (_context2.prev = _context2.next) {
152
152
  case 0:
@@ -70,7 +70,7 @@ export function getFilenameFromContentDisposition(contentDisposition) {
70
70
  }
71
71
  // 发起请求获取下载文件
72
72
  export var DownloadRequest = /*#__PURE__*/function () {
73
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
73
+ var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
74
74
  var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, onError, config, res, fileBlob, data, contentFileName;
75
75
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
76
76
  while (1) switch (_context2.prev = _context2.next) {
@@ -97,8 +97,8 @@ export var DownloadRequest = /*#__PURE__*/function () {
97
97
  config.headers = _objectSpread(_objectSpread({}, config.headers), headers);
98
98
  }
99
99
  _context2.next = 7;
100
- return fetch(url, config).then( /*#__PURE__*/function () {
101
- var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
100
+ return fetch(url, config).then(/*#__PURE__*/function () {
101
+ var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
102
102
  var _data, errorMsg;
103
103
  return _regeneratorRuntime().wrap(function _callee$(_context) {
104
104
  while (1) switch (_context.prev = _context.next) {
@@ -46,7 +46,7 @@ var ProDrawer = function ProDrawer(_ref) {
46
46
  loading = _useState2[0],
47
47
  toggleLoading = _useState2[1];
48
48
  var noRenderFooter = isView || footer === false || footer === null;
49
- var onConfirm = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
49
+ var onConfirm = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
50
50
  var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
51
51
  return _regeneratorRuntime().wrap(function _callee$(_context) {
52
52
  while (1) switch (_context.prev = _context.next) {
@@ -74,7 +74,7 @@ var ProDrawer = function ProDrawer(_ref) {
74
74
  }
75
75
  }, _callee);
76
76
  })), [onCancel, modalRef.current]);
77
- var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
77
+ var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
78
78
  var values, _error$errorFields, _error$errorFields$;
79
79
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
80
80
  while (1) switch (_context2.prev = _context2.next) {
@@ -166,7 +166,7 @@ var ProDrawer = function ProDrawer(_ref) {
166
166
  if (noRenderFooter) {
167
167
  return null;
168
168
  }
169
- if ( /*#__PURE__*/React.isValidElement(footer)) {
169
+ if (/*#__PURE__*/React.isValidElement(footer)) {
170
170
  return _jsx("div", {
171
171
  className: "pro-drawer-footer",
172
172
  children: footer
@@ -176,7 +176,7 @@ var ProDrawer = function ProDrawer(_ref) {
176
176
  return _jsx("div", {
177
177
  className: "pro-drawer-footer",
178
178
  children: footer.map(function (item) {
179
- if ( /*#__PURE__*/React.isValidElement(item)) {
179
+ if (/*#__PURE__*/React.isValidElement(item)) {
180
180
  return item;
181
181
  }
182
182
  return false;
@@ -52,7 +52,7 @@ var ProModal = function ProModal(_ref) {
52
52
  'pro-modal-no-footer': noRenderFooter,
53
53
  'pro-modal-footer-shadow': height >= 450
54
54
  }]);
55
- var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
55
+ var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
56
56
  var values, _error$errorFields, _error$errorFields$;
57
57
  return _regeneratorRuntime().wrap(function _callee$(_context) {
58
58
  while (1) switch (_context.prev = _context.next) {
@@ -146,7 +146,7 @@ var ProModal = function ProModal(_ref) {
146
146
  if (noRenderFooter) {
147
147
  return null;
148
148
  }
149
- if ( /*#__PURE__*/React.isValidElement(footer)) {
149
+ if (/*#__PURE__*/React.isValidElement(footer)) {
150
150
  return _jsx("div", {
151
151
  className: "pro-drawer-footer",
152
152
  children: footer
@@ -156,7 +156,7 @@ var ProModal = function ProModal(_ref) {
156
156
  return _jsx("div", {
157
157
  className: "pro-drawer-footer",
158
158
  children: footer.map(function (item) {
159
- if ( /*#__PURE__*/React.isValidElement(item)) {
159
+ if (/*#__PURE__*/React.isValidElement(item)) {
160
160
  return item;
161
161
  }
162
162
  return false;
@@ -134,7 +134,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
134
134
  * pop确认回调
135
135
  */
136
136
  var onConfirmHandle = /*#__PURE__*/function () {
137
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
137
+ var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
138
138
  var res, value;
139
139
  return _regeneratorRuntime().wrap(function _callee$(_context) {
140
140
  while (1) switch (_context.prev = _context.next) {
@@ -221,7 +221,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
221
221
  })
222
222
  });
223
223
  if (disabled) {
224
- if ( /*#__PURE__*/React.isValidElement(children)) {
224
+ if (/*#__PURE__*/React.isValidElement(children)) {
225
225
  return children;
226
226
  }
227
227
  if (props.value && !popupProps) {
@@ -253,7 +253,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
253
253
  if (mode === 'popup') {
254
254
  // 查看时内容渲染
255
255
  var labelRender = function labelRender() {
256
- if ( /*#__PURE__*/React.isValidElement(children)) {
256
+ if (/*#__PURE__*/React.isValidElement(children)) {
257
257
  return children;
258
258
  }
259
259
  return TextNode;
@@ -82,7 +82,7 @@ var ActionButton = function ActionButton(_ref) {
82
82
  disabled: isDisabled,
83
83
  okText: locale.ProEditTable.confirm,
84
84
  cancelText: locale.ProEditTable.cancel,
85
- children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
85
+ children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
86
86
  record: record,
87
87
  index: index,
88
88
  disabled: isDisabled
@@ -92,7 +92,7 @@ var ActionButton = function ActionButton(_ref) {
92
92
  children: btnConfig.label
93
93
  }))
94
94
  }) : _jsx(_Fragment, {
95
- children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
95
+ children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
96
96
  record: record,
97
97
  index: index,
98
98
  disabled: isDisabled,
@@ -109,7 +109,7 @@ var ActionButton = function ActionButton(_ref) {
109
109
  }))
110
110
  })
111
111
  }) : _jsx(_Fragment, {
112
- children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
112
+ children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
113
113
  record: record,
114
114
  index: index
115
115
  }))) : _jsx(_Button, _objectSpread(_objectSpread({
@@ -4,7 +4,7 @@ import "antd/es/tooltip/style";
4
4
  import _Tooltip from "antd/es/tooltip";
5
5
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
6
6
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
7
- var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type"];
7
+ var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "valuePropName"];
8
8
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
9
9
  import React, { useMemo } from 'react';
10
10
  import classNames from 'classnames';
@@ -41,7 +41,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
41
41
  var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
42
42
  if (!keyValue) return undefined;
43
43
  var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
44
- var originalValueRow = originalValueList.find(function (item) {
44
+ var originalValueRow = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
45
45
  return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
46
46
  });
47
47
  var originalValue;
@@ -78,6 +78,8 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
78
78
  rowKeyPath = props.rowKeyPath,
79
79
  children = props.children,
80
80
  type = props.type,
81
+ normalize = props.normalize,
82
+ valuePropName = props.valuePropName,
81
83
  rest = _objectWithoutProperties(props, _excluded);
82
84
  var _ref2 = useProConfig('ProEditTable') || {},
83
85
  isDiffAll = _ref2.isDiffAll;
@@ -96,14 +98,15 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
96
98
  var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
97
99
  var diffType = useMemo(function () {
98
100
  if (!isWatch || noChange) return 'same';
101
+ var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
99
102
  return diffOriginal({
100
- value: props.value,
103
+ value: _value,
101
104
  originalValue: originalValue,
102
105
  form: form,
103
106
  equalWith: equalWith
104
107
  // name: isString(namesStr) ? namesStr : originalName || name,
105
108
  });
106
- }, [props.value, originalValue]);
109
+ }, [props[valuePropName], originalValue]);
107
110
  var isAdd = diffType === 'add';
108
111
  var isChanged = diffType === 'changed';
109
112
  if (!isWatch || noChange) {
@@ -246,7 +246,7 @@ var RenderField = function RenderField(_ref) {
246
246
  if (typeof _editRender === 'function') {
247
247
  TargetComponent = _editRender.apply(void 0, rowParams);
248
248
  }
249
- if ( /*#__PURE__*/React.isValidElement(_editRender)) {
249
+ if (/*#__PURE__*/React.isValidElement(_editRender)) {
250
250
  TargetComponent = _editRender;
251
251
  }
252
252
  }
@@ -262,7 +262,7 @@ var RenderField = function RenderField(_ref) {
262
262
  children: View
263
263
  });
264
264
  }
265
- if ( /*#__PURE__*/React.isValidElement(viewRender)) {
265
+ if (/*#__PURE__*/React.isValidElement(viewRender)) {
266
266
  TargetComponent = viewRender;
267
267
  }
268
268
  }
@@ -305,7 +305,7 @@ var RenderField = function RenderField(_ref) {
305
305
  }, 100);
306
306
  };
307
307
  // 单元格更新数据时,加个防抖,防止更新频率过快,卡顿
308
- var _onChange = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
308
+ var _onChange = debounce(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
309
309
  var _len2,
310
310
  args,
311
311
  _key2,
@@ -409,7 +409,7 @@ var RenderField = function RenderField(_ref) {
409
409
  }, _callee);
410
410
  })), 300);
411
411
  var _onblur = /*#__PURE__*/function () {
412
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
412
+ var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
413
413
  var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
414
414
  var _len3,
415
415
  args,
@@ -545,7 +545,7 @@ var RenderField = function RenderField(_ref) {
545
545
  var getFieldItem = function getFieldItem() {
546
546
  var _componentProps;
547
547
  var FormItem = null;
548
- var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
548
+ var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? (/*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
549
549
  if (originalValues) {
550
550
  FieldComponent = _jsx(ListChangedWrapper, {
551
551
  name: cellName,
@@ -559,6 +559,8 @@ var RenderField = function RenderField(_ref) {
559
559
  equalWith: equalWith,
560
560
  type: type,
561
561
  onChange: _onChange,
562
+ valuePropName: _formItemProps.valuePropName,
563
+ normalize: _formItemProps.normalize,
562
564
  children: FieldComponent
563
565
  });
564
566
  }
@@ -76,7 +76,7 @@ var RenderToolbar = function RenderToolbar(config) {
76
76
  toolbar.show = show !== null && show !== void 0 ? show : true;
77
77
  toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
78
78
  toolbar.onEvent = /*#__PURE__*/function () {
79
- var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
79
+ var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
80
80
  var onEvent, result;
81
81
  return _regeneratorRuntime().wrap(function _callee$(_context) {
82
82
  while (1) switch (_context.prev = _context.next) {
@@ -63,7 +63,7 @@ export var actions = {
63
63
  });
64
64
  },
65
65
  save: function () {
66
- var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
66
+ var _save = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
67
67
  var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
68
68
  return _regeneratorRuntime().wrap(function _callee$(_context) {
69
69
  while (1) switch (_context.prev = _context.next) {
@@ -166,7 +166,7 @@ export var actions = {
166
166
  }
167
167
  },
168
168
  add: function () {
169
- var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
169
+ var _add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
170
170
  var _tableRef$current$que, _tableRef$current$que2;
171
171
  var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
172
172
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -26,7 +26,7 @@ import locale from '../../locale';
26
26
  // 渲染操作栏
27
27
  var getActionColumn = function getActionColumn(config) {
28
28
  var _cloneDeepWith = cloneDeepWith(config, function (value) {
29
- if ( /*#__PURE__*/React.isValidElement(value)) {
29
+ if (/*#__PURE__*/React.isValidElement(value)) {
30
30
  return value;
31
31
  }
32
32
  }),
@@ -83,7 +83,7 @@ var getActionColumn = function getActionColumn(config) {
83
83
  action.show = show !== null && show !== void 0 ? show : true;
84
84
  action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
85
85
  action.onEvent = /*#__PURE__*/function () {
86
- var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
86
+ var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
87
87
  var _form$getFieldValue;
88
88
  var rowName, _record, onEvent, result;
89
89
  return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -234,7 +234,7 @@ export var transformColumns = function transformColumns() {
234
234
  children: [before, columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
235
235
  title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
236
236
  }, resetProps), {}, {
237
- children: icon ? ( /*#__PURE__*/React.cloneElement(icon, {
237
+ children: icon ? (/*#__PURE__*/React.cloneElement(icon, {
238
238
  className: 'icon-tip'
239
239
  })) : _jsx(ReactSVG, {
240
240
  className: "icon-tip",
@@ -380,8 +380,8 @@ export var transformColumns = function transformColumns() {
380
380
  }
381
381
  // cacheMap 用来存储缓存值,若有值后不再请求
382
382
  if (JSON.stringify(cacheMap.current) === '{}') {
383
- Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
384
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
383
+ Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
384
+ var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
385
385
  var _item, key, value, _ref4, service, option;
386
386
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
387
387
  while (1) switch (_context2.prev = _context2.next) {
@@ -191,7 +191,7 @@ export var handleScrollToError = function handleScrollToError() {
191
191
  */
192
192
  export function cloneDeepFilterNode(value) {
193
193
  return cloneDeepWith(value, function (val) {
194
- if ( /*#__PURE__*/React.isValidElement(val)) {
194
+ if (/*#__PURE__*/React.isValidElement(val)) {
195
195
  return val;
196
196
  }
197
197
  });
@@ -52,7 +52,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
52
52
  staleTime: 6e4 * 60
53
53
  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
54
54
  setCache: function () {
55
- var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
55
+ var _setCache = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
56
56
  var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
57
57
  return _regeneratorRuntime().wrap(function _callee$(_context) {
58
58
  while (1) switch (_context.prev = _context.next) {
@@ -162,7 +162,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
162
162
  }
163
163
  }));
164
164
  var mergeData = /*#__PURE__*/function () {
165
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
165
+ var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
166
166
  var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
167
167
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
168
168
  while (1) switch (_context2.prev = _context2.next) {
@@ -153,7 +153,7 @@ var ProEnum = function ProEnum(props) {
153
153
  list = [];
154
154
  }
155
155
  }
156
- if ( /*#__PURE__*/React.isValidElement(component)) {
156
+ if (/*#__PURE__*/React.isValidElement(component)) {
157
157
  var Component = component;
158
158
  return _jsx(Component, _objectSpread(_objectSpread({}, enumProps), {}, {
159
159
  dataSource: list,
@@ -133,7 +133,7 @@ var ActionButton = function ActionButton(props) {
133
133
  return _actionProps;
134
134
  }, [props.actionProps]);
135
135
  var handleClick = /*#__PURE__*/function () {
136
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
136
+ var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
137
137
  var value, data;
138
138
  return _regeneratorRuntime().wrap(function _callee$(_context) {
139
139
  while (1) switch (_context.prev = _context.next) {
@@ -272,7 +272,7 @@ var ActionButton = function ActionButton(props) {
272
272
  },
273
273
  children: label
274
274
  }))
275
- }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : ( /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
275
+ }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
276
276
  key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
277
277
  type: "text",
278
278
  onClick: function onClick(e) {
@@ -13,7 +13,7 @@ var BlockTitle = function BlockTitle(props) {
13
13
  if (!title) {
14
14
  return _jsx("div", {});
15
15
  }
16
- if ( /*#__PURE__*/React.isValidElement(title)) {
16
+ if (/*#__PURE__*/React.isValidElement(title)) {
17
17
  return title;
18
18
  }
19
19
  var titleContent = title;
@@ -55,7 +55,7 @@ var ToolbarButton = function ToolbarButton(props) {
55
55
  return _toolbarProps;
56
56
  }, [props.toolbarProps]);
57
57
  var handleClick = /*#__PURE__*/function () {
58
- var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
58
+ var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
59
59
  var value, data;
60
60
  return _regeneratorRuntime().wrap(function _callee$(_context) {
61
61
  while (1) switch (_context.prev = _context.next) {
@@ -23,7 +23,7 @@ export var namesPathTransform = function namesPathTransform(_ref) {
23
23
  // 比较memo
24
24
  export var memoWith = function memoWith(pre, next) {
25
25
  return isEqualWith(pre, next, function (objValue, othValue) {
26
- if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
26
+ if (/*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
27
27
  return true;
28
28
  }
29
29
  // 移除解决formlist函数里不更新问题
@@ -48,7 +48,7 @@ var ComRender = function ComRender(props) {
48
48
  };
49
49
  var _props = mergedGetValueProps(fieldProps.value);
50
50
  var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
51
- var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
51
+ var Component = component ? (/*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
52
52
  var Com = getComRender(Component, props, componentProps);
53
53
  return _jsx(FieldProvider, {
54
54
  value: _objectSpread(_objectSpread({}, contextProps), {}, {
@@ -96,8 +96,11 @@ var ProCascader = function ProCascader(props) {
96
96
  enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
97
97
  var realDataSource = useMemo(function () {
98
98
  var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
99
- var result = isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
100
- return transformDataName(result, fieldNames);
99
+ var result = transformDataName(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
100
+ if (transformResponse) {
101
+ return transformResponse(result);
102
+ }
103
+ return result;
101
104
  }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
102
105
  var _useRequest = _objectSpread({}, useRequest),
103
106
  service = _useRequest.service,
@@ -112,7 +115,7 @@ var ProCascader = function ProCascader(props) {
112
115
  defaultLabel = _useState4[0],
113
116
  setDefaultLabel = _useState4[1];
114
117
  var getFirstLevelOptions = /*#__PURE__*/function () {
115
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
118
+ var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
116
119
  var _yield$service, data, newData, transFormData, serviceData;
117
120
  return _regeneratorRuntime().wrap(function _callee$(_context) {
118
121
  while (1) switch (_context.prev = _context.next) {
@@ -24,7 +24,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
24
24
  });
25
25
  };
26
26
  var defaultService = /*#__PURE__*/function () {
27
- var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
27
+ var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
28
28
  return _regeneratorRuntime().wrap(function _callee$(_context) {
29
29
  while (1) switch (_context.prev = _context.next) {
30
30
  case 0: