@kdcloudjs/kdesign 1.6.5 → 1.6.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 (108) hide show
  1. package/CHANGELOG.md +36 -0
  2. package/dist/kdesign-complete.less +113 -106
  3. package/dist/kdesign.css +108 -84
  4. package/dist/kdesign.css.map +1 -1
  5. package/dist/kdesign.js +758 -513
  6. package/dist/kdesign.js.map +1 -1
  7. package/dist/kdesign.min.css +3 -3
  8. package/dist/kdesign.min.js +8 -8
  9. package/dist/kdesign.min.js.map +1 -1
  10. package/es/_utils/hooks.js +1 -9
  11. package/es/carousel/style/index.css +3 -0
  12. package/es/carousel/style/index.less +4 -0
  13. package/es/cascader/style/index.css +7 -7
  14. package/es/cascader/style/token.less +2 -2
  15. package/es/config-provider/compDefaultProps.d.ts +5 -0
  16. package/es/config-provider/compDefaultProps.js +6 -1
  17. package/es/date-picker/date-picker.js +11 -14
  18. package/es/date-picker/panel/month/month.d.ts +0 -1
  19. package/es/date-picker/panel/month/month.js +6 -4
  20. package/es/date-picker/range/input-range.js +41 -11
  21. package/es/date-picker/range-picker.js +8 -11
  22. package/es/date-picker/single/input-date.js +40 -10
  23. package/es/date-picker/style/index.css +27 -23
  24. package/es/date-picker/style/index.less +16 -33
  25. package/es/date-picker/style/mixin.less +7 -0
  26. package/es/date-picker/style/token.less +2 -1
  27. package/es/form/Field.d.ts +1 -0
  28. package/es/form/Field.js +9 -5
  29. package/es/form/FieldLabel.d.ts +1 -0
  30. package/es/form/FieldLabel.js +4 -2
  31. package/es/input/ClearableLabeledInput.js +23 -5
  32. package/es/input/TextArea.d.ts +1 -0
  33. package/es/input/TextArea.js +8 -6
  34. package/es/input/style/index.css +12 -8
  35. package/es/input/style/index.less +9 -5
  36. package/es/input/style/mixin.less +3 -3
  37. package/es/input/style/token.less +2 -0
  38. package/es/search/style/index.css +3 -1
  39. package/es/search/style/index.less +3 -1
  40. package/es/search/style/token.less +2 -1
  41. package/es/select/interface.d.ts +2 -0
  42. package/es/select/option.js +1 -1
  43. package/es/select/select.js +180 -128
  44. package/es/select/style/index.css +54 -24
  45. package/es/select/style/index.less +60 -43
  46. package/es/select/style/mixin.less +0 -2
  47. package/es/select/style/token.less +2 -0
  48. package/es/split-panel/style/index.css +0 -6
  49. package/es/split-panel/style/index.less +0 -3
  50. package/es/steps/style/index.css +0 -13
  51. package/es/steps/style/index.less +0 -11
  52. package/es/table/feature/mergeCellHover.d.ts +3 -0
  53. package/es/table/feature/mergeCellHover.js +7 -0
  54. package/es/table/interface.d.ts +8 -0
  55. package/es/table/table.d.ts +2 -2
  56. package/es/table/table.js +20 -6
  57. package/es/tooltip/style/index.css +1 -1
  58. package/es/tooltip/style/token.less +1 -1
  59. package/lib/_utils/hooks.js +1 -9
  60. package/lib/carousel/style/index.css +3 -0
  61. package/lib/carousel/style/index.less +4 -0
  62. package/lib/cascader/style/index.css +7 -7
  63. package/lib/cascader/style/token.less +2 -2
  64. package/lib/config-provider/compDefaultProps.d.ts +5 -0
  65. package/lib/config-provider/compDefaultProps.js +6 -1
  66. package/lib/date-picker/date-picker.js +10 -16
  67. package/lib/date-picker/panel/month/month.d.ts +0 -1
  68. package/lib/date-picker/panel/month/month.js +10 -8
  69. package/lib/date-picker/range/input-range.js +40 -11
  70. package/lib/date-picker/range-picker.js +7 -13
  71. package/lib/date-picker/single/input-date.js +37 -9
  72. package/lib/date-picker/style/index.css +27 -23
  73. package/lib/date-picker/style/index.less +16 -33
  74. package/lib/date-picker/style/mixin.less +7 -0
  75. package/lib/date-picker/style/token.less +2 -1
  76. package/lib/form/Field.d.ts +1 -0
  77. package/lib/form/Field.js +10 -6
  78. package/lib/form/FieldLabel.d.ts +1 -0
  79. package/lib/form/FieldLabel.js +4 -2
  80. package/lib/input/ClearableLabeledInput.js +34 -5
  81. package/lib/input/TextArea.d.ts +1 -0
  82. package/lib/input/TextArea.js +9 -7
  83. package/lib/input/style/index.css +12 -8
  84. package/lib/input/style/index.less +9 -5
  85. package/lib/input/style/mixin.less +3 -3
  86. package/lib/input/style/token.less +2 -0
  87. package/lib/search/style/index.css +3 -1
  88. package/lib/search/style/index.less +3 -1
  89. package/lib/search/style/token.less +2 -1
  90. package/lib/select/interface.d.ts +2 -0
  91. package/lib/select/option.js +1 -1
  92. package/lib/select/select.js +179 -126
  93. package/lib/select/style/index.css +54 -24
  94. package/lib/select/style/index.less +60 -43
  95. package/lib/select/style/mixin.less +0 -2
  96. package/lib/select/style/token.less +2 -0
  97. package/lib/split-panel/style/index.css +0 -6
  98. package/lib/split-panel/style/index.less +0 -3
  99. package/lib/steps/style/index.css +0 -13
  100. package/lib/steps/style/index.less +0 -11
  101. package/lib/table/feature/mergeCellHover.d.ts +3 -0
  102. package/lib/table/feature/mergeCellHover.js +15 -0
  103. package/lib/table/interface.d.ts +8 -0
  104. package/lib/table/table.d.ts +2 -2
  105. package/lib/table/table.js +20 -4
  106. package/lib/tooltip/style/index.css +1 -1
  107. package/lib/tooltip/style/token.less +1 -1
  108. package/package.json +1 -1
