@kdcloudjs/kdesign 1.5.3 → 1.5.4

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 (47) hide show
  1. package/dist/kdesign-complete.less +5 -3
  2. package/dist/kdesign.css +8 -4
  3. package/dist/kdesign.css.map +1 -1
  4. package/dist/kdesign.js +117 -71
  5. package/dist/kdesign.js.map +1 -1
  6. package/dist/kdesign.min.css +3 -3
  7. package/dist/kdesign.min.js +3 -3
  8. package/dist/kdesign.min.js.map +1 -1
  9. package/es/drawer/drawer.js +1 -0
  10. package/es/dropdown/dropdown.js +16 -6
  11. package/es/radio/style/index.css +1 -1
  12. package/es/radio/style/index.less +1 -1
  13. package/es/select/select.js +1 -1
  14. package/es/stepper/stepper.js +9 -4
  15. package/es/stepper/style/index.css +2 -0
  16. package/es/stepper/style/index.less +2 -0
  17. package/es/stepper/style/token.less +1 -2
  18. package/es/style/icon/kdicon.css +2 -1
  19. package/es/style/icon/kdicon.woff +0 -0
  20. package/es/tabs/style/index.css +1 -0
  21. package/es/tabs/style/index.less +1 -0
  22. package/es/tooltip/tooltip.js +1 -1
  23. package/es/tree/tree.js +12 -9
  24. package/es/tree/treeHooks.d.ts +1 -1
  25. package/es/tree/treeHooks.js +3 -3
  26. package/es/tree/utils/treeUtils.d.ts +6 -3
  27. package/es/tree/utils/treeUtils.js +66 -42
  28. package/lib/drawer/drawer.js +1 -0
  29. package/lib/dropdown/dropdown.js +15 -6
  30. package/lib/radio/style/index.css +1 -1
  31. package/lib/radio/style/index.less +1 -1
  32. package/lib/select/select.js +1 -1
  33. package/lib/stepper/stepper.js +9 -4
  34. package/lib/stepper/style/index.css +2 -0
  35. package/lib/stepper/style/index.less +2 -0
  36. package/lib/stepper/style/token.less +1 -2
  37. package/lib/style/icon/kdicon.css +2 -1
  38. package/lib/style/icon/kdicon.woff +0 -0
  39. package/lib/tabs/style/index.css +1 -0
  40. package/lib/tabs/style/index.less +1 -0
  41. package/lib/tooltip/tooltip.js +1 -1
  42. package/lib/tree/tree.js +11 -9
  43. package/lib/tree/treeHooks.d.ts +1 -1
  44. package/lib/tree/treeHooks.js +3 -3
  45. package/lib/tree/utils/treeUtils.d.ts +6 -3
  46. package/lib/tree/utils/treeUtils.js +64 -42
  47. package/package.json +1 -1
@@ -206,6 +206,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
206
206
  width: width,
207
207
  transform: transform
208
208
  } : {
209
+ height: height,
209
210
  transform: transform
210
211
  });
211
212
 
@@ -7,6 +7,17 @@ import ConfigContext from '../config-provider/ConfigContext';
7
7
  import { getCompProps } from '../_utils';
8
8
  import { Menu, Item } from './menu';
9
9
  import usePopper from '../_utils/usePopper';
10
+
11
+ var findItem = function findItem(element) {
12
+ var isItem = element.className === 'kd-dropdown-menu-item';
13
+
14
+ if (isItem) {
15
+ return element;
16
+ } else {
17
+ return element.parentNode ? findItem(element.parentNode) : null;
18
+ }
19
+ };
20
+
10
21
  var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
11
22
  var _a, _b, _c;
12
23
 
@@ -37,7 +48,7 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
37
48
  setVisible(!!props.visible);
38
49
  }, [props.visible]);
