@zat-design/sisyphus-react 3.7.3-beta.5 → 3.7.3-beta.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (19) hide show
  1. package/dist/index.esm.css +25 -12
  2. package/dist/less.esm.css +25 -12
  3. package/es/ProForm/components/render/ChangedWrapper.js +4 -6
  4. package/es/ProForm/style/index.less +22 -12
  5. package/es/ProStep/components/Listener/index.d.ts +1 -1
  6. package/es/ProStep/components/Listener/index.js +5 -2
  7. package/es/ProStep/index.d.ts +1 -1
  8. package/es/ProStep/index.js +24 -17
  9. package/es/style/theme/index.less +1 -0
  10. package/es/style/theme/tokens.less +1 -0
  11. package/lib/ProForm/components/render/ChangedWrapper.js +4 -6
  12. package/lib/ProForm/style/index.less +22 -12
  13. package/lib/ProStep/components/Listener/index.d.ts +1 -1
  14. package/lib/ProStep/components/Listener/index.js +5 -2
  15. package/lib/ProStep/index.d.ts +1 -1
  16. package/lib/ProStep/index.js +24 -17
  17. package/lib/style/theme/index.less +1 -0
  18. package/lib/style/theme/tokens.less +1 -0
  19. package/package.json +1 -1
package/dist/index.esm.css CHANGED
@@ -3059,11 +3059,17 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3059
3059
  .pro-form .pro-form-list-mode-block .pro-collapse-content .ant-row {
3060
3060
  width: auto;
3061
3061
  }
3062
+ .pro-form .pro-form-item-changed {
3063
+ border-radius: 4px;
3064
+ height: 100%;
3065
+ width: 100%;
3066
+ background: var(--zaui-contract-bg, #fffaa1) !important;
3067
+ }
3062
3068
  .pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
3063
3069
  .pro-form .pro-form-item-changed .ant-select .ant-select-selector,
3064
3070
  .pro-form .pro-form-item-changed .ant-picker,
3065
3071
  .pro-form .pro-form-item-changed .ant-input-number {
3066
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1)) !important;
3072
+ background: var(--zaui-contract-bg, #fffaa1) !important;
3067
3073
  }
3068
3074
  .pro-form .pro-form-item-changed span.ant-input-affix-wrapper input,
3069
3075
  .pro-form .pro-form-item-changed .ant-select .ant-select-selector input,
@@ -3079,32 +3085,38 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3079
3085
  }
3080
3086
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
3081
3087
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3082
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
3088
+ background: var(--zaui-contract-bg, #fffaa1);
3083
3089
  border-radius: 4px;
3084
3090
  }
3085
3091
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > span {
3086
3092
  border-radius: 4px;
3087
3093
  padding: 5px 8px;
3088
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
3094
+ background: var(--zaui-contract-bg, #fffaa1);
3089
3095
  }
3090
3096
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-select-selector,
3091
3097
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
3092
3098
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
3093
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
3099
+ background: var(--zaui-contract-bg, #fffaa1);
3094
3100
  }
3095
3101
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
3096
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
3102
+ background: var(--zaui-contract-bg, #fffaa1);
3097
3103
  }
3098
3104
  .pro-form .pro-form-item-changed .pro-form-view-container {
3099
3105
  padding: 4px 8px;
3100
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
3106
+ background: var(--zaui-contract-bg, #fffaa1);
3107
+ border-radius: 4px;
3108
+ }
3109
+ .pro-form .pro-form-item-add {
3101
3110
  border-radius: 4px;
3111
+ height: 100%;
3112
+ width: 100%;
3113
+ background: var(--zaui-contract-bg-add, #d2fff4) !important;
3102
3114
  }
3103
3115
  .pro-form .pro-form-item-add span.ant-input-affix-wrapper,
3104
3116
  .pro-form .pro-form-item-add .ant-select .ant-select-selector,
3105
3117
  .pro-form .pro-form-item-add .ant-picker,
3106
3118
  .pro-form .pro-form-item-add .ant-input-number {
3107
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1)) !important;
3119
+ background: var(--zaui-contract-bg-add, #d2fff4) !important;
3108
3120
  }
3109
3121
  .pro-form .pro-form-item-add span.ant-input-affix-wrapper input,
3110
3122
  .pro-form .pro-form-item-add .ant-select .ant-select-selector input,
@@ -3120,25 +3132,25 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3120
3132
  }
3121
3133
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-switch-handle),
3122
3134
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3123
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1));
3135
+ background: var(--zaui-contract-bg-add, #d2fff4);
3124
3136
  border-radius: 4px;
3125
3137
  }
3126
3138
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > span {
3127
3139
  border-radius: 4px;
3128
3140
  padding: 5px 8px;
3129
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1));
3141
+ background: var(--zaui-contract-bg-add, #d2fff4);
3130
3142
  }
3131
3143
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-select-selector,
3132
3144
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
3133
3145
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
3134
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1));
3146
+ background: var(--zaui-contract-bg-add, #d2fff4);
3135
3147
  }