@@ -4,8 +4,6 @@
4
4
 
5
5
 
6
6
  @datePicker-prefix-cls: ~'@{kd-prefix}-date-picker';
7
- // @rangePicker-prefix-cls: ~'@{kd-prefix}-rangePicker';
8
- // @datePicker-prefix-cls-input: ~'@{datePicker-prefix-cls}-input';
9
7
  @datePicker-prefix-cls-panel: ~'@{datePicker-prefix-cls}-panel';
10
8
 
11
9
  @datePicker-calendar-text: 24px;
@@ -21,14 +19,6 @@
21
19
  input {
22
20
  font-size: @date-small-font-size;
23
21
  }
24
-
25
- .@{datePicker-prefix-cls}-clear {
26
- right: calc(@date-small-font-size + 1px);
27
- }
28
-
29
- &.@{datePicker-prefix-cls}-range .@{datePicker-prefix-cls}-clear {
30
- right: calc(@date-small-font-size + 12px);
31
- }
32
22
  }
33
23
 
34
24
  &-large {
@@ -37,14 +27,6 @@
37
27
  input {
38
28
  font-size: @date-large-font-size;
39
29
  }
40
-
41
- .@{datePicker-prefix-cls}-clear {
42
- right:calc(@date-large-font-size + 1px);
43
- }
44
-
45
- &.@{datePicker-prefix-cls}-range .@{datePicker-prefix-cls}-clear {
46
- right: calc(@date-large-font-size + 9px);
47
- }
48
30
  }
49
31
 
50
32
  &-middle {
@@ -53,14 +35,6 @@
53
35
  input {
54
36
  font-size: @date-middle-font-size;
55
37
  }
56
-
57
- .@{datePicker-prefix-cls}-clear {
58
- right: calc(@date-middle-font-size + 1px);
59
- }
60
-
61
- &.@{datePicker-prefix-cls}-range .@{datePicker-prefix-cls}-clear {
62
- right: calc(@date-middle-font-size + 11px);
63
- }
64
38
  }
65
39
 