39
50
  var child = /*#__PURE__*/React.cloneElement(React.Children.only(children), {
40
- ref: ref,
51
+ ref: children.ref || ref,
41
52
  className: classNames("".concat(prefixCls, "-trigger"), children.props.className, {
42
53
  disabled: disabled
43
54
  })
@@ -55,13 +66,12 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
55
66
  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;
56
67
 
57
68
  var handleItemClick = function handleItemClick(e) {
58
- var _a, _b;
69
+ var _a;
59
70
 
60
- var currentTarget = e.target;
61
- var parentTarget = currentTarget.parentNode;
62
- var key = ((_a = currentTarget.dataset) === null || _a === void 0 ? void 0 : _a.key) || ((_b = currentTarget.parentNode.dataset) === null || _b === void 0 ? void 0 : _b.key);
71
+ var item = findItem(e.target);
72
+ var key = (_a = item === null || item === void 0 ? void 0 : item.dataset) === null || _a === void 0 ? void 0 : _a.key;
63
73
 
64
- if (currentTarget.className.indexOf('disabled') === -1 && parentTarget.className.indexOf('disabled') === -1 && key) {
74
+ if ((item === null || item === void 0 ? void 0 : item.className.indexOf('disabled')) === -1 && key) {
65
75
  if (isMenu && menu.props.onClick) {
66
76
  menu.props.onClick(key);
67
77
  } else if (onItemClick) {
@@ -407,7 +407,7 @@
407
407
  .kd-radio-button-checked:hover {
408
408
  color: var(--kd-c-radio-color-background, var(--kd-g-color-white, #fff));
409
409
  }
410
- .kd-radio-button-checked::before {
410
+ .kd-radio-button-checked:not(.kd-radio-button-disabled)::before {
411
411
  background-color: var(--kd-c-radio-color-theme, var(--kd-g-color-theme, #5582f3));
412
412
  }
413
413
  .kd-radio-button-checked:first-child {
@@ -312,7 +312,7 @@
312
312
  color: @radio-color-background;
313
313
  }
314
314
 
315
- &::before {
315
+ &:not(.@{radio-button-prefix-cls}-disabled)::before {
316
316
  background-color: @radio-color-theme;
317
317
  }
318
318
 
@@ -448,7 +448,7 @@ var InternalSelect = function InternalSelect(props, ref) {
448
448
  var selectedVal = multipleRef.current.selectedVal; // 选择器下拉icon样式
449
449
 
450
450
  var arrowIconCls = classNames((_classNames8 = {}, _defineProperty(_classNames8, "".concat(selectPrefixCls, "-icon-arrow"), true), _defineProperty(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), _defineProperty(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), _defineProperty(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-focus"), optionShow), _classNames8));
451
- var iconShow = allowClear && !disabled && (isMultiple ? mulOptions.length > 0 : selectedVal);
451
+ var iconShow = allowClear && !disabled && (isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '');
452
452
  var clearIconCls = classNames(_defineProperty({}, "".concat(selectPrefixCls, "-icon-clear"), true));
453
453
  return /*#__PURE__*/React.createElement(React.Fragment, null, iconShow && /*#__PURE__*/React.createElement("span", {
454
454
  onClick: handleReset,
@@ -29,6 +29,7 @@ var InternalStepper = function InternalStepper(props, ref) {
29
29
  stepBtnClassName = inputNumberProps.stepBtnClassName,
30
30
  max = inputNumberProps.max,
31
31
  min = inputNumberProps.min,
32
+ disabled = inputNumberProps.disabled,
32
33
  propsValue = inputNumberProps.value,
33
34
  defaultValue = inputNumberProps.defaultValue;
34
35
  var inputPrefixCls = getPrefixCls(prefixCls, 'inputNumber', customPrefixcls);
@@ -70,10 +71,11 @@ var InternalStepper = function InternalStepper(props, ref) {
70
71
  return null;
71
72
  }
72
73
 
73
- var decreaseClassName = getStepBtnClassNames('base', 'decrease', showPlusdisabled);
74
+ var decreaseClassName = getStepBtnClassNames('base', 'decrease', showPlusdisabled || disabled);
74
75
  return /*#__PURE__*/React.createElement("span", {
75
76
  className: decreaseClassName,
76
77
  onMouseDown: function onMouseDown() {
78
+ if (disabled) return;
77
79
  handleStepMouseDown('minus');
78
80
  }
79
81
  }, /*#__PURE__*/React.createElement(Icon, {
@@ -83,10 +85,11 @@ var InternalStepper = function InternalStepper(props, ref) {
83
85
  };
84
86
 
85
87
  var getStepSuffix = function getStepSuffix() {
86
- var increaseClassName = getStepBtnClassNames('base', 'increase', showMinusdisabled);
88
+ var increaseClassName = getStepBtnClassNames('base', 'increase', showMinusdisabled || disabled);
87
89
  return type === 'embed' ? getEmbedStepView() : /*#__PURE__*/React.createElement("span", {
88
90
  className: increaseClassName,
89
91
  onMouseDown: function onMouseDown() {
92
+ if (disabled) return;
90
93
  handleStepMouseDown('plus');
91
94
  }
92
95
  }, /*#__PURE__*/React.createElement(Icon, {
@@ -183,13 +186,14 @@ var InternalStepper = function InternalStepper(props, ref) {
183
186
  var _classNames2, _classNames3;
184
187
 
185
188
  var embedStepClassName = getStepBtnClassNames('embed');
186
- var plusClassName = classNames("".concat(inputPrefixCls, "-embedStep-plus"), (_classNames2 = {}, _defineProperty(_classNames2, stepBtnClassName, stepBtnClassName), _defineProperty(_classNames2, "".concat(inputPrefixCls, "-embedStep-disabled"), showMinusdisabled), _classNames2));
187
- var minusClassName = classNames("".concat(inputPrefixCls, "-embedStep-minus"), (_classNames3 = {}, _defineProperty(_classNames3, stepBtnClassName, stepBtnClassName), _defineProperty(_classNames3, "".concat(inputPrefixCls, "-embedStep-disabled"), showPlusdisabled), _classNames3));
189
+ var plusClassName = classNames("".concat(inputPrefixCls, "-embedStep-plus"), (_classNames2 = {}, _defineProperty(_classNames2, stepBtnClassName, stepBtnClassName), _defineProperty(_classNames2, "".concat(inputPrefixCls, "-embedStep-disabled"), showMinusdisabled || disabled), _classNames2));
190
+ var minusClassName = classNames("".concat(inputPrefixCls, "-embedStep-minus"), (_classNames3 = {}, _defineProperty(_classNames3, stepBtnClassName, stepBtnClassName), _defineProperty(_classNames3, "".concat(inputPrefixCls, "-embedStep-disabled"), showPlusdisabled || disabled), _classNames3));
188
191
  return /*#__PURE__*/React.createElement("span", {
189
192
  className: embedStepClassName
190
193
  }, /*#__PURE__*/React.createElement("span", {
191
194
  className: plusClassName,
192
195
  onMouseDown: function onMouseDown() {
196
+ if (disabled) return;
193
197
  handleStepMouseDown('plus');
194
198
  }
195
199
  }, /*#__PURE__*/React.createElement(Icon, {
@@ -198,6 +202,7 @@ var InternalStepper = function InternalStepper(props, ref) {
198
202
  })), /*#__PURE__*/React.createElement("span", {
199
203
  className: minusClassName,
200
204
  onMouseDown: function onMouseDown() {
205
+ if (disabled) return;
201
206
  handleStepMouseDown('minus');
202
207
  }
203
208
  }, /*#__PURE__*/React.createElement(Icon, {
@@ -152,6 +152,7 @@
152
152
  }
153
153
  .kd-inputNumber-baseStep-disabled {
154
154
  cursor: not-allowed;
155
+ color: var(--kd-c-stepper-icon-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
155
156
  }
156
157
  .kd-inputNumber-baseStep-disabled .kd-inputNumber-icon {
157
158
  color: unset !important;
@@ -244,6 +245,7 @@
244
245
  }
245
246
  .kd-inputNumber-embedStep-disabled {
246
247
  cursor: not-allowed !important;
248
+ color: var(--kd-c-stepper-icon-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
247
249
  }
248
250
  .kd-inputNumber-embedStep-disabled .kd-inputNumber-icon {
249
251
  color: unset !important;
@@ -53,6 +53,7 @@
53
53
 
54
54
  &-disabled {
55
55
  cursor: not-allowed;
56
+ color: @stepper-icon-color-disabled;
56
57
 
57
58
  .@{inputNumber-prefix-cls}-icon {
58
59
  color: unset !important;
@@ -104,6 +105,7 @@
104
105
 
105
106
  &-disabled {
106
107
  cursor: not-allowed !important;
108
+ color: @stepper-icon-color-disabled;
107
109
 
108
110
  .@{inputNumber-prefix-cls}-icon {
109
111
  color: unset !important;
@@ -7,15 +7,14 @@
7
7
  @stepper-icon-color-hover: var(~'@{stepper-prefix}-icon-color-hover', @color-theme);
8
8
  @stepper-color-border-strong: var(~'@{stepper-prefix}-color-border-strong', @color-border-strong);
9
9
  @stepper-embed-icon-color-background: var(~'@{stepper-prefix}-embed-icon-color-background', transparent);
10
+ @stepper-icon-color-disabled: var(~'@{stepper-prefix}-icon-color-disabled', @color-disabled);
10
11
 
11
12
  // font
12
13
  @stepper-input-font-size: var(~'@{stepper-prefix}-input-font-size', 12px);
13
14
 
14
-
15
15
  // motion
16
16
  @stepper-motion-duration: var(~'@{stepper-prefix}-motion-duration', @duration-promptly);
17
17
 
18
-
19
18
  // sizing
20
19
  @stepper-input-small-sizing-height: var(~'@{stepper-prefix}-input-small-sizing-height', 20px);
21
20
  @stepper-input-middle-sizing-height: var(~'@{stepper-prefix}-input-middle-sizing-height', 28px);
@@ -99,6 +99,7 @@
99
99
  .kdicon-fixed-solid:before { content: "\e65f"; }
100
100
  .kdicon-fixed-window:before { content: "\e6d1"; }
101
101
  .kdicon-fixed:before { content: "\e6e3"; }
102
+ .kdicon-fold:before { content: "\e71d"; }
102
103
  .kdicon-foldmenu:before { content: "\e70e"; }
103
104
  .kdicon-font-background-solid:before { content: "\e673"; }
104
105
  .kdicon-font-color-solid:before { content: "\e674"; }
@@ -209,7 +210,7 @@
209
210
  .kdicon-two-window:before { content: "\e6f6"; }
210
211
  .kdicon-underline-solid:before { content: "\e671"; }
211
212
  .kdicon-unfold-all:before { content: "\e6ad"; }
212
- .kdicon-unfold:before { content: "\e6bb"; }
213
+ .kdicon-unfold:before { content: "\e71e"; }
213
214
  .kdicon-unfoldmenu:before { content: "\e70d"; }
214
215
  .kdicon-unlock-solid:before { content: "\e666"; }
215
216
  .kdicon-unlock:before { content: "\e69e"; }
Binary file
@@ -294,6 +294,7 @@
294
294
  min-width: 120px;
295
295
  height: 100%;
296
296
  font-size: 0;
297
+ border-top: 1px solid transparent;
297
298
  }
298
299
  .kd-tabs-navs-card.kd-tabs-navs-left::before,
299
300
  .kd-tabs-navs-card.kd-tabs-navs-right::before,
@@ -156,6 +156,7 @@
156
156
  min-width: 120px;
157
157
  height: 100%;
158
158
  font-size: 0;
159
+ border-top: 1px solid transparent;
159
160
  &::before, &::after {
160
161
  position: absolute;
161
162
  content: '';
@@ -17,7 +17,7 @@ var Tooltip = /*#__PURE__*/React.forwardRef(function (props, ref) {
17
17
 
18
18
  var prefixCls = getPrefixCls(pkgPrefixCls, 'tooltip', customPrefixcls);
19
19
  var tiplocator = /*#__PURE__*/React.cloneElement(React.Children.count(children) === 1 && children.type ? children : /*#__PURE__*/React.createElement("span", null, children), {
20
- ref: ref
20
+ ref: children.ref || ref
21
21
  });
22
22
 
23
23
  var popperProps = _extends(_extends({}, allProps), {
package/es/tree/tree.js CHANGED
@@ -10,7 +10,7 @@ import classNames from 'classnames';
10
10
  import ConfigContext from '../config-provider/ConfigContext';
11
11
  import { getCompProps } from '../_utils';
12
12
  import TreeNode from './treeNode';
13
- import { getChecked, getHalfChecked, addKeys, flattenAll, delKey, getFilterData, getSpreadAttrData, getDataCheckededState, getDataCheckededStateStrictly, getMaxLevel, getAllChildKeys, getPos, getSelected, calcDropPosition } from './utils/treeUtils';
13
+ import { getChecked, getHalfChecked, addKeys, flattenAll, delKey, getFilterData, getSpreadAttrData, getDataCheckededState, getDataCheckededStateStrictly, getAllChildKeys, getPos, getSelected, calcDropPosition } from './utils/treeUtils';
14
14
  import { useChecked, useExpand, usePlantomHeightEffect, useViewportHeight, useVisibleDataMemo, useScrollToKey, useSelect } from './treeHooks';
15
15
  import isBoolean from 'lodash/isBoolean';
16
16
  var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
@@ -71,12 +71,11 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
71
71
  var treeRootClassName = "".concat(treePrefixCls, "-root");
72
72
  var estimatedItemSize = innerEstimatedItemSize; // 节点高度
73
73
 
74
- var flattenAllData = React.useMemo(function () {
74
+ var _React$useMemo = React.useMemo(function () {
75
75
  return flattenAll(treeData, []);
76
- }, [treeData]);
77
- var maxLevel = React.useMemo(function () {
78
- return getMaxLevel(flattenAllData);
79
- }, [flattenAllData]);
76
+ }, [treeData]),
77
+ flattenAllData = _React$useMemo.flattenAllData,
78
+ maxLevel = _React$useMemo.maxLevel;
80
79
 
81
80
  var _useChecked = useChecked(checkStrictly, checkedKeysProps, defaultCheckedKeys, flattenAllData, maxLevel, checkable),
82
81
  _useChecked2 = _slicedToArray(_useChecked, 4),
@@ -123,7 +122,11 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
123
122
  dragOverNodeKey = _React$useState10[0],
124
123
  setDragOverNodeKey = _React$useState10[1];
125
124
 
126
- var _useExpand = useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue),
125
+ var isSearching = React.useMemo(function () {
126
+ return typeof filterTreeNode === 'function' && filterValue;
127
+ }, [filterValue]);
128
+
129
+ var _useExpand = useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching),
127
130
  _useExpand2 = _slicedToArray(_useExpand, 2),
128
131
  expandedKeys = _useExpand2[0],
129
132
  setExpandedKeys = _useExpand2[1];
@@ -132,8 +135,8 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
132
135
  return getSpreadAttrData(flattenAllData, expandedKeys);
133
136
  }, [flattenAllData, expandedKeys]);
134
137
  var filterData = React.useMemo(function () {
135
- return getFilterData(spreadAttrData, filterTreeNode, filterValue);
136
- }, [spreadAttrData, filterTreeNode, filterValue]);
138
+ return getFilterData(spreadAttrData, filterTreeNode, isSearching);
139
+ }, [spreadAttrData, isSearching]);
137
140
 
138
141
  var _useViewportHeight = useViewportHeight(height, listRef),
139
142
  _useViewportHeight2 = _slicedToArray(_useViewportHeight, 1),
@@ -4,6 +4,6 @@ export declare const useViewportHeight: (height: number, listRef: React.RefObjec
4
4
  export declare const useVisibleDataMemo: (virtual: boolean, filterData: TreeNodeData[], viewportHeight: number, estimatedItemSize: number, start: number) => TreeNodeData[][];
5
5
  export declare const usePlantomHeightEffect: (plantomRef: React.RefObject<HTMLElement>, filterData: TreeNodeData[], estimatedItemSize: number) => void;
6
6
  export declare const useChecked: (checkStrictly: boolean, checkedKeysProps: string[], defaultCheckedKeys: string[], flattenAllData: any[], maxLevel: number, checkable: boolean) => readonly [string[], string[], React.Dispatch<React.SetStateAction<string[]>>, React.Dispatch<React.SetStateAction<string[]>>];
7
- export declare const useExpand: (flattenAllData: any[], expandedKeysProps: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, scrollKey: string, isInit: boolean, filterTreeNode: FunctionConstructor, filterValue: string) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
7
+ export declare const useExpand: (flattenAllData: any[], expandedKeysProps: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, scrollKey: string, isInit: boolean, filterTreeNode: FunctionConstructor, isSearching: boolean) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
8
8
  export declare const useScrollToKey: (scrollKey: string, index: number, estimatedItemSize: number, scrollRef: any, viewportHeight: number, treeNodePrefixCls: string) => void;
9
9
  export declare const useSelect: (selectedKeysProps: string[], defaultSelectedKeys: string[]) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
@@ -64,7 +64,7 @@ export var useChecked = function useChecked(checkStrictly, checkedKeysProps, def
64
64
  }, [nextHalfCheckedKeys]);
65
65
  return [checkedKeys, halfCheckedKeys, setCheckedKeys, setHalfCheckedKeys];
66
66
  };
67
- export var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue) {
67
+ export var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching) {
68
68
  var expandScrollkeys = [];
69
69
 
70
70
  if (scrollKey) {
@@ -73,8 +73,8 @@ export var useExpand = function useExpand(flattenAllData, expandedKeysProps, def
73
73
  }
74
74
 
75
75
  var initialExpandedKeys = React.useMemo(function () {
76
- return getInitExpandedKeys(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, filterValue);
77
- }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, filterValue]);
76
+ return getInitExpandedKeys(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching);
77
+ }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching]);
78
78
  var newExpandedKeys = React.useMemo(function () {
79
79
  return getExpandedKeys(expandedKeysProps, expandScrollkeys);
80
80
  }, [expandedKeysProps]);
@@ -7,13 +7,16 @@ import { TreeNodeData } from '../tree';
7
7
  * @param level
8
8
  * @param pos
9
9
  */
10
- export declare const flattenAll: (treeData: any[], newTreeData?: TreeNodeData[], level?: number, pos?: string | undefined) => TreeNodeData[];
10
+ export declare const flattenAll: (treeData: any[], newTreeData?: TreeNodeData[], level?: number, pos?: string | undefined) => {
11
+ flattenAllData: TreeNodeData[];
12
+ maxLevel: number;
13
+ };
11
14
  export declare const getExpand: (expandedKeys: string[], key: string) => boolean;
12
15
  export declare const getChecked: (checkedKeys: string[], key: string) => boolean;
13
16
  export declare const getSelected: (selectedKeys: string[], key: string) => boolean;
14
17
  export declare const getHalfChecked: (halfCheckedKeys: string[], key: string) => boolean;
15
18
  export declare const getAllFilterKeys: (data: any[], filterTreeNode: FunctionConstructor) => any[];
16
- export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, filterValue: string) => any[];
19
+ export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, isSearching: boolean) => any[];
17
20
  export declare const getMaxLevel: (data: any[]) => number;
18
21
  /**
19
22
  *计算node的属性后返回新的 treedata
@@ -43,6 +46,6 @@ export declare const getDataCheckededStateStrictly: (checkedKeys: string[]) => {
43
46
  };
44
47
  export declare const delKey: (prevKeys: string[], delKeys: string[]) => never[] & string[];
45
48
  export declare const getAllNodeKeys: (data: any[]) => string[];
46
- export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, filterValue: string) => string[];
49
+ export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, isSearching: boolean) => string[];
47
50
  export declare const getExpandedKeys: (expandedKeys: string[], expandScrollkeys?: string[]) => string[];
48
51
  export declare const calcDropPosition: (event: React.MouseEvent, dropNode: HTMLElement) => 0 | 1 | -1;
@@ -5,7 +5,6 @@ import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
5
5
  import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
6
6
  import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
7
7
  import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
8
- import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
9
8
  import _Set from "@babel/runtime-corejs3/core-js-stable/set";
10
9
  import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/starts-with";
11
10
  import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
@@ -38,29 +37,54 @@ export var flattenAll = function flattenAll(treeData) {
38
37
  var newTreeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
39
38
  var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
40
39
  var pos = arguments.length > 3 ? arguments[3] : undefined;
41
- treeData && treeData.forEach(function (item, index) {
42
- var _context;
40
+ var maxLevel = 0;
43
41
 
44
- var children = item.children,
45
- title = item.title,
46
- key = item.key,
47
- others = __rest(item, ["children", "title", "key"]);
42
+ var fn = function fn(treeData) {
43
+ var newTreeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
44
+ var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
45
+ var pos = arguments.length > 3 ? arguments[3] : undefined;
46
+ var parent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
47
+ treeData && treeData.forEach(function (item, index) {
48
+ var _context;
48
49
 
49
- var _pos = pos ? _concatInstanceProperty(_context = "".concat(pos, "-")).call(_context, index) : "".concat(index);
50
+ var children = item.children,
51
+ title = item.title,
52
+ key = item.key,
53
+ others = __rest(item, ["children", "title", "key"]);
50
54
 
51
- var hasChildNode = children && children instanceof Array && children.length > 0;
52
- newTreeData.push(_extends({
53
- title: title,
54
- key: key,
55
- pos: _pos,
56
- hasChildNode: hasChildNode,
57
- level: level
58
- }, others));
59
- var _level = level;
60
- _level++;
61
- flattenAll(children, newTreeData, _level, _pos);
62
- });
63
- return newTreeData;
55
+ item.parent = parent;
56
+
57
+ var _pos = pos ? _concatInstanceProperty(_context = "".concat(pos, "-")).call(_context, index) : "".concat(index);
58
+
59
+ var hasChildNode = children && children instanceof Array && children.length > 0;
60
+
61
+ var flattenNode = _extends({
62
+ title: title,
63
+ key: key,
64
+ pos: _pos,
65
+ hasChildNode: hasChildNode,
66
+ level: level,
67
+ parent: parent
68
+ }, others);
69
+
70
+ newTreeData.push(flattenNode);
71
+ var _level = level;
72
+
73
+ if (maxLevel < level) {
74
+ maxLevel = level;
75
+ }
76
+
77
+ _level++;
78
+ fn(children, newTreeData, _level, _pos, flattenNode);
79
+ });
80
+ return newTreeData;
81
+ };
82
+
83
+ var flattenAllData = fn(treeData, newTreeData, level, pos);
84
+ return {
85
+ flattenAllData: flattenAllData,
86
+ maxLevel: maxLevel
87
+ };
64
88
  };
65
89
  export var getExpand = function getExpand(expandedKeys, key) {
66
90
  return expandedKeys === null || expandedKeys === void 0 ? void 0 : _includesInstanceProperty(expandedKeys).call(expandedKeys, key);
@@ -97,29 +121,29 @@ var isAllParentExpand = function isAllParentExpand(data, pos) {
97
121
  };
98
122
 
99
123
  export var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode) {
100
- var filterData = _filterInstanceProperty(data).call(data, function (item) {
101
- return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
102
- });
103
-
104
- var filterKeys = getAllNodeKeys(filterData);
105
124
  var allFilterKeys = [];
106
125
 
107
- _mapInstanceProperty(filterKeys).call(filterKeys, function (key) {
108
- var _context2;
126
+ _filterInstanceProperty(data).call(data, function (item) {
127
+ return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
128
+ }).forEach(function (item) {
129
+ var node = _extends({}, item);
109
130
 
110
- return allFilterKeys.push.apply(allFilterKeys, _concatInstanceProperty(_context2 = _toConsumableArray(getAllParentKeys(data, key))).call(_context2, [key]));
131
+ while (node) {
132
+ allFilterKeys.push(node.key);
133
+ node = node.parent;
134
+ }
111
135
  });
112
136
 
113
137
  return _toConsumableArray(new _Set(allFilterKeys));
114
138
  };
115
- export var getFilterData = function getFilterData(data, filterTreeNode, filterValue) {
139
+ export var getFilterData = function getFilterData(data, filterTreeNode, isSearching) {
116
140
  var filterData = data;
141
+ var allFilterKeys = null;
117
142
 
118
- if (typeof filterTreeNode === 'function' && filterValue) {
143
+ if (isSearching) {
144
+ allFilterKeys = getAllFilterKeys(filterData, filterTreeNode);
119
145
  filterData = _filterInstanceProperty(filterData).call(filterData, function (item) {
120
- var _context3;
121
-
122
- return _includesInstanceProperty(_context3 = getAllFilterKeys(filterData, filterTreeNode)).call(_context3, item.key);
146
+ return _includesInstanceProperty(allFilterKeys).call(allFilterKeys, item.key);
123
147
  });
124
148
  }
125
149
 
@@ -258,11 +282,11 @@ export var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys
258
282
  return newTreeData;
259
283
  };
260
284
  export var addKeys = function addKeys() {
261
- var _context4;
285
+ var _context2;
262
286
 
263
287
  var prevKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
264
288
  var newKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
265
- return _Array$from(new _Set(_concatInstanceProperty(_context4 = []).call(_context4, _toConsumableArray(prevKeys), _toConsumableArray(newKeys))));
289
+ return _Array$from(new _Set(_concatInstanceProperty(_context2 = []).call(_context2, _toConsumableArray(prevKeys), _toConsumableArray(newKeys))));
266
290
  };
267
291
  export var getAllParentKeys = function getAllParentKeys(data) {
268
292
  var pos = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -315,14 +339,14 @@ export var getPos = function getPos(data, key) {
315
339
  return node === null || node === void 0 ? void 0 : node.pos;
316
340
  };
317
341
  export var getInitCheckedKeys = function getInitCheckedKeys(data, keys) {
318
- var _context5;
342
+ var _context3;
319
343
 
320
344
  var checkedKeys = [];
321
345
  keys.forEach(function (item) {
322
346
  var pos = getPos(data, item);
323
347
  checkedKeys.push.apply(checkedKeys, _toConsumableArray(getAllChildKeys(data, pos)));
324
348
  });
325
- return _Array$from(new _Set(_concatInstanceProperty(_context5 = []).call(_context5, checkedKeys, _toConsumableArray(keys))));
349
+ return _Array$from(new _Set(_concatInstanceProperty(_context3 = []).call(_context3, checkedKeys, _toConsumableArray(keys))));
326
350
  };
327
351
  export var getInitCheckededState = function getInitCheckededState(data) {
328
352
  var checkedKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -497,7 +521,7 @@ var getRootKeys = function getRootKeys(data) {
497
521
  export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent) {
498
522
  var expandScrollkeys = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : [];
499
523
  var filterTreeNode = arguments.length > 7 ? arguments[7] : undefined;
500
- var filterValue = arguments.length > 8 ? arguments[8] : undefined;
524
+ var isSearching = arguments.length > 8 ? arguments[8] : undefined;
501
525
  var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : _concatInstanceProperty(expandedKeys).call(expandedKeys, expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : _concatInstanceProperty(defaultExpandedKeys).call(defaultExpandedKeys, expandScrollkeys)) || [];
502
526
 
503
527
  if (defaultExpandAll) {
@@ -520,10 +544,10 @@ export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys
520
544
  }
521
545
  }
522
546
 
523
- if (typeof filterTreeNode === 'function' && filterValue) {
524
- var _context6;
547
+ if (isSearching) {
548
+ var _context4;
525
549
 
526
- keys = _concatInstanceProperty(_context6 = []).call(_context6, _toConsumableArray(keys), _toConsumableArray(getAllFilterKeys(data, filterTreeNode)));
550
+ keys = _concatInstanceProperty(_context4 = []).call(_context4, _toConsumableArray(keys), _toConsumableArray(getAllFilterKeys(data, filterTreeNode)));
527
551
  }
528
552
 
529
553
  return _Array$from(new _Set(_toConsumableArray(keys)));
@@ -241,6 +241,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
241
241
  width: width,
242
242
  transform: transform
243
243
  } : {
244
+ height: height,
244
245
  transform: transform
245
246
  });
246
247
 
@@ -35,6 +35,16 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
35
35
 
36
36
  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; }
37
37
 
38
+ var findItem = function findItem(element) {
39
+ var isItem = element.className === 'kd-dropdown-menu-item';
40
+
41
+ if (isItem) {
42
+ return element;
43
+ } else {
44
+ return element.parentNode ? findItem(element.parentNode) : null;
45
+ }
46
+ };
47
+
38
48
  var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
39
49
  var _a, _b, _c;
40
50
 
@@ -65,7 +75,7 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
65
75
  setVisible(!!props.visible);
66
76
  }, [props.visible]);
67
77
  var child = /*#__PURE__*/React.cloneElement(React.Children.only(children), {
68
- ref: ref,
78
+ ref: children.ref || ref,
69
79
  className: (0, _classnames.default)("".concat(prefixCls, "-trigger"), children.props.className, {
70
80
  disabled: disabled
71
81
  })
@@ -83,13 +93,12 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
83
93
  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;
84
94
 
85
95
  var handleItemClick = function handleItemClick(e) {
86
- var _a, _b;
96
+ var _a;
87
97
 
88
- var currentTarget = e.target;
89
- var parentTarget = currentTarget.parentNode;
90
- var key = ((_a = currentTarget.dataset) === null || _a === void 0 ? void 0 : _a.key) || ((_b = currentTarget.parentNode.dataset) === null || _b === void 0 ? void 0 : _b.key);
98
+ var item = findItem(e.target);
99
+ var key = (_a = item === null || item === void 0 ? void 0 : item.dataset) === null || _a === void 0 ? void 0 : _a.key;
91
100
 
92
- if (currentTarget.className.indexOf('disabled') === -1 && parentTarget.className.indexOf('disabled') === -1 && key) {
101
+ if ((item === null || item === void 0 ? void 0 : item.className.indexOf('disabled')) === -1 && key) {
93
102
  if (isMenu && menu.props.onClick) {
94
103
  menu.props.onClick(key);
95
104
  } else if (onItemClick) {
@@ -407,7 +407,7 @@
407
407
  .kd-radio-button-checked:hover {
408
408
  color: var(--kd-c-radio-color-background, var(--kd-g-color-white, #fff));
409
409
  }
410
- .kd-radio-button-checked::before {
410
+ .kd-radio-button-checked:not(.kd-radio-button-disabled)::before {
411
411
  background-color: var(--kd-c-radio-color-theme, var(--kd-g-color-theme, #5582f3));
412
412
  }
413
413
  .kd-radio-button-checked:first-child {
@@ -312,7 +312,7 @@
312
312
  color: @radio-color-background;
313
313
  }
314
314
 
315
- &::before {
315
+ &:not(.@{radio-button-prefix-cls}-disabled)::before {
316
316
  background-color: @radio-color-theme;
317
317
  }
318
318
 
@@ -476,7 +476,7 @@ var InternalSelect = function InternalSelect(props, ref) {
476
476
  var selectedVal = multipleRef.current.selectedVal; // 选择器下拉icon样式
477
477
 
478
478
  var arrowIconCls = (0, _classnames.default)((_classNames8 = {}, (0, _defineProperty2.default)(_classNames8, "".concat(selectPrefixCls, "-icon-arrow"), true), (0, _defineProperty2.default)(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), (0, _defineProperty2.default)(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), (0, _defineProperty2.default)(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-focus"), optionShow), _classNames8));
479
- var iconShow = allowClear && !disabled && (isMultiple ? mulOptions.length > 0 : selectedVal);
479
+ var iconShow = allowClear && !disabled && (isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '');
480
480
  var clearIconCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-icon-clear"), true));
481
481
  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconShow && /*#__PURE__*/_react.default.createElement("span", {
482
482
  onClick: handleReset,