@kdcloudjs/kdesign 1.6.15 → 1.6.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (56) hide show
  1. package/CHANGELOG.md +40 -0
  2. package/dist/kdesign-complete.less +5 -0
  3. package/dist/kdesign.css +7 -1
  4. package/dist/kdesign.css.map +1 -1
  5. package/dist/kdesign.js +563 -316
  6. package/dist/kdesign.js.map +1 -1
  7. package/dist/kdesign.min.css +2 -2
  8. package/dist/kdesign.min.js +8 -8
  9. package/dist/kdesign.min.js.map +1 -1
  10. package/es/_utils/usePopper.js +2 -0
  11. package/es/checkbox/checkbox.d.ts +1 -4
  12. package/es/checkbox/checkbox.js +26 -19
  13. package/es/checkbox/group.d.ts +11 -1
  14. package/es/checkbox/group.js +43 -71
  15. package/es/checkbox/index.d.ts +2 -1
  16. package/es/checkbox/index.js +1 -1
  17. package/es/date-picker/range/input-range.js +1 -1
  18. package/es/date-picker/single/input-date.js +1 -1
  19. package/es/modal/style/index.css +4 -0
  20. package/es/modal/style/index.less +2 -0
  21. package/es/select/select.js +4 -3
  22. package/es/stepper/style/index.css +2 -0
  23. package/es/stepper/style/index.less +3 -0
  24. package/es/table/feature/useFooterDataSource.d.ts +3 -0
  25. package/es/table/feature/useFooterDataSource.js +11 -0
  26. package/es/table/interface.d.ts +1 -0
  27. package/es/table/table.js +10 -9
  28. package/es/tree/tree.js +15 -1
  29. package/es/tree/treeHooks.d.ts +1 -1
  30. package/es/tree/treeHooks.js +5 -5
  31. package/es/tree/utils/treeUtils.d.ts +3 -2
  32. package/es/tree/utils/treeUtils.js +49 -17
  33. package/lib/_utils/usePopper.js +2 -0
  34. package/lib/checkbox/checkbox.d.ts +1 -4
  35. package/lib/checkbox/checkbox.js +32 -25
  36. package/lib/checkbox/group.d.ts +11 -1
  37. package/lib/checkbox/group.js +49 -75
  38. package/lib/checkbox/index.d.ts +2 -1
  39. package/lib/checkbox/index.js +4 -4
  40. package/lib/date-picker/range/input-range.js +1 -1
  41. package/lib/date-picker/single/input-date.js +1 -1
  42. package/lib/modal/style/index.css +4 -0
  43. package/lib/modal/style/index.less +2 -0
  44. package/lib/select/select.js +4 -3
  45. package/lib/stepper/style/index.css +2 -0
  46. package/lib/stepper/style/index.less +3 -0
  47. package/lib/table/feature/useFooterDataSource.d.ts +3 -0
  48. package/lib/table/feature/useFooterDataSource.js +19 -0
  49. package/lib/table/interface.d.ts +1 -0
  50. package/lib/table/table.js +11 -9
  51. package/lib/tree/tree.js +16 -1
  52. package/lib/tree/treeHooks.d.ts +1 -1
  53. package/lib/tree/treeHooks.js +5 -5
  54. package/lib/tree/utils/treeUtils.d.ts +3 -2
  55. package/lib/tree/utils/treeUtils.js +54 -19
  56. package/package.json +1 -1
@@ -493,9 +493,8 @@ var InternalSelect = function InternalSelect(props, ref) {
493
493
  }; // 多选模式下清除某一项
494
494
 
495
495
 
496
- var handleRemove = function handleRemove(e) {
496
+ var handleRemove = function handleRemove(e, tag) {
497
497
  if (disabled) return;
498
- var tag = e.currentTarget.parentNode.getAttribute('data-tag');
499
498
  var _multipleRef$current4 = multipleRef.current,
500
499
  selectedVal = _multipleRef$current4.selectedVal,
501
500
  selectMulOpts = _multipleRef$current4.selectMulOpts;
@@ -695,7 +694,9 @@ var InternalSelect = function InternalSelect(props, ref) {
695
694
  size: size,
696
695
  closable: true,
697
696
  disabled: disabled,
698
- onClose: handleRemove,
697
+ onClose: function onClose(e) {
698
+ return handleRemove(e, value);
699
+ },
699
700
  "data-tag": value
700
701
  }, label));