66
40
  &-input {
@@ -102,6 +76,7 @@
102
76
 
103
77
  &-range {
104
78
  display: inline-flex;
79
+ align-items: center;
105
80
  position: relative;
106
81
 
107
82
  &-separator {
@@ -146,15 +121,12 @@
146
121
  .@{datePicker-prefix-cls}-clear {
147
122
  opacity: 1;
148
123
  }
149
-
150
- .@{datePicker-prefix-cls}-suffix {
151
- color: @date-color-background-checked;
152
- }
153
124
  }
154
125
 
155
126
  &-clear {
156
127
  position: absolute;
157
128
  top: 50%;
129
+ right: 0;
158
130
  color: @date-icon-color;
159
131
  line-height: 1;
160
132
  background: @date-clear-background-color;
@@ -167,7 +139,19 @@
167
139
  }
168
140
 
169
141
  &:hover {
170
- color: @date-clear-background-color-hover;
142
+ color: @date-icon-color-hover;
143
+ }
144
+ }
145
+
146
+ .@{datePicker-prefix-cls}-range-clear {
147
+ align-self: center;
148
+ margin-left: @date-suffix-spacing-margin-left;
149
+ color: @date-icon-color;
150
+ line-height: 1;
151
+ cursor: pointer;
152
+
153
+ &:hover {
154
+ color: @date-icon-color-hover;
171
155
  }
172
156
  }
173
157
 
@@ -809,8 +793,6 @@
809
793
  }
810
794
  }
811
795
  }
812
-
813
-
814
796
  }
815
797
 
816
798
  .@{datePicker-prefix-cls}-container {
@@ -834,6 +816,7 @@
834
816
  line-height: @date-panel-header-height;
835
817
  font-size: @date-container-font-size;
836
818
  border-bottom: .5px solid @date-container-color-border;
819
+ cursor: pointer;
837
820
  }
838
821
  }
839
822
  }
@@ -1,5 +1,8 @@
1
+ @import '../../style/themes/index';
1
2
  @import './token.less';
2
3
 
4
+ @datePicker-prefix-cls: ~'@{kd-prefix}-date-picker';
5
+
3
6
  .input-wrapper() {
4
7
  display: inline-flex;
5
8
  border: 1px solid @date-input-color-border;
@@ -71,6 +74,10 @@
71
74
  line-height: calc(@height - (@padding-vertical * 2) - 2);
72
75
  font-size: @fonSize;
73
76
  padding: @padding-vertical @padding-horizontal;
77
+
78
+ &.@{datePicker-prefix-cls}-underline {
79
+ padding: @padding-vertical 0;
80
+ }
74
81
  }
75
82
 
