@kdcloudjs/kdesign 1.3.9 → 1.5.0

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 (74) hide show
  1. package/CHANGELOG.md +9 -1
  2. package/dist/kdesign-complete.less +89 -44
  3. package/dist/kdesign.css +98 -55
  4. package/dist/kdesign.css.map +1 -1
  5. package/dist/kdesign.js +418 -262
  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/carousel/carousel.js +4 -4
  11. package/es/config-provider/compDefaultProps.d.ts +0 -1
  12. package/es/config-provider/compDefaultProps.js +0 -1
  13. package/es/date-picker/range-picker.d.ts +1 -0
  14. package/es/date-picker/range-picker.js +2 -0
  15. package/es/date-picker/style/index.css +6 -3
  16. package/es/date-picker/style/index.less +7 -3
  17. package/es/dropdown/style/index.css +3 -0
  18. package/es/dropdown/style/index.less +4 -0
  19. package/es/dropdown/style/token.less +1 -0
  20. package/es/input/style/index.css +8 -0
  21. package/es/input/style/index.less +4 -0
  22. package/es/input/style/mixin.less +6 -1
  23. package/es/menu/menu.d.ts +1 -0
  24. package/es/menu/menu.js +13 -14
  25. package/es/menu/menuItem.js +13 -3
  26. package/es/menu/style/index.css +50 -50
  27. package/es/menu/style/index.less +15 -15
  28. package/es/menu/style/mixin.less +24 -24
  29. package/es/menu/subMenu.js +19 -13
  30. package/es/radio/radio.js +6 -1
  31. package/es/tree/style/index.css +30 -1
  32. package/es/tree/style/index.less +25 -1
  33. package/es/tree/style/token.less +3 -0
  34. package/es/tree/tree.d.ts +2 -0
  35. package/es/tree/tree.js +77 -12
  36. package/es/tree/treeHooks.d.ts +1 -1
  37. package/es/tree/treeHooks.js +3 -3
  38. package/es/tree/treeNode.d.ts +1 -0
  39. package/es/tree/treeNode.js +11 -8
  40. package/es/tree/utils/treeUtils.d.ts +4 -2
  41. package/es/tree/utils/treeUtils.js +64 -10
  42. package/lib/carousel/carousel.js +4 -4
  43. package/lib/config-provider/compDefaultProps.d.ts +0 -1
  44. package/lib/config-provider/compDefaultProps.js +0 -1
  45. package/lib/date-picker/range-picker.d.ts +1 -0
  46. package/lib/date-picker/range-picker.js +2 -0
  47. package/lib/date-picker/style/index.css +6 -3
  48. package/lib/date-picker/style/index.less +7 -3
  49. package/lib/dropdown/style/index.css +3 -0
  50. package/lib/dropdown/style/index.less +4 -0
  51. package/lib/dropdown/style/token.less +1 -0
  52. package/lib/input/style/index.css +8 -0
  53. package/lib/input/style/index.less +4 -0
  54. package/lib/input/style/mixin.less +6 -1
  55. package/lib/menu/menu.d.ts +1 -0
  56. package/lib/menu/menu.js +13 -14
  57. package/lib/menu/menuItem.js +15 -3
  58. package/lib/menu/style/index.css +50 -50
  59. package/lib/menu/style/index.less +15 -15
  60. package/lib/menu/style/mixin.less +24 -24
  61. package/lib/menu/subMenu.js +21 -14
  62. package/lib/radio/radio.js +7 -1
  63. package/lib/tree/style/index.css +30 -1
  64. package/lib/tree/style/index.less +25 -1
  65. package/lib/tree/style/token.less +3 -0
  66. package/lib/tree/tree.d.ts +2 -0
  67. package/lib/tree/tree.js +79 -11
  68. package/lib/tree/treeHooks.d.ts +1 -1
  69. package/lib/tree/treeHooks.js +3 -3
  70. package/lib/tree/treeNode.d.ts +1 -0
  71. package/lib/tree/treeNode.js +11 -8
  72. package/lib/tree/utils/treeUtils.d.ts +4 -2
  73. package/lib/tree/utils/treeUtils.js +71 -13
  74. package/package.json +1 -1
package/dist/kdesign.js CHANGED
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  *
3
- * @kdcloudjs/kdesign v1.3.8
3
+ * @kdcloudjs/kdesign v1.4.1
4
4
  *
5
5
  * Copyright 2020-present, Kingdee, Inc.
6
6
  * All rights reserved.
@@ -5060,7 +5060,7 @@ var InternalCarousel = function InternalCarousel(props, ref) {
5060
5060
  setCurrentIndex(index);
5061
5061
  setNeedAnimation(needAnimation);
5062
5062
  }
5063
- }, [isFadeEffect, beforeChange, currentIndex, children.length]);
5063
+ }, [isFadeEffect, beforeChange, currentIndex, children === null || children === void 0 ? void 0 : children.length]);
5064
5064
  var next = react__WEBPACK_IMPORTED_MODULE_3___default.a.useCallback(function () {
5065
5065
  jumpTo(currentIndex + 1, true);
5066
5066
  }, [currentIndex, jumpTo]);
@@ -5150,7 +5150,7 @@ var InternalCarousel = function InternalCarousel(props, ref) {
5150
5150
  setNeedAnimation(true);
5151
5151
  }, [beforeChange, currentIndex]);
5152
5152
  var handleTransitionEnd = react__WEBPACK_IMPORTED_MODULE_3___default.a.useCallback(function () {
5153
- if (!autoplay) return;
5153
+ if (!autoplay || !(children !== null && children !== void 0 && children.length)) return;
5154
5154
  var childrenL = children.length;
5155
5155
  var newCurrentIndex = currentIndex;
5156
5156
 
@@ -5167,7 +5167,7 @@ var InternalCarousel = function InternalCarousel(props, ref) {
5167
5167
  afterChange && afterChange(currentIndex);
5168
5168
  setCurrentIndex(newCurrentIndex);
5169
5169
  isScrollxEffect && setNeedAnimation(false);
5170
- }, [currentIndex, children.length, afterChange, isScrollxEffect, autoplay]);
5170
+ }, [currentIndex, children === null || children === void 0 ? void 0 : children.length, afterChange, isScrollxEffect, autoplay]);
5171
5171
  var handleMouseEnter = react__WEBPACK_IMPORTED_MODULE_3___default.a.useCallback(function () {
5172
5172
  autoplayRef.current && clearTimeout(autoplayRef.current);
5173
5173
  }, []);
