@kdcloudjs/kdesign 1.7.16 → 1.7.18

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 (56) hide show
  1. package/CHANGELOG.md +28 -0
  2. package/dist/kdesign-complete.less +35 -19
  3. package/dist/kdesign.css +28 -17
  4. package/dist/kdesign.css.map +1 -1
  5. package/dist/kdesign.js +198 -135
  6. package/dist/kdesign.js.map +1 -1
  7. package/dist/kdesign.min.css +3 -3
  8. package/dist/kdesign.min.js +6 -6
  9. package/dist/kdesign.min.js.map +1 -1
  10. package/es/card/card.js +27 -17
  11. package/es/carousel/carousel.js +3 -2
  12. package/es/carousel/slideList.d.ts +1 -0
  13. package/es/carousel/slideList.js +5 -2
  14. package/es/cascader/cascader.js +59 -60
  15. package/es/cascader/style/index.css +16 -6
  16. package/es/cascader/style/index.less +20 -6
  17. package/es/color-picker/color-picker-panel.js +4 -3
  18. package/es/color-picker/color-picker.js +4 -2
  19. package/es/color-picker/interface.d.ts +1 -0
  20. package/es/color-picker/style/index.css +4 -1
  21. package/es/color-picker/style/index.less +5 -1
  22. package/es/dropdown/dropdown.js +21 -8
  23. package/es/dropdown/style/index.css +3 -0
  24. package/es/dropdown/style/index.less +4 -0
  25. package/es/filter/scheme.js +2 -1
  26. package/es/filter/style/index.css +2 -1
  27. package/es/filter/style/index.less +3 -2
  28. package/es/input/ClearableLabeledInput.js +9 -1
  29. package/es/select/option.js +6 -2
  30. package/es/select/select.js +32 -14
  31. package/es/select/style/index.css +2 -8
  32. package/es/select/style/index.less +3 -10
  33. package/lib/card/card.js +27 -17
  34. package/lib/carousel/carousel.js +3 -2
  35. package/lib/carousel/slideList.d.ts +1 -0
  36. package/lib/carousel/slideList.js +5 -2
  37. package/lib/cascader/cascader.js +58 -59
  38. package/lib/cascader/style/index.css +16 -6
  39. package/lib/cascader/style/index.less +20 -6
  40. package/lib/color-picker/color-picker-panel.js +4 -3
  41. package/lib/color-picker/color-picker.js +4 -2
  42. package/lib/color-picker/interface.d.ts +1 -0
  43. package/lib/color-picker/style/index.css +4 -1
  44. package/lib/color-picker/style/index.less +5 -1
  45. package/lib/dropdown/dropdown.js +21 -8
  46. package/lib/dropdown/style/index.css +3 -0
  47. package/lib/dropdown/style/index.less +4 -0
  48. package/lib/filter/scheme.js +2 -1
  49. package/lib/filter/style/index.css +2 -1
  50. package/lib/filter/style/index.less +3 -2
  51. package/lib/input/ClearableLabeledInput.js +8 -0
  52. package/lib/select/option.js +6 -2
  53. package/lib/select/select.js +32 -14
  54. package/lib/select/style/index.css +2 -8
  55. package/lib/select/style/index.less +3 -10
  56. package/package.json +1 -1
package/es/card/card.js CHANGED
@@ -1,4 +1,13 @@
1
1
  import _extends from "@babel/runtime-corejs3/helpers/extends";
2
+ import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
3
+ var __rest = this && this.__rest || function (s, e) {
4
+ var t = {};
5
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
6
+ if (s != null && typeof _Object$getOwnPropertySymbols === "function") for (var i = 0, p = _Object$getOwnPropertySymbols(s); i < p.length; i++) {
7
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
8
+ }
9
+ return t;
10
+ };
2
11
  import * as React from 'react';
3
12
  import classNames from 'classnames';
4
13
  import Checkbox from '../checkbox';