701
702
  }), maxTagCount && mulOptions.length > maxTagCount ? maxTagPlaceholder ? handleMaxTagHolder() : /*#__PURE__*/_react.default.createElement("span", {
@@ -104,6 +104,8 @@
104
104
  .kd-inputNumber {
105
105
  width: 100px;
106
106
  height: var(--kd-c-stepper-input-middle-sizing-height, 28px);
107
+ --kd-c-input-wrapper-padding-left: 9px;
108
+ --kd-c-input-padding-left: 0;
107
109
  }
108
110
  .kd-inputNumber input {
109
111
  text-align: center;
@@ -2,10 +2,13 @@
2
2
  @import './mixin.less';
3
3
 
4
4
  @inputNumber-prefix-cls: ~'@{kd-prefix}-inputNumber';
5
+ @inputWrapper-prefix-cls: ~'@{kd-prefix}-wrapper';
5
6
  .@{inputNumber-prefix-cls} {
6
7
  width: 100px;
7
8
  height: @stepper-input-middle-sizing-height;
8
9
 
10
+ --kd-c-input-wrapper-padding-left: 9px;
11
+ --kd-c-input-padding-left: 0;
9
12
  input {
10
13
  text-align: center;
11
14
  color: @stepper-input-color;
@@ -0,0 +1,3 @@
1
+ import { TablePipeline } from '../interface';
2
+ declare function useFooterDataSource(pipeline: TablePipeline, footerDataSource: any[] | undefined): void;
3
+ export default useFooterDataSource;
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+
8
+ var _table = require("@kdcloudjs/table");
9
+
10
+ function useFooterDataSource(pipeline, footerDataSource) {
11
+ if (footerDataSource) {
12
+ pipeline.use(_table.features.footerDataSource({
13
+ dataSource: footerDataSource
14
+ }));
15
+ }
16
+ }
17
+
18
+ var _default = useFooterDataSource;
19
+ exports.default = _default;
@@ -14,6 +14,7 @@ export declare type TableApi = {
14
14
  getColumns: () => any[];
15
15
  getDataSource: () => any[];
16
16
  getFooterDataSource: () => any[];
17
+ clearRangeSelection: () => void;
17
18
  };
18
19
  export declare type TableInstance = {
19
20
  api: TableApi;
@@ -57,6 +57,8 @@ var _mergeCellHover = _interopRequireDefault(require("./feature/mergeCellHover")
57
57
 
58
58
  var _devwarning = _interopRequireDefault(require("../_utils/devwarning"));
59
59
 
60
+ var _useFooterDataSource = _interopRequireDefault(require("./feature/useFooterDataSource"));
61
+
60
62
  function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
61
63
 
62
64
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -110,22 +112,21 @@ var Table = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
110
112
  dataSource: dataSource
111
113
  });
112
114
  var pipelineRef = (0, _react.useRef)(pipeline);
113
- pipelineRef.current = pipeline;
114
-
115
- if (footerDataSource) {
116
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
117
- // @ts-ignore
118
- pipeline.footerDataSource(footerDataSource);
119
- }
115
+ pipelineRef.current = pipeline; // if (footerDataSource) {
116
+ // // eslint-disable-next-line @typescript-eslint/ban-ts-comment
117
+ // // @ts-ignore
118
+ // pipeline.footerDataSource(footerDataSource)
119
+ // }
120
120
 
121
121
  (0, _react.useImperativeHandle)(ref, function () {
122
- var _a, _b, _c;
122
+ var _a, _b, _c, _d;
123
123
 
124
124
  return {
125
125
  api: {
126
126
  getColumns: (_a = pipelineRef.current.getColumns) === null || _a === void 0 ? void 0 : _a.bind(pipelineRef.current),
127
127
  getDataSource: (_b = pipelineRef.current.getDataSource) === null || _b === void 0 ? void 0 : _b.bind(pipelineRef.current),
128
- getFooterDataSource: (_c = pipelineRef.current.getFooterDataSource) === null || _c === void 0 ? void 0 : _c.bind(pipelineRef.current)
128
+ getFooterDataSource: (_c = pipelineRef.current.getFooterDataSource) === null || _c === void 0 ? void 0 : _c.bind(pipelineRef.current),
129
+ clearRangeSelection: (_d = pipelineRef.current.clearRangeSelection) === null || _d === void 0 ? void 0 : _d.bind(pipelineRef.current)
129
130
  }
130
131
  };
131
132
  });
@@ -146,6 +147,7 @@ var Table = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
146
147
  (0, _contextMenu.default)(pipeline, contextMenu);
147
148
  (0, _useRangeSelection.default)(pipeline, rangeSelection);
148
149
  (0, _mergeCellHover.default)(pipeline);
150
+ (0, _useFooterDataSource.default)(pipeline, footerDataSource);
149
151
  /* -------------------------------------------------------------------------- */
150
152
 
151
153
  /* after useTablePipeline, merge pipeline.getProps result */
package/lib/tree/tree.js CHANGED
@@ -172,11 +172,20 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
172
172
  loadingKeys = _React$useState14[0],
173
173
  setLoadingKeys = _React$useState14[1];
174
174
 
175
+ var _React$useState15 = _react.default.useState([]),
176
+ _React$useState16 = (0, _slicedToArray2.default)(_React$useState15, 2),
177
+ searchExpandedKeys = _React$useState16[0],
178
+ setSearchExpandedKeys = _React$useState16[1];
179
+
175
180
  var isSearching = _react.default.useMemo(function () {
176
181
  return typeof filterTreeNode === 'function' && filterValue;
177
182
  }, [filterValue]);
178
183
 
179
- var _useExpand = (0, _treeHooks.useExpand)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData),
184
+ (0, _react.useEffect)(function () {
185
+ setSearchExpandedKeys([]);
186
+ }, [filterValue]);
187
+
188
+ var _useExpand = (0, _treeHooks.useExpand)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchExpandedKeys),
180
189
  _useExpand2 = (0, _slicedToArray2.default)(_useExpand, 2),
181
190
  expandedKeys = _useExpand2[0],
182
191
  setExpandedKeys = _useExpand2[1];
@@ -273,6 +282,12 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
273
282
  node: node,
274
283
  expanded: expanded
275
284
  });
285
+
286
+ if (isSearching) {
287
+ var newSearchExpandedKeys = expanded ? (0, _treeUtils.addKeys)(searchExpandedKeys, [key]) : (0, _treeUtils.delKey)(searchExpandedKeys, [key]);
288
+ setSearchExpandedKeys(newSearchExpandedKeys);
289
+ }
290
+
276
291
  setScrollKey('');
277
292
  setIsInit(false);
278
293
 
@@ -4,6 +4,6 @@ export declare const useViewportHeight: (height: number, listRef: React.RefObjec
4
4
  export declare const useVisibleDataMemo: (virtual: boolean, filterData: TreeNodeData[], viewportHeight: number, estimatedItemSize: number, start: number) => TreeNodeData[][];
5
5
  export declare const usePlantomHeightEffect: (plantomRef: React.RefObject<HTMLElement>, filterData: TreeNodeData[], estimatedItemSize: number) => void;
6
6
  export declare const useChecked: (checkStrictly: boolean, checkedKeysProps: string[], defaultCheckedKeys: string[], _flattenAllData: any[], _maxLevel: number, checkable: boolean, keysData: KeysDataType) => readonly [string[], string[], React.Dispatch<React.SetStateAction<string[]>>, React.Dispatch<React.SetStateAction<string[]>>];
7
- export declare const useExpand: (flattenAllData: any[], expandedKeysProps: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, scrollKey: string, isInit: boolean, filterTreeNode: FunctionConstructor, isSearching: boolean, keysData: KeysDataType) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
7
+ export declare const useExpand: (flattenAllData: any[], expandedKeysProps: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, scrollKey: string, isInit: boolean, filterTreeNode: FunctionConstructor, isSearching: boolean, keysData: KeysDataType, searchExpandedKeys: string[]) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
8
8
  export declare const useScrollToKey: (scrollKey: string, index: number, estimatedItemSize: number, scrollRef: any, viewportHeight: number, treeNodePrefixCls: string) => void;
9
9
  export declare const useSelect: (selectedKeysProps: string[], defaultSelectedKeys: string[]) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
@@ -104,7 +104,7 @@ var useChecked = function useChecked(checkStrictly, checkedKeysProps, defaultChe
104
104
 
105
105
  exports.useChecked = useChecked;
106
106
 
107
- var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData) {
107
+ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchExpandedKeys) {
108
108
  var expandScrollkeys = [];
109
109
 
110
110
  if (scrollKey) {
@@ -113,8 +113,8 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
113
113
  }
114
114
 
115
115
  var initialExpandedKeys = _react.default.useMemo(function () {
116
- return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData);
117
- }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData]);
116
+ return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, searchExpandedKeys);
117
+ }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, searchExpandedKeys]);
118
118
 
