@kdcloudjs/kdesign 1.5.3 → 1.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (47) hide show
  1. package/dist/kdesign-complete.less +5 -3
  2. package/dist/kdesign.css +8 -4
  3. package/dist/kdesign.css.map +1 -1
  4. package/dist/kdesign.js +117 -71
  5. package/dist/kdesign.js.map +1 -1
  6. package/dist/kdesign.min.css +3 -3
  7. package/dist/kdesign.min.js +3 -3
  8. package/dist/kdesign.min.js.map +1 -1
  9. package/es/drawer/drawer.js +1 -0
  10. package/es/dropdown/dropdown.js +16 -6
  11. package/es/radio/style/index.css +1 -1
  12. package/es/radio/style/index.less +1 -1
  13. package/es/select/select.js +1 -1
  14. package/es/stepper/stepper.js +9 -4
  15. package/es/stepper/style/index.css +2 -0
  16. package/es/stepper/style/index.less +2 -0
  17. package/es/stepper/style/token.less +1 -2
  18. package/es/style/icon/kdicon.css +2 -1
  19. package/es/style/icon/kdicon.woff +0 -0
  20. package/es/tabs/style/index.css +1 -0
  21. package/es/tabs/style/index.less +1 -0
  22. package/es/tooltip/tooltip.js +1 -1
  23. package/es/tree/tree.js +12 -9
  24. package/es/tree/treeHooks.d.ts +1 -1
  25. package/es/tree/treeHooks.js +3 -3
  26. package/es/tree/utils/treeUtils.d.ts +6 -3
  27. package/es/tree/utils/treeUtils.js +66 -42
  28. package/lib/drawer/drawer.js +1 -0
  29. package/lib/dropdown/dropdown.js +15 -6
  30. package/lib/radio/style/index.css +1 -1
  31. package/lib/radio/style/index.less +1 -1
  32. package/lib/select/select.js +1 -1
  33. package/lib/stepper/stepper.js +9 -4
  34. package/lib/stepper/style/index.css +2 -0
  35. package/lib/stepper/style/index.less +2 -0
  36. package/lib/stepper/style/token.less +1 -2
  37. package/lib/style/icon/kdicon.css +2 -1
  38. package/lib/style/icon/kdicon.woff +0 -0
  39. package/lib/tabs/style/index.css +1 -0
  40. package/lib/tabs/style/index.less +1 -0
  41. package/lib/tooltip/tooltip.js +1 -1
  42. package/lib/tree/tree.js +11 -9
  43. package/lib/tree/treeHooks.d.ts +1 -1
  44. package/lib/tree/treeHooks.js +3 -3
  45. package/lib/tree/utils/treeUtils.d.ts +6 -3
  46. package/lib/tree/utils/treeUtils.js +64 -42
  47. package/package.json +1 -1