3136
3148
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
3137
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1));
3149
+ background: var(--zaui-contract-bg-add, #d2fff4);
3138
3150
  }
3139
3151
  .pro-form .pro-form-item-add .pro-form-view-container {
3140
3152
  padding: 4px 8px;
3141
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1));
3153
+ background: var(--zaui-contract-bg-add, #d2fff4);
3142
3154
  border-radius: 4px;
3143
3155
  }
3144
3156
  .pro-upload .pro-upload-dragger .pro-upload-handle-box {
@@ -5328,6 +5340,7 @@ input[type='button'] {
5328
5340
  --zaui-table-selected-hover-bg: var(--zaui-table-hover-bg);
5329
5341
  --zaui-table-nested-bg: #fafcfe;
5330
5342
  --zaui-contract-bg: #fffaa1;
5343
+ --zaui-contract-bg-add: #d2fff4;
5331
5344
  --zaui-form-label-width: 130px;
5332
5345
  --zaui-border-radius: 8px;
5333
5346
  --zaui-border-radius-card: 4px;
package/dist/less.esm.css CHANGED
@@ -3059,11 +3059,17 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3059
3059
  .pro-form .pro-form-list-mode-block .pro-collapse-content .ant-row {
3060
3060
  width: auto;
3061
3061
  }
3062
+ .pro-form .pro-form-item-changed {
3063
+ border-radius: 4px;
3064
+ height: 100%;
3065
+ width: 100%;
3066
+ background: var(--zaui-contract-bg, #fffaa1) !important;
3067
+ }
3062
3068
  .pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
3063
3069
  .pro-form .pro-form-item-changed .ant-select .ant-select-selector,
3064
3070
  .pro-form .pro-form-item-changed .ant-picker,
3065
3071
  .pro-form .pro-form-item-changed .ant-input-number {
3066
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1)) !important;
3072
+ background: var(--zaui-contract-bg, #fffaa1) !important;
3067
3073
  }
3068
3074
  .pro-form .pro-form-item-changed span.ant-input-affix-wrapper input,
3069
3075
  .pro-form .pro-form-item-changed .ant-select .ant-select-selector input,
@@ -3079,32 +3085,38 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3079
3085
  }
3080
3086
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-switch-handle),
3081
3087
  .pro-form .pro-form-item-changed .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3082
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
3088
+ background: var(--zaui-contract-bg, #fffaa1);
3083
3089
  border-radius: 4px;
3084
3090
  }
3085
3091
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > span {
3086
3092
  border-radius: 4px;
3087
3093
  padding: 5px 8px;
3088
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
3094
+ background: var(--zaui-contract-bg, #fffaa1);
3089
3095
  }
3090
3096
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-select-selector,
3091
3097
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
3092
3098
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
3093
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
3099
+ background: var(--zaui-contract-bg, #fffaa1);
3094
3100
  }
3095
3101
  .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
3096
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
3102
+ background: var(--zaui-contract-bg, #fffaa1);
3097
3103
  }
3098
3104
  .pro-form .pro-form-item-changed .pro-form-view-container {
3099
3105
  padding: 4px 8px;
3100
- background: var(--change-tip-color, var(--zaui-contract-bg, #fffaa1));
3106
+ background: var(--zaui-contract-bg, #fffaa1);
3107
+ border-radius: 4px;
3108
+ }
3109
+ .pro-form .pro-form-item-add {
3101
3110
  border-radius: 4px;
3111
+ height: 100%;
3112
+ width: 100%;
3113
+ background: var(--zaui-contract-bg-add, #d2fff4) !important;
3102
3114
  }
3103
3115
  .pro-form .pro-form-item-add span.ant-input-affix-wrapper,
3104
3116
  .pro-form .pro-form-item-add .ant-select .ant-select-selector,
3105
3117
  .pro-form .pro-form-item-add .ant-picker,
3106
3118
  .pro-form .pro-form-item-add .ant-input-number {
3107
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1)) !important;
3119
+ background: var(--zaui-contract-bg-add, #d2fff4) !important;
3108
3120
  }
3109
3121
  .pro-form .pro-form-item-add span.ant-input-affix-wrapper input,
3110
3122
  .pro-form .pro-form-item-add .ant-select .ant-select-selector input,
@@ -3120,25 +3132,25 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
3120
3132
  }
3121
3133
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-switch-handle),
3122
3134
  .pro-form .pro-form-item-add .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
3123
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1));
3135
+ background: var(--zaui-contract-bg-add, #d2fff4);
3124
3136
  border-radius: 4px;
3125
3137
  }
3126
3138
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > span {
3127
3139
  border-radius: 4px;
3128
3140
  padding: 5px 8px;
3129
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1));
3141
+ background: var(--zaui-contract-bg-add, #d2fff4);
3130
3142
  }