119
119
  var newExpandedKeys = _react.default.useMemo(function () {
120
120
  return (0, _treeUtils.getExpandedKeys)(expandedKeysProps, expandScrollkeys);
@@ -126,9 +126,9 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
126
126
  setExpandedKeys = _React$useState8[1];
127
127
 
128
128
  _react.default.useEffect(function () {
129
- var keys = isInit ? initialExpandedKeys : newExpandedKeys;
129
+ var keys = isInit || isSearching ? initialExpandedKeys : newExpandedKeys;
130
130
  setExpandedKeys(keys);
131
- }, [newExpandedKeys, initialExpandedKeys]);
131
+ }, [newExpandedKeys, initialExpandedKeys, isSearching, isInit]);
132
132
 
133
133
  return [expandedKeys, setExpandedKeys];
134
134
  };
@@ -16,7 +16,8 @@ export declare const getExpand: (expandedKeys: string[], key: string) => boolean
16
16
  export declare const getChecked: (checkedKeys: string[], key: string) => boolean;
17
17
  export declare const getSelected: (selectedKeys: string[], key: string) => boolean;
18
18
  export declare const getHalfChecked: (halfCheckedKeys: string[], key: string) => boolean;
19
- export declare const getAllFilterKeys: (data: any[], filterTreeNode: FunctionConstructor, keysData: KeysDataType) => any[];
19
+ export declare function findfilterChildrenKeys(node: any, allFilterKeys: Set<any>): Set<string>;
20
+ export declare const getAllFilterKeys: (data: any[], filterTreeNode: FunctionConstructor, keysData: KeysDataType) => any;
20
21
  export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, isSearching: boolean, posData?: {}, keysData?: {}) => any[];