@@ -5215,7 +5215,7 @@ var InternalCarousel = function InternalCarousel(props, ref) {
5215
5215
  style: style,
5216
5216
  onMouseEnter: handleMouseEnter,
5217
5217
  onMouseLeave: handleMouseLeave
5218
- }, renderDisplayList(), showDot() && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(_slidebar__WEBPACK_IMPORTED_MODULE_14__["Slidebar"], {
5218
+ }, (children === null || children === void 0 ? void 0 : children.length) && renderDisplayList(), (children === null || children === void 0 ? void 0 : children.length) && showDot() && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(_slidebar__WEBPACK_IMPORTED_MODULE_14__["Slidebar"], {
5219
5219
  number: children.length,
5220
5220
  currentIndex: currentIndex,
5221
5221
  dotsClassName: dots,
@@ -7886,7 +7886,6 @@ var compDefaultProps = {
7886
7886
 
7887
7887
  },
7888
7888
  Radio: {
7889
- checked: false,
7890
7889
  defaultChecked: false,
7891
7890
  disabled: false
7892
7891
  },
@@ -11437,6 +11436,7 @@ function DatePicker(props) {
11437
11436
  minuteStep = _ref$minuteStep === void 0 ? 1 : _ref$minuteStep,
11438
11437
  _ref$secondStep = _ref.secondStep,
11439
11438
  secondStep = _ref$secondStep === void 0 ? 1 : _ref$secondStep,
11439
+ suffixIcon = _ref.suffixIcon,
11440
11440
  renderExtraFooter = _ref.renderExtraFooter,
11441
11441
  disabledHours = _ref.disabledHours,
11442
11442
  disabledMinutes = _ref.disabledMinutes,
@@ -12008,6 +12008,7 @@ function DatePicker(props) {
12008
12008
  startOpen: startOpen,
12009
12009
  endOpen: endOpen,
12010
12010
  needConfirmButton: needConfirmButton,
12011
+ suffixIcon: suffixIcon,
12011
12012
  format: _format,
12012
12013
  open: mergedOpen,
12013
12014
  readOnly: inputReadOnly,
@@ -21613,7 +21614,7 @@ __webpack_require__.r(__webpack_exports__);
21613
21614
 
21614
21615
 
21615
21616
 
21616
- var _excluded = ["prefixCls", "mode", "inlineIndent", "forceSubMenuRender", "additionalTools", "onClick", "onOpenChange", "children", "className", "theme", "collapsed"];
21617
+ var _excluded = ["prefixCls", "mode", "inlineIndent", "forceSubMenuRender", "additionalTools", "onClick", "onOpenChange", "children", "className", "theme", "collapsed", "accordion"];
21617
21618
 
21618
21619
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
21619
21620
 
@@ -21665,10 +21666,12 @@ var Menu = function Menu(props) {
21665
21666
  className = _getCompProps.className,
21666
21667
  theme = _getCompProps.theme,
21667
21668
  collapsed = _getCompProps.collapsed,
21669
+ accordion = _getCompProps.accordion,
21668
21670
  restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_9___default()(_getCompProps, _excluded);
21669
21671
 
21670
21672
  var prefixCls = getPrefixCls(pkgPrefixCls, 'menu', customPrefixcls);
21671
- Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'")); // const [collapsed, setCollapsed] = React.useState<boolean | undefined>(restProps.collapsed)
21673
+ Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(['inline', 'vertical', undefined].indexOf(mode) === -1, 'menu', "cannot found menu mode '".concat(mode, "'"));
21674
+ Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_23__["default"])(mode !== 'inline' && accordion !== undefined, 'menu', "'accordion' is valid only in mode='inline'");
21672
21675
 
21673
21676
  var _React$useState = react__WEBPACK_IMPORTED_MODULE_18___default.a.useState(''),
21674
21677
  _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_8___default()(_React$useState, 2),
@@ -21703,26 +21706,18 @@ var Menu = function Menu(props) {
21703
21706
  Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
21704
21707
  if (userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
21705
21708
  setOpenKeys(userOpenKeys);
21706
- }
21707
- }, [userOpenKeys]);
21708
- Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
21709
- if (userSelectedKey !== undefined && userOpenKeys !== undefined && Array.isArray(userOpenKeys)) {
21710
- setSelectedKeyPath(userOpenKeys);
21711
- setTimeout(function () {
21712
- userOpenKeys.forEach(function (d) {
21713
- openSubMenuSet.add(d);
21714
- });
21709
+ openSubMenuSet.clear();
21710
+ userOpenKeys.forEach(function (d) {
21711
+ openSubMenuSet.add(d);
21715
21712
  });
21716
21713
  }
21717
- }, []);
21714
+ }, [userOpenKeys]);
21718
21715
 
21719
21716
  var handleOnClick = function handleOnClick(info) {
21720
21717
  if (userSelectedKey === undefined) {
21721
21718
  setSelectedKey(info.key);
21722
21719
  }
21723
21720
 
21724
- setSelectedKeyPath(info.keyPath);
21725
-
21726
21721
  if (mode !== 'inline' && openKeys.length > 0) {
21727
21722
  setOpenKeys([]);
21728
21723
  openSubMenuSet.clear();
@@ -21750,6 +21745,10 @@ var Menu = function Menu(props) {
21750
21745
  if (clean) {
21751
21746
  openSubMenuSet.clear();
21752
21747
  } else {
21748
+ if (mode === 'inline' && accordion) {
21749
+ openSubMenuSet.clear();
21750
+ }
21751
+
21753
21752
  if (isAdd) {
21754
21753
  openSubMenuSet.add(openKey);
21755
21754
  } else {
@@ -21776,6 +21775,7 @@ var Menu = function Menu(props) {
21776
21775
  openKeys: openKeys,
21777
21776
  selectedKey: selectedKey,
21778
21777
  selectedKeyPath: selectedKeyPath,
21778
+ setSelectedKeyPath: setSelectedKeyPath,
21779
21779
  theme: theme,
21780
21780
  triggerSubMenuAction: restProps.triggerSubMenuAction,
21781
21781
  forceSubMenuRender: forceSubMenuRender,
@@ -21825,20 +21825,26 @@ __webpack_require__.r(__webpack_exports__);
21825
21825
  /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__);
21826
21826
  /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
21827
21827
  /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1__);
21828
- /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
21829
- /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__);
21830
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react */ "react");
21831
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
21832
- /* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
21833
- /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
21834
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
21835
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_6__);
21836
- /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./util */ "./components/menu/util.ts");
21837
- /* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
21828
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ "./node_modules/@babel/runtime/helpers/toConsumableArray.js");
21829
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__);
21830
+ /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
21831
+ /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3__);
21832
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
21833
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__);
21834
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react */ "react");
21835
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_5__);
21836
+ /* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
21837
+ /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
21838
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
21839
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_8__);
21840
+ /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./util */ "./components/menu/util.ts");
21841
+ /* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
21842
+
21838
21843
 
21839
21844
 
21840
21845
 
21841
- var _excluded = ["prefixCls", "icon", "mode", "level", "disabled", "children", "collapsed", "keyValue", "selectedKey", "subMenuMode", "inlineIndent", "className", "handleOnClick", "paddingLeft", "style"];
21846
+ var _excluded = ["prefixCls", "icon", "mode", "level", "disabled", "children", "collapsed", "keyValue", "selectedKey", "setSelectedKeyPath", "subMenuMode", "inlineIndent", "className", "handleOnClick", "paddingLeft", "style", "parentPath"];
21847
+
21842
21848
 
21843
21849
 
21844
21850
 
@@ -21850,13 +21856,13 @@ var MENU_ITEM_CONTAINER_NAME = 'menu-item-content-container';
21850
21856
  var InternalMenuItem = function InternalMenuItem(props, ref) {
21851
21857
  var _classNames;
21852
21858
 
21853
- var _React$useContext = react__WEBPACK_IMPORTED_MODULE_3__["useContext"](_config_provider__WEBPACK_IMPORTED_MODULE_4__["ConfigContext"]),
21859
+ var _React$useContext = react__WEBPACK_IMPORTED_MODULE_5__["useContext"](_config_provider__WEBPACK_IMPORTED_MODULE_6__["ConfigContext"]),
21854
21860
  getPrefixCls = _React$useContext.getPrefixCls,
21855
21861
  pkgPrefixCls = _React$useContext.prefixCls,
21856
21862
  userDefaultProps = _React$useContext.compDefaultProps; // 属性需要合并一遍用户定义的默认属性
21857
21863
 
21858
21864
 
21859
- var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_5__["getCompProps"])('MenuItem', userDefaultProps, props),
21865
+ var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_7__["getCompProps"])('MenuItem', userDefaultProps, props),
21860
21866
  customPrefixcls = _getCompProps.prefixCls,
21861
21867
  icon = _getCompProps.icon,
21862
21868
  mode = _getCompProps.mode,
@@ -21867,6 +21873,7 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
21867
21873
  collapsed = _getCompProps.collapsed,
21868
21874
  keyValue = _getCompProps.keyValue,
21869
21875
  selectedKey = _getCompProps.selectedKey,
21876
+ setSelectedKeyPath = _getCompProps.setSelectedKeyPath,
21870
21877
  subMenuMode = _getCompProps.subMenuMode,
21871
21878
  inlineIndent = _getCompProps.inlineIndent,
21872
21879
  className = _getCompProps.className,
@@ -21874,20 +21881,22 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
21874
21881
  _getCompProps$padding = _getCompProps.paddingLeft,
21875
21882
  paddingLeft = _getCompProps$padding === void 0 ? 0 : _getCompProps$padding,
21876
21883
  style = _getCompProps.style,
21877
- restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default()(_getCompProps, _excluded);
21884
+ parentPath = _getCompProps.parentPath,
21885
+ restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3___default()(_getCompProps, _excluded);
21878
21886
 
21879
- Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_8__["default"])(!keyValue && keyValue !== 0, 'menuitem', 'cannot found children in Menu.Item');
21887
+ Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_10__["default"])(!keyValue && keyValue !== 0, 'menuitem', 'cannot found children in Menu.Item');
21880
21888
  var prefixCls = getPrefixCls(pkgPrefixCls, 'menu-item', customPrefixcls);
21881
- var menuItemRef = ref || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createRef"]();
21889
+ var menuItemRef = ref || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createRef"]();
21890
+ var menuItemParentPath = Array.isArray(parentPath) ? [].concat(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2___default()(parentPath), [keyValue]) : [keyValue];
21882
21891
 
21883
21892
  var renderItemChildren = function renderItemChildren(children) {
21884
21893
  if (typeof children === 'string') {
21885
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createElement"]("span", {
21894
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createElement"]("span", {
21886
21895
  className: MENU_ITEM_CONTAINER_NAME
21887
21896
  }, children);
21888
21897
  }
21889
21898
 
21890
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createElement"]("div", {
21899
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createElement"]("div", {
21891
21900
  className: MENU_ITEM_CONTAINER_NAME
21892
21901
  }, typeof children === 'function' ? children() : children);
21893
21902
  };
@@ -21911,7 +21920,7 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
21911
21920
  e.stopPropagation();
21912
21921
  var info = {
21913
21922
  key: keyValue,
21914
- keyPath: [keyValue],
21923
+ keyPath: menuItemParentPath,
21915
21924
  domEvent: e.nativeEvent
21916
21925
  };
21917
21926
  handleOnClick(info);
@@ -21923,7 +21932,7 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
21923
21932
  }
21924
21933
 
21925
21934
  if (level > 1 && mode !== 'inline') {
21926
- return _util__WEBPACK_IMPORTED_MODULE_7__["DEFAUTL_PADDING"];
21935
+ return _util__WEBPACK_IMPORTED_MODULE_9__["DEFAUTL_PADDING"];
21927
21936
  } // if (level === 1 && icon) {
21928
21937
  // return 0
21929
21938
  // }
@@ -21944,32 +21953,37 @@ var InternalMenuItem = function InternalMenuItem(props, ref) {
21944
21953
  };
21945
21954
  var titleStyle = {
21946
21955
  paddingLeft: "".concat(getPaddingLeft(), "px"),
21947
- paddingRight: mode !== 'inline' && level > 1 ? "".concat(_util__WEBPACK_IMPORTED_MODULE_7__["DEFAUTL_PADDING"], "px") : 0
21956
+ paddingRight: mode !== 'inline' && level > 1 ? "".concat(_util__WEBPACK_IMPORTED_MODULE_9__["DEFAUTL_PADDING"], "px") : 0
21948
21957
  };
21949
21958
 
21950
21959
  var renderTitle = function renderTitle() {
21951
21960
  if (!icon && collapsed && level === 1 && typeof children === 'string') {
21952
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createElement"]("p", null, children.charAt(0));
21961
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createElement"]("p", null, children.charAt(0));
21953
21962
  }
21954
21963
 
21955
21964
  return renderItemChildren(children);
21956
21965
  };
21957
21966
 
21958
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createElement"]("li", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
21967
+ react__WEBPACK_IMPORTED_MODULE_5__["useEffect"](function () {
21968
+ if (selectedKey && selectedKey === keyValue) {
21969
+ setSelectedKeyPath(menuItemParentPath);
21970
+ }
21971
+ }, [selectedKey]);
21972
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createElement"]("li", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
21959
21973
  ref: menuItemRef,
21960
- className: classnames__WEBPACK_IMPORTED_MODULE_6___default()(className, (_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, prefixCls, subMenuMode !== 'horizontal'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-collapsed"), collapsed && level === 1), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-active"), selectedKey === keyValue), _classNames)),
21974
+ className: classnames__WEBPACK_IMPORTED_MODULE_8___default()(className, (_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, prefixCls, subMenuMode !== 'horizontal'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-collapsed"), collapsed && level === 1), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames, "".concat(prefixCls, "-active"), selectedKey === keyValue), _classNames)),
21961
21975
  role: "menuitem",
21962
21976
  style: style,
21963
21977
  key: keyValue
21964
- }, mouseEvent), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["createElement"]("div", {
21965
- className: classnames__WEBPACK_IMPORTED_MODULE_6___default()("".concat(prefixCls, "-title")),
21978
+ }, mouseEvent), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["createElement"]("div", {
21979
+ className: classnames__WEBPACK_IMPORTED_MODULE_8___default()("".concat(prefixCls, "-title")),
21966
21980
  style: titleStyle
21967
- }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["cloneElement"](Object(_util__WEBPACK_IMPORTED_MODULE_7__["renderReactNodeFunction"])(icon), {
21968
- className: classnames__WEBPACK_IMPORTED_MODULE_6___default()("".concat(prefixCls, "-icon"))
21981
+ }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["cloneElement"](Object(_util__WEBPACK_IMPORTED_MODULE_9__["renderReactNodeFunction"])(icon), {
21982
+ className: classnames__WEBPACK_IMPORTED_MODULE_8___default()("".concat(prefixCls, "-icon"))
21969
21983
  }), renderTitle()));
21970
21984
  };
21971
21985
 
21972
- var MenuItem = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3__["forwardRef"](InternalMenuItem);
21986
+ var MenuItem = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5__["forwardRef"](InternalMenuItem);
21973
21987
  MenuItem.displayName = 'MenuItem';
21974
21988
  /* harmony default export */ __webpack_exports__["default"] = (MenuItem);
21975
21989
 
@@ -22017,33 +22031,36 @@ __webpack_require__.r(__webpack_exports__);
22017
22031
  /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0__);
22018
22032
  /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
22019
22033
  /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1__);
