@zat-design/sisyphus-react 3.8.0-beat.10 → 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 (7) hide show
  1. package/dist/index.esm.css +7 -51
  2. package/dist/less.esm.css +7 -51
  3. package/es/ProForm/components/combination/ProNumberRange/index.js +51 -47
  4. package/es/ProForm/components/combination/ProNumberRange/style/index.less +51 -56
  5. package/lib/ProForm/components/combination/ProNumberRange/index.js +45 -45
  6. package/lib/ProForm/components/combination/ProNumberRange/style/index.less +51 -56
  7. package/package.json +1 -1
package/dist/index.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 {
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 {
package/es/ProForm/components/combination/ProNumberRange/index.js CHANGED
@@ -1,8 +1,12 @@
1
+ import "antd/es/input/style";
2
+ import _Input from "antd/es/input";
3
+ import "antd/es/button/style";
4
+ import _Button from "antd/es/button";
1
5
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
2
6
  import "antd/es/input-number/style";
3
7
  import _InputNumber from "antd/es/input-number";
4
- import "antd/es/input/style";
5
- import _Input from "antd/es/input";
8
+ import "antd/es/space/style";
9
+ import _Space from "antd/es/space";
6
10
  import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
7
11
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
8
12
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -86,8 +90,7 @@ var ProNumberRange = function ProNumberRange(props) {
86
90
  };
87
91
  var cls = classnames({
88
92
  'pro-number-range': true,
89
- 'pro-number-range-after': addonAfter,
90
- 'pro-number-range-before': addonBefore,
93
+ 'pro-number-range-disabled': disabled,
91
94
  className: className
92
95
  });
93
96
  // 查看模式
@@ -176,50 +179,51 @@ var ProNumberRange = function ProNumberRange(props) {
176
179
  }
177
180
  return result;
178
181
  };
179
- return _jsxs(_Input.Group, {
180
- compact: true,
182
+ return _jsx(_Space, {
181
183
  className: cls,
182
- children: [_jsx(_InputNumber, _objectSpread(_objectSpread({
183
- id: id,
184
- className: "range-left",
185
- value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
186
- placeholder: "".concat(locale.ProForm.inputPlaceholder),
187
- precision: precision,
188
- disabled: getDisabled(disabled, 0),
189
- onChange: function onChange(e) {
190
- firstHandleChange(e);
191
- },
192
- addonBefore: addonBefore
193
- }, valueProps), {}, {
194
- style: addonAfter ? {
195
- width: "calc(50% - ".concat(16 + addonAfterDomWidth / 2, "px)")
196
- } : null,
197
- min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
198
- max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
199
- }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), _jsx(_Input, {
200
- className: classnames({
201
- 'range-split': true,
202
- 'range-split-disabled': !!disabled
203
- }),
204
- placeholder: "~",
205
- disabled: true
206
- }), _jsx(_InputNumber, _objectSpread(_objectSpread({
207
- className: "range-right",
208
- value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
209
- placeholder: "".concat(locale.ProForm.inputPlaceholder),
210
- precision: precision,
211
- disabled: getDisabled(disabled, 1),
212
- onChange: function onChange(e) {
213
- lastHandleChange(e);
214
- },
215
- addonAfter: addonAfter
216
- }, valueProps), {}, {
217
- style: addonAfter ? {
218
- width: "calc(50% - ".concat(16 - addonAfterDomWidth / 2, "px)")
219
- } : null,
220
- min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
221
- max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
222
- }, childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
184
+ children: _jsxs(_Space.Compact, {
185
+ children: [_jsx(_InputNumber, _objectSpread(_objectSpread({
186
+ id: id,
187
+ className: "range-left",
188
+ value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
189
+ placeholder: "".concat(locale.ProForm.inputPlaceholder),
190
+ precision: precision,
191
+ disabled: getDisabled(disabled, 0),
192
+ onChange: function onChange(e) {
193
+ firstHandleChange(e);
194
+ }
195
+ }, valueProps), {}, {
196
+ min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
197
+ max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
198
+ }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? _jsx(_Button, {
199
+ disabled: true,
200
+ className: "range-addon-before",
201
+ children: addonBefore
202
+ }) : null, _jsx(_Input, {
203
+ className: classnames({
204
+ 'range-split': true,
205
+ 'range-split-disabled': !!disabled
206
+ }),
207
+ placeholder: "~",
208
+ disabled: true
209
+ }), _jsx(_InputNumber, _objectSpread(_objectSpread({
210
+ className: "range-right",
211
+ value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
212
+ placeholder: "".concat(locale.ProForm.inputPlaceholder),
213
+ precision: precision,
214
+ disabled: getDisabled(disabled, 1),
215
+ onChange: function onChange(e) {
216
+ lastHandleChange(e);
217
+ }
218
+ }, valueProps), {}, {
219
+ min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
220
+ max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
221
+ }, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? _jsx(_Button, {
222
+ disabled: true,
223
+ className: "range-addon-after",
224
+ children: addonAfter
225
+ }) : null]
226
+ })
223
227
  });
224
228
  };
225
229
  export default ProNumberRange;
package/es/ProForm/components/combination/ProNumberRange/style/index.less CHANGED
@@ -6,87 +6,82 @@
6
6
  width: 32px !important;
7
7
  text-align: center !important;
8
8
 
9
- border-right: 0px;
10
- border-left: 0px;
11
9
  pointer-events: none;
12
10
  &.@{ant-prefix}-input[disabled] {
13
11
  background: #fff !important;
14
12
  }
15
13
  }
14
+ // 数字输入框error状态
16
15
  .@{ant-prefix}-input-number-status-error:not(.@{ant-prefix}-input-number-disabled):not(
17
16
  .@{ant-prefix}-input-number-borderless
18
17
  ).@{ant-prefix}-input-number {
19
18
  border-color: @zaui-danger !important;
20
19
  }
21
- .@{ant-prefix}-input-status-error {
22
- &.range-split {
23
- color: @zaui-danger !important;
20
+
21
+ // 分隔符输入框error状态
22
+ &:has(.@{ant-prefix}-input-status-error):not(.pro-number-range-disabled) {
23
+ .range-split,
24
+ .range-addon-before,
25
+ .range-addon-after {
26
+ // color: @zaui-danger !important;
24
27
  border-color: @zaui-danger;
25
28
  }
26
29
  }
27
30
 
28
- & .@{ant-prefix}-input-rtl.range-right {
29
- border-right-width: 0;
30
- }
31
-
32
- & .@{ant-prefix}-input-rtl.range-right:hover,
33
- & .@{ant-prefix}-input-rtl.range-right:focus {
34
- border-right-width: 1px;
35
- }
36
-
37
31
  .@{ant-prefix}-form-item {
38
32
  margin-bottom: 0;
39
33
  }
40
34
 
41
- .range-left,
42
- .range-right {
43
- width: calc(50% - 16px);
44
- text-align: center;
45
- transition: none;
46
- .range-left {
47
- width: calc(100% + 2px) !important;
48
- }
49
- }
35
+ // .range-left,
36
+ // .range-right {
37
+ // text-align: center;
38
+ // }
50
39
 
51
- .range-left {
52
- .@{ant-prefix}-input-number {
53
- border-right: none;
54
- }
55
- }
40
+ // .range-left {
41
+ // .@{ant-prefix}-input-number {
42
+ // border-right: none;
43
+ // }
44
+ // }
56
45
 
57
- .range-right {
58
- .@{ant-prefix}-input-number {
59
- border-left: none;
60
- }
46
+ // .range-right {
47
+ // .@{ant-prefix}-input-number {
48
+ // border-left: none;
49
+ // }
61
50
 
62
- .range-right {
63
- width: 100%;
64
- border-top-left-radius: 0;
65
- border-bottom-left-radius: 0;
66
- }
67
- }
51
+ // .range-right {
52
+ // width: 100%;
53
+ // border-top-left-radius: 0;
54
+ // border-bottom-left-radius: 0;
55
+ // }
56
+ // }
68
57
 
69
- &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
70
- margin-right: 0;
58
+ .range-addon-before,
59
+ .range-addon-after {
60
+ color: var(--zaui-disabled-text);
61
+ pointer-events: none;
71
62
  }
72
63
 
73
- > *:first-child {
74
- border-top-right-radius: 0 !important;
75
- border-bottom-right-radius: 0 !important;
64
+ // &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
65
+ // margin-right: 0;
66
+ // }
76
67
 
77
- > .@{ant-prefix}-select-selector {
78
- border-top-right-radius: 0 !important;
79
- border-bottom-right-radius: 0 !important;
80
- }
81
- }
68
+ // > *:first-child {
69
+ // border-top-right-radius: 0 !important;
70
+ // border-bottom-right-radius: 0 !important;
82
71
 
83
- > *:last-child {
84
- border-top-left-radius: 0 !important;
85
- border-bottom-left-radius: 0 !important;
72
+ // > .@{ant-prefix}-select-selector {
73
+ // border-top-right-radius: 0 !important;
74
+ // border-bottom-right-radius: 0 !important;
75
+ // }
76
+ // }
86
77
 
87
- > .@{ant-prefix}-select-selector {
88
- border-top-left-radius: 0 !important;
89
- border-bottom-left-radius: 0 !important;
90
- }
91
- }
78
+ // > *:last-child {
79
+ // border-top-left-radius: 0 !important;
80
+ // border-bottom-left-radius: 0 !important;
81
+
82
+ // > .@{ant-prefix}-select-selector {
83
+ // border-top-left-radius: 0 !important;
84
+ // border-bottom-left-radius: 0 !important;
85
+ // }
86
+ // }
92
87
  }
package/lib/ProForm/components/combination/ProNumberRange/index.js CHANGED
@@ -90,8 +90,7 @@ var ProNumberRange = function ProNumberRange(props) {
90
90
  };
91
91
  var cls = (0, _classnames.default)({
92
92
  'pro-number-range': true,
93
- 'pro-number-range-after': addonAfter,
94
- 'pro-number-range-before': addonBefore,
93
+ 'pro-number-range-disabled': disabled,
95
94
  className: className
96
95
  });
97
96
  // 查看模式
@@ -180,50 +179,51 @@ var ProNumberRange = function ProNumberRange(props) {
180
179
  }
181
180
  return result;
182
181
  };
183
- return (0, _jsxRuntime.jsxs)(_antd.Input.Group, {
184
- compact: true,
182
+ return (0, _jsxRuntime.jsx)(_antd.Space, {
185
183
  className: cls,
186
- children: [(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
187
- id: id,
188
- className: "range-left",
189
- value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
190
- placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
191
- precision: precision,
192
- disabled: getDisabled(disabled, 0),
193
- onChange: function onChange(e) {
194
- firstHandleChange(e);
195
- },
196
- addonBefore: addonBefore
197
- }, valueProps), {}, {
198
- style: addonAfter ? {
199
- width: "calc(50% - ".concat(16 + addonAfterDomWidth / 2, "px)")
200
- } : null,
201
- min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
202
- max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
203
- }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), (0, _jsxRuntime.jsx)(_antd.Input, {
204
- className: (0, _classnames.default)({
205
- 'range-split': true,
206
- 'range-split-disabled': !!disabled
207
- }),
208
- placeholder: "~",
209
- disabled: true
210
- }), (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
211
- className: "range-right",
212
- value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
213
- placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
214
- precision: precision,
215
- disabled: getDisabled(disabled, 1),
216
- onChange: function onChange(e) {
217
- lastHandleChange(e);
218
- },
219
- addonAfter: addonAfter
220
- }, valueProps), {}, {
221
- style: addonAfter ? {
222
- width: "calc(50% - ".concat(16 - addonAfterDomWidth / 2, "px)")
223
- } : null,
224
- min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
225
- max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
226
- }, childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
184
+ children: (0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
185
+ children: [(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
186
+ id: id,
187
+ className: "range-left",
188
+ value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
189
+ placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
190
+ precision: precision,
191
+ disabled: getDisabled(disabled, 0),
192
+ onChange: function onChange(e) {
193
+ firstHandleChange(e);
194
+ }
195
+ }, valueProps), {}, {
196
+ min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
197
+ max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
198
+ }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? (0, _jsxRuntime.jsx)(_antd.Button, {
199
+ disabled: true,
200
+ className: "range-addon-before",
201
+ children: addonBefore
202
+ }) : null, (0, _jsxRuntime.jsx)(_antd.Input, {
203
+ className: (0, _classnames.default)({
204
+ 'range-split': true,
205
+ 'range-split-disabled': !!disabled
206
+ }),
207
+ placeholder: "~",
208
+ disabled: true
209
+ }), (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
210
+ className: "range-right",
211
+ value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
212
+ placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
213
+ precision: precision,
214
+ disabled: getDisabled(disabled, 1),
215
+ onChange: function onChange(e) {
216
+ lastHandleChange(e);
217
+ }
218
+ }, valueProps), {}, {
219
+ min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
220
+ max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
221
+ }, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? (0, _jsxRuntime.jsx)(_antd.Button, {
222
+ disabled: true,
223
+ className: "range-addon-after",
224
+ children: addonAfter
225
+ }) : null]
226
+ })
227
227
  });
228
228
  };
229
229
  var _default = exports.default = ProNumberRange;
package/lib/ProForm/components/combination/ProNumberRange/style/index.less CHANGED
@@ -6,87 +6,82 @@
6
6
  width: 32px !important;
7
7
  text-align: center !important;
8
8
 
9
- border-right: 0px;
10
- border-left: 0px;
11
9
  pointer-events: none;
12
10
  &.@{ant-prefix}-input[disabled] {
13
11
  background: #fff !important;
14
12
  }
15
13
  }
14
+ // 数字输入框error状态
16
15
  .@{ant-prefix}-input-number-status-error:not(.@{ant-prefix}-input-number-disabled):not(
17
16
  .@{ant-prefix}-input-number-borderless
18
17
  ).@{ant-prefix}-input-number {
19
18
  border-color: @zaui-danger !important;
20
19
  }
21
- .@{ant-prefix}-input-status-error {
22
- &.range-split {
23
- color: @zaui-danger !important;
20
+
21
+ // 分隔符输入框error状态
22
+ &:has(.@{ant-prefix}-input-status-error):not(.pro-number-range-disabled) {
23
+ .range-split,
24
+ .range-addon-before,
25
+ .range-addon-after {
26
+ // color: @zaui-danger !important;
24
27
  border-color: @zaui-danger;
25
28
  }
26
29
  }
27
30
 
28
- & .@{ant-prefix}-input-rtl.range-right {
29
- border-right-width: 0;
30
- }
31
-
32
- & .@{ant-prefix}-input-rtl.range-right:hover,
33
- & .@{ant-prefix}-input-rtl.range-right:focus {
34
- border-right-width: 1px;
35
- }
36
-
37
31
  .@{ant-prefix}-form-item {
38
32
  margin-bottom: 0;
39
33
  }
40
34
 
41
- .range-left,
42
- .range-right {
43
- width: calc(50% - 16px);
44
- text-align: center;
45
- transition: none;
46
- .range-left {
47
- width: calc(100% + 2px) !important;
48
- }
49
- }
35
+ // .range-left,
36
+ // .range-right {
37
+ // text-align: center;
38
+ // }
50
39
 
51
- .range-left {
52
- .@{ant-prefix}-input-number {
53
- border-right: none;
54
- }
55
- }
40
+ // .range-left {
41
+ // .@{ant-prefix}-input-number {
42
+ // border-right: none;
43
+ // }
44
+ // }
56
45
 
57
- .range-right {
58
- .@{ant-prefix}-input-number {
59
- border-left: none;
60
- }
46
+ // .range-right {
47
+ // .@{ant-prefix}-input-number {
48
+ // border-left: none;
49
+ // }
61
50
 
62
- .range-right {
63
- width: 100%;
64
- border-top-left-radius: 0;
65
- border-bottom-left-radius: 0;
66
- }
67
- }
51
+ // .range-right {
52
+ // width: 100%;
53
+ // border-top-left-radius: 0;
54
+ // border-bottom-left-radius: 0;
55
+ // }
56
+ // }
68
57
 
69
- &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
70
- margin-right: 0;
58
+ .range-addon-before,
59
+ .range-addon-after {
60
+ color: var(--zaui-disabled-text);
61
+ pointer-events: none;
71
62
  }
72
63
 
73
- > *:first-child {
74
- border-top-right-radius: 0 !important;
75
- border-bottom-right-radius: 0 !important;
64
+ // &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
65
+ // margin-right: 0;
66
+ // }
76
67
 
77
- > .@{ant-prefix}-select-selector {
78
- border-top-right-radius: 0 !important;
79
- border-bottom-right-radius: 0 !important;
80
- }
81
- }
68
+ // > *:first-child {
69
+ // border-top-right-radius: 0 !important;
70
+ // border-bottom-right-radius: 0 !important;
82
71
 
83
- > *:last-child {
84
- border-top-left-radius: 0 !important;
85
- border-bottom-left-radius: 0 !important;
72
+ // > .@{ant-prefix}-select-selector {
73
+ // border-top-right-radius: 0 !important;
74
+ // border-bottom-right-radius: 0 !important;
75
+ // }
76
+ // }
86
77
 
87
- > .@{ant-prefix}-select-selector {
88
- border-top-left-radius: 0 !important;
89
- border-bottom-left-radius: 0 !important;
90
- }
91
- }
78
+ // > *:last-child {
79
+ // border-top-left-radius: 0 !important;
80
+ // border-bottom-left-radius: 0 !important;
81
+
82
+ // > .@{ant-prefix}-select-selector {
83
+ // border-top-left-radius: 0 !important;
84
+ // border-bottom-left-radius: 0 !important;
85
+ // }
86
+ // }
92
87
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.8.0-beat.10",
3
+ "version": "3.8.0-beat.11",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",