@@ -10,31 +19,32 @@ var Card = /*#__PURE__*/React.forwardRef(function (props, ref) {
10
19
  pkgPrefixCls = _React$useContext.prefixCls,
11
20
  userDefaultProps = _React$useContext.compDefaultProps;
12
21
  // 属性需要合并一遍用户定义的默认属性
13
- var _getCompProps = getCompProps('Card', userDefaultProps, props),
14
- tags = _getCompProps.tags,
15
- style = _getCompProps.style,
16
- title = _getCompProps.title,
17
- avatar = _getCompProps.avatar,
18
- actions = _getCompProps.actions,
19
- extra = _getCompProps.extra,
20
- children = _getCompProps.children,
21
- className = _getCompProps.className,
22
- hoverable = _getCompProps.hoverable,
23
- headStyle = _getCompProps.headStyle,
24
- bodyStyle = _getCompProps.bodyStyle,
25
- selectable = _getCompProps.selectable,
26
- checkboxProps = _getCompProps.checkboxProps,
27
- customPrefixcls = _getCompProps.prefixCls;
22
+ var _a = getCompProps('Card', userDefaultProps, props),
23
+ tags = _a.tags,
24
+ style = _a.style,
25
+ title = _a.title,
26
+ avatar = _a.avatar,
27
+ actions = _a.actions,
28
+ extra = _a.extra,
29
+ children = _a.children,
30
+ className = _a.className,
31
+ hoverable = _a.hoverable,
32
+ headStyle = _a.headStyle,
33
+ bodyStyle = _a.bodyStyle,
34
+ selectable = _a.selectable,
35
+ checkboxProps = _a.checkboxProps,
36
+ customPrefixcls = _a.prefixCls,
37
+ others = __rest(_a, ["tags", "style", "title", "avatar", "actions", "extra", "children", "className", "hoverable", "headStyle", "bodyStyle", "selectable", "checkboxProps", "prefixCls"]);
28
38
  // className前缀
29
39
  var prefixCls = getPrefixCls(pkgPrefixCls, 'card', customPrefixcls);
30
40
  var cardClassName = classNames(prefixCls, {
31
41
  hoverable: hoverable
32
42
  }, className);
33
- return /*#__PURE__*/React.createElement("div", {
43
+ return /*#__PURE__*/React.createElement("div", _extends({
34
44
  ref: ref,
35
45
  className: cardClassName,
36
46
  style: style
37
- }, title && !avatar && /*#__PURE__*/React.createElement("header", {
47
+ }, others), title && !avatar && /*#__PURE__*/React.createElement("header", {
38
48
  className: "".concat(prefixCls, "-header"),
39
49
  style: headStyle
40
50
  }, title), avatar && /*#__PURE__*/React.createElement("header", {
@@ -74,8 +74,8 @@ var InternalCarousel = function InternalCarousel(props, ref) {
74
74
  var setScrollXEffectStyle = React.useCallback(function () {
75
75
  var _context;
76
76
  if (!listRef.current) return;
77
- listRef.current.style.cssText = needAnimation ? _concatInstanceProperty(_context = "transform: translateX(".concat(posX, "px); transition:all 0.3s ")).call(_context, easing) : "transform: translateX(".concat(posX, "px); transition:'none'");
78
- }, [needAnimation, easing, posX]);
77
+ listRef.current.style.cssText = needAnimation ? _concatInstanceProperty(_context = "transform: translateX(".concat(posX, "px); transition:all 0.3s ")).call(_context, easing) : "transform: translateX(".concat(posX, "px); transition:none");
78
+ }, [children === null || children === void 0 ? void 0 : children.length, needAnimation, easing, posX]);
79
79
  var jumpTo = React.useCallback(function (index, needAnimation) {
80
80
  if (isFadeEffect) {
81
81
  if (index === -1 || index === children.length) index = 0;
@@ -213,6 +213,7 @@ var InternalCarousel = function InternalCarousel(props, ref) {
213
213
  content = /*#__PURE__*/React.createElement(SlideList, {
214
214
  items: children,
215
215
  parentPrefixCls: carouselPrefixCls,
216
+ currentIndex: currentIndex,
216
217
  ref: listRef
217
218
  });
218
219
  }
@@ -6,6 +6,7 @@ declare type ItemType = {
6
6
  export interface SlideListProps {
7
7
  parentPrefixCls: string;
8
8
  items: ItemType[];
9
+ currentIndex: number;
9
10
  }
10
11
  export declare const SlideList: React.ForwardRefExoticComponent<SlideListProps & React.RefAttributes<unknown>>;
11
12
  export {};
@@ -1,11 +1,14 @@
1
+ import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
1
2
  import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
2
3
  import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
3
4
  import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
5
+ import classNames from 'classnames';
4
6
  import React from 'react';
5
7
  export var SlideList = /*#__PURE__*/React.forwardRef(function (props, ref) {
6
8
  var _context2;
7
9
  var items = props.items,
8
- parentPrefixCls = props.parentPrefixCls;
10
+ parentPrefixCls = props.parentPrefixCls,
11
+ currentIndex = props.currentIndex;
9
12
  var slideListPrefixCls = "".concat(parentPrefixCls, "-list-slide");
10
13
  var listPrefixCls = "".concat(parentPrefixCls, "-list");
11
14
  var renderItems = function renderItems() {
@@ -13,7 +16,7 @@ export var SlideList = /*#__PURE__*/React.forwardRef(function (props, ref) {
13
16
  var _items = _concatInstanceProperty(_context = _sliceInstanceProperty(items).call(items, -1)).call(_context, items, _sliceInstanceProperty(items).call(items, 0, 1)); // 首位分别添加一项
14
17
  return _mapInstanceProperty(_items).call(_items, function (item, index) {
15
18
  return /*#__PURE__*/React.createElement("li", {
16
- className: "".concat(listPrefixCls, "-item"),
19
+ className: classNames("".concat(listPrefixCls, "-item"), _defineProperty({}, "".concat(listPrefixCls, "-item-active"), currentIndex === index - 1)),
17
20
  key: index
18
21
  }, item);
19
22
  });
@@ -16,7 +16,7 @@ var __rest = this && this.__rest || function (s, e) {
16
16
  }
17
17
  return t;
18
18
  };
19
- import React, { useMemo, useCallback } from 'react';
19
+ import React, { useMemo, useCallback, useState, useRef } from 'react';
20
20
  import classNames from 'classnames';
21
21
  import { tuple } from '../_utils/type';
22
22
  import { getCompProps } from '../_utils';
@@ -59,38 +59,41 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
59
59
  onPopupVisibleChange = allProps.onPopupVisibleChange,
60
60
  onPopperVisibleChange = allProps.onPopperVisibleChange,
61
61
  customPrefixcls = allProps.prefixCls,
62
+ customAllowClear = allProps.allowClear,
63
+ popupPlacement = allProps.popupPlacement,
64
+ maxTagCount = allProps.maxTagCount,
62
65
  otherProps = __rest(allProps
63
66
  // className前缀
64
- , ["mode", "style", "options", "bordered", "disabled", "children", "loadData", "clearIcon", "className", "fieldNames", "placeholder", "defaultValue", "maxTagPlaceholder", "displayRender", "expandTrigger", "changeOnSelect", "dropdownRender", "notFoundContent", "getPopupContainer", "defaultPopupVisible", "onPopupVisibleChange", "onPopperVisibleChange", "prefixCls"]);
67
+ , ["mode", "style", "options", "bordered", "disabled", "children", "loadData", "clearIcon", "className", "fieldNames", "placeholder", "defaultValue", "maxTagPlaceholder", "displayRender", "expandTrigger", "changeOnSelect", "dropdownRender", "notFoundContent", "getPopupContainer", "defaultPopupVisible", "onPopupVisibleChange", "onPopperVisibleChange", "prefixCls", "allowClear", "popupPlacement", "maxTagCount"]);
65
68
  // className前缀
66
69
  var prefixCls = getPrefixCls(pkgPrefixCls, 'cascader', customPrefixcls);
67
- var pickerRef = React.useRef();
68
- var triggerRef = React.useRef();
69
- var wrapperRef = React.useRef();
70
+ var pickerRef = useRef();
71
+ var triggerRef = useRef();
72
+ var wrapperRef = useRef();
70
73
  var mergeRef = ref || pickerRef;
71
- var _React$useState = React.useState(!!props.popperVisible || !!props.popupVisible || defaultPopupVisible),
72
- _React$useState2 = _slicedToArray(_React$useState, 2),
73
- visible = _React$useState2[0],
74
- setVisible = _React$useState2[1];
74
+ var _useState = useState(!!props.popperVisible || !!props.popupVisible || defaultPopupVisible),
75
+ _useState2 = _slicedToArray(_useState, 2),
76
+ visible = _useState2[0],
77
+ setVisible = _useState2[1];
75
78
  React.useEffect(function () {
76
79
  setVisible(!!props.popperVisible || !!props.popupVisible);
77
80
  }, [props.popperVisible, props.popupVisible]);
78
- var _React$useState3 = React.useState([options]),
79
- _React$useState4 = _slicedToArray(_React$useState3, 2),
80
- menus = _React$useState4[0],
81
- setMenus = _React$useState4[1];
82
- var _React$useState5 = React.useState([]),
83
- _React$useState6 = _slicedToArray(_React$useState5, 2),
84
- currentOptions = _React$useState6[0],
85
- setCurrentOptions = _React$useState6[1];
86
- var _React$useState7 = React.useState([]),
87
- _React$useState8 = _slicedToArray(_React$useState7, 2),
88
- selectedOptions = _React$useState8[0],
89
- setSelectedOptions = _React$useState8[1];
90
- var _React$useState9 = React.useState(props.value || defaultValue || []),
91
- _React$useState10 = _slicedToArray(_React$useState9, 2),
92
- value = _React$useState10[0],
93
- setValue = _React$useState10[1];
81
+ var _useState3 = useState([options]),
82
+ _useState4 = _slicedToArray(_useState3, 2),
83
+ menus = _useState4[0],
84
+ setMenus = _useState4[1];
85
+ var _useState5 = useState([]),
86
+ _useState6 = _slicedToArray(_useState5, 2),
87
+ currentOptions = _useState6[0],
88
+ setCurrentOptions = _useState6[1];
89
+ var _useState7 = useState([]),
90
+ _useState8 = _slicedToArray(_useState7, 2),
91
+ selectedOptions = _useState8[0],
92
+ setSelectedOptions = _useState8[1];
93
+ var _useState9 = useState(props.value || defaultValue || []),
94
+ _useState10 = _slicedToArray(_useState9, 2),
95
+ value = _useState10[0],
96
+ setValue = _useState10[1];
94
97
  React.useEffect(function () {
95
98
  props.value && setValue(props.value);
96
99
  }, [props.value]);
@@ -192,37 +195,10 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
192
195
  });
193
196
  });
194
197
  }, [currentOptions, isMultiple]);
195
- var allowClear = allProps.allowClear && value.length > 0;
196
- var locatorProps = {
197
- style: style,
198
- tabIndex: 0,
199
- className: classNames("".concat(prefixCls, "-picker"), className, {
200
- expand: visible,
201
- allowClear: allowClear,
202
- disabled: disabled
203
- })
204
- };
198
+ var allowClear = customAllowClear && value.length > 0;
205
199
  var handleClear = function handleClear() {
206
200
  onChange([]);
207
201
  };
208
- var inputProps = {
209
- value: value,
210
- placeholder: placeholder,
211
- readOnly: true,
212
- disabled: disabled,
213
- className: classNames("".concat(prefixCls, "-picker-input"), {
214
- expand: visible
215
- }),
216
- suffix: props.suffixIcon || /*#__PURE__*/React.createElement(Icon, {
217
- type: "arrow-down",
218
- className: classNames({
219
- expand: visible
220
- })
221
- })
222
- };
223
- if (bordered) {
224
- inputProps.borderType = 'bordered';
225
- }
226
202
  var renderSuffix = function renderSuffix() {
227
203
  var _classNames;
228
204
  var suffixIcon = allProps.suffixIcon;
@@ -260,8 +236,6 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
260
236
  };
261
237
  var renderMultiple = function renderMultiple() {
262
238
  var _classNames3, _classNames4;
263
- var maxTagCount = allProps.maxTagCount,
264
- maxTagPlaceholder = allProps.maxTagPlaceholder;
265
239
  var multipleCls = classNames((_classNames3 = {
266
240
  disabled: disabled
267
241
  }, _defineProperty(_classNames3, "".concat(prefixCls, "-multiple"), true), _defineProperty(_classNames3, "".concat(prefixCls, "-bordered"), bordered), _classNames3));
@@ -300,19 +274,44 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
300
274
  }, renderSuffix())));
301
275
  };
302
276
  var renderSingle = function renderSingle() {
303
- return /*#__PURE__*/React.createElement("span", _extends({}, locatorProps, {
277
+ var inputProps = {
278
+ value: value,
279
+ placeholder: placeholder,
280
+ readOnly: true,
281
+ borderType: bordered ? 'bordered' : 'underline',
282
+ disabled: disabled,
283
+ className: classNames("".concat(prefixCls, "-picker-input"), {
284
+ expand: visible
285
+ }),
286
+ suffix: props.suffixIcon || /*#__PURE__*/React.createElement(Icon, {
287
+ type: "arrow-down",
288
+ className: classNames({
289
+ expand: visible
290
+ })
291
+ })
292
+ };
293
+ var singleProps = {
294
+ style: style,
295
+ tabIndex: 0,
296
+ className: classNames("".concat(prefixCls, "-picker"), className, _defineProperty({
297
+ expand: visible,
298
+ allowClear: allowClear,
299
+ disabled: disabled
300
+ }, "".concat(prefixCls, "-bordered"), bordered))
301
+ };
302
+ return /*#__PURE__*/React.createElement("div", _extends({}, singleProps, {
304
303
  ref: mergeRef
305
304
  }, otherProps), React.Children.count(children) === 1 && children.type ? /*#__PURE__*/React.cloneElement(children, {
306
305
  ref: triggerRef
307
- }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
306
+ }) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
308
307
  ref: triggerRef
309
308
  }, /*#__PURE__*/React.createElement(Input, _extends({}, inputProps)), /*#__PURE__*/React.createElement("span", {
310
309
  className: "".concat(prefixCls, "-picker-label")
311
- }, (labels === null || labels === void 0 ? void 0 : labels.length) ? displayRender(labels, currentOptions) : '')), allowClear && /*#__PURE__*/React.createElement(Icon, {
310
+ }, (labels === null || labels === void 0 ? void 0 : labels.length) ? displayRender(labels, currentOptions) : ''), allowClear && /*#__PURE__*/React.createElement(Icon, {
312
311
  type: "close-solid",
313
312
  className: "".concat(prefixCls, "-picker-close"),
314
313
  onClick: handleClear
315
- })));
314
+ }))));
316
315
  };