22020
- /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
22021
- /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2__);
22022
- /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");
22023
- /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_3__);
22024
- /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.string.includes.js */ "./node_modules/core-js/modules/es.string.includes.js");
22025
- /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_4__);
22026
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
22027
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_5__);
22028
- /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
22029
- /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_6__);
22030
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! react */ "react");
22031
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_7__);
22032
- /* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
22033
- /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
22034
- /* harmony import */ var _utils_react_children__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../_utils/react-children */ "./components/_utils/react-children.ts");
22035
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
22036
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_11__);
22037
- /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./util */ "./components/menu/util.ts");
22038
- /* harmony import */ var _utils_hooks__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ../_utils/hooks */ "./components/_utils/hooks.tsx");
22039
- /* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../index */ "./components/index.tsx");
22040
- /* harmony import */ var _utils_usePopper__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../_utils/usePopper */ "./components/_utils/usePopper.tsx");
22041
- /* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
22042
- /* harmony import */ var _menuItem__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./menuItem */ "./components/menu/menuItem.tsx");
22034
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ "./node_modules/@babel/runtime/helpers/toConsumableArray.js");
22035
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2__);
22036
+ /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/objectWithoutProperties */ "./node_modules/@babel/runtime/helpers/objectWithoutProperties.js");
22037
+ /* harmony import */ var _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3__);
22038
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
22039
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_4__);
22040
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.array.includes.js */ "./node_modules/core-js/modules/es.array.includes.js");
22041
+ /* harmony import */ var core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_includes_js__WEBPACK_IMPORTED_MODULE_5__);
22042
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.string.includes.js */ "./node_modules/core-js/modules/es.string.includes.js");
22043
+ /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_6__);
22044
+ /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
22045
+ /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_7__);
22046
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react */ "react");
22047
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_8__);
22048
+ /* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../config-provider */ "./components/config-provider/index.tsx");
22049
+ /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
22050
+ /* harmony import */ var _utils_react_children__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../_utils/react-children */ "./components/_utils/react-children.ts");
22051
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
22052
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_12__);
22053
+ /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./util */ "./components/menu/util.ts");
22054
+ /* harmony import */ var _utils_hooks__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../_utils/hooks */ "./components/_utils/hooks.tsx");
22055
+ /* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../index */ "./components/index.tsx");
22056
+ /* harmony import */ var _utils_usePopper__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../_utils/usePopper */ "./components/_utils/usePopper.tsx");
22057
+ /* harmony import */ var _utils_devwarning__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ../_utils/devwarning */ "./components/_utils/devwarning.ts");
22058
+ /* harmony import */ var _menuItem__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./menuItem */ "./components/menu/menuItem.tsx");
22059
+
22043
22060
 
22044
22061
 
22045
22062
 
22046
- var _excluded = ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "selectedKeyPath", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"];
22063
+ var _excluded = ["prefixCls", "theme", "mode", "title", "icon", "disabled", "children", "collapsed", "keyValue", "selectedKey", "selectedKeyPath", "setSelectedKeyPath", "openKeys", "triggerSubMenuAction", "forceSubMenuRender", "inlineIndent", "className", "style", "handleOnOpenChange", "paddingLeft"];
22047
22064
 
22048
22065
 
22049
22066
 
@@ -22063,13 +22080,13 @@ var _excluded = ["prefixCls", "theme", "mode", "title", "icon", "disabled", "chi
22063
22080
  var SubMenu = function SubMenu(props) {
22064
22081
  var _classNames2, _classNames3;
22065
22082
 
22066
- var _React$useContext = react__WEBPACK_IMPORTED_MODULE_7___default.a.useContext(_config_provider__WEBPACK_IMPORTED_MODULE_8__["ConfigContext"]),
22083
+ var _React$useContext = react__WEBPACK_IMPORTED_MODULE_8___default.a.useContext(_config_provider__WEBPACK_IMPORTED_MODULE_9__["ConfigContext"]),
22067
22084
  getPrefixCls = _React$useContext.getPrefixCls,
22068
22085
  pkgPrefixCls = _React$useContext.prefixCls,
22069
22086
  userDefaultProps = _React$useContext.compDefaultProps; // 属性需要合并一遍用户定义的默认属性
22070
22087
 
22071
22088
 
22072
- var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_9__["getCompProps"])('MenuSubMenu', userDefaultProps, props),
22089
+ var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_10__["getCompProps"])('MenuSubMenu', userDefaultProps, props),
22073
22090
  customPrefixcls = _getCompProps.prefixCls,
22074
22091
  theme = _getCompProps.theme,
22075
22092
  mode = _getCompProps.mode,