76
83
  .today-after(@background) {
@@ -13,7 +13,8 @@
13
13
  @date-input-color-background: var(~'@{date-picker-custom-prefix}-input-color-background', @color-white);
14
14
  @date-input-color-background-disabled: var(~'@{date-picker-custom-prefix}-input-color-background-disabled', @color-background-contain-disabled);
15
15
  @date-input-color-focus: var(~'@{date-picker-custom-prefix}-input-color-focused', @color-text-primary);
16
- @date-icon-color: var(~'@{date-picker-custom-prefix}-icon-color', @color-disabled);
16
+ @date-icon-color: var(~'@{date-picker-custom-prefix}-icon-color', #d9d9d9);
17
+ @date-icon-color-hover: var(~'@{date-picker-custom-prefix}-icon-color-hover', #999);
17
18
  @date-clear-background-color: var(~'@{date-picker-custom-prefix}-clear-color-background', @color-background);
18
19
  @date-clear-background-color-hover: var(~'@{date-picker-custom-prefix}-clear-color-background-hover', @color-theme-5);
19
20
  @date-clear-background-color-focused: var(~'@{date-picker-custom-prefix}-clear-color-background-focused', @color-theme);
@@ -10,6 +10,7 @@ export interface FormItemProps {
10
10
  labelWidth?: string | number;
11
11
  labelAlign?: LabelAlign;
12
12
  name: NamePath;
13
+ htmlFor?: string;
13
14
  prefixCls?: string;
14
15
  required?: boolean;
15
16
  rules?: Rule[];
package/lib/form/Field.js CHANGED
@@ -23,10 +23,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/hel
23
23
 
24
24
  var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
25
25
 
26
- var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
27
-
28
26
  var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
29
27
 
28
+ var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
29
+
30
30
  var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
31
31
 
32
32
  var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
@@ -112,7 +112,7 @@ var INNER_VALUE_PROPS_LIST = [{
112
112
  }];
113
113
 
114
114
  var Field = function Field(props) {
115
- var _classnames;
115
+ var _context, _classnames;
116
116
 
117
117
  var _a;
118
118
 
@@ -146,6 +146,7 @@ var Field = function Field(props) {
146
146
  setDefaultValues = _getInternalHooks.setDefaultValues;
147
147
 
148
148
  var name = props.name,
149
+ customizeHtmlFor = props.htmlFor,
149
150
  children = props.children,
150
151
  className = props.className,
151
152
  disabled = props.disabled,
@@ -161,6 +162,7 @@ var Field = function Field(props) {
161
162
  validateTrigger = props.validateTrigger,
162
163
  defaultValue = props.defaultValue,
163
164
  valuePropName = props.valuePropName;
165
+ var htmlFor = customizeHtmlFor || (name ? (0, _concat.default)(_context = "form_".concat(name, "_")).call(_context, (Math.random() * 100).toFixed(0)) : undefined);
164
166
  var childrenNode = null;
165
167
  var innerValuePropName = 'value';
166
168
  var childrenArray = (0, _reactChildren.toArray)(children);
@@ -216,11 +218,11 @@ var Field = function Field(props) {
216
218
  if (Array.isArray(rules) && !rules.some(function (rule) {
217
219
  return Object.prototype.hasOwnProperty.call(rule, 'required');
218
220
  }) && required) {
219
- var _context;
221
+ var _context2;
220
222
 
221
223
  rules.push({
222
224
  required: true,
223
- message: (0, _concat.default)(_context = "".concat(local && local.requiredMessage)).call(_context, label)
225
+ message: (0, _concat.default)(_context2 = "".concat(local && local.requiredMessage)).call(_context2, label)
224
226
  });
225
227
  }
226
228
 
@@ -340,6 +342,7 @@ var Field = function Field(props) {
340
342
  return /*#__PURE__*/_react.default.createElement("div", {
341
343
  className: formItemClassName
342
344
  }, /*#__PURE__*/_react.default.createElement(_FieldLabel.default, {
345
+ htmlFor: htmlFor,
343
346
  value: label,
344
347
  width: labelWidth,
345
348
  textAlign: labelAlign,
@@ -351,7 +354,8 @@ var Field = function Field(props) {
351
354
  var keys = mergeProps((0, _extends5.default)((0, _extends5.default)((0, _defineProperty2.default)({
352
355
  disabled: disabled
353
356
  }, innerValuePropName, value), trigger), {
354
- key: index
357
+ key: index,
358
+ id: customizeHtmlFor ? undefined : htmlFor
355
359
  }), child);
356
360
  return child ? /*#__PURE__*/_react.default.cloneElement(child, keys) : child;
357
361
  })));
@@ -5,6 +5,7 @@ export interface FieldLabelProps {
5
5
  width?: string | number;
6
6
  textAlign?: LabelAlign;
7
7
  prefixCls?: string;
8
+ htmlFor?: string;
8
9
  requiredMark?: boolean;
9
10
  }
10
11
  declare const FieldLabel: React.FC<FieldLabelProps>;
@@ -46,7 +46,8 @@ var FieldLabel = function FieldLabel(props) {
46
46
  width = _getCompProps.width,
47
47
  textAlign = _getCompProps.textAlign,
48
48
  customizePrefixCls = _getCompProps.prefixCls,
49
- requiredMark = _getCompProps.requiredMark;
49
+ requiredMark = _getCompProps.requiredMark,
50
+ htmlFor = _getCompProps.htmlFor;
50
51
 
51
52
  if (value === undefined) return null;
52
53
  var fieldLabelPrefixCls = getPrefixCls === null || getPrefixCls === void 0 ? void 0 : getPrefixCls(prefixCls, 'form-field-label', customizePrefixCls);
@@ -62,7 +63,8 @@ var FieldLabel = function FieldLabel(props) {
62
63
  style: style
63
64
  }, /*#__PURE__*/_react.default.createElement("label", {
64
65
  className: labelClassName,
65
- title: value
66
+ title: value,
67
+ htmlFor: htmlFor
66
68
  }, value));
67
69
  };
68
70
 
@@ -1,5 +1,11 @@
1
1
  "use strict";
2
2
 
3
+ var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
4
+
5
+ var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
6
+
7
+ var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
8
+
3
9
  var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
4
10
 
5
11
  Object.defineProperty(exports, "__esModule", {
@@ -12,7 +18,9 @@ var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
12
18
 
13
19
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
14
20
 
15
- var _react = _interopRequireDefault(require("react"));
21
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
22
+
23
+ var _react = _interopRequireWildcard(require("react"));
16
24
 
17
25
  var _index = require("../index");
18
26
 
@@ -20,6 +28,10 @@ var _classnames = _interopRequireDefault(require("classnames"));
20
28
 
21
29
  var _type = require("../_utils/type");
22
30
 
31
+ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
32
+
33
+ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
34
+
23
35
  var ClearableInputType = (0, _type.tuple)('input', 'text');
24
36
 
25
37
  function hasPrefixSuffix(props) {
@@ -45,6 +57,19 @@ var ClearableInput = function ClearableInput(props) {
45
57
  focused = props.focused,
46
58
  numberMark = props.numberMark;
47
59
 
60
+ var _useState = (0, _react.useState)(false),
61
+ _useState2 = (0, _slicedToArray2.default)(_useState, 2),
62
+ isMouseEnter = _useState2[0],
63
+ setIsMouseEnter = _useState2[1];
64
+
65
+ var mouseEnterHandle = function mouseEnterHandle() {
66
+ setIsMouseEnter(true);
67
+ };
68
+
69
+ var mouseLeaveHandle = function mouseLeaveHandle() {
70
+ setIsMouseEnter(false);
71
+ };
72
+
48
73
  var renderClearIcon = function renderClearIcon() {
49
74
  var _classNames;
50
75
 
@@ -52,13 +77,13 @@ var ClearableInput = function ClearableInput(props) {
52
77
  return null;
53
78
  }
54
79
 
55
- var needClear = !disabled && value;
80
+ var needClear = !disabled && value && isMouseEnter;
56
81
  var clearIconclasses = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-textarea-clear-icon"), inputType === ClearableInputType[1]), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-clear-icon"), inputType === ClearableInputType[0]), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-clear-icon-hidden"), !needClear), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-clear-icon-rightSpace"), suffix), _classNames));
57
82
  return /*#__PURE__*/_react.default.createElement("span", {
58
83
  onClick: handleReset,
59
84
  className: clearIconclasses
60
85
  }, typeof allowClear === 'boolean' ? /*#__PURE__*/_react.default.createElement(_index.Icon, {
61
- type: "close"
86
+ type: "close-solid"
62
87
  }) : allowClear);
63
88
  };
64
89
 
@@ -86,7 +111,9 @@ var ClearableInput = function ClearableInput(props) {
86
111
  var inputWrapperClasses = (0, _classnames.default)((_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-wrapper"), true), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-wrapper-focused"), focused && !disabled), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-wrapper-disabled"), disabled), (0, _defineProperty2.default)(_classNames2, (0, _concat.default)(_context = "".concat(prefixCls, "-wrapper-size-")).call(_context, size), size), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-wrapper-borderless"), borderType === 'none'), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-wrapper-underline"), borderType === 'underline'), _classNames2), (0, _defineProperty2.default)({}, className, className && !addonBefore && !addonAfter));
87
112
  return /*#__PURE__*/_react.default.createElement("span", {
88
113
  className: inputWrapperClasses,
89
- style: style
114
+ style: style,
115
+ onMouseEnter: mouseEnterHandle,
116
+ onMouseLeave: mouseLeaveHandle
90
117
  }, prefixNode, /*#__PURE__*/_react.default.cloneElement(originElement, {
91
118
  style: null
92
119
  }), suffixNode);
@@ -148,7 +175,9 @@ var ClearableInput = function ClearableInput(props) {
148
175
  var textAreaWrapperClasses = (0, _classnames.default)(className, (0, _defineProperty2.default)({}, "".concat(prefixCls, "-wrapper-textarea"), true));
149
176
  return /*#__PURE__*/_react.default.createElement("span", {
150
177
  className: textAreaWrapperClasses,
151
- style: wrapperStyle
178
+ style: wrapperStyle,
179
+ onMouseEnter: mouseEnterHandle,
180
+ onMouseLeave: mouseLeaveHandle
152
181
  }, originElement, renderClearIcon(), numberMark && numberMark);
153
182
  };
154
183
 
@@ -5,6 +5,7 @@ export interface textAreaProps extends React.TextareaHTMLAttributes<HTMLInputEle
5
5
  borderType?: BorderType;
6
6
  defaultValue?: string;
7
7
  count?: boolean;
8
+ countPosition?: string;
8
9
  value?: any;
9
10
  canResize?: boolean;
10
11
  disabled?: boolean;
@@ -13,10 +13,10 @@ Object.defineProperty(exports, "__esModule", {
13
13
  });
14
14
  exports.default = void 0;
15
15
 
16
- var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
17
-
18
16
  var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
19
17
 
18
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
19
+
20
20
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
21
21
 
22
22
  var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
@@ -81,6 +81,7 @@ var InternalTextarea = function InternalTextarea(props, ref) {
81
81
  borderType = textAreaProps.borderType,
82
82
  defaultValue = textAreaProps.defaultValue,
83
83
  count = textAreaProps.count,
84
+ countPosition = textAreaProps.countPosition,
84
85
  autoSize = textAreaProps.autoSize,
85
86
  className = textAreaProps.className,
86
87
  customPrefixcls = textAreaProps.prefixCls,
@@ -93,7 +94,7 @@ var InternalTextarea = function InternalTextarea(props, ref) {
93
94
  placeholder = textAreaProps.placeholder,
94
95
  style = textAreaProps.style,
95
96
  size = textAreaProps.size,
96
- others = __rest(textAreaProps, ["value", "allowClear", "borderType", "defaultValue", "count", "autoSize", "className", "prefixCls", "canResize", "maxLength", "disabled", "onBlur", "onFocus", "onChange", "placeholder", "style", "size"]);
97
+ others = __rest(textAreaProps, ["value", "allowClear", "borderType", "defaultValue", "count", "countPosition", "autoSize", "className", "prefixCls", "canResize", "maxLength", "disabled", "onBlur", "onFocus", "onChange", "placeholder", "style", "size"]);
97
98
 
98
99
  var textAreaPrefixCls = getPrefixCls(prefixCls, 'input', customPrefixcls); // TextArea样式前缀
99
100
 
@@ -148,7 +149,7 @@ var InternalTextarea = function InternalTextarea(props, ref) {
148
149
  };
149
150
 
150
151
  var handleBlur = function handleBlur(e) {
151
- showNumberMark && setShowNumberMark(false);
152
+ // showNumberMark && setShowNumberMark(false)
152
153
  onBlur && onBlur(e);
153
154
  };
154
155
 
@@ -177,8 +178,9 @@ var InternalTextarea = function InternalTextarea(props, ref) {
177
178
  }
178
179
 
179
180
  if (count && showNumberMark && !disabled && maxLength !== '' && maxLength >= 0) {
181
+ var countClass = (0, _classnames.default)("".concat(textAreaPrefixCls, "-textarea-mark"), (0, _defineProperty2.default)({}, "".concat(textAreaPrefixCls, "-textarea-mark-inner"), countPosition === 'inner'));
180
182
  return /*#__PURE__*/_react.default.createElement("div", {
181
- className: "".concat(textAreaPrefixCls, "-textarea-mark")
183
+ className: countClass
182
184
  }, enteredLength, "/", maxLength);
183
185
  }
184
186
 
@@ -195,7 +197,7 @@ var InternalTextarea = function InternalTextarea(props, ref) {
195
197
  }, [propsValue, setValue]);
196
198
 
197
199
  var renderTextArea = function renderTextArea(prefixCls) {
198
- var _context, _classNames, _context2;
200
+ var _context, _classNames2, _context2;
199
201
 
200
202
  var hadCount = count && !disabled && !allowClear;
201
203
 
@@ -227,7 +229,7 @@ var InternalTextarea = function InternalTextarea(props, ref) {
227
229
  ref: textareaRef,
228
230
  disabled: disabled,
229
231
  style: (0, _extends2.default)({}, textareaStyles, hadCount || !!allowClear ? otherStyles : style),
230
- className: (0, _classnames.default)("".concat(prefixCls, "-textarea"), (_classNames = {}, (0, _defineProperty2.default)(_classNames, (0, _concat.default)(_context = "".concat(prefixCls, "-size-")).call(_context, size), size), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-borderless"), borderType === 'none'), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-underline"), borderType === 'underline'), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-no-resize"), canResize !== true), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-allowClear-spacing"), !!allowClear), _classNames), (0, _defineProperty2.default)({}, className, className && !allowClear && !hadCount)),
232
+ className: (0, _classnames.default)("".concat(prefixCls, "-textarea"), (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, (0, _concat.default)(_context = "".concat(prefixCls, "-size-")).call(_context, size), size), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-borderless"), borderType === 'none'), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-underline"), borderType === 'underline'), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-disabled"), disabled), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-no-resize"), canResize !== true), (0, _defineProperty2.default)(_classNames2, "".concat(prefixCls, "-allowClear-spacing"), !!allowClear), _classNames2), (0, _defineProperty2.default)({}, className, className && !allowClear && !hadCount)),
231
233
  onChange: handleChange,