21
22
  export declare const getMaxLevel: (data: any[]) => number;
22
23
  /**
@@ -59,6 +60,6 @@ export declare const getDataCheckededStateStrictly: (checkedKeys: string[]) => {
59
60
  };
60
61
  export declare const delKey: (prevKeys: string[], delKeys: string[]) => never[] & string[];
61
62
  export declare const getAllNodeKeys: (data: any[]) => string[];
62
- export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, isSearching: boolean, keysData: KeysDataType) => string[];
63
+ export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, isSearching: boolean, keysData: KeysDataType, searchExpandedKeys: string[]) => string[];
63
64
  export declare const getExpandedKeys: (expandedKeys: string[], expandScrollkeys?: string[]) => string[];
64
65
  export declare const calcDropPosition: (event: React.MouseEvent, dropNode: HTMLElement) => 0 | 1 | -1;
@@ -5,7 +5,9 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.flattenAll = exports.delKey = exports.calcDropPosition = exports.addKeys = void 0;
8
+ exports.delKey = exports.calcDropPosition = exports.addKeys = void 0;
9
+ exports.findfilterChildrenKeys = findfilterChildrenKeys;
10
+ exports.flattenAll = void 0;
9
11
  exports.getAllCheckedKeys = getAllCheckedKeys;
10
12
  exports.getChecked = exports.getAllParentPos = exports.getAllParentKeys = exports.getAllNodeKeys = exports.getAllFilterKeys = exports.getAllChildKeys = void 0;
11
13
  exports.getChildNodeKeys = getChildNodeKeys;
@@ -21,18 +23,18 @@ var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
21
23
 
22
24
  var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
23
25
 
24
- var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
25
-
26
26
  var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
27
27
 
28
+ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
29
+
30
+ var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
31
+
28
32
  var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
29
33
 
30
34
  var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
31
35
 
32
36
  var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
33
37
 
34
- var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
35
-
36
38
  var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
37
39
 
38
40
  var __rest = void 0 && (void 0).__rest || function (s, e) {
@@ -161,19 +163,51 @@ var isAllParentExpand = function isAllParentExpand(_data, pos, posData) {
161
163
  return expand;
162
164
  };
163
165
 
166
+ function findfilterChildrenKeys(node, allFilterKeys) {
167
+ var nodes = new _set.default();
168
+
169
+ var loop = function loop(children) {
170
+ (0, _map.default)(children).call(children, function (child) {
171
+ var key = child.key;
172
+ var item = child;
173
+ allFilterKeys.add(key);
174
+ loop(item.children || []);
175
+ });
176
+ };
177
+
178
+ if (node) {
179
+ loop(node.children || []);
180
+ }
181
+
182
+ return nodes;
183
+ }
184
+
164
185
  var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData) {
165
- var allFilterKeys = [];
166
- (0, _filter.default)(data).call(data, function (item) {
186
+ var allFilterKeys = new _set.default();
187
+ var filterExpandKeys = new _set.default();
188
+ var filterKeys = (0, _filter.default)(data).call(data, function (item) {
167
189
  return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
168
- }).forEach(function (item) {
190
+ });
191
+ filterKeys.forEach(function (item) {
192
+ findfilterChildrenKeys(item, allFilterKeys);
193
+ });
194
+ filterKeys.forEach(function (item) {
169
195
  var node = (0, _extends2.default)({}, item);
170
196
 
171
197
  while (node) {
172
- allFilterKeys.push(node.key);
198
+ var _context3;
199
+
200
+ allFilterKeys.add(node.key);
201
+ !(0, _includes.default)(_context3 = (0, _map.default)(filterKeys).call(filterKeys, function (i) {
202
+ return i.key;
203
+ })).call(_context3, node.key) && filterExpandKeys.add(node.key);
173
204
  node = (keysData === null || keysData === void 0 ? void 0 : keysData[node === null || node === void 0 ? void 0 : node.parentKey]) || null;
174
205
  }
175
206
  });
176
- return (0, _toConsumableArray2.default)(new _set.default(allFilterKeys));
207
+ return {
208
+ allFilterKeys: (0, _toConsumableArray2.default)(allFilterKeys),
209
+ filterExpandKeys: (0, _toConsumableArray2.default)(filterExpandKeys)
210
+ };
177
211
  };
178
212
 
179
213
  exports.getAllFilterKeys = getAllFilterKeys;
@@ -185,7 +219,7 @@ var getFilterData = function getFilterData(data, filterTreeNode, isSearching) {
185
219
  var allFilterKeys = null;
186
220
 
187
221
  if (isSearching) {
188
- allFilterKeys = getAllFilterKeys(filterData, filterTreeNode, keysData);
222
+ allFilterKeys = getAllFilterKeys(filterData, filterTreeNode, keysData).allFilterKeys;
189
223
  filterData = (0, _filter.default)(filterData).call(filterData, function (item) {
190
224
  return (0, _includes.default)(allFilterKeys).call(allFilterKeys, item.key);
191
225
  });
@@ -339,11 +373,11 @@ var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys) {
339
373
  exports.getSpreadAttrData = getSpreadAttrData;
340
374
 
341
375
  var addKeys = function addKeys() {
342
- var _context3;
376
+ var _context4;
343
377
 
344
378
  var prevKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
345
379
  var newKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
346
- return (0, _from.default)(new _set.default((0, _concat.default)(_context3 = []).call(_context3, (0, _toConsumableArray2.default)(prevKeys), (0, _toConsumableArray2.default)(newKeys))));
380
+ return (0, _from.default)(new _set.default((0, _concat.default)(_context4 = []).call(_context4, (0, _toConsumableArray2.default)(prevKeys), (0, _toConsumableArray2.default)(newKeys))));
347
381
  };
348
382
 
349
383
  exports.addKeys = addKeys;
@@ -408,14 +442,14 @@ var getPos = function getPos(data, key) {
408
442
  exports.getPos = getPos;
409
443
 
410
444
  var getInitCheckedKeys = function getInitCheckedKeys(data, keys) {
411
- var _context4;
445
+ var _context5;
412
446
 
413
447
  var checkedKeys = [];
414
448
  keys.forEach(function (item) {
415
449
  var pos = getPos(data, item);
416
450
  checkedKeys.push.apply(checkedKeys, (0, _toConsumableArray2.default)(getAllChildKeys(data, pos)));
417
451
  });
418
- return (0, _from.default)(new _set.default((0, _concat.default)(_context4 = []).call(_context4, checkedKeys, (0, _toConsumableArray2.default)(keys))));
452
+ return (0, _from.default)(new _set.default((0, _concat.default)(_context5 = []).call(_context5, checkedKeys, (0, _toConsumableArray2.default)(keys))));
419
453
  };
420
454
 
421
455
  exports.getInitCheckedKeys = getInitCheckedKeys;
@@ -542,7 +576,7 @@ var updateParent = function updateParent(key, keysNodeProps, allKeys, halfChecke
542
576
  };
543
577
 
544
578
  var getInitCheckededKeys = function getInitCheckededKeys() {
545
- var _context5;
579
+ var _context6;
546
580
 
547
581
  var checkedKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
548
582
  var keysNodeProps = arguments.length > 1 ? arguments[1] : undefined;
@@ -564,7 +598,7 @@ var getInitCheckededKeys = function getInitCheckededKeys() {
564
598
  }
565
599
  });
566
600
  return {
567
- checkedKeys: (0, _toConsumableArray2.default)(new _set.default((0, _concat.default)(_context5 = []).call(_context5, (0, _toConsumableArray2.default)(checkedKeysSet), (0, _toConsumableArray2.default)(childCheckedKeysSet)))),
601
+ checkedKeys: (0, _toConsumableArray2.default)(new _set.default((0, _concat.default)(_context6 = []).call(_context6, (0, _toConsumableArray2.default)(checkedKeysSet), (0, _toConsumableArray2.default)(childCheckedKeysSet)))),
568
602
  halfCheckedKeys: (0, _toConsumableArray2.default)(halfCheckedKeysSet)
569
603
  };
570
604
  };
@@ -741,6 +775,7 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
741
775
  var filterTreeNode = arguments.length > 7 ? arguments[7] : undefined;
742
776
  var isSearching = arguments.length > 8 ? arguments[8] : undefined;
743
777
  var keysData = arguments.length > 9 ? arguments[9] : undefined;
778
+ var searchExpandedKeys = arguments.length > 10 ? arguments[10] : undefined;
744
779
  var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : (0, _concat.default)(expandedKeys).call(expandedKeys, expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : (0, _concat.default)(defaultExpandedKeys).call(defaultExpandedKeys, expandScrollkeys)) || [];
745
780
 
746
781
  if (defaultExpandAll) {
@@ -764,9 +799,9 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
764
799
  }
765
800
 
766
801
  if (isSearching) {
767
- var _context6;
802
+ var _context7;
768
803
 
769
- keys = (0, _concat.default)(_context6 = []).call(_context6, (0, _toConsumableArray2.default)(keys), (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData)));
804
+ keys = (0, _concat.default)(_context7 = []).call(_context7, (0, _toConsumableArray2.default)(searchExpandedKeys), (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys));
770
805
  }
771
806
 
772
807
  return (0, _from.default)(new _set.default((0, _toConsumableArray2.default)(keys)));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kdcloudjs/kdesign",
3
- "version": "1.6.15",
3
+ "version": "1.6.17",
4
4
  "description": "KDesign 金蝶前端react 组件库",
5
5
  "title": "kdesign",
6
6
  "keywords": [