@@ -22081,6 +22098,7 @@ var SubMenu = function SubMenu(props) {
22081
22098
  keyValue = _getCompProps.keyValue,
22082
22099
  selectedKey = _getCompProps.selectedKey,
22083
22100
  selectedKeyPath = _getCompProps.selectedKeyPath,
22101
+ setSelectedKeyPath = _getCompProps.setSelectedKeyPath,
22084
22102
  openKeys = _getCompProps.openKeys,
22085
22103
  triggerSubMenuAction = _getCompProps.triggerSubMenuAction,
22086
22104
  forceSubMenuRender = _getCompProps.forceSubMenuRender,
@@ -22090,7 +22108,7 @@ var SubMenu = function SubMenu(props) {
22090
22108
  handleOnOpenChange = _getCompProps.handleOnOpenChange,
22091
22109
  _getCompProps$padding = _getCompProps.paddingLeft,
22092
22110
  paddingLeft = _getCompProps$padding === void 0 ? 0 : _getCompProps$padding,
22093
- restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_2___default()(_getCompProps, _excluded);
22111
+ restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_3___default()(_getCompProps, _excluded);
22094
22112
 
22095
22113
  var isVertical = mode === 'vertical'; // 初始化level
22096
22114
 
@@ -22098,25 +22116,31 @@ var SubMenu = function SubMenu(props) {
22098
22116
  restProps.level = 1;
22099
22117
  }
22100
22118
 
22119
+ if (Array.isArray(restProps.parentPath)) {
22120
+ restProps.parentPath = [].concat(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_2___default()(restProps.parentPath), [keyValue]);
22121
+ } else {
22122
+ restProps.parentPath = [keyValue];
22123
+ }
22124
+
22101
22125
  if (mode === 'inline') {
22102
22126
  restProps.subMenuMode = 'vertical';
22103
22127
  restProps.popupOffset = [];
22104
22128
  }
22105
22129
 
22106
- Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_16__["default"])(!children, 'submenu', 'cannot found children in Menu.SubMenu'); // className前缀
22130
+ Object(_utils_devwarning__WEBPACK_IMPORTED_MODULE_17__["default"])(!children, 'submenu', 'cannot found children in Menu.SubMenu'); // className前缀
22107
22131
 
22108
22132
  var prefixCls = getPrefixCls(pkgPrefixCls, 'menu-submenu', customPrefixcls);
22109
- var subMenuRef = react__WEBPACK_IMPORTED_MODULE_7___default.a.useRef(null);
22110
- var subMenuWrapperRef = react__WEBPACK_IMPORTED_MODULE_7___default.a.useRef(null);
22111
- var subMenuVerticalRef = react__WEBPACK_IMPORTED_MODULE_7___default.a.useRef(null);
22112
- var subMenuWrapperVerticalRef = react__WEBPACK_IMPORTED_MODULE_7___default.a.useRef(null);
22133
+ var subMenuRef = react__WEBPACK_IMPORTED_MODULE_8___default.a.useRef(null);
22134
+ var subMenuWrapperRef = react__WEBPACK_IMPORTED_MODULE_8___default.a.useRef(null);
22135
+ var subMenuVerticalRef = react__WEBPACK_IMPORTED_MODULE_8___default.a.useRef(null);
22136
+ var subMenuWrapperVerticalRef = react__WEBPACK_IMPORTED_MODULE_8___default.a.useRef(null);
22113
22137
  var visible = Array.isArray(openKeys) && openKeys.includes(keyValue);
22114
- react__WEBPACK_IMPORTED_MODULE_7___default.a.useEffect(function () {
22138
+ react__WEBPACK_IMPORTED_MODULE_8___default.a.useEffect(function () {
22115
22139
  if (!visible || isVertical) return;
22116
22140
  var subMenuWrapperEle = subMenuWrapperRef.current;
22117
22141
  var subMenuEle = subMenuRef.current;
22118
22142
 
22119
- if (subMenuWrapperEle && Object(_util__WEBPACK_IMPORTED_MODULE_12__["isElementInViewport"])(subMenuEle)) {
22143
+ if (subMenuWrapperEle && Object(_util__WEBPACK_IMPORTED_MODULE_13__["isElementInViewport"])(subMenuEle)) {
22120
22144
  var position = subMenuWrapperEle.getBoundingClientRect();
22121
22145
  var windowHeight = document.body.offsetHeight;
22122
22146
 
@@ -22131,12 +22155,12 @@ var SubMenu = function SubMenu(props) {
22131
22155
  return 0;
22132
22156
  }
22133
22157
 
22134
- return _util__WEBPACK_IMPORTED_MODULE_12__["DEFAUTL_PADDING"];
22158
+ return _util__WEBPACK_IMPORTED_MODULE_13__["DEFAUTL_PADDING"];
22135
22159
  };
22136
22160
 
22137
22161
  var getPaddingLeft = function getPaddingLeft() {
22138
22162
  if (restProps.level > 1 && mode !== 'inline') {
22139
- return _util__WEBPACK_IMPORTED_MODULE_12__["DEFAUTL_PADDING"];
22163
+ return _util__WEBPACK_IMPORTED_MODULE_13__["DEFAUTL_PADDING"];
22140
22164
  }
22141
22165
 
22142
22166
  if (restProps.level === 1 && icon) {
@@ -22153,7 +22177,7 @@ var SubMenu = function SubMenu(props) {
22153
22177
 
22154
22178
  var curPaddingRight = getPaddingRight();
22155
22179
  var curPaddingLeft = getPaddingLeft();
22156
- var getCurrentStyle = react__WEBPACK_IMPORTED_MODULE_7___default.a.useCallback(function () {
22180
+ var getCurrentStyle = react__WEBPACK_IMPORTED_MODULE_8___default.a.useCallback(function () {
22157
22181
  // 内嵌模式height主要是用来动画的,必须要设置overflow溢出隐藏
22158
22182
  if (mode === 'inline') {
22159
22183
  var _subMenuWrapperRef$cu;
@@ -22209,18 +22233,15 @@ var SubMenu = function SubMenu(props) {
22209
22233
  }; // 点击区域外的地方关闭
22210
22234
 
22211
22235
 
22212
- Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_13__["useOnClickOutside"])([subMenuVerticalRef, subMenuWrapperVerticalRef], function (e) {
22236
+ Object(_utils_hooks__WEBPACK_IMPORTED_MODULE_14__["useOnClickOutside"])([subMenuVerticalRef, subMenuWrapperVerticalRef], function (e) {
22213
22237
  var _e$target;
22214
22238
 
22215
22239
  var className = (e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.className) || '';
22216
22240
 
22217
- if (!className.includes(_menuItem__WEBPACK_IMPORTED_MODULE_17__["MENU_ITEM_CONTAINER_NAME"])) {
22241
+ if (!className.includes(_menuItem__WEBPACK_IMPORTED_MODULE_18__["MENU_ITEM_CONTAINER_NAME"])) {
22218
22242
  closeSubMenu();
22219
22243
  }
22220
- }); // // 缩略模式自动关闭子菜单
22221
- // if (triggerSubMenuAction === 'click' && mode === 'vertical' && collapsed) {
22222
- // closeSubMenu()
22223
- // }
22244
+ });
22224
22245
 
22225
22246
  var handleMouseEvent = function handleMouseEvent(status) {
22226
22247
  if (disabled || triggerSubMenuAction === 'click') return;
@@ -22236,9 +22257,6 @@ var SubMenu = function SubMenu(props) {
22236
22257
  };
22237
22258
 
22238
22259
  var handleOnClick = function handleOnClick(info) {
22239
- // 保存路径
22240
- info.keyPath = info.keyPath.concat([keyValue]);
22241
-
22242
22260
  if (triggerSubMenuAction === 'click' && isVertical) {
22243
22261
  closeSubMenu();
22244
22262
  }
@@ -22253,38 +22271,38 @@ var SubMenu = function SubMenu(props) {
22253
22271
  };
22254
22272
 
22255
22273
  var renderItemTitle = function renderItemTitle() {
22256
- if (!icon && collapsed && restProps.level === 1 && Object(_util__WEBPACK_IMPORTED_MODULE_12__["isString"])(title)) {
22257
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("p", null, title.charAt(0));
22274
+ if (!icon && collapsed && restProps.level === 1 && Object(_util__WEBPACK_IMPORTED_MODULE_13__["isString"])(title)) {
22275
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("p", null, title.charAt(0));
22258
22276
  }
22259
22277
 
22260
- if (Object(_util__WEBPACK_IMPORTED_MODULE_12__["isString"])(title)) {
22261
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("span", null, title);
22278
+ if (Object(_util__WEBPACK_IMPORTED_MODULE_13__["isString"])(title)) {
22279
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("span", null, title);
22262
22280
  }
22263
22281
 
22264
- return Object(_util__WEBPACK_IMPORTED_MODULE_12__["renderReactNodeFunction"])(title);
22282
+ return Object(_util__WEBPACK_IMPORTED_MODULE_13__["renderReactNodeFunction"])(title);
22265
22283
  };
22266
22284
 
22267
22285
  var renderItemArrow = function renderItemArrow() {
22268
22286
  if (mode !== 'inline' || collapsed) return null;
22269
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_14__["Icon"], {
22287
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_15__["Icon"], {
22270
22288
  type: "arrow-down",
22271
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-arrow"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "".concat(prefixCls, "-arrow-").concat(visible ? 'up' : 'down'), true))
22289
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-arrow"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, "".concat(prefixCls, "-arrow-").concat(visible ? 'up' : 'down'), true))
22272
22290
  });
22273
22291
  };
22274
22292
 
22275
22293
  if (restProps.subMenuMode === 'horizontal' && restProps.level > 1 && children) {
22276
- var width = Object(_util__WEBPACK_IMPORTED_MODULE_12__["getItemWidth"])(children);
22277
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22278
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-thrid-item")),
22294
+ var width = Object(_util__WEBPACK_IMPORTED_MODULE_13__["getItemWidth"])(children);
22295
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22296
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-thrid-item")),
22279
22297
  style: {
22280
22298
  width: width
22281
22299
  }
22282
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22283
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-thrid-title"))
22284
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("span", null, title)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("ul", {
22285
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-thrid-list"), restProps.popupClassName)
22286
- }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_10__["toArray"])(children).map(function (item, i) {
22287
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.cloneElement(item, {
22300
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22301
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-thrid-title"))
22302
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("span", null, title)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("ul", {
22303
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-thrid-list"), restProps.popupClassName)
22304
+ }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_11__["toArray"])(children).map(function (item, i) {
22305
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.cloneElement(item, {
22288
22306
  level: restProps.level + 1,
22289
22307
  subMenuMode: restProps.subMenuMode,
22290
22308
  keyValue: item && item.key || i,
@@ -22310,20 +22328,20 @@ var SubMenu = function SubMenu(props) {
22310
22328
  paddingLeft: "".concat(curPaddingLeft, "px")
22311
22329
  }; // eslint-disable-next-line react-hooks/rules-of-hooks
22312
22330
 
22313
- var verticalView = Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_15__["default"])( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("li", {
22314
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()(prefixCls, className, (_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "light", theme === 'light'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-hover"), !disabled && Array.isArray(openKeys) && openKeys.includes(keyValue)), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-active"), Array.isArray(selectedKeyPath) && selectedKeyPath.includes(keyValue)), _classNames2)),
22331
+ var verticalView = Object(_utils_usePopper__WEBPACK_IMPORTED_MODULE_16__["default"])( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("li", {
22332
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()(prefixCls, className, (_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "light", theme === 'light'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-hover"), !disabled && Array.isArray(openKeys) && openKeys.includes(keyValue)), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-active"), Array.isArray(selectedKeyPath) && selectedKeyPath.includes(keyValue)), _classNames2)),
22315
22333
  ref: subMenuVerticalRef,
22316
22334
  key: keyValue // style={Object.assign(style || {}, { display: mode === 'vertical' ? 'list-item' : 'none' })}
22317
22335
  ,
22318
22336
  onMouseLeave: handleOnMouseLeave,
22319
22337
  onMouseEnter: handleOnMouseEnter,
22320
22338
  onClick: handleOnClickSubMenu
22321
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22322
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-title")),
22339
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22340
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-title")),
22323
22341
  style: titleStyle
22324
- }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.cloneElement(Object(_util__WEBPACK_IMPORTED_MODULE_12__["renderReactNodeFunction"])(icon), {
22325
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-icon"))
22326
- }), renderItemTitle(), renderItemArrow())), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22342
+ }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.cloneElement(Object(_util__WEBPACK_IMPORTED_MODULE_13__["renderReactNodeFunction"])(icon), {
22343
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-icon"))
22344
+ }), renderItemTitle(), renderItemArrow())), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22327
22345
  ref: subMenuWrapperVerticalRef,
22328
22346
  onMouseLeave: function onMouseLeave() {
22329
22347
  handleOnMouseLeave();
@@ -22331,11 +22349,11 @@ var SubMenu = function SubMenu(props) {
22331
22349
  onMouseEnter: function onMouseEnter() {
22332
22350
  handleOnMouseEnter();
22333
22351
  }
22334
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("ul", {
22335
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-sub"), restProps.popupClassName, (_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(prefixCls, "-sub-second"), restProps.level === 1), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(prefixCls, "-sub-third"), restProps.level === 2), _classNames3))
22336
- }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_10__["toArray"])(children).map(function (item, index) {
22352
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("ul", {
22353
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-sub"), restProps.popupClassName, (_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(prefixCls, "-sub-second"), restProps.level === 1), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames3, "".concat(prefixCls, "-sub-third"), restProps.level === 2), _classNames3))
22354
+ }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_11__["toArray"])(children).map(function (item, index) {
22337
22355
  var key = item.key || index;
22338
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.cloneElement(item, {
22356
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.cloneElement(item, {
22339
22357
  key: key,
22340
22358
  level: restProps.level + 1,
22341
22359
  keyValue: key,
@@ -22343,13 +22361,15 @@ var SubMenu = function SubMenu(props) {
22343
22361
  mode: mode,
22344
22362
  theme: theme,
22345
22363
  selectedKey: selectedKey,
22364
+ setSelectedKeyPath: setSelectedKeyPath,
22346
22365
  openKeys: openKeys,
22347
22366
  forceSubMenuRender: forceSubMenuRender,
22348
22367
  triggerSubMenuAction: triggerSubMenuAction,
22349
22368
  handleOnOpenChange: handleOnOpenChange,
22350
22369
  handleOnClick: handleOnClick,
22351
22370
  inlineIndent: inlineIndent,
22352
- paddingLeft: curPaddingLeft
22371
+ paddingLeft: curPaddingLeft,
22372
+ parentPath: restProps.parentPath
22353
22373
  });
22354
22374
  }))), {
22355
22375
  arrow: false,
@@ -22366,38 +22386,40 @@ var SubMenu = function SubMenu(props) {
22366
22386
  } else {
22367
22387
  var _classNames4;
22368
22388
 
22369
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("li", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
22389
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("li", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_1___default()({
22370
22390
  ref: subMenuRef,
22371
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()(prefixCls, className, (_classNames4 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-active"), Array.isArray(selectedKeyPath) && selectedKeyPath.includes(keyValue)), _classNames4)),
22391
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()(prefixCls, className, (_classNames4 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-collapsed"), collapsed), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-disabled"), disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames4, "".concat(prefixCls, "-active"), Array.isArray(selectedKeyPath) && selectedKeyPath.includes(keyValue)), _classNames4)),
22372
22392
  key: keyValue
22373
22393
  }, mouseEvent, {
22374
22394
  style: style
22375
- }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22376
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-title")),
22395
+ }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22396
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-title")),
22377
22397
  style: titleStyle
22378
- }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.cloneElement(Object(_util__WEBPACK_IMPORTED_MODULE_12__["renderReactNodeFunction"])(icon), {
22379
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-icon"))
22380
- }), renderItemTitle(), renderItemArrow()), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("div", {
22398
+ }, icon && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.cloneElement(Object(_util__WEBPACK_IMPORTED_MODULE_13__["renderReactNodeFunction"])(icon), {
22399
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-icon"))
22400
+ }), renderItemTitle(), renderItemArrow()), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("div", {
22381
22401
  style: getCurrentStyle(),
22382
22402
  ref: subMenuWrapperRef
22383
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.createElement("ul", {
22384
- className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-sub"), restProps.popupClassName)
22385
- }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_10__["toArray"])(children).map(function (item, index) {
22403
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.createElement("ul", {
22404
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-sub"), restProps.popupClassName)
22405
+ }, Object(_utils_react_children__WEBPACK_IMPORTED_MODULE_11__["toArray"])(children).map(function (item, index) {
22386
22406
  var key = item.key || index;
22387
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_7___default.a.cloneElement(item, {
22407
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8___default.a.cloneElement(item, {
22388
22408
  key: key,
22389
22409
  level: restProps.level + 1,
22390
22410
  keyValue: key,
22391
22411
  collapsed: collapsed,
22392
22412
  mode: mode,
22393
22413
  selectedKey: selectedKey,
22414
+ setSelectedKeyPath: setSelectedKeyPath,
22394
22415
  openKeys: openKeys,
22395
22416
  forceSubMenuRender: forceSubMenuRender,
22396
22417
  triggerSubMenuAction: triggerSubMenuAction,
22397
22418
  handleOnOpenChange: handleOnOpenChange,
22398
22419
  handleOnClick: handleOnClick,
22399
22420
  inlineIndent: inlineIndent,
22400
- paddingLeft: curPaddingLeft
22421
+ paddingLeft: curPaddingLeft,
22422
+ parentPath: restProps.parentPath
22401
22423
  });
22402
22424
  }))));
22403
22425
  }
@@ -25603,9 +25625,11 @@ __webpack_require__.r(__webpack_exports__);
25603
25625
  /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_12__);
25604
25626
  /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
25605
25627
  /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_13__);
25606
- /* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
25607
- /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
25608
- /* harmony import */ var _context__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ./context */ "./components/radio/context.tsx");
25628
+ /* harmony import */ var lodash_isBoolean__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! lodash/isBoolean */ "./node_modules/lodash/isBoolean.js");
25629
+ /* harmony import */ var lodash_isBoolean__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(lodash_isBoolean__WEBPACK_IMPORTED_MODULE_14__);
25630
+ /* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
25631
+ /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
25632
+ /* harmony import */ var _context__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./context */ "./components/radio/context.tsx");
25609
25633
 
25610
25634
 
25611
25635
 
@@ -25630,12 +25654,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
25630
25654
 
25631
25655
 
25632
25656
 
25657
+
25633
25658
  var InternalRadio = function InternalRadio(props, ref) {
25634
25659
  var _classNames;
25635
25660
 
25636
- var context = react__WEBPACK_IMPORTED_MODULE_12___default.a.useContext(_context__WEBPACK_IMPORTED_MODULE_16__["default"]);
25661
+ var context = react__WEBPACK_IMPORTED_MODULE_12___default.a.useContext(_context__WEBPACK_IMPORTED_MODULE_17__["default"]);
25637
25662
 
25638
- var _React$useContext = react__WEBPACK_IMPORTED_MODULE_12___default.a.useContext(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_14__["default"]),
25663
+ var _React$useContext = react__WEBPACK_IMPORTED_MODULE_12___default.a.useContext(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_15__["default"]),
25639
25664
  getPrefixCls = _React$useContext.getPrefixCls,
25640
25665
  prefixCls = _React$useContext.prefixCls,
25641
25666
  userDefaultProps = _React$useContext.compDefaultProps;
@@ -25643,7 +25668,7 @@ var InternalRadio = function InternalRadio(props, ref) {
25643
25668
  var innerRef = react__WEBPACK_IMPORTED_MODULE_12___default.a.useRef();
25644
25669
  var mergedRef = ref || innerRef;
25645
25670
 
25646
- var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_15__["getCompProps"])('Radio', userDefaultProps, props),
25671
+ var _getCompProps = Object(_utils__WEBPACK_IMPORTED_MODULE_16__["getCompProps"])('Radio', userDefaultProps, props),
25647
25672
  style = _getCompProps.style,
25648
25673
  checked = _getCompProps.checked,
25649
25674
  children = _getCompProps.children,
@@ -25654,13 +25679,17 @@ var InternalRadio = function InternalRadio(props, ref) {
25654
25679
  restProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_10___default()(_getCompProps, _excluded); // 属性需要合并一遍用户定义的默认属性
25655
25680
 
25656
25681
 
25682
+ var getChecked = function getChecked() {
25683
+ return lodash_isBoolean__WEBPACK_IMPORTED_MODULE_14___default()(checked) ? checked : defaultChecked;
25684
+ };
25685
+
25657
25686
  var getPrefix = function getPrefix(radioType) {
25658
25687
  return "radio".concat(radioType === 'square' ? "-".concat(radioType) : '');
25659
25688
  };
25660
25689
 
25661
25690
  var radioPrefixCls = getPrefixCls === null || getPrefixCls === void 0 ? void 0 : getPrefixCls(prefixCls, getPrefix(radioType), customPrefixcls); // 样式前缀
25662
25691
 
25663
- var _React$useState = react__WEBPACK_IMPORTED_MODULE_12___default.a.useState(checked || defaultChecked),
25692
+ var _React$useState = react__WEBPACK_IMPORTED_MODULE_12___default.a.useState(getChecked()),
25664
25693
  _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9___default()(_React$useState, 2),
25665
25694
  isChecked = _React$useState2[0],
25666
25695
  setIsChecked = _React$useState2[1];
@@ -34073,25 +34102,33 @@ __webpack_require__.r(__webpack_exports__);
34073
34102
  __webpack_require__.r(__webpack_exports__);
34074
34103
  /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js");
34075
34104
  /* harmony import */ var _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__);
34076
- /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
34077
- /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1__);
34078
- /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
34079
- /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2__);
34080
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
34081
- /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_3__);
34082
- /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
34083
- /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_4__);
34084
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! react */ "react");
34085
- /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_5__);
34086
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
34087
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_6__);
34088
- /* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
34089
- /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
34090
- /* harmony import */ var _treeNode__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./treeNode */ "./components/tree/treeNode.tsx");
34091
- /* harmony import */ var _utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./utils/treeUtils */ "./components/tree/utils/treeUtils.tsx");
34092
- /* harmony import */ var _treeHooks__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./treeHooks */ "./components/tree/treeHooks.tsx");
34093
- /* harmony import */ var lodash_isBoolean__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! lodash/isBoolean */ "./node_modules/lodash/isBoolean.js");
34094
- /* harmony import */ var lodash_isBoolean__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(lodash_isBoolean__WEBPACK_IMPORTED_MODULE_12__);
34105
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ "./node_modules/@babel/runtime/helpers/toConsumableArray.js");
34106
+ /* harmony import */ var _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1__);
34107
+ /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js");
34108
+ /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2__);
34109
+ /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js");
34110
+ /* harmony import */ var _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_3__);
34111
+ /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.object.to-string.js */ "./node_modules/core-js/modules/es.object.to-string.js");
34112
+ /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_4__);
34113
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/web.dom-collections.for-each.js */ "./node_modules/core-js/modules/web.dom-collections.for-each.js");
34114
+ /* harmony import */ var core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_for_each_js__WEBPACK_IMPORTED_MODULE_5__);
34115
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ "./node_modules/core-js/modules/es.object.keys.js");
34116
+ /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_6__);
34117
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
34118
+ /* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_7__);
34119
+ /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
34120
+ /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_8__);
34121
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! react */ "react");
34122
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_9__);
34123
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! classnames */ "./node_modules/classnames/index.js");
34124
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_10__);
34125
+ /* harmony import */ var _config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../config-provider/ConfigContext */ "./components/config-provider/ConfigContext.tsx");
34126
+ /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../_utils */ "./components/_utils/index.ts");
34127
+ /* harmony import */ var _treeNode__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./treeNode */ "./components/tree/treeNode.tsx");
34128
+ /* harmony import */ var _utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./utils/treeUtils */ "./components/tree/utils/treeUtils.tsx");
34129
+ /* harmony import */ var _treeHooks__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! ./treeHooks */ "./components/tree/treeHooks.tsx");
34130
+ /* harmony import */ var lodash_isBoolean__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! lodash/isBoolean */ "./node_modules/lodash/isBoolean.js");
34131
+ /* harmony import */ var lodash_isBoolean__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(lodash_isBoolean__WEBPACK_IMPORTED_MODULE_16__);
34095
34132
 