232
234
  onFocus: !disabled ? handleFocus : undefined,
233
235
  onBlur: !disabled ? handleBlur : undefined,
@@ -205,6 +205,13 @@ textarea {
205
205
  z-index: 1;
206
206
  color: var(--kd-c-input-placeholder-color-text, var(--kd-g-color-text-placeholder, #ccc));
207
207
  font-size: var(--kd-c-input-font-size-small, var(--kd-g-font-size-small, 12px));
208
+ line-height: 18px;
209
+ background-color: #fff;
210
+ }
211
+ .kd-input-textarea-mark-inner {
212
+ top: auto;
213
+ bottom: 5px;
214
+ right: 8px;
208
215
  }
209
216
  .kd-input-no-resize {
210
217
  resize: none;
@@ -356,10 +363,6 @@ textarea {
356
363
  .kd-input-wrapper-focused {
357
364
  border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
358
365
  }
359
- .kd-input-wrapper-focused .kd-input-clear-icon,
360
- .kd-input-wrapper-focused .kd-input-textarea-clear-icon {
361
- color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
362
- }
363
366
  .kd-input-wrapper-disabled {
364
367
  background-color: var(--kd-c-input-color-background-disabled, var(--kd-g-color-background-contain-disabled, #f5f5f5));
365
368
  border-color: var(--kd-c-input-color-border-disabled, var(--kd-g-color-border-strong, #d9d9d9));
@@ -411,22 +414,23 @@ textarea {
411
414
  }
412
415
  .kd-input-wrapper-textarea .kd-input-textarea-clear-icon {
413
416
  position: absolute;
417
+ z-index: 2;
414
418
  right: 8px;
415
- top: -2px;
419
+ top: 3px;
416
420
  }
417
421
  .kd-input-clear-icon,
418
422
  .kd-input-textarea-clear-icon {
419
423
  cursor: pointer;
420
- color: var(--kd-c-input-color-border, #999);
424
+ color: var(--kd-c-input-clear-color, #d9d9d9);
421
425
  }
422
426
  .kd-input-clear-icon:hover,
423
427
  .kd-input-textarea-clear-icon:hover {
424
- color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
428
+ color: var(--kd-c-input-clear-color-hover, #999);
425
429
  }
426
430
  .kd-input-clear-icon i,
427
431
  .kd-input-textarea-clear-icon i {
428
432
  vertical-align: middle;
429
- font-size: 12px !important;
433
+ font-size: 16px;
430
434
  }
431
435
  .kd-input-clear-icon-hidden {
432
436
  visibility: hidden;
@@ -37,7 +37,14 @@ textarea {
37
37
  z-index: 1;
38
38
  color: @input-placeholder-color-inner;
39
39
  font-size: @input-small-font-size-inner;
40
+ line-height: 18px;
41
+ background-color: #fff;
40
42
  }
43
+ &-mark-inner {
44
+ top: auto;
45
+ bottom: 5px;
46
+ right: 8px;
47
+ }
41
48
  }
42
49
  &-no-resize {
43
50
  resize: none;
@@ -121,10 +128,6 @@ textarea {
121
128
 
122
129
  &-focused {
123
130
  border-color: @input-border-color-focused;
124
-
125
- .@{input-prefix-cls}-clear-icon, .@{input-prefix-cls}-textarea-clear-icon {
126
- color: @input-border-color-focused;
127
- }
128
131
  }
129
132
 
130
133
  &-disabled {
@@ -146,8 +149,9 @@ textarea {
146
149
  .@{input-prefix-cls} {
147
150
  &-textarea-clear-icon {
148
151
  position: absolute;
152
+ z-index: 2;
149
153
  right: 8px;
150
- top: -2px;
154
+ top: 3px;
151
155
  }
152
156
  }
153
157
  }
@@ -47,15 +47,15 @@
47
47
 
48
48
  .input-clear-icon() {
49
49
  cursor: pointer;
50
- color: @input-color-border;
50
+ color: @input-clear-color;
51
51
 
52
52
  &:hover {
53
- color: @input-border-color-focused;
53
+ color: @input-clear-color-hover;
54
54
  }
55
55
 
56
56
  i {
57
57
  vertical-align: middle;
58
- font-size: 12px !important;
58
+ font-size: 16px;
59
59
  }
60
60
  }
61
61
 
@@ -7,6 +7,8 @@
7
7
  @input-font-color-inner: var(~'@{input-prefix}-color-text', @color-text-primary);
8
8
  @input-placeholder-color-inner: var(~'@{input-prefix}-placeholder-color-text', @color-text-placeholder);
9
9
  @input-color-border: var(~'@{input-prefix}-color-border', #999);
10
+ @input-clear-color: var(~'@{input-prefix}-clear-color', #d9d9d9);
11
+ @input-clear-color-hover: var(~'@{input-prefix}-clear-color-hover', #999);
10
12
  @input-background-color-inner: var(~'@{input-prefix}-color-background', @color-white);
11
13
  @input-background-color-disabled-inner: var(~'@{input-prefix}-color-background-disabled', @color-background-contain-disabled);
12
14
  @input-border-color-focused: var(~'@{input-prefix}-color-border-focused', @color-theme);
@@ -205,6 +205,7 @@
205
205
  }
206
206
  .kd-search-border {
207
207
  border: var(--kd-c-search-sizing-border-width, 1px) solid var(--kd-c-search-color-border, var(--kd-g-color-border-strong-2, #d9d9d9));
208
+ border-radius: var(--kd-c-search-radius-border, var(--kd-g-radius-border, 2px));
208
209
  }
209
210
  .kd-search-prefix,
210
211
  .kd-search-suffix {
@@ -238,6 +239,7 @@
238
239
  }
239
240
  .kd-quick-search-border {
240
241
  border: var(--kd-c-search-sizing-border-width, 1px) solid var(--kd-c-search-color-border, var(--kd-g-color-border-strong-2, #d9d9d9));
242
+ border-radius: var(--kd-c-search-radius-border, var(--kd-g-radius-border, 2px));
241
243
  }
242
244
  .kd-quick-search:hover:not(.kd-quick-search-disabled) {
243
245
  border-color: var(--kd-c-search-color-theme, var(--kd-g-color-theme, #5582f3));
@@ -414,7 +416,7 @@
414
416
  font-size: var(--kd-c-search-dropdown-font-size, 12px);
415
417
  -webkit-box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.2);
416
418
  box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.2);
417
- border-radius: var(--kd-c-search-radius-border, var(--kd-g-radius-border, 2px));
419
+ border-radius: var(--kd-c-search-dropdown-radius-border, var(--kd-g-radius-border, 2px));
418
420
  background: var(--kd-c-search-color-background, var(--kd-g-color-background, #fff));
419
421
  overflow: auto;
420
422
  }
@@ -27,6 +27,7 @@
27
27
 
28
28
  &-border {
29
29
  border: @search-sizing-border-width solid @quick-search-border-bottom-color;
30
+ border-radius: @search-border-radius;
30
31
  }
31
32
 
32
33
  &-prefix,
@@ -61,6 +62,7 @@
61
62
  }
62
63
  &-border {
63
64
  border: @search-sizing-border-width solid @quick-search-border-bottom-color;
65
+ border-radius: @search-border-radius;
64
66
  }
65
67
  &:hover:not(&-disabled) {
66
68
  border-color: @search-color-theme;
@@ -206,7 +208,7 @@
206
208
  z-index: @zIndex-popper;
207
209
  font-size: @quick-search-dropdown-font-size;
208
210
  box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.2);
209
- border-radius: @search-radius-size;
211
+ border-radius: @search-dropdown-border-radius;
210
212
  background: @search-color-background;
211
213
  overflow: auto;
212
214
  &-scroll {
@@ -57,4 +57,5 @@
57
57
  @search-transition-duration: var(~'@{search-prefix}-motion-duration', @duration-promptly);
58
58
 
59
59
  // radius
60
- @search-radius-size: var(~'@{search-prefix}-radius-border', @radius-border);
60
+ @search-dropdown-border-radius: var(~'@{search-prefix}-dropdown-radius-border', @radius-border);
61
+ @search-border-radius: var(~'@{search-prefix}-radius-border', @radius-border);
@@ -34,6 +34,8 @@ export interface AbstractSelectProps extends PopperProps {
34
34
  listHeight?: number;
35
35
  labelInValue?: boolean;
36
36
  maxTagPlaceholder?: React.ReactNode | ((omittedValues: LabeledValue[]) => React.ReactNode);
37
+ filterOption?: boolean | ((inputValue: string, option?: OptionsType) => boolean);
38
+ optionFilterProp?: string;
37
39
  }
38
40
  export interface LabeledValue {
39
41
  key?: string;
@@ -83,7 +83,7 @@ var InternalOption = function InternalOption(props, ref) {
83
83
 
84
84
  var titleText = (0, _typeof2.default)(children) !== 'object' ? children : null;
85
85
  var checkStyle = {
86
- height: '22px',
86
+ minHeight: '22px',
87
87
  background: 'none'
88
88
  };
89
89
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {