@aloudata/aloudata-design 2.15.9 → 2.15.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.
- package/dist/AldSelect/BaseSelect.js +2 -0
- package/dist/AldSelect/components/Suffix.d.ts +2 -1
- package/dist/AldSelect/components/Suffix.js +3 -2
- package/dist/AldSelect/index.js +7 -2
- package/dist/AldSelect/style/color.less +3 -1
- package/dist/AldSelect/style/index.less +0 -1
- package/dist/Checkbox/style/index.less +1 -4
- package/dist/ColorPicker/ComplexColorPicker/index.js +1 -1
- package/dist/ColorPicker/style/complex.less +43 -41
- package/dist/Input/style/status.less +2 -5
- package/dist/InputNumber/style/index.less +2 -2
- package/dist/InputSearch/index.d.ts +1 -0
- package/dist/InputSearch/index.js +36 -8
- package/dist/Table/hooks/useFixed.d.ts +1 -0
- package/dist/Table/hooks/useFixed.js +2 -1
- package/dist/Table/index.js +189 -38
- package/dist/Table/style/index.less +7 -0
- package/dist/ald.min.css +1 -1
- package/package.json +1 -1
|
@@ -97,6 +97,7 @@ var BaseSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
97
97
|
var _useContext = useContext(FormItemInputContext),
|
|
98
98
|
contextStatus = _useContext.status;
|
|
99
99
|
var mergedStatus = customStatus || contextStatus || undefined;
|
|
100
|
+
|
|
100
101
|
// =========================== Imperative ===========================
|
|
101
102
|
React.useImperativeHandle(ref, function () {
|
|
102
103
|
return {
|
|
@@ -246,6 +247,7 @@ var BaseSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
246
247
|
})))), /*#__PURE__*/React.createElement(Suffix, {
|
|
247
248
|
showArrow: showArrow,
|
|
248
249
|
allowClear: allowClear,
|
|
250
|
+
disabled: disabled,
|
|
249
251
|
isHover: isHover,
|
|
250
252
|
onClear: function onClear() {
|
|
251
253
|
onToggleOpen(false);
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { DisplayValueType } from '../interface';
|
|
3
|
-
export default function Suffix({ showArrow, allowClear, isActive, isHover, icon, onClear, displayValues, }: {
|
|
3
|
+
export default function Suffix({ showArrow, allowClear, isActive, isHover, icon, onClear, displayValues, disabled, }: {
|
|
4
4
|
showArrow?: boolean;
|
|
5
5
|
allowClear?: boolean;
|
|
6
6
|
isActive?: boolean;
|
|
7
7
|
isHover?: boolean;
|
|
8
|
+
disabled?: boolean;
|
|
8
9
|
icon: React.ReactNode;
|
|
9
10
|
onClear?: () => void;
|
|
10
11
|
displayValues: DisplayValueType[];
|
|
@@ -8,9 +8,10 @@ export default function Suffix(_ref) {
|
|
|
8
8
|
isHover = _ref.isHover,
|
|
9
9
|
icon = _ref.icon,
|
|
10
10
|
onClear = _ref.onClear,
|
|
11
|
-
displayValues = _ref.displayValues
|
|
11
|
+
displayValues = _ref.displayValues,
|
|
12
|
+
disabled = _ref.disabled;
|
|
12
13
|
var classNames = prefixCls('select');
|
|
13
|
-
if ((isActive || isHover) && allowClear && displayValues.length > 0) {
|
|
14
|
+
if ((isActive || isHover) && !disabled && allowClear && displayValues.length > 0) {
|
|
14
15
|
return /*#__PURE__*/React.createElement("div", {
|
|
15
16
|
className: classNames('suffix', 'clear'),
|
|
16
17
|
onClick: function onClick(event) {
|
package/dist/AldSelect/index.js
CHANGED
|
@@ -15,7 +15,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
|
15
15
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
16
16
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
17
17
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
18
|
-
import React, { forwardRef, useCallback, useMemo } from 'react';
|
|
18
|
+
import React, { forwardRef, useCallback, useContext, useMemo } from 'react';
|
|
19
19
|
import useOptions, { isRawValue } from "./hooks/useOptions";
|
|
20
20
|
import useMergedState from 'rc-util/lib/hooks/useMergedState';
|
|
21
21
|
import { toArray } from "./utils/commonUtil";
|
|
@@ -24,6 +24,7 @@ import BaseSelect, { isMultiple } from "./BaseSelect";
|
|
|
24
24
|
import { injectPropsWithOption } from "./utils/valueUtil";
|
|
25
25
|
import useDisplayMenu from "./hooks/useDisplayMenu";
|
|
26
26
|
import { toString } from "./utils/commonUtil";
|
|
27
|
+
import DisabledContext from 'antd/lib/config-provider/DisabledContext';
|
|
27
28
|
export default /*#__PURE__*/forwardRef(function AldSelect(props, ref) {
|
|
28
29
|
var value = props.value,
|
|
29
30
|
defaultValue = props.defaultValue,
|
|
@@ -37,7 +38,8 @@ export default /*#__PURE__*/forwardRef(function AldSelect(props, ref) {
|
|
|
37
38
|
filterOption = props.filterOption,
|
|
38
39
|
searchValue = props.searchValue,
|
|
39
40
|
optionLabelProp = props.optionLabelProp,
|
|
40
|
-
listHeight = props.listHeight
|
|
41
|
+
listHeight = props.listHeight,
|
|
42
|
+
customDisabled = props.disabled;
|
|
41
43
|
|
|
42
44
|
// =========================== Values ===========================
|
|
43
45
|
var _useMergedState = useMergedState(defaultValue, {
|
|
@@ -46,6 +48,8 @@ export default /*#__PURE__*/forwardRef(function AldSelect(props, ref) {
|
|
|
46
48
|
_useMergedState2 = _slicedToArray(_useMergedState, 2),
|
|
47
49
|
internalValue = _useMergedState2[0],
|
|
48
50
|
setInternalValue = _useMergedState2[1];
|
|
51
|
+
var disabled = useContext(DisabledContext);
|
|
52
|
+
var mergedDisabled = customDisabled !== null && customDisabled !== void 0 ? customDisabled : disabled;
|
|
49
53
|
var parsedOptions = useOptions({
|
|
50
54
|
menu: menu,
|
|
51
55
|
options: options,
|
|
@@ -228,6 +232,7 @@ export default /*#__PURE__*/forwardRef(function AldSelect(props, ref) {
|
|
|
228
232
|
var displayMenu = useDisplayMenu(selectMenu, filterOption, innerSearchValue);
|
|
229
233
|
return /*#__PURE__*/React.createElement(BaseSelect, _extends({}, props, {
|
|
230
234
|
ref: ref,
|
|
235
|
+
disabled: mergedDisabled,
|
|
231
236
|
displayValues: displayValues,
|
|
232
237
|
onDisplayValuesChange: onDisplayValuesChange,
|
|
233
238
|
setInnerSearchValue: setInnerSearchValue,
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
.beta-ald-select {
|
|
2
2
|
border-color: #d1d5db;
|
|
3
3
|
color: #1f2937;
|
|
4
|
+
background-color: #fff;
|
|
4
5
|
|
|
5
6
|
&-active {
|
|
6
7
|
border-color: #007bff;
|
|
@@ -17,6 +18,7 @@
|
|
|
17
18
|
|
|
18
19
|
&-borderless {
|
|
19
20
|
border-color: transparent;
|
|
21
|
+
background-color: transparent;
|
|
20
22
|
color: #111827;
|
|
21
23
|
|
|
22
24
|
&:hover {
|
|
@@ -32,7 +34,7 @@
|
|
|
32
34
|
|
|
33
35
|
&-disabled {
|
|
34
36
|
border: 1px solid #d1d5db;
|
|
35
|
-
background: #
|
|
37
|
+
background: #f3f4f6;
|
|
36
38
|
|
|
37
39
|
&.beta-ald-select-borderless {
|
|
38
40
|
border-color: transparent;
|
|
@@ -31,10 +31,7 @@
|
|
|
31
31
|
--alias-colors-bg-selected-strong-press,
|
|
32
32
|
#0b4385
|
|
33
33
|
);
|
|
34
|
-
@checkbox-checked-inner-bgc-disabled:
|
|
35
|
-
--alias-colors-bg-disabled,
|
|
36
|
-
rgba(0, 0, 0, 0.05)
|
|
37
|
-
);
|
|
34
|
+
@checkbox-checked-inner-bgc-disabled: #f3f4f6;
|
|
38
35
|
|
|
39
36
|
@checkout-border-radius: var(--alias-radius-25);
|
|
40
37
|
|
|
@@ -15,7 +15,7 @@ import useColor from "../hooks/useColor";
|
|
|
15
15
|
import { genAlphaColor, generateColor, getColorAlpha } from "../util";
|
|
16
16
|
import Dropdown from "../../Dropdown";
|
|
17
17
|
import classNames from 'classnames';
|
|
18
|
-
var prefixCls = 'ald-color-picker';
|
|
18
|
+
var prefixCls = 'ald-color-picker-complex';
|
|
19
19
|
export default function ColorPicker(props) {
|
|
20
20
|
var value = props.value,
|
|
21
21
|
onChange = props.onChange,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
.ald-color-picker-wrapper {
|
|
1
|
+
.ald-color-picker-complex-wrapper {
|
|
2
2
|
position: relative;
|
|
3
3
|
width: 258px;
|
|
4
4
|
padding: 12px;
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
|
|
9
9
|
}
|
|
10
10
|
|
|
11
|
-
.ald-color-picker {
|
|
11
|
+
.ald-color-picker-complex {
|
|
12
12
|
position: absolute;
|
|
13
13
|
z-index: 1;
|
|
14
14
|
display: block;
|
|
@@ -17,42 +17,42 @@
|
|
|
17
17
|
visibility: visible;
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
.ald-color-picker-hidden {
|
|
20
|
+
.ald-color-picker-complex-hidden {
|
|
21
21
|
display: none;
|
|
22
22
|
}
|
|
23
23
|
|
|
24
|
-
.ald-color-picker-panel {
|
|
24
|
+
.ald-color-picker-complex-panel {
|
|
25
25
|
display: flex;
|
|
26
26
|
flex-direction: column;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
.ald-color-picker-panel-disabled {
|
|
29
|
+
.ald-color-picker-complex-panel-disabled {
|
|
30
30
|
cursor: not-allowed;
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
.ald-color-picker-select {
|
|
33
|
+
.ald-color-picker-complex-select {
|
|
34
34
|
margin-bottom: 12px;
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
-
.ald-color-picker-select .ald-color-picker-palette {
|
|
37
|
+
.ald-color-picker-complex-select .ald-color-picker-complex-palette {
|
|
38
38
|
min-height: 160px;
|
|
39
39
|
overflow: hidden;
|
|
40
40
|
border-radius: 4px;
|
|
41
41
|
}
|
|
42
42
|
|
|
43
|
-
.ald-color-picker-select
|
|
44
|
-
.ald-color-picker-palette
|
|
45
|
-
> .ald-color-picker-gradient {
|
|
43
|
+
.ald-color-picker-complex-select
|
|
44
|
+
.ald-color-picker-complex-palette
|
|
45
|
+
> .ald-color-picker-complex-gradient {
|
|
46
46
|
border-top-left-radius: 5px;
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
.ald-color-picker-saturation {
|
|
49
|
+
.ald-color-picker-complex-saturation {
|
|
50
50
|
position: absolute;
|
|
51
51
|
border-radius: inherit;
|
|
52
52
|
inset: 0;
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
.ald-color-picker-handler {
|
|
55
|
+
.ald-color-picker-complex-handler {
|
|
56
56
|
box-sizing: border-box;
|
|
57
57
|
width: 16px;
|
|
58
58
|
height: 16px;
|
|
@@ -61,29 +61,29 @@
|
|
|
61
61
|
box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.06);
|
|
62
62
|
}
|
|
63
63
|
|
|
64
|
-
.ald-color-picker-handler-sm {
|
|
64
|
+
.ald-color-picker-complex-handler-sm {
|
|
65
65
|
width: 12px;
|
|
66
66
|
height: 12px;
|
|
67
67
|
}
|
|
68
68
|
|
|
69
|
-
.ald-color-picker-slider {
|
|
69
|
+
.ald-color-picker-complex-slider {
|
|
70
70
|
width: 100%;
|
|
71
71
|
margin-bottom: 12px;
|
|
72
72
|
}
|
|
73
73
|
|
|
74
|
-
.ald-color-picker-slider .ald-color-picker-palette {
|
|
74
|
+
.ald-color-picker-complex-slider .ald-color-picker-complex-palette {
|
|
75
75
|
height: 8px;
|
|
76
76
|
}
|
|
77
77
|
|
|
78
|
-
.ald-color-picker-slider .ald-color-picker-gradient {
|
|
78
|
+
.ald-color-picker-complex-slider .ald-color-picker-complex-gradient {
|
|
79
79
|
border-radius: 4px;
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
-
.ald-color-picker-slider-alpha {
|
|
82
|
+
.ald-color-picker-complex-slider-alpha {
|
|
83
83
|
background: url('../alpha.svg');
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
-
.ald-color-picker-color-block {
|
|
86
|
+
.ald-color-picker-complex-color-block {
|
|
87
87
|
position: relative;
|
|
88
88
|
width: 28px;
|
|
89
89
|
height: 28px;
|
|
@@ -93,7 +93,7 @@
|
|
|
93
93
|
border-radius: 4px;
|
|
94
94
|
}
|
|
95
95
|
|
|
96
|
-
.ald-color-picker-color-block-inner {
|
|
96
|
+
.ald-color-picker-complex-color-block-inner {
|
|
97
97
|
box-sizing: border-box;
|
|
98
98
|
width: 100%;
|
|
99
99
|
height: 100%;
|
|
@@ -101,96 +101,98 @@
|
|
|
101
101
|
border-radius: 4px;
|
|
102
102
|
}
|
|
103
103
|
|
|
104
|
-
.ald-color-picker-slider-container {
|
|
104
|
+
.ald-color-picker-complex-slider-container {
|
|
105
105
|
display: flex;
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
-
.ald-color-picker-slider-container
|
|
108
|
+
.ald-color-picker-complex-slider-container
|
|
109
|
+
.ald-color-picker-complex-slider-group {
|
|
109
110
|
flex: 1;
|
|
110
111
|
}
|
|
111
112
|
|
|
112
|
-
.ald-color-picker-slider-container
|
|
113
|
-
.ald-color-picker-slider-group-disabled-alpha {
|
|
113
|
+
.ald-color-picker-complex-slider-container
|
|
114
|
+
.ald-color-picker-complex-slider-group-disabled-alpha {
|
|
114
115
|
display: flex;
|
|
115
116
|
align-items: center;
|
|
116
117
|
}
|
|
117
118
|
|
|
118
|
-
.ald-color-picker-slider-container
|
|
119
|
-
.ald-color-picker-slider-group-disabled-alpha
|
|
120
|
-
.ald-color-picker-slider {
|
|
119
|
+
.ald-color-picker-complex-slider-container
|
|
120
|
+
.ald-color-picker-complex-slider-group-disabled-alpha
|
|
121
|
+
.ald-color-picker-complex-slider {
|
|
121
122
|
margin-bottom: 0;
|
|
122
123
|
}
|
|
123
124
|
|
|
124
|
-
.ald-color-picker-input-container {
|
|
125
|
+
.ald-color-picker-complex-input-container {
|
|
125
126
|
display: flex;
|
|
126
127
|
align-items: center;
|
|
127
128
|
gap: 4px;
|
|
128
129
|
}
|
|
129
130
|
|
|
130
|
-
.ald-color-picker-input-container
|
|
131
|
+
.ald-color-picker-complex-input-container
|
|
132
|
+
.ald-color-picker-complex-format-select {
|
|
131
133
|
.ant-select-borderless .ant-select-selector {
|
|
132
134
|
padding: 0;
|
|
133
135
|
}
|
|
134
136
|
}
|
|
135
137
|
|
|
136
|
-
.ald-color-picker-input-container .ald-color-picker-input {
|
|
138
|
+
.ald-color-picker-complex-input-container .ald-color-picker-complex-input {
|
|
137
139
|
width: 0;
|
|
138
140
|
flex: 1;
|
|
139
141
|
|
|
140
|
-
.ald-color-picker-hsb-input,
|
|
141
|
-
.ald-color-picker-rgb-input {
|
|
142
|
+
.ald-color-picker-complex-hsb-input,
|
|
143
|
+
.ald-color-picker-complex-rgb-input {
|
|
142
144
|
display: flex;
|
|
143
145
|
align-items: center;
|
|
144
146
|
gap: 4px;
|
|
145
147
|
}
|
|
146
148
|
}
|
|
147
149
|
|
|
148
|
-
.ald-color-picker-input-container
|
|
149
|
-
.ald-color-picker-steppers.ald-color-picker-alpha-input {
|
|
150
|
+
.ald-color-picker-complex-input-container
|
|
151
|
+
.ald-color-picker-complex-steppers.ald-color-picker-complex-alpha-input {
|
|
150
152
|
width: 44px;
|
|
151
153
|
}
|
|
152
154
|
|
|
153
|
-
.ald-color-picker-trigger-wrapper {
|
|
155
|
+
.ald-color-picker-complex-trigger-wrapper {
|
|
154
156
|
display: inline-flex;
|
|
155
157
|
padding: 3px;
|
|
156
158
|
border: 1px solid #d1d5db;
|
|
157
159
|
background-color: #fff;
|
|
158
160
|
|
|
159
|
-
.ald-color-picker-trigger-inner {
|
|
161
|
+
.ald-color-picker-complex-trigger-inner {
|
|
160
162
|
border: 1px solid rgba(0, 0, 0, 0.2);
|
|
161
163
|
}
|
|
162
164
|
}
|
|
163
165
|
|
|
164
|
-
.ald-color-picker-trigger-wrapper-small {
|
|
166
|
+
.ald-color-picker-complex-trigger-wrapper-small {
|
|
165
167
|
width: 28px;
|
|
166
168
|
height: 28px;
|
|
167
169
|
border-radius: 4px;
|
|
168
170
|
|
|
169
|
-
.ald-color-picker-trigger-inner {
|
|
171
|
+
.ald-color-picker-complex-trigger-inner {
|
|
170
172
|
width: 20px;
|
|
171
173
|
height: 20px;
|
|
172
174
|
border-radius: 2px;
|
|
173
175
|
}
|
|
174
176
|
}
|
|
175
177
|
|
|
176
|
-
.ald-color-picker-trigger-wrapper-middle {
|
|
178
|
+
.ald-color-picker-complex-trigger-wrapper-middle {
|
|
177
179
|
width: 32px;
|
|
178
180
|
height: 32px;
|
|
179
181
|
border-radius: 6px;
|
|
180
182
|
|
|
181
|
-
.ald-color-picker-trigger-inner {
|
|
183
|
+
.ald-color-picker-complex-trigger-inner {
|
|
182
184
|
width: 24px;
|
|
183
185
|
height: 24px;
|
|
184
186
|
border-radius: 3px;
|
|
185
187
|
}
|
|
186
188
|
}
|
|
187
189
|
|
|
188
|
-
.ald-color-picker-trigger-wrapper-large {
|
|
190
|
+
.ald-color-picker-complex-trigger-wrapper-large {
|
|
189
191
|
width: 36px;
|
|
190
192
|
height: 36px;
|
|
191
193
|
border-radius: 8px;
|
|
192
194
|
|
|
193
|
-
.ald-color-picker-trigger-inner {
|
|
195
|
+
.ald-color-picker-complex-trigger-inner {
|
|
194
196
|
width: 28px;
|
|
195
197
|
height: 28px;
|
|
196
198
|
border-radius: 4px;
|
|
@@ -27,11 +27,8 @@
|
|
|
27
27
|
@input-focus-placeholder-color: var(--alias-colors-text-subtlest, #9ca3af);
|
|
28
28
|
|
|
29
29
|
//color disabled
|
|
30
|
-
@input-disabled-border-color:
|
|
31
|
-
|
|
32
|
-
rgba(0, 0, 0, 0.1)
|
|
33
|
-
);
|
|
34
|
-
@input-disabled-bg-color: var(--alias-colors-bg-transp, rgba(0, 0, 0, 0));
|
|
30
|
+
@input-disabled-border-color: #d1d5db;
|
|
31
|
+
@input-disabled-bg-color: #f3f4f6;
|
|
35
32
|
@input-disabled-text-color: var(
|
|
36
33
|
--alias-colors-text-disabled,
|
|
37
34
|
rgba(0, 0, 0, 0.25)
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
@inputNumber-active-border-color: var(--alias-colors-border-selected, #126fdd);
|
|
30
30
|
|
|
31
31
|
//disable
|
|
32
|
-
@inputNumber-disabled-bg-color:
|
|
33
|
-
@inputNumber-disabled-border-color:
|
|
32
|
+
@inputNumber-disabled-bg-color: #f3f4f6;
|
|
33
|
+
@inputNumber-disabled-border-color: #d1d5db;
|
|
34
34
|
@inputNumber-disabled-color: @NL40;
|
|
35
35
|
//光标颜色
|
|
36
36
|
@inputNumber-cursor-color: @B60;
|
|
@@ -2,6 +2,7 @@ import React from 'react';
|
|
|
2
2
|
export default function InputSearch(props: IProps): React.JSX.Element;
|
|
3
3
|
interface IProps {
|
|
4
4
|
onSearch: (value: string) => void;
|
|
5
|
+
onBlur?: (value: string, e: React.FocusEvent<HTMLInputElement>) => void;
|
|
5
6
|
className?: string;
|
|
6
7
|
debounce?: boolean;
|
|
7
8
|
placeholder?: string;
|
|
@@ -13,7 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
13
13
|
import { useDebounceFn } from 'ahooks';
|
|
14
14
|
import classnames from 'classnames';
|
|
15
15
|
import _ from 'lodash';
|
|
16
|
-
import React, { useCallback, useContext, useMemo, useState } from 'react';
|
|
16
|
+
import React, { useCallback, useContext, useMemo, useRef, useState } from 'react';
|
|
17
17
|
import { SearchLine } from "../Icon";
|
|
18
18
|
import Input from "../Input";
|
|
19
19
|
import { ELangType, LocaleContext, getTranslator } from "../locale/default";
|
|
@@ -38,7 +38,8 @@ export default function InputSearch(props) {
|
|
|
38
38
|
defaultValue = props.defaultValue,
|
|
39
39
|
_props$inputMode = props.inputMode,
|
|
40
40
|
inputMode = _props$inputMode === void 0 ? false : _props$inputMode,
|
|
41
|
-
style = props.style
|
|
41
|
+
style = props.style,
|
|
42
|
+
_onBlur = props.onBlur;
|
|
42
43
|
var defaultWidth = useMemo(function () {
|
|
43
44
|
if (size === 'small') {
|
|
44
45
|
if (locale === ELangType.EN) {
|
|
@@ -61,24 +62,44 @@ export default function InputSearch(props) {
|
|
|
61
62
|
_useState2 = _slicedToArray(_useState, 2),
|
|
62
63
|
searchValue = _useState2[0],
|
|
63
64
|
setSearchValue = _useState2[1];
|
|
65
|
+
var isComposing = useRef(false);
|
|
64
66
|
var onPressEnter = useCallback(function (e) {
|
|
65
|
-
|
|
67
|
+
if (!isComposing.current) {
|
|
68
|
+
onSearch(_.trim(e.target.value));
|
|
69
|
+
}
|
|
66
70
|
}, [onSearch]);
|
|
67
71
|
var DEFAULT_DEBOUNCE_TIME = 500;
|
|
68
72
|
var _useDebounceFn = useDebounceFn(function (val) {
|
|
69
|
-
|
|
73
|
+
if (!isComposing.current) {
|
|
74
|
+
onSearch(val);
|
|
75
|
+
}
|
|
70
76
|
}, {
|
|
71
77
|
wait: DEFAULT_DEBOUNCE_TIME
|
|
72
78
|
}),
|
|
73
79
|
debounceSearch = _useDebounceFn.run;
|
|
74
80
|
var onChangeValue = useCallback(function (e) {
|
|
75
81
|
var newValue = e.target.value;
|
|
82
|
+
setSearchValue(newValue);
|
|
83
|
+
if (!isComposing.current) {
|
|
84
|
+
if (debounce) {
|
|
85
|
+
debounceSearch(newValue);
|
|
86
|
+
} else {
|
|
87
|
+
onSearch(newValue);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}, [debounce, debounceSearch, onSearch]);
|
|
91
|
+
var handleCompositionStart = useCallback(function () {
|
|
92
|
+
isComposing.current = true;
|
|
93
|
+
}, []);
|
|
94
|
+
var handleCompositionEnd = useCallback(function (e) {
|
|
95
|
+
isComposing.current = false;
|
|
96
|
+
// 在输入法结束后触发一次搜索
|
|
97
|
+
var value = e.target.value;
|
|
76
98
|
if (debounce) {
|
|
77
|
-
debounceSearch(
|
|
99
|
+
debounceSearch(value);
|
|
78
100
|
} else {
|
|
79
|
-
onSearch(
|
|
101
|
+
onSearch(value);
|
|
80
102
|
}
|
|
81
|
-
setSearchValue(newValue);
|
|
82
103
|
}, [debounce, debounceSearch, onSearch]);
|
|
83
104
|
var iconSize = useMemo(function () {
|
|
84
105
|
if (size === 'middle' || size === 'large') {
|
|
@@ -99,11 +120,18 @@ export default function InputSearch(props) {
|
|
|
99
120
|
status: 'success',
|
|
100
121
|
onChange: onChangeValue,
|
|
101
122
|
onPressEnter: onPressEnter,
|
|
123
|
+
onCompositionStart: handleCompositionStart,
|
|
124
|
+
onCompositionEnd: handleCompositionEnd,
|
|
102
125
|
prefix: /*#__PURE__*/React.createElement(SearchLine, {
|
|
103
126
|
size: iconSize
|
|
104
127
|
}),
|
|
105
128
|
placeholder: placeholder || t.InputSearch.search,
|
|
106
129
|
allowClear: true,
|
|
107
|
-
defaultValue: defaultValue
|
|
130
|
+
defaultValue: defaultValue,
|
|
131
|
+
onBlur: function onBlur(e) {
|
|
132
|
+
if (_onBlur) {
|
|
133
|
+
_onBlur(searchValue, e);
|
|
134
|
+
}
|
|
135
|
+
}
|
|
108
136
|
}));
|
|
109
137
|
}
|
|
@@ -30,7 +30,8 @@ export default function useFixed(_ref) {
|
|
|
30
30
|
}
|
|
31
31
|
return {
|
|
32
32
|
className: classnames((_classnames = {}, _defineProperty(_classnames, prefixCls('fixed-left'), fixed === 'left'), _defineProperty(_classnames, prefixCls('fixed-right'), fixed === 'right'), _classnames)),
|
|
33
|
-
style: style
|
|
33
|
+
style: style,
|
|
34
|
+
fixed: fixed
|
|
34
35
|
};
|
|
35
36
|
}, [tableColumns, y, scrollbarWidth, columnWidths]);
|
|
36
37
|
}
|