34096
34133
 
34097
34134
 
@@ -34105,13 +34142,17 @@ __webpack_require__.r(__webpack_exports__);
34105
34142
 
34106
34143
 
34107
34144
 
34108
- var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.forwardRef(function (props, ref) {
34109
- var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_5__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_7__["default"]),
34145
+
34146
+
34147
+
34148
+
34149
+ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.forwardRef(function (props, ref) {
34150
+ var _useContext = Object(react__WEBPACK_IMPORTED_MODULE_9__["useContext"])(_config_provider_ConfigContext__WEBPACK_IMPORTED_MODULE_11__["default"]),
34110
34151
  getPrefixCls = _useContext.getPrefixCls,
34111
34152
  prefixCls = _useContext.prefixCls,
34112
34153
  userDefaultProps = _useContext.compDefaultProps;
34113
34154
 
34114
- var TreeProps = Object(_utils__WEBPACK_IMPORTED_MODULE_8__["getCompProps"])('Tree', userDefaultProps, props); // 按钮属性需要合并一遍用户定义的默认属性
34155
+ var TreeProps = Object(_utils__WEBPACK_IMPORTED_MODULE_12__["getCompProps"])('Tree', userDefaultProps, props); // 按钮属性需要合并一遍用户定义的默认属性
34115
34156
 
34116
34157
  var customPrefixcls = TreeProps.prefixCls,
34117
34158
  treeData = TreeProps.treeData,
@@ -34152,76 +34193,90 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34152
34193
  return '';
34153
34194
  } : _TreeProps$setTreeNod2,
34154
34195
  innerEstimatedItemSize = TreeProps.estimatedItemSize,
34155
- style = TreeProps.style;
34196
+ style = TreeProps.style,
34197
+ filterTreeNode = TreeProps.filterTreeNode,
34198
+ filterValue = TreeProps.filterValue;
34156
34199
  var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls); // 树样式前缀
34157
34200
 
34158
34201
  var treeNodePrefixCls = getPrefixCls(prefixCls, 'tree-node', customPrefixcls); // 树节点样式前缀
34159
34202
 
34160
- var treeNodeClassName = classnames__WEBPACK_IMPORTED_MODULE_6___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()({}, "".concat(treePrefixCls), true));
34203
+ var treeNodeClassName = classnames__WEBPACK_IMPORTED_MODULE_10___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_3___default()({}, "".concat(treePrefixCls), true));
34161
34204
  var treeRootClassName = "".concat(treePrefixCls, "-root");
34162
34205
  var estimatedItemSize = innerEstimatedItemSize; // 节点高度
34163
34206
 
34164
- var flattenAllData = react__WEBPACK_IMPORTED_MODULE_5___default.a.useMemo(function () {
34165
- return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["flattenAll"])(treeData, []);
34207
+ var flattenAllData = react__WEBPACK_IMPORTED_MODULE_9___default.a.useMemo(function () {
34208
+ return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["flattenAll"])(treeData, []);
34166
34209
  }, [treeData]);
34167
- var maxLevel = react__WEBPACK_IMPORTED_MODULE_5___default.a.useMemo(function () {
34168
- return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["getMaxLevel"])(flattenAllData);
34210
+ var maxLevel = react__WEBPACK_IMPORTED_MODULE_9___default.a.useMemo(function () {
34211
+ return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getMaxLevel"])(flattenAllData);
34169
34212
  }, [flattenAllData]);
34170
34213
 
34171
- var _useChecked = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_11__["useChecked"])(checkStrictly, checkedKeysProps, defaultCheckedKeys, flattenAllData, maxLevel, checkable),
34172
- _useChecked2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useChecked, 4),
34214
+ var _useChecked = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_15__["useChecked"])(checkStrictly, checkedKeysProps, defaultCheckedKeys, flattenAllData, maxLevel, checkable),
34215
+ _useChecked2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useChecked, 4),
34173
34216
  checkedKeys = _useChecked2[0],
34174
34217
  halfCheckedKeys = _useChecked2[1],
34175
34218
  setCheckedKeys = _useChecked2[2],
34176
34219
  setHalfCheckedKeys = _useChecked2[3];
34177
34220
 
34178
- var _React$useState = react__WEBPACK_IMPORTED_MODULE_5___default.a.useState(scrollToKey),
34179
- _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_React$useState, 2),
34221
+ var _React$useState = react__WEBPACK_IMPORTED_MODULE_9___default.a.useState(scrollToKey),
34222
+ _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_React$useState, 2),
34180
34223
  scrollKey = _React$useState2[0],
34181
34224
  setScrollKey = _React$useState2[1];
34182
34225
 
34183
- var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_5___default.a.useState(0),
34184
- _React$useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_React$useState3, 2),
34226
+ var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_9___default.a.useState(0),
34227
+ _React$useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_React$useState3, 2),
34185
34228
  start = _React$useState4[0],
34186
34229
  setStart = _React$useState4[1];
34187
34230
 
34188
- var _useSelect = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_11__["useSelect"])(selectedKeysProps, defaultSelectedKeys),
34189
- _useSelect2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useSelect, 2),
34231
+ var _useSelect = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_15__["useSelect"])(selectedKeysProps, defaultSelectedKeys),
34232
+ _useSelect2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useSelect, 2),
34190
34233
  selectedKeys = _useSelect2[0],
34191
34234
  setSelectedKeys = _useSelect2[1];
34192
34235
 
34193
- var listRef = react__WEBPACK_IMPORTED_MODULE_5___default.a.useRef(null);
34194
- var plantomRef = react__WEBPACK_IMPORTED_MODULE_5___default.a.useRef(null);
34195
- var rootRef = react__WEBPACK_IMPORTED_MODULE_5___default.a.useRef(null);
34236
+ var listRef = react__WEBPACK_IMPORTED_MODULE_9___default.a.useRef(null);
34237
+ var plantomRef = react__WEBPACK_IMPORTED_MODULE_9___default.a.useRef(null);
34238
+ var rootRef = react__WEBPACK_IMPORTED_MODULE_9___default.a.useRef(null);
34196
34239
  var scrollRef = ref || rootRef;
34197
- var treeNodeRef = react__WEBPACK_IMPORTED_MODULE_5___default.a.useRef(null);
34198
- var dragNodeRef = react__WEBPACK_IMPORTED_MODULE_5___default.a.useRef(null);
34240
+ var treeNodeRef = react__WEBPACK_IMPORTED_MODULE_9___default.a.useRef(null);
34241
+ var dragNodeRef = react__WEBPACK_IMPORTED_MODULE_9___default.a.useRef(null);
34242
+ var delayedDragEnterRef = react__WEBPACK_IMPORTED_MODULE_9___default.a.useRef(null);
34199
34243
 