package/dist/kdesign.js CHANGED
@@ -1,6 +1,6 @@
1
1
  /*!
2
2
  *
3
- * @kdcloudjs/kdesign v1.5.2
3
+ * @kdcloudjs/kdesign v1.5.3
4
4
  *
5
5
  * Copyright 2020-present, Kingdee, Inc.
6
6
  * All rights reserved.
@@ -14013,6 +14013,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
14013
14013
  width: width,
14014
14014
  transform: transform
14015
14015
  } : {
14016
+ height: height,
14016
14017
  transform: transform
14017
14018
  });
14018
14019
 
@@ -14175,6 +14176,17 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
14175
14176
 
14176
14177
 
14177
14178
 
14179
+
14180
+ var findItem = function findItem(element) {
14181
+ var isItem = element.className === 'kd-dropdown-menu-item';
14182
+
14183
+ if (isItem) {
14184
+ return element;
14185
+ } else {
14186
+ return element.parentNode ? findItem(element.parentNode) : null;
14187
+ }
14188
+ };
14189
+
14178
14190
  var Dropdown = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10__["forwardRef"](function (props, ref) {
14179
14191
  var _menu$props, _menu$props2, _menu$props3;
14180
14192
 
@@ -14205,7 +14217,7 @@ var Dropdown = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10__["forwardRef"](fu
14205
14217
  setVisible(!!props.visible);
14206
14218
  }, [props.visible]);
14207
14219
  var child = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10__["cloneElement"](react__WEBPACK_IMPORTED_MODULE_10__["Children"].only(children), {
14208
- ref: ref,
14220
+ ref: children.ref || ref,
14209
14221
  className: classnames__WEBPACK_IMPORTED_MODULE_11___default()("".concat(prefixCls, "-trigger"), children.props.className, {
14210
14222
  disabled: disabled
14211
14223
  })
@@ -14223,13 +14235,12 @@ var Dropdown = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_10__["forwardRef"](fu
14223
14235
  var menuSelectable = ((_menu$props2 = menu.props) === null || _menu$props2 === void 0 ? void 0 : _menu$props2.selectable) === undefined ? selectable : (_menu$props3 = menu.props) === null || _menu$props3 === void 0 ? void 0 : _menu$props3.selectable;
14224
14236
 
14225
14237
  var handleItemClick = function handleItemClick(e) {
14226
- var _currentTarget$datase, _currentTarget$parent;
14238
+ var _item$dataset;
14227
14239
 
14228
- var currentTarget = e.target;
14229
- var parentTarget = currentTarget.parentNode;
14230
- var key = ((_currentTarget$datase = currentTarget.dataset) === null || _currentTarget$datase === void 0 ? void 0 : _currentTarget$datase.key) || ((_currentTarget$parent = currentTarget.parentNode.dataset) === null || _currentTarget$parent === void 0 ? void 0 : _currentTarget$parent.key);
14240
+ var item = findItem(e.target);
14241
+ var key = item === null || item === void 0 ? void 0 : (_item$dataset = item.dataset) === null || _item$dataset === void 0 ? void 0 : _item$dataset.key;
14231
14242
 
14232
- if (currentTarget.className.indexOf('disabled') === -1 && parentTarget.className.indexOf('disabled') === -1 && key) {
14243
+ if ((item === null || item === void 0 ? void 0 : item.className.indexOf('disabled')) === -1 && key) {
14233
14244
  if (isMenu && menu.props.onClick) {
14234
14245
  menu.props.onClick(key);
14235
14246
  } else if (onItemClick) {
@@ -28139,7 +28150,7 @@ var InternalSelect = function InternalSelect(props, ref) {
28139
28150
  var selectedVal = multipleRef.current.selectedVal; // 选择器下拉icon样式
28140
28151
 
28141
28152
  var arrowIconCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()((_classNames8 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames8, "".concat(selectPrefixCls, "-icon-arrow"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-focus"), optionShow), _classNames8));
28142
- var iconShow = allowClear && !disabled && (isMultiple ? mulOptions.length > 0 : selectedVal);
28153
+ var iconShow = allowClear && !disabled && (isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '');
28143
28154
  var clearIconCls = classnames__WEBPACK_IMPORTED_MODULE_20___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-icon-clear"), true));
28144
28155
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_18___default.a.Fragment, null, iconShow && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_18___default.a.createElement("span", {
28145
28156
  onClick: handleReset,
@@ -30079,6 +30090,7 @@ var InternalStepper = function InternalStepper(props, ref) {
30079
30090
  stepBtnClassName = inputNumberProps.stepBtnClassName,
30080
30091
  max = inputNumberProps.max,
30081
30092
  min = inputNumberProps.min,
30093
+ disabled = inputNumberProps.disabled,
30082
30094
  propsValue = inputNumberProps.value,
30083
30095
  defaultValue = inputNumberProps.defaultValue;
30084
30096
  var inputPrefixCls = getPrefixCls(prefixCls, 'inputNumber', customPrefixcls);
@@ -30120,10 +30132,11 @@ var InternalStepper = function InternalStepper(props, ref) {
30120
30132
  return null;
30121
30133
  }
30122
30134
 
30123
- var decreaseClassName = getStepBtnClassNames('base', 'decrease', showPlusdisabled);
30135
+ var decreaseClassName = getStepBtnClassNames('base', 'decrease', showPlusdisabled || disabled);
30124
30136
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("span", {
30125
30137
  className: decreaseClassName,
30126
30138
  onMouseDown: function onMouseDown() {
30139
+ if (disabled) return;
30127
30140
  handleStepMouseDown('minus');
30128
30141
  }
30129
30142
  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_9__["default"], {
@@ -30133,10 +30146,11 @@ var InternalStepper = function InternalStepper(props, ref) {
30133
30146
  };
30134
30147
 
30135
30148
  var getStepSuffix = function getStepSuffix() {
30136
- var increaseClassName = getStepBtnClassNames('base', 'increase', showMinusdisabled);
30149
+ var increaseClassName = getStepBtnClassNames('base', 'increase', showMinusdisabled || disabled);
30137
30150
  return type === 'embed' ? getEmbedStepView() : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("span", {
30138
30151
  className: increaseClassName,
30139
30152
  onMouseDown: function onMouseDown() {
30153
+ if (disabled) return;
30140
30154
  handleStepMouseDown('plus');
30141
30155
  }
30142
30156
  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_9__["default"], {
@@ -30233,13 +30247,14 @@ var InternalStepper = function InternalStepper(props, ref) {
30233
30247
  var _classNames2, _classNames3;
30234
30248
 
30235
30249
  var embedStepClassName = getStepBtnClassNames('embed');
30236
- var plusClassName = classnames__WEBPACK_IMPORTED_MODULE_6___default()("".concat(inputPrefixCls, "-embedStep-plus"), (_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, stepBtnClassName, stepBtnClassName), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, "".concat(inputPrefixCls, "-embedStep-disabled"), showMinusdisabled), _classNames2));
30237
- var minusClassName = classnames__WEBPACK_IMPORTED_MODULE_6___default()("".concat(inputPrefixCls, "-embedStep-minus"), (_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames3, stepBtnClassName, stepBtnClassName), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames3, "".concat(inputPrefixCls, "-embedStep-disabled"), showPlusdisabled), _classNames3));
30250
+ var plusClassName = classnames__WEBPACK_IMPORTED_MODULE_6___default()("".concat(inputPrefixCls, "-embedStep-plus"), (_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, stepBtnClassName, stepBtnClassName), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames2, "".concat(inputPrefixCls, "-embedStep-disabled"), showMinusdisabled || disabled), _classNames2));
30251
+ var minusClassName = classnames__WEBPACK_IMPORTED_MODULE_6___default()("".concat(inputPrefixCls, "-embedStep-minus"), (_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames3, stepBtnClassName, stepBtnClassName), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_1___default()(_classNames3, "".concat(inputPrefixCls, "-embedStep-disabled"), showPlusdisabled || disabled), _classNames3));
30238
30252
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("span", {
30239
30253
  className: embedStepClassName
30240
30254
  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("span", {
30241
30255
  className: plusClassName,
30242
30256
  onMouseDown: function onMouseDown() {
30257
+ if (disabled) return;
30243
30258
  handleStepMouseDown('plus');
30244
30259
  }
30245
30260
  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_9__["default"], {
@@ -30248,6 +30263,7 @@ var InternalStepper = function InternalStepper(props, ref) {
30248
30263
  })), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("span", {
30249
30264
  className: minusClassName,
30250
30265
  onMouseDown: function onMouseDown() {
30266
+ if (disabled) return;
30251
30267
  handleStepMouseDown('minus');
30252
30268
  }
30253
30269
  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_9__["default"], {
@@ -32977,7 +32993,7 @@ var Tooltip = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8__["forwardRef"](func
32977
32993
 
32978
32994
  var prefixCls = getPrefixCls(pkgPrefixCls, 'tooltip', customPrefixcls);
32979
32995
  var tiplocator = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8__["cloneElement"](react__WEBPACK_IMPORTED_MODULE_8__["Children"].count(children) === 1 && children.type ? children : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_8__["createElement"]("span", null, children), {
32980
- ref: ref
32996
+ ref: children.ref || ref
32981
32997
  });
32982
32998
 
32983
32999
  var popperProps = _objectSpread(_objectSpread({}, allProps), {}, {
@@ -34302,12 +34318,11 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.for
34302
34318
  var treeRootClassName = "".concat(treePrefixCls, "-root");
34303
34319
  var estimatedItemSize = innerEstimatedItemSize; // 节点高度
34304
34320
 
34305
- var flattenAllData = react__WEBPACK_IMPORTED_MODULE_9___default.a.useMemo(function () {
34321
+ var _React$useMemo = react__WEBPACK_IMPORTED_MODULE_9___default.a.useMemo(function () {
34306
34322
  return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["flattenAll"])(treeData, []);
34307
- }, [treeData]);
34308
- var maxLevel = react__WEBPACK_IMPORTED_MODULE_9___default.a.useMemo(function () {
34309
- return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getMaxLevel"])(flattenAllData);
34310
- }, [flattenAllData]);
34323
+ }, [treeData]),
34324
+ flattenAllData = _React$useMemo.flattenAllData,
34325
+ maxLevel = _React$useMemo.maxLevel;
34311
34326
 
34312
34327
  var _useChecked = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_15__["useChecked"])(checkStrictly, checkedKeysProps, defaultCheckedKeys, flattenAllData, maxLevel, checkable),
34313
34328
  _useChecked2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useChecked, 4),
@@ -34354,7 +34369,11 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.for
34354
34369
  dragOverNodeKey = _React$useState10[0],
34355
34370
  setDragOverNodeKey = _React$useState10[1];
34356
34371
 
34357
- var _useExpand = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_15__["useExpand"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue),
34372
+ var isSearching = react__WEBPACK_IMPORTED_MODULE_9___default.a.useMemo(function () {
34373
+ return typeof filterTreeNode === 'function' && filterValue;
34374
+ }, [filterValue]);
34375
+
34376
+ var _useExpand = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_15__["useExpand"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching),
34358
34377
  _useExpand2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useExpand, 2),
34359
34378
  expandedKeys = _useExpand2[0],
34360
34379
  setExpandedKeys = _useExpand2[1];
@@ -34363,8 +34382,8 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_9___default.a.for
34363
34382
  return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getSpreadAttrData"])(flattenAllData, expandedKeys);
34364
34383
  }, [flattenAllData, expandedKeys]);
34365
34384
  var filterData = react__WEBPACK_IMPORTED_MODULE_9___default.a.useMemo(function () {
34366
- return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getFilterData"])(spreadAttrData, filterTreeNode, filterValue);
34367
- }, [spreadAttrData, filterTreeNode, filterValue]);
34385
+ return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_14__["getFilterData"])(spreadAttrData, filterTreeNode, isSearching);
34386
+ }, [spreadAttrData, isSearching]);
34368
34387
 
34369
34388
  var _useViewportHeight = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_15__["useViewportHeight"])(height, listRef),
34370
34389
  _useViewportHeight2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useViewportHeight, 1),
@@ -34695,7 +34714,7 @@ var useChecked = function useChecked(checkStrictly, checkedKeysProps, defaultChe
34695
34714
  }, [nextHalfCheckedKeys]);
34696
34715
  return [checkedKeys, halfCheckedKeys, setCheckedKeys, setHalfCheckedKeys];
34697
34716
  };
34698
- var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, filterValue) {
34717
+ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching) {
34699
34718
  var expandScrollkeys = [];
34700
34719
 
34701
34720
  if (scrollKey) {
@@ -34704,8 +34723,8 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
34704
34723
  }
34705
34724
 
34706
34725
  var initialExpandedKeys = react__WEBPACK_IMPORTED_MODULE_3___default.a.useMemo(function () {
34707
- return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getInitExpandedKeys"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, filterValue);
34708
- }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, filterValue]);
34726
+ return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getInitExpandedKeys"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching);
34727
+ }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching]);
34709
34728
  var newExpandedKeys = react__WEBPACK_IMPORTED_MODULE_3___default.a.useMemo(function () {
34710
34729
  return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getExpandedKeys"])(expandedKeysProps, expandScrollkeys);
34711
34730
  }, [expandedKeysProps]);
@@ -35209,22 +35228,20 @@ __webpack_require__.r(__webpack_exports__);
35209
35228
  /* 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__);
35210
35229
  /* 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");
35211
35230
  /* 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__);
35212
- /* 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");
35213
- /* 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__);
35214
- /* 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");
35215
- /* 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__);
35216
- /* 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");
35217
- /* 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__);
35218
- /* 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");
35219
- /* 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__);
35220
- /* 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");
35221
- /* 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__);
35222
- /* 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");
35223
- /* 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__);
35224
- /* 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");
35225
- /* 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__);
35226
- /* 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");
35227
- /* 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__);
35231
+ /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(/*! core-js/modules/es.array.iterator.js */ "./node_modules/core-js/modules/es.array.iterator.js");
35232
+ /* harmony import */ var core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_15__);
35233
+ /* harmony import */ var core_js_modules_es_set_js__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(/*! core-js/modules/es.set.js */ "./node_modules/core-js/modules/es.set.js");
35234
+ /* harmony import */ var core_js_modules_es_set_js__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_set_js__WEBPACK_IMPORTED_MODULE_16__);
35235
+ /* 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");
35236
+ /* 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__);
35237
+ /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! core-js/modules/web.dom-collections.iterator.js */ "./node_modules/core-js/modules/web.dom-collections.iterator.js");
35238
+ /* harmony import */ var core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_18___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_collections_iterator_js__WEBPACK_IMPORTED_MODULE_18__);
35239
+ /* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! core-js/modules/es.string.starts-with.js */ "./node_modules/core-js/modules/es.string.starts-with.js");
35240
+ /* harmony import */ var core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_starts_with_js__WEBPACK_IMPORTED_MODULE_19__);
35241
+ /* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! core-js/modules/es.array.from.js */ "./node_modules/core-js/modules/es.array.from.js");
35242
+ /* harmony import */ var core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_20___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_from_js__WEBPACK_IMPORTED_MODULE_20__);
35243
+ /* 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");
35244
+ /* 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__);
35228
35245
 
35229
35246
 
35230
35247
 
@@ -35254,7 +35271,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
35254
35271
 
35255
35272
 
35256
35273
 
35257
-
35258
35274
  var DRAG_OFFSET = 0.3;
35259
35275
  /**
35260
35276
  * 打平所有数组,并添加pos位置信息,
@@ -35269,27 +35285,52 @@ var flattenAll = function flattenAll(treeData) {
35269
35285
  var newTreeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
35270
35286
  var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
35271
35287
  var pos = arguments.length > 3 ? arguments[3] : undefined;
35272
- treeData && treeData.forEach(function (item, index) {
35273
- var children = item.children,
35274
- title = item.title,
35275
- key = item.key,
35276
- others = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_7___default()(item, _excluded);
35288
+ var maxLevel = 0;
35277
35289
 
35278
- var _pos = pos ? "".concat(pos, "-").concat(index) : "".concat(index);
35290
+ var fn = function fn(treeData) {
35291
+ var newTreeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
35292
+ var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
35293
+ var pos = arguments.length > 3 ? arguments[3] : undefined;
35294
+ var parent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
35295
+ treeData && treeData.forEach(function (item, index) {
35296
+ var children = item.children,
35297
+ title = item.title,
35298
+ key = item.key,
35299
+ others = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_7___default()(item, _excluded);
35279
35300
 
35280
- var hasChildNode = children && children instanceof Array && children.length > 0;
35281
- newTreeData.push(_objectSpread({
35282
- title: title,
35283
- key: key,
35284
- pos: _pos,
35285
- hasChildNode: hasChildNode,
35286
- level: level
35287
- }, others));
35288
- var _level = level;
35289
- _level++;
35290
- flattenAll(children, newTreeData, _level, _pos);
35291
- });
35292
- return newTreeData;
35301
+ item.parent = parent;
35302
+
35303
+ var _pos = pos ? "".concat(pos, "-").concat(index) : "".concat(index);
35304
+
35305
+ var hasChildNode = children && children instanceof Array && children.length > 0;
35306
+
35307
+ var flattenNode = _objectSpread({
35308
+ title: title,
35309
+ key: key,
35310
+ pos: _pos,
35311
+ hasChildNode: hasChildNode,
35312
+ level: level,
35313
+ parent: parent
35314
+ }, others);
35315
+
35316
+ newTreeData.push(flattenNode);
35317
+ var _level = level;
35318
+
35319
+ if (maxLevel < level) {
35320
+ maxLevel = level;
35321
+ }
35322
+
35323
+ _level++;
35324
+ fn(children, newTreeData, _level, _pos, flattenNode);
35325
+ });
35326
+ return newTreeData;
35327
+ };
35328
+
35329
+ var flattenAllData = fn(treeData, newTreeData, level, pos);
35330
+ return {
35331
+ flattenAllData: flattenAllData,
35332
+ maxLevel: maxLevel
35333
+ };
35293
35334
  };
35294
35335
  var getExpand = function getExpand(expandedKeys, key) {
35295
35336
  return expandedKeys === null || expandedKeys === void 0 ? void 0 : expandedKeys.includes(key);
@@ -35324,22 +35365,27 @@ var isAllParentExpand = function isAllParentExpand(data, pos) {
35324
35365
  };
35325
35366
 
35326
35367
  var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode) {
35327
- var filterData = data.filter(function (item) {
35328
- return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
35329
- });
35330
- var filterKeys = getAllNodeKeys(filterData);
35331
35368
  var allFilterKeys = [];
35332
- filterKeys.map(function (key) {
35333
- return allFilterKeys.push.apply(allFilterKeys, _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(getAllParentKeys(data, key)).concat([key]));
35369
+ data.filter(function (item) {
35370
+ return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
35371
+ }).forEach(function (item) {
35372
+ var node = _objectSpread({}, item);
35373
+
35374
+ while (node) {
35375
+ allFilterKeys.push(node.key);
35376
+ node = node.parent;
35377
+ }
35334
35378
  });
35335
35379
  return _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(new Set(allFilterKeys));
35336
35380
  };
35337
- var getFilterData = function getFilterData(data, filterTreeNode, filterValue) {
35381
+ var getFilterData = function getFilterData(data, filterTreeNode, isSearching) {
35338
35382
  var filterData = data;
35383
+ var allFilterKeys = null;
35339
35384
 
35340
- if (typeof filterTreeNode === 'function' && filterValue) {
35385
+ if (isSearching) {
35386
+ allFilterKeys = getAllFilterKeys(filterData, filterTreeNode);
35341
35387
  filterData = filterData.filter(function (item) {
35342
- return getAllFilterKeys(filterData, filterTreeNode).includes(item.key);
35388
+ return allFilterKeys.includes(item.key);
35343
35389
  });
35344
35390
  }
35345
35391
 
@@ -35703,7 +35749,7 @@ var getRootKeys = function getRootKeys(data) {
35703
35749
  var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent) {
35704
35750
  var expandScrollkeys = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : [];
35705
35751
  var filterTreeNode = arguments.length > 7 ? arguments[7] : undefined;
35706
- var filterValue = arguments.length > 8 ? arguments[8] : undefined;
35752
+ var isSearching = arguments.length > 8 ? arguments[8] : undefined;
35707
35753
  var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : expandedKeys.concat(expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : defaultExpandedKeys.concat(expandScrollkeys)) || [];
35708
35754
 
35709
35755
  if (defaultExpandAll) {
@@ -35726,7 +35772,7 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
35726
35772
  }
35727
35773
  }
35728
35774
 
35729
- if (typeof filterTreeNode === 'function' && filterValue) {
35775
+ if (isSearching) {
35730
35776
  keys = [].concat(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(keys), _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_5___default()(getAllFilterKeys(data, filterTreeNode)));
35731
35777
  }
35732
35778