3131
3143
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-select-selector,
3132
3144
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
3133
3145
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
3134
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1));
3146
+ background: var(--zaui-contract-bg-add, #d2fff4);
3135
3147
  }
3136
3148
  .pro-form .pro-form-item-add .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
3137
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1));
3149
+ background: var(--zaui-contract-bg-add, #d2fff4);
3138
3150
  }
3139
3151
  .pro-form .pro-form-item-add .pro-form-view-container {
3140
3152
  padding: 4px 8px;
3141
- background: var(--add-tip-color, var(--zaui-contract-bg, #fffaa1));
3153
+ background: var(--zaui-contract-bg-add, #d2fff4);
3142
3154
  border-radius: 4px;
3143
3155
  }
3144
3156
  .pro-upload .pro-upload-dragger .pro-upload-handle-box {
@@ -5328,6 +5340,7 @@ input[type='button'] {
5328
5340
  --zaui-table-selected-hover-bg: var(--zaui-table-hover-bg);
5329
5341
  --zaui-table-nested-bg: #fafcfe;
5330
5342
  --zaui-contract-bg: #fffaa1;
5343
+ --zaui-contract-bg-add: #d2fff4;
5331
5344
  --zaui-form-label-width: 130px;
5332
5345
  --zaui-border-radius: 8px;
5333
5346
  --zaui-border-radius-card: 4px;
package/es/ProForm/components/render/ChangedWrapper.js CHANGED
@@ -26,10 +26,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
26
26
  var _useProConfig = useProConfig('ProForm'),
27
27
  isDiffAll = _useProConfig.isDiffAll;
28
28
  var originalValues = diffConfig.originalValues,
29
- _diffConfig$changeTip = diffConfig.changeTipColor,
30
- changeTipColor = _diffConfig$changeTip === void 0 ? '#fffaa1' : _diffConfig$changeTip,
31
- _diffConfig$addTipCol = diffConfig.addTipColor,
32
- addTipColor = _diffConfig$addTipCol === void 0 ? '#d2fff4' : _diffConfig$addTipCol;
29
+ changeTipColor = diffConfig.changeTipColor,
30
+ addTipColor = diffConfig.addTipColor;
33
31
  var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
34
32
  // 不渲染tooltip
35
33
  var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
@@ -66,8 +64,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
66
64
  return isChanged ? undefined : false;
67
65
  };
68
66
  var style = {
69
- '--change-tip-color': changeTipColor || '@zaui-contract-bg',
70
- '--add-tip-color': addTipColor || '@zaui-contract-bg'
67
+ '--zaui-contract-bg': changeTipColor,
68
+ '--zaui-contract-bg-add': addTipColor
71
69
  };
72
70
  var diffClassName = classNames({
73
71
  'pro-form-item-changed': isChanged,
package/es/ProForm/style/index.less CHANGED
@@ -324,11 +324,16 @@
324
324
 
325
325
  // 比较原始值场景下 不同时的样式
326
326
  .pro-form-item-changed {
327
+ border-radius: 4px;
328
+ height: 100%;
329
+ width: 100%;
330
+ background: @zaui-contract-bg !important;
331
+
327
332
  span.@{ant-prefix}-input-affix-wrapper,
328
333
  .@{ant-prefix}-select .@{ant-prefix}-select-selector,
329
334
  .@{ant-prefix}-picker,
330
335
  .@{ant-prefix}-input-number {
331
- background: var(--change-tip-color, @zaui-contract-bg) !important;
336
+ background: @zaui-contract-bg !important;
332
337
 
333
338
  input {
334
339
  background: transparent !important;
@@ -340,7 +345,7 @@
340
345
 
341
346
  .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
342
347
  .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
343
- background: var(--change-tip-color, @zaui-contract-bg);
348
+ background: @zaui-contract-bg;
344
349
  border-radius: 4px;
345
350
  }
346
351
 
@@ -350,26 +355,26 @@
350
355
  & > span {
351
356
  border-radius: 4px;
352
357
  padding: 5px 8px;
353
- background: var(--change-tip-color, @zaui-contract-bg);
358
+ background: @zaui-contract-bg;
354
359
  }
355
360
 
356
361
  & > .pro-address {
357
362
  .@{ant-prefix}-select-selector,
358
363
  .@{ant-prefix}-input-affix-wrapper,
359
364
  .@{ant-prefix}-input-disabled {
360
- background: var(--change-tip-color, @zaui-contract-bg);
365
+ background: @zaui-contract-bg;
361
366
  }
362
367
  }
363
368
  & > .@{ant-prefix}-input-group {
364
369
  .forever-checkbox {
365
- background: var(--change-tip-color, @zaui-contract-bg);
370
+ background: @zaui-contract-bg;
366
371
  }
367
372
  }
368
373
  }
369
374
 
370
375
  .pro-form-view-container {
371
376
  padding: 4px 8px;
372
- background: var(--change-tip-color, @zaui-contract-bg);
377
+ background: @zaui-contract-bg;
373
378
  border-radius: 4px;
374
379
  }
375
380
  }
@@ -377,11 +382,16 @@
377
382
 
378
383
  // 比较原始值场景下 不同时的样式
379
384
  .pro-form-item-add {
385
+ border-radius: 4px;
386
+ height: 100%;
387
+ width: 100%;
388
+ background: @zaui-contract-bg-add !important;
389
+
380
390
  span.@{ant-prefix}-input-affix-wrapper,
381
391
  .@{ant-prefix}-select .@{ant-prefix}-select-selector,
382
392
  .@{ant-prefix}-picker,
383
393
  .@{ant-prefix}-input-number {
384
- background: var(--add-tip-color, @zaui-contract-bg) !important;
394
+ background: @zaui-contract-bg-add !important;
385
395
 
386
396
  input {
387
397
  background: transparent !important;
@@ -393,7 +403,7 @@
393
403
 
394
404
  .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
395
405
  .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
396
- background: var(--add-tip-color, @zaui-contract-bg);
406
+ background: @zaui-contract-bg-add;
397
407
  border-radius: 4px;
398
408
  }
399
409
 
@@ -403,26 +413,26 @@
403
413
  & > span {
404
414
  border-radius: 4px;
405
415
  padding: 5px 8px;
406
- background: var(--add-tip-color, @zaui-contract-bg);
416
+ background: @zaui-contract-bg-add;
407
417
  }
408
418
 
409
419
  & > .pro-address {
410
420
  .@{ant-prefix}-select-selector,
411
421
  .@{ant-prefix}-input-affix-wrapper,
412
422
  .@{ant-prefix}-input-disabled {
413
- background: var(--add-tip-color, @zaui-contract-bg);
423
+ background: @zaui-contract-bg-add;
414
424
  }
415
425
  }
416
426
  & > .@{ant-prefix}-input-group {
417
427
  .forever-checkbox {
418
- background: var(--add-tip-color, @zaui-contract-bg);
428
+ background: @zaui-contract-bg-add;
419
429
  }
420
430
  }
421
431
  }
422
432
 
423
433
  .pro-form-view-container {
424
434
  padding: 4px 8px;
425
- background: var(--add-tip-color, @zaui-contract-bg);
435
+ background: @zaui-contract-bg-add;
426
436
  border-radius: 4px;
427
437
  }
428
438
  }
package/es/ProStep/components/Listener/index.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import React from 'react';
2
- declare const _default: ({ children, delayTime, ...props }: any) => React.DetailedReactHTMLElement<any, HTMLElement>;
2
+ declare const _default: ({ children, delayTime, excludes, ...props }: any) => React.DetailedReactHTMLElement<any, HTMLElement>;
3
3
  export default _default;
package/es/ProStep/components/Listener/index.js CHANGED
@@ -2,13 +2,14 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
2
2
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
3
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
4
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
5
- var _excluded = ["children", "delayTime"];
5
+ var _excluded = ["children", "delayTime", "excludes"];
6
6
  import { throttle } from 'lodash';
7
7
  import React from 'react';
8
8
  import { useStep } from '../../index';
9
9
  export default (function (_ref) {
10
10
  var children = _ref.children,
11
11
  delayTime = _ref.delayTime,
12
+ excludes = _ref.excludes,
12
13
  props = _objectWithoutProperties(_ref, _excluded);
13
14
  var _useStep = useStep(),
14
15
  notify = _useStep.notify;
@@ -20,7 +21,9 @@ export default (function (_ref) {
20
21
  case 0:
21
22
  localStorage.setItem('cache-pro-step', '');
22
23
  _context.next = 3;
23
- return notify === null || notify === void 0 ? void 0 : notify();
24
+ return notify === null || notify === void 0 ? void 0 : notify({
25
+ excludes: excludes
26
+ });
24
27
  case 3:
25
28
  values = _context.sent;
26
29
  setTimeout(function () {
package/es/ProStep/index.d.ts CHANGED
@@ -7,6 +7,6 @@ declare const ProStep: {
7
7
  ({ children, ...resetProps }: ProStepPropsType): import("react/jsx-runtime").JSX.Element;
8
8
  useStep: () => any;
9
9
  Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => import("react/jsx-runtime").JSX.Element;
10
- Listener: ({ children, delayTime, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
10
+ Listener: ({ children, delayTime, excludes, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
11
11
  };
12
12
  export default ProStep;
package/es/ProStep/index.js CHANGED
@@ -128,47 +128,54 @@ var ProStep = function ProStep(_ref) {
128
128
  registerMap.current[id] = record;
129
129
  };
130
130
  var notify = /*#__PURE__*/function () {
131
- var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
132
- var events, res, nextErrorCollection;
131
+ var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
132
+ var _ref7, excludes, triggerIds, events, res, nextErrorCollection;
133
133
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
134
134
  while (1) switch (_context2.prev = _context2.next) {
135
135
  case 0:
136
- events = Object.values(registerMap.current).map(function (item) {
137
- var _item$subEvent;
138
- return item === null || item === void 0 ? void 0 : (_item$subEvent = item.subEvent) === null || _item$subEvent === void 0 ? void 0 : _item$subEvent.call(item);
136
+ _ref7 = params || {}, excludes = _ref7.excludes;
137
+ triggerIds = Object.keys(registerMap.current); // 排除指定模块不触发校验
138
+ if (excludes === null || excludes === void 0 ? void 0 : excludes.length) {
139
+ triggerIds = triggerIds.filter(function (id) {
140
+ return !excludes.includes(id);
141
+ });
142
+ }
143
+ events = triggerIds.map(function (id) {
144
+ var _registerMap$current$, _registerMap$current$2;
145
+ return (_registerMap$current$ = registerMap.current[id]) === null || _registerMap$current$ === void 0 ? void 0 : (_registerMap$current$2 = _registerMap$current$.subEvent) === null || _registerMap$current$2 === void 0 ? void 0 : _registerMap$current$2.call(_registerMap$current$);
139
146
  });
140
- _context2.next = 3;
147
+ _context2.next = 6;
141
148
  return Promise.all(events);
142
- case 3:
149
+ case 6:
143
150
  res = _context2.sent;
144
151
  nextErrorCollection = {};
145
- Object.keys(registerMap.current).forEach(function (id, index) {
146
- var _ref7 = (res === null || res === void 0 ? void 0 : res[index]) || {},
147
- errorFields = _ref7.errorFields;
152
+ triggerIds.forEach(function (id, index) {
153
+ var _ref8 = (res === null || res === void 0 ? void 0 : res[index]) || {},
154
+ errorFields = _ref8.errorFields;
148
155
  nextErrorCollection[id] = (errorFields === null || errorFields === void 0 ? void 0 : errorFields.length) || 0;
149
156
  });
150
157
  setErrorCollection(nextErrorCollection);
151
158
  return _context2.abrupt("return", res);
152
- case 8:
159
+ case 11:
153
160
  case "end":
154
161
  return _context2.stop();
155
162
  }
156
163
  }, _callee2);
157
164
  }));
158
- return function notify() {
165
+ return function notify(_x) {
159
166
  return _ref6.apply(this, arguments);
160
167
  };
161
168
  }();
162
169
  var triggerTo = /*#__PURE__*/function () {
163
- var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
170
+ var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(keys) {
164
171
  var events, result, nextErrorCollection;
165
172
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
166
173
  while (1) switch (_context3.prev = _context3.next) {
167
174
  case 0:
168
175
  events = [];
169
176
  keys === null || keys === void 0 ? void 0 : keys.forEach(function (key) {
170
- var _registerMap$current, _registerMap$current$, _registerMap$current$2;
171
- events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : (_registerMap$current$ = _registerMap$current[key]) === null || _registerMap$current$ === void 0 ? void 0 : (_registerMap$current$2 = _registerMap$current$.subEvent) === null || _registerMap$current$2 === void 0 ? void 0 : _registerMap$current$2.call(_registerMap$current$));
177
+ var _registerMap$current, _registerMap$current$3, _registerMap$current$4;
178
+ events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : (_registerMap$current$3 = _registerMap$current[key]) === null || _registerMap$current$3 === void 0 ? void 0 : (_registerMap$current$4 = _registerMap$current$3.subEvent) === null || _registerMap$current$4 === void 0 ? void 0 : _registerMap$current$4.call(_registerMap$current$3));
172
179
  });
173
180
  _context3.next = 4;
174
181
  return Promise.all(events);
@@ -190,8 +197,8 @@ var ProStep = function ProStep(_ref) {
190
197
  }
191
198
  }, _callee3);
192
199
  }));
193
- return function triggerTo(_x) {
194
- return _ref8.apply(this, arguments);
200
+ return function triggerTo(_x2) {
201
+ return _ref9.apply(this, arguments);
195
202
  };
196
203
  }();
197
204
  useDeepCompareEffect(function () {
package/es/style/theme/index.less CHANGED
@@ -55,6 +55,7 @@
55
55
  --zaui-table-selected-hover-bg : var(--zaui-table-hover-bg); // 默认同悬停
56
56
  --zaui-table-nested-bg : #fafcfe;
57
57
  --zaui-contract-bg : #fffaa1; // 对比背景色
58
+ --zaui-contract-bg-add : #d2fff4; // 新增对比背景色
58
59
  --zaui-form-label-width : 130px; // 8个全角字符宽度
59
60
  --zaui-border-radius : 8px;
60
61
  --zaui-border-radius-card : 4px;
package/es/style/theme/tokens.less CHANGED
@@ -53,6 +53,7 @@
53
53
  @zaui-table-selected-hover-bg: var(--zaui-table-hover-bg #fafafa);
54
54
  @zaui-table-nested-bg: var(--zaui-table-nested-bg #FAFCFE);
55
55
  @zaui-contract-bg: var(--zaui-contract-bg; #fffaa1); // 对比背景色
56
+ @zaui-contract-bg-add: var(--zaui-contract-bg-add; #d2fff4); // 新增对比背景色
56
57
  @zaui-form-required-after: var(--zaui-form-required-after; inline);
57
58
  @zaui-form-required-before: var(--zaui-form-required-before; none);
58
59
  @zaui-form-label-width: var(--zaui-form-label-width; 130px);
package/lib/ProForm/components/render/ChangedWrapper.js CHANGED
@@ -31,10 +31,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
31
31
  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
32
32
  isDiffAll = _useProConfig.isDiffAll;
33
33
  var originalValues = diffConfig.originalValues,
34
- _diffConfig$changeTip = diffConfig.changeTipColor,
35
- changeTipColor = _diffConfig$changeTip === void 0 ? '#fffaa1' : _diffConfig$changeTip,
36
- _diffConfig$addTipCol = diffConfig.addTipColor,
37
- addTipColor = _diffConfig$addTipCol === void 0 ? '#d2fff4' : _diffConfig$addTipCol;
34
+ changeTipColor = diffConfig.changeTipColor,
35
+ addTipColor = diffConfig.addTipColor;
38
36
  var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
39
37
  // 不渲染tooltip
40
38
  var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
@@ -71,8 +69,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
71
69
  return isChanged ? undefined : false;
72
70
  };
73
71
  var style = {
74
- '--change-tip-color': changeTipColor || '@zaui-contract-bg',
75
- '--add-tip-color': addTipColor || '@zaui-contract-bg'
72
+ '--zaui-contract-bg': changeTipColor,
73
+ '--zaui-contract-bg-add': addTipColor
76
74
  };
77
75
  var diffClassName = (0, _classnames.default)({
78
76
  'pro-form-item-changed': isChanged,
package/lib/ProForm/style/index.less CHANGED
@@ -324,11 +324,16 @@
324
324
 
325
325
  // 比较原始值场景下 不同时的样式
326
326
  .pro-form-item-changed {
327
+ border-radius: 4px;
328
+ height: 100%;
329
+ width: 100%;
330
+ background: @zaui-contract-bg !important;
331
+
327
332
  span.@{ant-prefix}-input-affix-wrapper,
328
333
  .@{ant-prefix}-select .@{ant-prefix}-select-selector,
329
334
  .@{ant-prefix}-picker,
330
335
  .@{ant-prefix}-input-number {
331
- background: var(--change-tip-color, @zaui-contract-bg) !important;
336
+ background: @zaui-contract-bg !important;
332
337
 
333
338
  input {
334
339
  background: transparent !important;
@@ -340,7 +345,7 @@
340
345
 
341
346
  .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
342
347
  .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
343
- background: var(--change-tip-color, @zaui-contract-bg);
348
+ background: @zaui-contract-bg;
344
349
  border-radius: 4px;
345
350
  }
346
351
 
@@ -350,26 +355,26 @@
350
355
  & > span {
351
356
  border-radius: 4px;
352
357
  padding: 5px 8px;
353
- background: var(--change-tip-color, @zaui-contract-bg);
358
+ background: @zaui-contract-bg;
354
359
  }
355
360
 
356
361
  & > .pro-address {
357
362
  .@{ant-prefix}-select-selector,
358
363
  .@{ant-prefix}-input-affix-wrapper,
359
364
  .@{ant-prefix}-input-disabled {
360
- background: var(--change-tip-color, @zaui-contract-bg);
365
+ background: @zaui-contract-bg;
361
366
  }
362
367
  }
363
368
  & > .@{ant-prefix}-input-group {
364
369
  .forever-checkbox {
365
- background: var(--change-tip-color, @zaui-contract-bg);
370
+ background: @zaui-contract-bg;
366
371
  }
367
372
  }
368
373
  }
369
374
 
370
375
  .pro-form-view-container {
371
376
  padding: 4px 8px;
372
- background: var(--change-tip-color, @zaui-contract-bg);
377
+ background: @zaui-contract-bg;
373
378
  border-radius: 4px;
374
379
  }
375
380
  }
@@ -377,11 +382,16 @@
377
382
 
378
383
  // 比较原始值场景下 不同时的样式
379
384
  .pro-form-item-add {
385
+ border-radius: 4px;
386
+ height: 100%;
387
+ width: 100%;
388
+ background: @zaui-contract-bg-add !important;
389
+
380
390
  span.@{ant-prefix}-input-affix-wrapper,
381
391
  .@{ant-prefix}-select .@{ant-prefix}-select-selector,
382
392
  .@{ant-prefix}-picker,
383
393
  .@{ant-prefix}-input-number {
384
- background: var(--add-tip-color, @zaui-contract-bg) !important;
394
+ background: @zaui-contract-bg-add !important;
385
395
 
386
396
  input {
387
397
  background: transparent !important;
@@ -393,7 +403,7 @@
393
403
 
394
404
  .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
395
405
  .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
396
- background: var(--add-tip-color, @zaui-contract-bg);
406
+ background: @zaui-contract-bg-add;
397
407
  border-radius: 4px;
398
408
  }
399
409
 
@@ -403,26 +413,26 @@
403
413
  & > span {
404
414
  border-radius: 4px;
405
415
  padding: 5px 8px;
406
- background: var(--add-tip-color, @zaui-contract-bg);
416
+ background: @zaui-contract-bg-add;
407
417
  }
408
418
 
409
419
  & > .pro-address {
410
420
  .@{ant-prefix}-select-selector,
411
421
  .@{ant-prefix}-input-affix-wrapper,
412
422
  .@{ant-prefix}-input-disabled {
413
- background: var(--add-tip-color, @zaui-contract-bg);
423
+ background: @zaui-contract-bg-add;
414
424
  }
415
425
  }
416
426
  & > .@{ant-prefix}-input-group {
417
427
  .forever-checkbox {
418
- background: var(--add-tip-color, @zaui-contract-bg);
428
+ background: @zaui-contract-bg-add;
419
429
  }
420
430
  }
421
431
  }
422
432
 
423
433
  .pro-form-view-container {
424
434
  padding: 4px 8px;
425
- background: var(--add-tip-color, @zaui-contract-bg);
435
+ background: @zaui-contract-bg-add;
426
436
  border-radius: 4px;
427
437
  }
428
438
  }
package/lib/ProStep/components/Listener/index.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import React from 'react';
2
- declare const _default: ({ children, delayTime, ...props }: any) => React.DetailedReactHTMLElement<any, HTMLElement>;
2
+ declare const _default: ({ children, delayTime, excludes, ...props }: any) => React.DetailedReactHTMLElement<any, HTMLElement>;
3
3
  export default _default;
package/lib/ProStep/components/Listener/index.js CHANGED
@@ -12,10 +12,11 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
12
12
  var _lodash = require("lodash");
13
13
  var _react = _interopRequireDefault(require("react"));
14
14
  var _index = require("../../index");
15
- var _excluded = ["children", "delayTime"];
15
+ var _excluded = ["children", "delayTime", "excludes"];
16
16
  var _default = exports.default = function _default(_ref) {
17
17
  var children = _ref.children,
18
18
  delayTime = _ref.delayTime,
19
+ excludes = _ref.excludes,
19
20
  props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
20
21
  var _useStep = (0, _index.useStep)(),
21
22
  notify = _useStep.notify;
@@ -27,7 +28,9 @@ var _default = exports.default = function _default(_ref) {
27
28
  case 0:
28
29
  localStorage.setItem('cache-pro-step', '');
29
30
  _context.next = 3;
30
- return notify === null || notify === void 0 ? void 0 : notify();
31
+ return notify === null || notify === void 0 ? void 0 : notify({
32
+ excludes: excludes
33
+ });
31
34
  case 3:
32
35
  values = _context.sent;
33
36
  setTimeout(function () {
package/lib/ProStep/index.d.ts CHANGED
@@ -7,6 +7,6 @@ declare const ProStep: {
7
7
  ({ children, ...resetProps }: ProStepPropsType): import("react/jsx-runtime").JSX.Element;
8
8
  useStep: () => any;
9
9
  Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => import("react/jsx-runtime").JSX.Element;
10
- Listener: ({ children, delayTime, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
10
+ Listener: ({ children, delayTime, excludes, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
11
11
  };
12
12
  export default ProStep;
package/lib/ProStep/index.js CHANGED
@@ -135,47 +135,54 @@ var ProStep = function ProStep(_ref) {
135
135
  registerMap.current[id] = record;
136
136
  };
137
137
  var notify = /*#__PURE__*/function () {
138
- var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
139
- var events, res, nextErrorCollection;
138
+ var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
139
+ var _ref7, excludes, triggerIds, events, res, nextErrorCollection;
140
140
  return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
141
141
  while (1) switch (_context2.prev = _context2.next) {
142
142
  case 0:
143
- events = Object.values(registerMap.current).map(function (item) {
144
- var _item$subEvent;
145
- return item === null || item === void 0 ? void 0 : (_item$subEvent = item.subEvent) === null || _item$subEvent === void 0 ? void 0 : _item$subEvent.call(item);
143
+ _ref7 = params || {}, excludes = _ref7.excludes;
144
+ triggerIds = Object.keys(registerMap.current); // 排除指定模块不触发校验
145
+ if (excludes === null || excludes === void 0 ? void 0 : excludes.length) {
146
+ triggerIds = triggerIds.filter(function (id) {
147
+ return !excludes.includes(id);
148
+ });
149
+ }
150
+ events = triggerIds.map(function (id) {
151
+ var _registerMap$current$, _registerMap$current$2;
152
+ return (_registerMap$current$ = registerMap.current[id]) === null || _registerMap$current$ === void 0 ? void 0 : (_registerMap$current$2 = _registerMap$current$.subEvent) === null || _registerMap$current$2 === void 0 ? void 0 : _registerMap$current$2.call(_registerMap$current$);
146
153
  });
147
- _context2.next = 3;
154
+ _context2.next = 6;
148
155
  return Promise.all(events);
149
- case 3:
156
+ case 6:
150
157
  res = _context2.sent;
151
158
  nextErrorCollection = {};
152
- Object.keys(registerMap.current).forEach(function (id, index) {
153
- var _ref7 = (res === null || res === void 0 ? void 0 : res[index]) || {},
154
- errorFields = _ref7.errorFields;
159
+ triggerIds.forEach(function (id, index) {
160
+ var _ref8 = (res === null || res === void 0 ? void 0 : res[index]) || {},
161
+ errorFields = _ref8.errorFields;
155
162
  nextErrorCollection[id] = (errorFields === null || errorFields === void 0 ? void 0 : errorFields.length) || 0;
156
163
  });
157
164
  setErrorCollection(nextErrorCollection);
158
165
  return _context2.abrupt("return", res);
159
- case 8:
166
+ case 11:
160
167
  case "end":
161
168
  return _context2.stop();
162
169
  }
163
170
  }, _callee2);
164
171
  }));
165
- return function notify() {
172
+ return function notify(_x) {
166
173
  return _ref6.apply(this, arguments);
167
174
  };
168
175
  }();
169
176
  var triggerTo = /*#__PURE__*/function () {
170
- var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(keys) {
177
+ var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(keys) {
171
178
  var events, result, nextErrorCollection;
172
179
  return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
173
180
  while (1) switch (_context3.prev = _context3.next) {
174
181
  case 0:
175
182
  events = [];
176
183
  keys === null || keys === void 0 ? void 0 : keys.forEach(function (key) {
177
- var _registerMap$current, _registerMap$current$, _registerMap$current$2;
178
- events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : (_registerMap$current$ = _registerMap$current[key]) === null || _registerMap$current$ === void 0 ? void 0 : (_registerMap$current$2 = _registerMap$current$.subEvent) === null || _registerMap$current$2 === void 0 ? void 0 : _registerMap$current$2.call(_registerMap$current$));
184
+ var _registerMap$current, _registerMap$current$3, _registerMap$current$4;
185
+ events.push(registerMap === null || registerMap === void 0 ? void 0 : (_registerMap$current = registerMap.current) === null || _registerMap$current === void 0 ? void 0 : (_registerMap$current$3 = _registerMap$current[key]) === null || _registerMap$current$3 === void 0 ? void 0 : (_registerMap$current$4 = _registerMap$current$3.subEvent) === null || _registerMap$current$4 === void 0 ? void 0 : _registerMap$current$4.call(_registerMap$current$3));
179
186
  });
180
187
  _context3.next = 4;
181
188
  return Promise.all(events);
@@ -197,8 +204,8 @@ var ProStep = function ProStep(_ref) {
197
204
  }
198
205
  }, _callee3);
199
206
  }));
200
- return function triggerTo(_x) {
201
- return _ref8.apply(this, arguments);
207
+ return function triggerTo(_x2) {
208
+ return _ref9.apply(this, arguments);
202
209
  };
203
210
  }();
204
211
  (0, _ahooks.useDeepCompareEffect)(function () {
package/lib/style/theme/index.less CHANGED
@@ -55,6 +55,7 @@
55
55
  --zaui-table-selected-hover-bg : var(--zaui-table-hover-bg); // 默认同悬停
56
56
  --zaui-table-nested-bg : #fafcfe;
57
57
  --zaui-contract-bg : #fffaa1; // 对比背景色
58
+ --zaui-contract-bg-add : #d2fff4; // 新增对比背景色
58
59
  --zaui-form-label-width : 130px; // 8个全角字符宽度
59
60
  --zaui-border-radius : 8px;
60
61
  --zaui-border-radius-card : 4px;
package/lib/style/theme/tokens.less CHANGED
@@ -53,6 +53,7 @@
53
53
  @zaui-table-selected-hover-bg: var(--zaui-table-hover-bg #fafafa);
54
54
  @zaui-table-nested-bg: var(--zaui-table-nested-bg #FAFCFE);
55
55
  @zaui-contract-bg: var(--zaui-contract-bg; #fffaa1); // 对比背景色
56
+ @zaui-contract-bg-add: var(--zaui-contract-bg-add; #d2fff4); // 新增对比背景色
56
57
  @zaui-form-required-after: var(--zaui-form-required-after; inline);
57
58
  @zaui-form-required-before: var(--zaui-form-required-before; none);
58
59
  @zaui-form-label-width: var(--zaui-form-label-width; 130px);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.7.3-beta.5",
3
+ "version": "3.7.3-beta.7",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",