34200
- var _React$useState5 = react__WEBPACK_IMPORTED_MODULE_5___default.a.useState(true),
34201
- _React$useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_React$useState5, 2),
34244
+ var _React$useState5 = react__WEBPACK_IMPORTED_MODULE_9___default.a.useState(true),
34245
+ _React$useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_React$useState5, 2),
34202
34246
  isInit = _React$useState6[0],
34203
34247
  setIsInit = _React$useState6[1];
34204
34248
 
34205
- var _useExpand = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_11__["useExpand"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit),
34206
- _useExpand2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useExpand, 1),
34207
- expandedKeys = _useExpand2[0];
34249
+ var _React$useState7 = react__WEBPACK_IMPORTED_MODULE_9___default.a.useState(null),
34250
+ _React$useState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_React$useState7, 2),
34251
+ dropPosition = _React$useState8[0],
34252
+ setDropPosition = _React$useState8[1];
34253
+
34254
+ var _React$useState9 = react__WEBPACK_IMPORTED_MODULE_9___default.a.useState(null),
34255
+ _React$useState10 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_React$useState9, 2),
34256
+ dragOverNodeKey = _React$useState10[0],
34257
+ setDragOverNodeKey = _React$useState10[1];
34208
34258
 
34209
- var spreadAttrData = react__WEBPACK_IMPORTED_MODULE_5___default.a.useMemo(function () {
34210
- return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["getSpreadAttrData"])(flattenAllData, expandedKeys);
34259
+ var _useExpand = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_15__["useExpand"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue),
34260
+ _useExpand2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useExpand, 2),
34261
+ expandedKeys = _useExpand2[0],
34262
+ setExpandedKeys = _useExpand2[1];
34263
+
34264
+ var spreadAttrData = react__WEBPACK_IMPORTED_MODULE_9___default.a.useMemo(function () {
34265
+ return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getSpreadAttrData"])(flattenAllData, expandedKeys);
34211
34266
  }, [flattenAllData, expandedKeys]);
34212
- var filterData = react__WEBPACK_IMPORTED_MODULE_5___default.a.useMemo(function () {
34213
- return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["getFilterData"])(spreadAttrData);
34214
- }, [spreadAttrData]);
34267
+ var filterData = react__WEBPACK_IMPORTED_MODULE_9___default.a.useMemo(function () {
34268
+ return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getFilterData"])(spreadAttrData, filterTreeNode, filterValue);
34269
+ }, [spreadAttrData, filterTreeNode, filterValue]);
34215
34270
 
34216
- var _useViewportHeight = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_11__["useViewportHeight"])(height, listRef),
34217
- _useViewportHeight2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useViewportHeight, 1),
34271
+ var _useViewportHeight = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_15__["useViewportHeight"])(height, listRef),
34272
+ _useViewportHeight2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useViewportHeight, 1),
34218
34273
  viewportHeight = _useViewportHeight2[0];
34219
34274
 
34220
- var _useVisibleDataMemo = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_11__["useVisibleDataMemo"])(virtual, filterData, viewportHeight, estimatedItemSize, start),
34221
- _useVisibleDataMemo2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useVisibleDataMemo, 1),
34275
+ var _useVisibleDataMemo = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_15__["useVisibleDataMemo"])(virtual, filterData, viewportHeight, estimatedItemSize, start),
34276
+ _useVisibleDataMemo2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useVisibleDataMemo, 1),
34222
34277
  visibleData = _useVisibleDataMemo2[0];
34223
34278
 
34224
- var index = react__WEBPACK_IMPORTED_MODULE_5___default.a.useMemo(function () {
34279
+ var index = react__WEBPACK_IMPORTED_MODULE_9___default.a.useMemo(function () {
34225
34280
  var scrollIndex = 0;
34226
34281
 
34227
34282
  for (var i = 0; i < filterData.length; i++) {
@@ -34233,9 +34288,9 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34233
34288
 
34234
34289
  return scrollIndex;
34235
34290
  }, [filterData, scrollKey]);
34236
- Object(_treeHooks__WEBPACK_IMPORTED_MODULE_11__["useScrollToKey"])(scrollKey, index, estimatedItemSize, scrollRef, viewportHeight, treeNodePrefixCls);
34237
- Object(_treeHooks__WEBPACK_IMPORTED_MODULE_11__["usePlantomHeightEffect"])(plantomRef, filterData, estimatedItemSize);
34238
- var handleScroll = Object(react__WEBPACK_IMPORTED_MODULE_5__["useCallback"])(function () {
34291
+ Object(_treeHooks__WEBPACK_IMPORTED_MODULE_15__["useScrollToKey"])(scrollKey, index, estimatedItemSize, scrollRef, viewportHeight, treeNodePrefixCls);
34292
+ Object(_treeHooks__WEBPACK_IMPORTED_MODULE_15__["usePlantomHeightEffect"])(plantomRef, filterData, estimatedItemSize);
34293
+ var handleScroll = Object(react__WEBPACK_IMPORTED_MODULE_9__["useCallback"])(function () {
34239
34294
  if (!virtual) return;
34240
34295
  var scrollTop = scrollRef.current.scrollTop;
34241
34296
  setStart(Math.floor(scrollTop / estimatedItemSize));
@@ -34245,8 +34300,8 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34245
34300
  listRef.current.style.transform = "translate3d(0,".concat(tempStartOffset, "px,0)");
34246
34301
  }
34247
34302
  }, [listRef, scrollRef, virtual, estimatedItemSize]);
34248
- var handleExpand = react__WEBPACK_IMPORTED_MODULE_5___default.a.useCallback(function (key, value, node) {
34249
- var newExpandedKeys = value ? Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["addKeys"])(expandedKeys, [key]) : Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["delKey"])(expandedKeys, [key]);
34303
+ var handleExpand = react__WEBPACK_IMPORTED_MODULE_9___default.a.useCallback(function (key, value, node) {
34304
+ var newExpandedKeys = value ? Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["addKeys"])(expandedKeys, [key]) : Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["delKey"])(expandedKeys, [key]);
34250
34305
  onExpand && onExpand(newExpandedKeys, {
34251
34306
  node: node,
34252
34307
  expanded: value
@@ -34254,9 +34309,9 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34254
34309
  setScrollKey('');
34255
34310
  setIsInit(false);
34256
34311
  }, [expandedKeys, onExpand]);
34257
- var handleCheck = react__WEBPACK_IMPORTED_MODULE_5___default.a.useCallback(function (key, value, node, event, pos) {
34258
- var newCheckedKeys = value ? Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["addKeys"])(checkedKeys, [key]) : Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["delKey"])(checkedKeys, [key]);
34259
- var checkState = checkStrictly ? Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["getDataCheckededStateStrictly"])(newCheckedKeys) : Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["getDataCheckededState"])(spreadAttrData, newCheckedKeys, halfCheckedKeys, maxLevel, false, pos, value);
34312
+ var handleCheck = react__WEBPACK_IMPORTED_MODULE_9___default.a.useCallback(function (key, value, node, event, pos) {
34313
+ var newCheckedKeys = value ? Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["addKeys"])(checkedKeys, [key]) : Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["delKey"])(checkedKeys, [key]);
34314
+ var checkState = checkStrictly ? Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getDataCheckededStateStrictly"])(newCheckedKeys) : Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getDataCheckededState"])(spreadAttrData, newCheckedKeys, halfCheckedKeys, maxLevel, false, pos, value);
34260
34315
  onCheck && onCheck(checkState.checkedKeys, {
34261
34316
  event: event,
34262
34317
  node: node,
@@ -34264,48 +34319,96 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34264
34319
  halfCheckedKeys: checkState.halfCheckedKeys
34265
34320
  });
34266
34321
  }, [checkedKeys, spreadAttrData, halfCheckedKeys, maxLevel, onCheck, checkStrictly, setCheckedKeys, setHalfCheckedKeys]);