317
316
  var cascaderLocator = isMultiple ? renderMultiple() : renderSingle();
318
317
  var onExpend = function onExpend(index, opt, opts) {
@@ -424,7 +423,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
424
423
  trigger: 'click',
425
424
  getPopupContainer: getPopupContainer,
426
425
  prefixCls: "".concat(prefixCls, "-menus"),
427
- placement: allProps.popperPlacement || allProps.popupPlacement,
426
+ placement: allProps.popperPlacement || popupPlacement,
428
427
  popperClassName: allProps.popperClassName || allProps.popupClassName,
429
428
  getTriggerElement: function getTriggerElement() {
430
429
  return triggerRef.current;
@@ -108,9 +108,9 @@
108
108
  /** 浮层箭头样式 **/
109
109
  .kd-cascader-picker {
110
110
  position: relative;
111
- display: inline-block;
112
111
  outline: none;
113
112
  cursor: pointer;
113
+ background: var(--kd-c-cascader-color-background, var(--kd-g-color-white, #fff));
114
114
  }
115
115
  .kd-cascader-picker:focus > .kd-cascader-picker-input {
116
116
  border-color: var(--kd-c-cascader-color-active, #999);
@@ -139,7 +139,7 @@
139
139
  left: 0;
140
140
  width: 100%;
141
141
  height: 20px;
142
- padding: 0 24px 0 9px;
142
+ padding: 0 24px 0 0;
143
143
  line-height: 20px;
144
144
  -webkit-transform: translateY(-50%);
145
145
  transform: translateY(-50%);
@@ -169,7 +169,7 @@
169
169
  -webkit-transition: all 0.2s;
170
170
  transition: all 0.2s;
171
171
  }
172
- .kd-cascader-picker.allowClear:hover > .kd-cascader-picker-close {
172
+ .kd-cascader-picker.allowClear:hover .kd-cascader-picker-close {
173
173
  opacity: 1;
174
174
  visibility: visible;
175
175
  -webkit-transition: all 0.2s;
@@ -186,7 +186,7 @@
186
186
  .kd-cascader-picker-close {
187
187
  position: absolute;
188
188
  top: 50%;
189
- right: 9px;
189
+ right: 0;
190
190
  opacity: 0;
191
191
  cursor: pointer;
192
192
  visibility: hidden;
@@ -278,11 +278,20 @@
278
278
  .kd-cascader-menus .kd-empty {
279
279
  padding: 10px 0 20px;
280
280
  }
281
- .kd-cascader-bordered {
281
+ .kd-cascader-bordered:not(.kd-cascader-multiple) .kd-cascader-picker-label {
282
+ padding-left: 9px;
283
+ }
284
+ .kd-cascader-bordered:not(.kd-cascader-multiple) .kd-cascader-picker-close {
285
+ right: 10px;
286
+ }
287
+ .kd-cascader-bordered.kd-cascader-multiple {
282
288
  border: 1px solid #d9d9d9;
283
- padding-left: 8px !important;
289
+ padding-left: 8px;
284
290
  border-radius: 2px;
285
291
  }
292
+ .kd-cascader-bordered.kd-cascader-multiple .kd-cascader-suffix {
293
+ right: 9px;
294
+ }
286
295
  .kd-cascader-multiple {
287
296
  padding: 1px 28px 1px 0;
288
297
  -webkit-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
@@ -301,6 +310,7 @@
301
310
  overflow-x: hidden;
302
311
  position: relative;
303
312
  border-bottom: 1px solid #d9d9d9;
313
+ background: var(--kd-c-cascader-color-background, var(--kd-g-color-white, #fff));
304
314
  }
305
315
  .kd-cascader-multiple-wrapper {
306
316
  display: -webkit-box;
@@ -8,9 +8,9 @@
8
8
 
9
9
  .@{cascader-picker-prefix-cls} {
10
10
  position: relative;
11
- display: inline-block;
12
11
  outline: none;
13
12
  cursor: pointer;
13
+ background: @cascader-bg-color;
14
14
 
15
15
  &:focus > &-input {
16
16
  border-color: @cascader-active-color;
@@ -47,7 +47,7 @@
47
47
  left: 0;
48
48
  width: 100%;
49
49
  height: 20px;
50
- padding: 0 24px 0 9px;
50
+ padding: 0 24px 0 0;
51
51
  line-height: 20px;
52
52
  transform: translateY(-50%);
53
53
  .ellipsis;
@@ -78,7 +78,7 @@
78
78
  }
79
79
 
80
80
  &.allowClear:hover {
81
- > .@{cascader-picker-prefix-cls}-close {
81
+ .@{cascader-picker-prefix-cls}-close {
82
82
  opacity: 1;
83
83
  visibility: visible;
84
84
  transition: all 0.2s;
@@ -95,7 +95,7 @@
95
95
  &-close {
96
96
  position: absolute;
97
97
  top: 50%;
98
- right: 9px;
98
+ right: 0;
99
99
  opacity: 0;
100
100
  cursor: pointer;
101
101
  visibility: hidden;
@@ -183,10 +183,23 @@
183
183
  }
184
184
 
185
185
  .@{kd-prefix}-cascader {
186
- &-bordered {
186
+ &-bordered:not(.@{kd-prefix}-cascader-multiple) {
187
+ .@{cascader-picker-prefix-cls}-label {
188
+ padding-left: 9px;
189
+ }
190
+ .@{cascader-picker-prefix-cls}-close {
191
+ right: 10px;
192
+ }
193
+ }
194
+
195
+ &-bordered&-multiple {
187
196
  border: 1px solid #d9d9d9;
188
- padding-left: 8px !important;
197
+ padding-left: 8px;
189
198
  border-radius: 2px;
199
+
200
+ .@{kd-prefix}-cascader-suffix {
201
+ right: 9px;
202
+ }
190
203
  }
191
204
 
192
205
  &-multiple {
@@ -203,6 +216,7 @@
203
216
  overflow-x: hidden;
204
217
  position: relative;
205
218
  border-bottom: 1px solid #d9d9d9;
219
+ background: @cascader-bg-color;
206
220
  }
207
221
 
208
222
  &-multiple-wrapper {
@@ -42,6 +42,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
42
42
  showColorTransfer = props.showColorTransfer,
43
43
  showPresetColor = props.showPresetColor,
44
44
  showColorPickerBox = props.showColorPickerBox,
45
+ showColorPickerPanel = props.showColorPickerPanel,
45
46
  value = props.value;
46
47
  var panelInputRef = useRef(null);
47
48
  var panelClsRef = useRef(null);
@@ -56,7 +57,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
56
57
  var panelFollowThemeCls = classNames("".concat(colorPickerPrefixCls, "-panel-switch"));
57
58
  var panelInputCls = classNames("".concat(colorPickerPrefixCls, "-panel-input"), _defineProperty({}, "".concat(colorPickerPrefixCls, "-panel-input-no-recommend"), !showPresetColor));
58
59
  var transparentCls = classNames("".concat(colorPickerPrefixCls, "-panel-transparent"));
59
- var colorDivContainerCls = classNames("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"));
60
+ var colorDivContainerCls = classNames("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), _defineProperty({}, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-unset-color"), (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) === 0));
60
61
  var colorLiClick = function colorLiClick(index, colorValue) {
61
62
  var formatArr = colorFormat(colorValue, alpha);
62
63
  var formatValue = toLowerCase(formatArr[valOfCorrespondingType(currentColorType)].value);
@@ -172,7 +173,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
172
173
  useOnClickOutside([panelClsRef, inputRef], function () {
173
174
  setShowPanel(false);
174
175
  });
175
- return /*#__PURE__*/React.createElement("div", {
176
+ return /*#__PURE__*/React.createElement(React.Fragment, null, showColorPickerPanel && /*#__PURE__*/React.createElement("div", {
176
177
  className: panelCls,
177
178
  ref: panelClsRef
178
179
  }, /*#__PURE__*/React.createElement(ChromePicker, {
@@ -229,7 +230,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
229
230
  'square-click': clickedColorIndex === i
230
231
  })
231
232
  }));
232
- })));
233
+ }))));
233
234
  };
234
235
  ColorPickerPanel.displayName = 'ColorPickerPanel';
235
236
  export default ColorPickerPanel;
@@ -79,6 +79,7 @@ var ColorPicker = function ColorPicker(props) {
79
79
  var containerCls = classNames("".concat(colorPickerPrefixCls, "-container"));
80
80
  var inputCls = classNames("".concat(colorPickerPrefixCls, "-input"), className);
81
81
  var inputRef = useRef(null);
82
+ var showColorPickerPanel = showColorTransfer || typeof showPresetColor === 'boolean' && showPresetColor && (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) || typeof showPresetColor === 'undefined' || (functionalColor === null || functionalColor === void 0 ? void 0 : functionalColor.length) && showSwitch || (showColorPickerBox === null || showColorPickerBox === void 0 ? void 0 : showColorPickerBox.showBox) || (showColorPickerBox === null || showColorPickerBox === void 0 ? void 0 : showColorPickerBox.showHue) || (showColorPickerBox === null || showColorPickerBox === void 0 ? void 0 : showColorPickerBox.showOpacity);
82
83
  var setIconColor = function setIconColor(value) {
83
84
  value === functionalColorName ? setIsFollow(true) : setIsFollow(false);
84
85
  var inpValue = value === functionalColorName ? functionalColor : value;
@@ -136,7 +137,7 @@ var ColorPicker = function ColorPicker(props) {
136
137
  style: {
137
138
  backgroundColor: "".concat(colTypeArr[2].value || defaultSystemColor)
138
139
  }
139
- }, /*#__PURE__*/React.createElement(Icon, {
140
+ }, showColorPickerPanel && /*#__PURE__*/React.createElement(Icon, {
140
141
  type: "arrow-down"
141
142
  }));
142
143
  };
@@ -186,7 +187,8 @@ var ColorPicker = function ColorPicker(props) {
186
187
  colTypeArr: colTypeArr,
187
188
  setColTypeArr: setColTypeArr,
188
189
  currentColorType: currentColorType,
189
- setCurrentColorType: setCurrentColorType
190
+ setCurrentColorType: setCurrentColorType,
191
+ showColorPickerPanel: showColorPickerPanel
190
192
  });
191
193
  var popperProps = _extends(_extends({}, colorPickerProps), {
192
194
  popperClassName: popUpLayer,
@@ -58,6 +58,7 @@ export interface IColorPickerPanelProps {
58
58
  showHue?: boolean;
59
59
  showOpacity?: boolean;
60
60
  };
61
+ showColorPickerPanel: boolean;
61
62
  value: string;
62
63
  setCurrentColorType: (currentColorType: IColorTypesObj['type']) => void;
63
64
  setColTypeArr: (colTypeArr: Array<IColorTypesObj>) => void;
@@ -262,7 +262,7 @@
262
262
  font-size: var(--kd-c-color-picker-panel-select-font-size, var(--kd-g-font-size-middle, 14px));
263
263
  }
264
264
  .kd-color-picker-pop .kd-color-picker-panel-input-no-recommend {
265
- margin-bottom: 8px;
265
+ margin-bottom: 0;
266
266
  }
267
267
  .kd-color-picker-pop .kd-color-picker-panel-input .kd-select.bottomLeft,
268
268
  .kd-color-picker-pop .kd-color-picker-panel-input .kd-select.topLeft {
@@ -311,6 +311,9 @@
311
311
  grid-row-gap: 8px;
312
312
  margin-top: 12px;
313
313
  }
314
+ .kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-unset-color {
315
+ margin-top: 0;
316
+ }
314
317
  .kd-color-picker-pop .kd-color-picker-panel-colorDivContainer li {
315
318
  position: relative;
316
319
  -webkit-box-sizing: border-box;
@@ -209,7 +209,7 @@
209
209
  font-size: @color-picker-panel-select-font-size;
210
210
 
211
211
  &-no-recommend {
212
- margin-bottom: 8px;
212
+ margin-bottom: 0;
213
213
  }
214
214
 
215
215
  .@{kd-prefix}-select {
@@ -266,6 +266,10 @@
266
266
  grid-row-gap: 8px;
267
267
  margin-top: 12px;
268
268
 
269
+ &-unset-color {
270
+ margin-top: 0;
271
+ }
272
+
269
273
  li {
270
274
  position: relative;
271
275
  box-sizing: border-box;
@@ -16,7 +16,7 @@ var findItem = function findItem(element) {
16
16
  }
17
17
  };
18
18
  var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
19
- var _a, _b, _c;
19
+ var _a, _b, _c, _d;
20
20
  var _React$useContext = React.useContext(ConfigContext),
21
21
  getPrefixCls = _React$useContext.getPrefixCls,
22
22
  pkgPrefixCls = _React$useContext.prefixCls,
@@ -30,6 +30,7 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
30
30
  onItemClick = allProps.onItemClick,
31
31
  defaultVisible = allProps.defaultVisible,
32
32
  onVisibleChange = allProps.onVisibleChange,
33
+ trigger = allProps.trigger,
33
34
  customPrefixcls = allProps.prefixCls;
34
35
  // className前缀
35
36
  var prefixCls = getPrefixCls(pkgPrefixCls, 'dropdown', customPrefixcls);
@@ -40,14 +41,30 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
40
41
  React.useEffect(function () {
41
42
  setVisible(!!props.visible);
42
43
  }, [props.visible]);
43
- var child = /*#__PURE__*/React.cloneElement(React.Children.only(children), {
44
+ var handleVisibleChange = function handleVisibleChange(visible) {
45
+ props.visible === undefined && setVisible(visible);
46
+ onVisibleChange && onVisibleChange(visible);
47
+ };
48
+ var child = children && ((_a = children === null || children === void 0 ? void 0 : children.type) === null || _a === void 0 ? void 0 : _a.displayName) === 'Input' ? /*#__PURE__*/React.createElement("span", {
49
+ className: classNames("".concat(prefixCls, "-trigger"), "".concat(prefixCls, "-trigger-container")),
50
+ ref: ref
51
+ }, trigger === 'focus' ? /*#__PURE__*/React.cloneElement(React.Children.only(children), {
52
+ onFocus: function onFocus(e) {
53
+ children.props.onFocus && children.props.onFocus(e);
54
+ handleVisibleChange(true);
55
+ },
56
+ onBlur: function onBlur(e) {
57
+ children.props.onBlur && children.props.onBlur(e);
58
+ handleVisibleChange(false);
59
+ }
60
+ }) : children) : /*#__PURE__*/React.cloneElement(React.Children.only(children), {
44
61
  ref: children.ref || ref,
45
62
  className: classNames("".concat(prefixCls, "-trigger"), children.props.className, {
46
63
  disabled: disabled
47
64
  })
48
65
  });
49
66
  var isMenu = menu.type === Menu;
50
- var _React$useState3 = React.useState(props.selectedKey || ((_a = menu.props) === null || _a === void 0 ? void 0 : _a.defaultKey) || props.defaultKey || ''),
67
+ var _React$useState3 = React.useState(props.selectedKey || ((_b = menu.props) === null || _b === void 0 ? void 0 : _b.defaultKey) || props.defaultKey || ''),
51
68
  _React$useState4 = _slicedToArray(_React$useState3, 2),
52
69
  selectedKey = _React$useState4[0],
53
70
  setSelectedKey = _React$useState4[1];
@@ -56,7 +73,7 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
56
73
  setSelectedKey(props.selectedKey);
57
74
  }
58
75
  }, [props.selectedKey]);
59
- var menuSelectable = ((_b = menu.props) === null || _b === void 0 ? void 0 : _b.selectable) === undefined ? selectable : (_c = menu.props) === null || _c === void 0 ? void 0 : _c.selectable;
76
+ var menuSelectable = ((_c = menu.props) === null || _c === void 0 ? void 0 : _c.selectable) === undefined ? selectable : (_d = menu.props) === null || _d === void 0 ? void 0 : _d.selectable;
60
77
  var handleItemClick = function handleItemClick(e) {
61
78
  var _a;
62
79
  var item = findItem(e.target);
@@ -107,10 +124,6 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
107
124
  role: "menuitem"
108
125
  }, href === undefined || disabled ? /*#__PURE__*/React.createElement("span", null, label) : /*#__PURE__*/React.createElement("a", _extends({}, alinkProps), /*#__PURE__*/React.createElement("span", null, label)));
109
126
  }));
110
- var handleVisibleChange = function handleVisibleChange(visible) {
111
- props.visible === undefined && setVisible(visible);
112
- onVisibleChange && onVisibleChange(visible);
113
- };
114
127
  var popperProps = _extends(_extends({}, allProps), {
115
128
  visible: visible,
116
129
  prefixCls: prefixCls,
@@ -109,6 +109,9 @@
109
109
  .kd-dropdown-trigger {
110
110
  outline: none;
111
111
  }
112
+ .kd-dropdown-trigger-container {
113
+ display: inline-block;
114
+ }
112
115
  .kd-dropdown {
113
116
  -webkit-box-sizing: border-box;
114
117
  box-sizing: border-box;
@@ -9,6 +9,10 @@
9
9
 
10
10
  .@{dropdown-trigger-prefix-cls} {
11
11
  outline: none;
12
+
13
+ &-container {
14
+ display: inline-block;
15
+ }
12
16
  }
13
17
 
14
18
  .@{dropdown-prefix-cls} {
@@ -153,8 +153,9 @@ var SchemeFilter = function SchemeFilter(props) {
153
153
  };
154
154
  var handleChangeOption = function handleChangeOption(index, value) {
155
155
  var nextScheme = cloneDeep(scheme);
156
+ var realValue = value.target !== undefined ? value.target.value : value;
156
157
  nextScheme.items[index] = _extends(_extends({}, nextScheme.items[index]), {
157
- value: value
158
+ value: realValue
158
159
  });
159
160
  setScheme(nextScheme);
160
161
  };