34267
- var handleDragStart = react__WEBPACK_IMPORTED_MODULE_5___default.a.useCallback(function (event, node) {
34322
+ var handleDragStart = react__WEBPACK_IMPORTED_MODULE_9___default.a.useCallback(function (event, node) {
34268
34323
  onDragStart && onDragStart({
34269
34324
  event: event,
34270
34325
  node: node
34271
34326
  });
34272
34327
  }, [onDragStart]);
34273
- var handleDragOver = react__WEBPACK_IMPORTED_MODULE_5___default.a.useCallback(function (event, node) {
34328
+ var handleDragOver = react__WEBPACK_IMPORTED_MODULE_9___default.a.useCallback(function (event, node, dropTarget) {
34329
+ var dropPos = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["calcDropPosition"])(event, dropTarget);
34330
+ setDropPosition(dropPos);
34331
+ var dragNode = getDragNode();
34332
+
34333
+ if (dragNode.key === node.key) {
34334
+ setDropPosition(null);
34335
+ }
34336
+
34274
34337
  onDragOver && onDragOver({
34275
34338
  event: event,
34276
34339
  node: node
34277
34340
  });
34278
34341
  }, [onDragOver]);
34279
- var handleDragLeave = react__WEBPACK_IMPORTED_MODULE_5___default.a.useCallback(function (event, node) {
34342
+ var handleDragLeave = react__WEBPACK_IMPORTED_MODULE_9___default.a.useCallback(function (event, node) {
34280
34343
  onDragLeave && onDragLeave({
34281
34344
  event: event,
34282
34345
  node: node
34283
34346
  });
34284
34347
  }, [onDragLeave]);
34285
- var handleDragEnter = react__WEBPACK_IMPORTED_MODULE_5___default.a.useCallback(function (event, node) {
34348
+ var handleDragEnter = react__WEBPACK_IMPORTED_MODULE_9___default.a.useCallback(function (event, node, dropTarget) {
34349
+ var key = node.key,
34350
+ pos = node.pos;
34351
+ var dragNode = getDragNode();
34352
+
34353
+ if (!dragNode) {
34354
+ return;
34355
+ }
34356
+
34357
+ if (!delayedDragEnterRef.current) {
34358
+ delayedDragEnterRef.current = {};
34359
+ }
34360
+
34361
+ Object.keys(delayedDragEnterRef.current).forEach(function (key) {
34362
+ clearTimeout(delayedDragEnterRef.current[key]);
34363
+ });
34364
+
34365
+ if ((dragNode === null || dragNode === void 0 ? void 0 : dragNode.key) !== key) {
34366
+ var dragPos = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["calcDropPosition"])(event, dropTarget);
34367
+ setDragOverNodeKey(key);
34368
+ setDropPosition(dragPos);
34369
+ delayedDragEnterRef.current[pos] = setTimeout(function () {
34370
+ var newExpandedKeys = _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default()(expandedKeys);
34371
+
34372
+ if (!node.expand) {
34373
+ newExpandedKeys = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["addKeys"])(expandedKeys, [key]);
34374
+ }
34375
+
34376
+ if (!('expandedKeys' in TreeProps)) {
34377
+ setExpandedKeys(newExpandedKeys);
34378
+ }
34379
+
34380
+ onExpand === null || onExpand === void 0 ? void 0 : onExpand(newExpandedKeys, {
34381
+ node: node,
34382
+ expanded: true
34383
+ });
34384
+ }, 800);
34385
+ }
34386
+
34286
34387
  onDragEnter && onDragEnter({
34287
34388
  event: event,
34288
34389
  node: node
34289
34390
  });
34290
- }, [onDragEnter]);
34291
- var handleDragEnd = react__WEBPACK_IMPORTED_MODULE_5___default.a.useCallback(function (event, node) {
34391
+ }, [TreeProps, expandedKeys, onDragEnter, onExpand, setExpandedKeys]);
34392
+ var handleDragEnd = react__WEBPACK_IMPORTED_MODULE_9___default.a.useCallback(function (event, node) {
34393
+ setDragOverNodeKey('');
34292
34394
  onDragEnd && onDragEnd({
34293
34395
  event: event,
34294
34396
  node: node
34295
34397
  });
34296
34398
  }, [onDragEnd]);
34297
- var handleDrop = react__WEBPACK_IMPORTED_MODULE_5___default.a.useCallback(function (event, node, dragNode, dragNodesKeys) {
34298
- var pos = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["getPos"])(flattenAllData, dragNodesKeys);
34299
- var keys = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["getAllChildKeys"])(flattenAllData, pos).concat(dragNodesKeys);
34399
+ var handleDrop = react__WEBPACK_IMPORTED_MODULE_9___default.a.useCallback(function (event, node, dragNode, dragNodesKeys) {
34400
+ var pos = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getPos"])(flattenAllData, dragNodesKeys);
34401
+ var keys = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getAllChildKeys"])(flattenAllData, pos).concat(dragNodesKeys);
34300
34402
  onDrop && onDrop({
34301
34403
  event: event,
34302
34404
  node: node,
34303
34405
  dragNode: dragNode,
34304
- keys: keys
34406
+ dragNodesKeys: keys,
34407
+ dropPosition: dropPosition
34305
34408
  });
34306
- }, [onDrop, flattenAllData]);
34307
- var handleSelect = react__WEBPACK_IMPORTED_MODULE_5___default.a.useCallback(function (event, node, key) {
34308
- var checked = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["getChecked"])(checkedKeys, key);
34409
+ }, [flattenAllData, onDrop, dropPosition]);
34410
+ var handleSelect = react__WEBPACK_IMPORTED_MODULE_9___default.a.useCallback(function (event, node, key) {
34411
+ var checked = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getChecked"])(checkedKeys, key);
34309
34412
  onSelect && onSelect([key], {
34310
34413
  node: node,
34311
34414
  event: event,
@@ -34314,7 +34417,7 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34314
34417
  }, [onSelect, setSelectedKeys, checkedKeys]);
34315
34418
 
34316
34419
  var getSelectable = function getSelectable(selectable) {
34317
- if (lodash_isBoolean__WEBPACK_IMPORTED_MODULE_12___default()(selectable)) {
34420
+ if (lodash_isBoolean__WEBPACK_IMPORTED_MODULE_16___default()(selectable)) {
34318
34421
  return selectable;
34319
34422
  }
34320
34423
 
@@ -34322,11 +34425,11 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34322
34425
  };
34323
34426
 
34324
34427
  var getCheckable = function getCheckable(checkableProps, itemCheckable) {
34325
- return lodash_isBoolean__WEBPACK_IMPORTED_MODULE_12___default()(itemCheckable) ? itemCheckable : checkableProps;
34428
+ return lodash_isBoolean__WEBPACK_IMPORTED_MODULE_16___default()(itemCheckable) ? itemCheckable : checkableProps;
34326
34429
  };
34327
34430
 
34328
34431
  var getDisabled = function getDisabled(disabledProps, itemDisabled) {
34329
- return lodash_isBoolean__WEBPACK_IMPORTED_MODULE_12___default()(itemDisabled) ? itemDisabled : disabledProps;
34432
+ return lodash_isBoolean__WEBPACK_IMPORTED_MODULE_16___default()(itemDisabled) ? itemDisabled : disabledProps;
34330
34433
  };
34331
34434
 
34332
34435
  var getDragNode = function getDragNode() {
@@ -34337,7 +34440,7 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34337
34440
  dragNodeRef.current = nodeData;
34338
34441
  };
34339
34442
 
34340
- Object(react__WEBPACK_IMPORTED_MODULE_5__["useEffect"])(function () {
34443
+ Object(react__WEBPACK_IMPORTED_MODULE_9__["useEffect"])(function () {
34341
34444
  if (scrollToKey) {
34342
34445
  setSelectedKeys([scrollToKey]);
34343
34446
  setScrollKey(scrollToKey);
@@ -34345,24 +34448,24 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34345
34448
  setSelectedKeys([]);
34346
34449
  }
34347
34450
  }, [scrollToKey]);
34348
- Object(react__WEBPACK_IMPORTED_MODULE_5__["useEffect"])(function () {
34451
+ Object(react__WEBPACK_IMPORTED_MODULE_9__["useEffect"])(function () {
34349
34452
  setHalfCheckedKeys(halfCheckedKeys);
34350
34453
  }, [halfCheckedKeys]);
34351
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
34454
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement("div", {
34352
34455
  className: treeNodeClassName,
34353
34456
  style: style,
34354
34457
  ref: scrollRef,
34355
34458
  onScroll: handleScroll
34356
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
34459
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement("div", {
34357
34460
  ref: plantomRef,
34358
34461
  className: "".concat(treePrefixCls, "-plantom")
34359
- }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("div", {
34462
+ }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement("div", {
34360
34463
  className: treeRootClassName,
34361
34464
  ref: listRef
34362
34465
  }, visibleData && visibleData.map(function (item) {
34363
34466
  // const props: any = {}
34364
- var checked = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["getChecked"])(checkedKeys, item.key);
34365
- var indeterminate = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["getHalfChecked"])(halfCheckedKeys, item.key);
34467
+ var checked = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getChecked"])(checkedKeys, item.key);
34468
+ var indeterminate = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getHalfChecked"])(halfCheckedKeys, item.key);
34366
34469
  item.nodeKey = item.key;
34367
34470
  item.onExpand = handleExpand;
34368
34471
  item.onCheck = handleCheck;
@@ -34374,7 +34477,7 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34374
34477
  item.onDrop = handleDrop;
34375
34478
  item.onSelect = handleSelect;
34376
34479
  item.checked = checked;
34377
- item.selected = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_10__["getSelected"])(selectedKeys, item.key);
34480
+ item.selected = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getSelected"])(selectedKeys, item.key);
34378
34481
  item.indeterminate = indeterminate; // item.showLine = showLine
34379
34482
 
34380
34483
  item.disabled = getDisabled(disabled, item.disabled);
@@ -34390,7 +34493,8 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.for
34390
34493
  item.style = setTreeNodeStyle(_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, item));
34391
34494
  item.getDragNode = getDragNode;
34392
34495
  item.setDragNode = setDragNode;
34393
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement(_treeNode__WEBPACK_IMPORTED_MODULE_9__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, item, {
34496
+ item.dragOver = dragOverNodeKey === item.key && dropPosition === 0;
34497
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.createElement(_treeNode__WEBPACK_IMPORTED_MODULE_13__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, item, {
34394
34498
  key: item.key,
34395
34499
  ref: treeNodeRef
34396
34500
  }));
@@ -34493,7 +34597,7 @@ var useChecked = function useChecked(checkStrictly, checkedKeysProps, defaultChe
34493
34597
  }, [nextHalfCheckedKeys]);
34494
34598
  return [checkedKeys, halfCheckedKeys, setCheckedKeys, setHalfCheckedKeys];
34495
34599
  };
34496
- var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit) {
34600
+ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue) {
34497
34601
  var expandScrollkeys = [];
34498
34602
 
34499
34603
  if (scrollKey) {
@@ -34502,8 +34606,8 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
34502
34606
  }
34503
34607
 
34504
34608
  var initialExpandedKeys = react__WEBPACK_IMPORTED_MODULE_3___default.a.useMemo(function () {
34505
- return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getInitExpandedKeys"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys);
34506
- }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey]);
34609
+ return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getInitExpandedKeys"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, filterValue);
34610
+ }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, filterValue]);
34507
34611
  var newExpandedKeys = react__WEBPACK_IMPORTED_MODULE_3___default.a.useMemo(function () {
34508
34612
  return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getExpandedKeys"])(expandedKeysProps, expandScrollkeys);
34509
34613
  }, [expandedKeysProps]);
@@ -34620,7 +34724,7 @@ __webpack_require__.r(__webpack_exports__);
34620
34724
 
34621
34725
 
34622
34726
 
34623
- var _excluded = ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"];
34727
+ var _excluded = ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"];
34624
34728
 
34625
34729
 
34626
34730
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -34664,6 +34768,7 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
34664
34768
  style = TreeNodeProps.style,
34665
34769
  indeterminate = TreeNodeProps.indeterminate,
34666
34770
  estimatedItemSize = TreeNodeProps.estimatedItemSize,
34771
+ dragOver = TreeNodeProps.dragOver,
34667
34772
  onExpand = TreeNodeProps.onExpand,
34668
34773
  onCheck = TreeNodeProps.onCheck,
34669
34774
  onDragStart = TreeNodeProps.onDragStart,
@@ -34842,7 +34947,7 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
34842
34947
 
34843
34948
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_11___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("div", {
34844
34949
  draggable: draggable && !disabled,
34845
- className: classnames__WEBPACK_IMPORTED_MODULE_12___default()((_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-draggabled"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-root"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-fb-children-pointerEvents"), forbiddenChildrenPointerEvents), _classNames3)),
34950
+ className: classnames__WEBPACK_IMPORTED_MODULE_12___default()((_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-draggabled"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-root"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-fb-children-pointerEvents"), forbiddenChildrenPointerEvents), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-drag-over"), dragOver), _classNames3)),
34846
34951
  onDragStart: handleDragStart,
34847
34952
  onDragEnd: handleDragEnd,
34848
34953
  onDragOver: handleDragOver,
@@ -34850,7 +34955,9 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
34850
34955
  onDragEnter: handleDragEnter,
34851
34956
  onDrop: handleDrop,
34852
34957
  ref: dragRef
34853
- }, indent(), renderExpandIcon(), showIcon && renderNodeIcon(), checkable ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_checkbox__WEBPACK_IMPORTED_MODULE_15__["default"], {
34958
+ }, indent(), renderExpandIcon(), showIcon && renderNodeIcon(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("div", {
34959
+ className: "".concat(treeNodePrefixCls, "-title-wrap")
34960
+ }, checkable ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_checkbox__WEBPACK_IMPORTED_MODULE_15__["default"], {
34854
34961
  onChange: handleOnchange,
34855
34962
  checked: checked,
34856
34963
  indeterminate: !disabled && indeterminate,
@@ -34859,9 +34966,9 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
34859
34966
  className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(treeNodePrefixCls, "-title"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-title-disabled"), disabled))
34860
34967
  }, title)) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("span", {
34861
34968
  className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(treeNodePrefixCls, "-title"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-title-disabled"), disabled))
34862
- }, title), showDragLine && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("span", {
34969
+ }, title), showDragLine && !dragOver && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("span", {
34863
34970
  className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(treeNodePrefixCls, "-drag-line"))
34864
- })));
34971
+ }))));
34865
34972
  };
34866
34973
 
34867
34974
  var handleOnchange = react__WEBPACK_IMPORTED_MODULE_11___default.a.useCallback(function (e) {
@@ -34886,11 +34993,11 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
34886
34993
  if (!draggable) return;
34887
34994
  setDragNode(nodeData);
34888
34995
  onDragStart && onDragStart(e, props);
34889
- }, [onDragStart, nodeData, props, draggable]);
34996
+ }, [draggable, setDragNode, nodeData, onDragStart, props]);
34890
34997
  var handleDragOver = react__WEBPACK_IMPORTED_MODULE_11___default.a.useCallback(function (e) {
34891
34998
  if (!draggable) return;
34892
34999
  e.preventDefault();
34893
- onDragOver && onDragOver(e, nodeData);
35000
+ onDragOver && onDragOver(e, nodeData, dragRef.current);
34894
35001
  }, [onDragOver, nodeData, draggable]);
34895
35002
  var handleDragLeave = react__WEBPACK_IMPORTED_MODULE_11___default.a.useCallback(function (e) {
34896
35003
  var _dragRef$current;
@@ -34908,7 +35015,7 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
34908
35015
  setForbiddenChildrenPointerEvents(true);
34909
35016
  if (!((_dragRef$current2 = dragRef.current) !== null && _dragRef$current2 !== void 0 && _dragRef$current2.isEqualNode(e.target))) return;
34910
35017
  setShowDragLine(true);
34911
- onDragEnter && onDragEnter(e, nodeData);
35018
+ onDragEnter && onDragEnter(e, nodeData, dragRef.current);
34912
35019
  }, [onDragEnter, nodeData, draggable]);
34913
35020
  var handleDragEnd = react__WEBPACK_IMPORTED_MODULE_11___default.a.useCallback(function (e) {
34914
35021
  if (!draggable) return;
@@ -34946,7 +35053,7 @@ TreeNode.displayName = 'TreeNode';
34946
35053
  /*!*********************************************!*\
34947
35054
  !*** ./components/tree/utils/treeUtils.tsx ***!
34948
35055
  \*********************************************/
34949
- /*! exports provided: flattenAll, getExpand, getChecked, getSelected, getHalfChecked, getFilterData, getMaxLevel, getSpreadAttrData, addKeys, getAllParentKeys, getAllParentPos, getAllChildKeys, getPos, getInitCheckedKeys, getInitCheckededState, getDataCheckededState, getDataCheckededStateStrictly, delKey, getAllNodeKeys, getInitExpandedKeys, getExpandedKeys */
35056
+ /*! exports provided: flattenAll, getExpand, getChecked, getSelected, getHalfChecked, getAllFilterKeys, getFilterData, getMaxLevel, getSpreadAttrData, addKeys, getAllParentKeys, getAllParentPos, getAllChildKeys, getPos, getInitCheckedKeys, getInitCheckededState, getDataCheckededState, getDataCheckededStateStrictly, delKey, getAllNodeKeys, getInitExpandedKeys, getExpandedKeys, calcDropPosition */
34950
35057
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
34951
35058
 
34952
35059
  "use strict";
@@ -34956,6 +35063,7 @@ __webpack_require__.r(__webpack_exports__);
34956
35063
  /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getChecked", function() { return getChecked; });
34957
35064
  /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSelected", function() { return getSelected; });
34958
35065
  /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getHalfChecked", function() { return getHalfChecked; });
35066
+ /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAllFilterKeys", function() { return getAllFilterKeys; });
34959
35067
  /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getFilterData", function() { return getFilterData; });
34960
35068
  /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getMaxLevel", function() { return getMaxLevel; });
34961
35069
  /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSpreadAttrData", function() { return getSpreadAttrData; });
@@ -34972,6 +35080,7 @@ __webpack_require__.r(__webpack_exports__);
34972
35080
  /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getAllNodeKeys", function() { return getAllNodeKeys; });
34973
35081
  /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getInitExpandedKeys", function() { return getInitExpandedKeys; });
34974
35082
  /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getExpandedKeys", function() { return getExpandedKeys; });
35083
+ /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "calcDropPosition", function() { return calcDropPosition; });
34975
35084
  /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es.object.keys.js */ "./node_modules/core-js/modules/es.object.keys.js");
34976
35085
  /* harmony import */ var core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_keys_js__WEBPACK_IMPORTED_MODULE_0__);
34977
35086
  /* harmony import */ var core_js_modules_es_symbol_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/es.symbol.js */ "./node_modules/core-js/modules/es.symbol.js");
@@ -35000,22 +35109,24 @@ __webpack_require__.r(__webpack_exports__);
35000
35109
  /* harmony import */ var core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_includes_js__WEBPACK_IMPORTED_MODULE_12__);
35001
35110
  /* harmony import */ var core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! core-js/modules/es.array.find.js */ "./node_modules/core-js/modules/es.array.find.js");
35002
35111
  /* harmony import */ var core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_find_js__WEBPACK_IMPORTED_MODULE_13__);
35003
- /* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! core-js/modules/es.string.starts-with.js */ "./node_modules/core-js/modules/es.string.starts-with.js");
35004
- /* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_14__);
35005
- /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
35006
- /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_15__);
35007
- /* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! core-js/modules/es.array.from.js */ "./node_modules/core-js/modules/es.array.from.js");
35008
- /* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_16__);
35009
- /* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! core-js/modules/es.string.iterator.js */ "./node_modules/core-js/modules/es.string.iterator.js");
35010
- /* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_17__);
35011
- /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! core-js/modules/es.array.iterator.js */ "./node_modules/core-js/modules/es.array.iterator.js");
35012
- /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_18__);
35013
- /* harmony import */ var core_js_modules_es_set_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! core-js/modules/es.set.js */ "./node_modules/core-js/modules/es.set.js");
35014
- /* harmony import */ var core_js_modules_es_set_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_set_js__WEBPACK_IMPORTED_MODULE_19__);
35015
- /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! core-js/modules/web.dom-collections.iterator.js */ "./node_modules/core-js/modules/web.dom-collections.iterator.js");
35016
- /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_20__);
35017
- /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! core-js/modules/es.array.splice.js */ "./node_modules/core-js/modules/es.array.splice.js");
35018
- /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_21__);
35112
+ /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
35113
+ /* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_14__);
35114
+ /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
35115
+ /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_15__);
35116
+ /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! core-js/modules/es.array.iterator.js */ "./node_modules/core-js/modules/es.array.iterator.js");
35117
+ /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_16__);
35118
+ /* harmony import */ var core_js_modules_es_set_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! core-js/modules/es.set.js */ "./node_modules/core-js/modules/es.set.js");
35119
+ /* harmony import */ var core_js_modules_es_set_js__WEBPACK_IMPORTED_MODULE_17___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_set_js__WEBPACK_IMPORTED_MODULE_17__);
35120
+ /* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! core-js/modules/es.string.iterator.js */ "./node_modules/core-js/modules/es.string.iterator.js");
35121
+ /* harmony import */ var core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_iterator_js__WEBPACK_IMPORTED_MODULE_18__);
35122
+ /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! core-js/modules/web.dom-collections.iterator.js */ "./node_modules/core-js/modules/web.dom-collections.iterator.js");
35123
+ /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_19__);
35124
+ /* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! core-js/modules/es.string.starts-with.js */ "./node_modules/core-js/modules/es.string.starts-with.js");
35125
+ /* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_20__);
35126
+ /* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! core-js/modules/es.array.from.js */ "./node_modules/core-js/modules/es.array.from.js");
35127
+ /* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_21___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_21__);
35128
+ /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! core-js/modules/es.array.splice.js */ "./node_modules/core-js/modules/es.array.splice.js");
35129
+ /* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_22___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_22__);
35019
35130
 
35020
35131
 
35021
35132
 
@@ -35046,6 +35157,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
35046
35157
 
35047
35158
 
35048
35159
 
35160
+ var DRAG_OFFSET = 0.4;
35049
35161
  /**
35050
35162
  * 打平所有数组,并添加pos位置信息,
35051
35163
  * 方便根据expandKeys等计算节点的expand,checkedKeys计算节点checked状态
@@ -35054,6 +35166,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
35054
35166
  * @param level
35055
35167
  * @param pos
35056
35168
  */
35169
+
35057
35170
  var flattenAll = function flattenAll(treeData) {
35058
35171
  var newTreeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
35059
35172
  var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
@@ -35112,11 +35225,30 @@ var isAllParentExpand = function isAllParentExpand(data, pos) {
35112
35225
  return expand;
35113
35226
  };
35114
35227
 
35115
- var getFilterData = function getFilterData(data) {
35228
+ var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode) {
35229
+ var filterData = data.filter(function (item) {
35230
+ return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
35231
+ });
35232
+ var filterKeys = getAllNodeKeys(filterData);
35233
+ var allFilterKeys = [];
35234
+ filterKeys.map(function (key) {
35235
+ return allFilterKeys.push.apply(allFilterKeys, _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(getAllParentKeys(data, key)).concat([key]));
35236
+ });
35237
+ return _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(new Set(allFilterKeys));
35238
+ };
35239
+ var getFilterData = function getFilterData(data, filterTreeNode, filterValue) {
35240
+ var filterData = data;
35241
+
35242
+ if (typeof filterTreeNode === 'function' && filterValue) {
35243
+ filterData = filterData.filter(function (item) {
35244
+ return getAllFilterKeys(filterData, filterTreeNode).includes(item.key);
35245
+ });
35246
+ }
35247
+
35116
35248
  var newData = [];
35117
- data.forEach(function (item) {
35249
+ filterData.forEach(function (item) {
35118
35250
  var pos = item.pos;
35119
- var parentExpand = isAllParentExpand(data, pos);
35251
+ var parentExpand = isAllParentExpand(filterData, pos);
35120
35252
 
35121
35253
  if (parentExpand) {
35122
35254
  newData.push(item);
@@ -35472,6 +35604,8 @@ var getRootKeys = function getRootKeys(data) {
35472
35604
 
35473
35605
  var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent) {
35474
35606
  var expandScrollkeys = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : [];
35607
+ var filterTreeNode = arguments.length > 7 ? arguments[7] : undefined;
35608
+ var filterValue = arguments.length > 8 ? arguments[8] : undefined;
35475
35609
  var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : expandedKeys.concat(expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : defaultExpandedKeys.concat(expandScrollkeys)) || [];
35476
35610
 
35477
35611
  if (defaultExpandAll) {
@@ -35494,6 +35628,10 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
35494
35628
  }
35495
35629
  }
35496
35630
 
35631
+ if (typeof filterTreeNode === 'function' && filterValue) {
35632
+ keys = [].concat(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(keys), _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(getAllFilterKeys(data, filterTreeNode)));
35633
+ }
35634
+
35497
35635
  return Array.from(new Set(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(keys)));
35498
35636
  };
35499
35637
  var getExpandedKeys = function getExpandedKeys(expandedKeys) {
@@ -35501,6 +35639,24 @@ var getExpandedKeys = function getExpandedKeys(expandedKeys) {
35501
35639
  var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : expandedKeys.concat(expandScrollkeys)) || [];
35502
35640
  return Array.from(new Set(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(keys)));
35503
35641
  };
35642
+ var calcDropPosition = function calcDropPosition(event, dropNode) {
35643
+ var clientY = event.clientY;
35644
+
35645
+ var _dropNode$getBounding = dropNode.getBoundingClientRect(),
35646
+ top = _dropNode$getBounding.top,
35647
+ bottom = _dropNode$getBounding.bottom,
35648
+ height = _dropNode$getBounding.height;
35649
+
35650
+ if (clientY <= top + height * DRAG_OFFSET) {
35651
+ return -1;
35652
+ }
35653
+
35654
+ if (clientY >= bottom - height * DRAG_OFFSET) {
35655
+ return 1;
35656
+ }
35657
+
35658
+ return 0;
35659
+ };
35504
35660
 
35505
35661
  /***/ }),
35506
35662