@kdcloudjs/kdesign 1.7.44 → 1.7.46

package/lib/select/select.js

@@ -1,6 +1,10 @@
 "use strict";
 
 var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
+var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
+var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
+var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
+var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-method");
 var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
@@ -13,6 +17,7 @@ var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _splice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/splice"));
+var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
@@ -32,9 +37,12 @@ var _virtualList = _interopRequireDefault(require("../virtual-list"));
 var _KeyCode = _interopRequireDefault(require("../_utils/KeyCode"));
 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); }
 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; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { var _context6; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context6 = Object.prototype.toString.call(o)).call(_context6, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var INPUT_MIN_WIDTH = 4; // 输入框最小宽度
 var InternalSelect = function InternalSelect(props, ref) {
-  var _context, _classNames6, _classNames12, _context5;
+  var _context, _classNames5, _classNames6, _classNames12, _context5;
   var _useContext = (0, _react.useContext)(_ConfigContext.default),
     getPrefixCls = _useContext.getPrefixCls,
     prefixCls = _useContext.prefixCls,
@@ -133,14 +141,12 @@ var InternalSelect = function InternalSelect(props, ref) {
   // 选择器样式
   var selectCls = (0, _classnames.default)(selectPrefixCls, className, (0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-visible"), optionShow));
   var selectionCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-selector"), true));
-  // 下拉列表框样式
-  var dropDownCls = (0, _classnames.default)(dropdownClassName, (0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-dropdown"), true));
   // 下拉子项列表样式
   var dropContentCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-dropdown-scroll"), (isMultiple ? (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 8 : (realChildren === null || realChildren === void 0 ? void 0 : realChildren.length) > 10) || selectProps.dropdownRender));
   // 多选底部样式
   var multipleFooterCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-multiple-footer"), true));
   // 多选，单选公共样式
-  var commCls = (0, _classnames.default)((_classNames6 = {}, (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), (0, _defineProperty2.default)(_classNames6, (0, _concat.default)(_context = "".concat(selectPrefixCls, "-size-")).call(_context, size), size), (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-wrapper"), true), (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-show-search"), isShowSearch && focusd), (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-error"), status === 'error'), _classNames6));
+  var commCls = (0, _classnames.default)((_classNames5 = {}, (0, _defineProperty2.default)(_classNames5, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), (0, _defineProperty2.default)(_classNames5, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), (0, _defineProperty2.default)(_classNames5, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), (0, _defineProperty2.default)(_classNames5, (0, _concat.default)(_context = "".concat(selectPrefixCls, "-size-")).call(_context, size), size), (0, _defineProperty2.default)(_classNames5, "".concat(selectPrefixCls, "-wrapper"), true), (0, _defineProperty2.default)(_classNames5, "".concat(selectPrefixCls, "-show-search"), isShowSearch && focusd), (0, _defineProperty2.default)(_classNames5, "".concat(selectPrefixCls, "-error"), status === 'error'), _classNames5));
   (0, _react.useEffect)(function () {
     if (typeof props.visible !== 'undefined') {
       setOptionShow(props.visible);
@@ -279,6 +285,8 @@ var InternalSelect = function InternalSelect(props, ref) {
     });
     return childrenList;
   }, [searchValue, realChildren, filterOption, optionFilterProp]);
+  // 下拉列表框样式
+  var dropDownCls = (0, _classnames.default)(dropdownClassName, (_classNames6 = {}, (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-dropdown"), true), (0, _defineProperty2.default)(_classNames6, "".concat(selectPrefixCls, "-dropdown-no-data"), filledOptions.length === 0), _classNames6));
   var getOptionLabel = (0, _react.useCallback)(function (obj) {
     var _a;
     var text = Object.prototype.hasOwnProperty.call(selectProps, 'options') && !Object.prototype.hasOwnProperty.call(props, 'optionLabelProp') ? 'label' : optionLabelProp;
@@ -388,14 +396,39 @@ var InternalSelect = function InternalSelect(props, ref) {
     setSearchValue('');
     onSelect && onSelect(key); // 下拉项被选中时调用，参数为选中项value或key
   };
+
+  var removeIntersection = function removeIntersection(selectedItems, filteredItems) {
+    var filteredValues = new _set.default((0, _map.default)(filteredItems).call(filteredItems, function (item) {
+      var _a;
+      return item.value || ((_a = item.props) === null || _a === void 0 ? void 0 : _a.value);
+    }));
+    var filteredSelectedItems = [];
+    var filteredSelectedValues = [];
+    var _iterator = _createForOfIteratorHelper(selectedItems),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var item = _step.value;
+        if (!filteredValues.has(item.value)) {
+          filteredSelectedItems.push(item);
+          filteredSelectedValues.push(item.value);
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    return [filteredSelectedValues, filteredSelectedItems];
+  };
   // 多选模式下选中所有 与清除所有 (可以优化)
-  var handleSelectAll = function handleSelectAll() {
+  var handleSelectAll = function handleSelectAll(checked) {
     var _multipleRef$current3 = multipleRef.current,
       selectedVal = _multipleRef$current3.selectedVal,
       selectMulOpts = _multipleRef$current3.selectMulOpts;
     var newSelectedVal = (0, _toConsumableArray2.default)(selectedVal);
     var newSelectMulOpts = (0, _toConsumableArray2.default)(selectMulOpts);
-    if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== newSelectedVal.length) {
+    if (!checked) {
       (0, _map.default)(filledOptions).call(filledOptions, function (child) {
         var _ref = child.props || child,
           value = _ref.value;
@@ -414,12 +447,15 @@ var InternalSelect = function InternalSelect(props, ref) {
         setSearchValue('');
       }
     } else {
-      newSelectedVal = [];
-      newSelectMulOpts = [];
+      ;
+      var _removeIntersection = removeIntersection(newSelectMulOpts, filledOptions);
+      var _removeIntersection2 = (0, _slicedToArray2.default)(_removeIntersection, 2);
+      newSelectedVal = _removeIntersection2[0];
+      newSelectMulOpts = _removeIntersection2[1];
       if (typeof value === 'undefined') {
-        multipleRef.current.selectedVal = [];
-        multipleRef.current.selectMulOpts = [];
-        setMulOptions([]);
+        multipleRef.current.selectedVal = newSelectedVal;
+        multipleRef.current.selectMulOpts = newSelectMulOpts;
+        setMulOptions((0, _toConsumableArray2.default)(newSelectMulOpts));
       }
     }
     onChange && onChange(labelInValue ? newSelectMulOpts : newSelectedVal, newSelectMulOpts);
@@ -540,6 +576,33 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
   }, [isShowSearch, autoFocus, disabled]);
   var optionsListRef = _react.default.useRef(null);
+  var getCheckedState = function getCheckedState(selectedItems, filteredItems) {
+    var _a;
+    var valuesSet = new _set.default((0, _map.default)(selectedItems).call(selectedItems, function (item) {
+      return item.value;
+    }));
+    var number = 0;
+    var _iterator2 = _createForOfIteratorHelper(filteredItems),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var item = _step2.value;
+        if (valuesSet.has(item.value || ((_a = item.props) === null || _a === void 0 ? void 0 : _a.value))) {
+          number += 1;
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+    var checked = number > 0 && number === filteredItems.length;
+    var indeterminate = number > 0 && number < filteredItems.length;
+    return {
+      checked: checked,
+      indeterminate: indeterminate
+    };
+  };
   // 渲染下拉列表框
   var renderContent = function renderContent() {
     var dropdownRender = selectProps.dropdownRender,
@@ -579,25 +642,28 @@ var InternalSelect = function InternalSelect(props, ref) {
       height: '30px',
       background: 'none'
     };
-    var indeterminate = mulOptions.length > 0 && mulOptions.length < filledOptions.length;
-    var checked = mulOptions.length > 0 && mulOptions.length === filledOptions.length;
+    var _getCheckedState = getCheckedState(mulOptions, filledOptions),
+      checked = _getCheckedState.checked,
+      indeterminate = _getCheckedState.indeterminate;
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
       className: dropDownCls,
       style: dropdownStyle,
       ref: dropDownRef
-    }, !dropdownRender && childrenToRender.length > 0 ? dropRender(eleOptionList, heightStyle) : null, renderNotContent(), /*#__PURE__*/_react.default.createElement("div", null, dropdownRender ? dropdownRender(dropRender(eleOptionList, heightStyle)) : null), isMultiple && realChildren.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
+    }, !dropdownRender && childrenToRender.length > 0 ? dropRender(eleOptionList, heightStyle) : null, renderNotContent(), /*#__PURE__*/_react.default.createElement("div", null, dropdownRender ? dropdownRender(dropRender(eleOptionList, heightStyle)) : null), isMultiple && filledOptions.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
       className: multipleFooterCls
     }, /*#__PURE__*/_react.default.createElement(_index.Checkbox, {
       style: checkboxStyle,
       checked: checked,
       indeterminate: indeterminate,
-      onChange: handleSelectAll
+      onChange: function onChange() {
+        return handleSelectAll(checked);
+      }
     }, selectLangMsg === null || selectLangMsg === void 0 ? void 0 : selectLangMsg.selectAll), /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(selectPrefixCls, "-multiple-footer-hadSelected")
     }, locale.getLangMsg('Select', 'seleted', {
       size: /*#__PURE__*/_react.default.createElement("span", {
         className: "".concat(selectPrefixCls, "-multiple-footer-hadSelected-number")
-      }, selectedVal.length)
+      }, selectedVal === null || selectedVal === void 0 ? void 0 : selectedVal.length)
     }))) : null));
   };
   // 处理多选tag
@@ -794,7 +860,7 @@ var InternalSelect = function InternalSelect(props, ref) {
       selectedVal = _multipleRef$current5.selectedVal,
       selectMulOpts = _multipleRef$current5.selectMulOpts;
     // isMultiple
-    if (which === _KeyCode.default.BACKSPACE && !searchValue && isMultiple && selectedVal.length && selectMulOpts.length) {
+    if (which === _KeyCode.default.BACKSPACE && !searchValue && isMultiple && (selectedVal === null || selectedVal === void 0 ? void 0 : selectedVal.length) && selectMulOpts.length) {
       (0, _splice.default)(selectedVal).call(selectedVal, -1, 1);
       (0, _splice.default)(selectMulOpts).call(selectMulOpts, -1, 1);
       setMulOptions((0, _toConsumableArray2.default)(selectMulOpts));

package/lib/select/style/index.css

@@ -399,7 +399,7 @@
 .kd-select-dropdown-search-hidden {
   display: none;
 }
-.kd-select-multiple-dropdown-panel .kd-select-dropdown {
+.kd-select-multiple-dropdown-panel .kd-select-dropdown:not(.kd-select-dropdown-no-data) {
   padding-bottom: 0;
 }
 .kd-select-item {

package/lib/select/style/index.less

@@ -173,7 +173,7 @@
   }
 
   &-multiple-dropdown-panel {
-    .@{select-prefix-cls}-dropdown {
+    .@{select-prefix-cls}-dropdown:not(.@{select-prefix-cls}-dropdown-no-data) {
       padding-bottom: 0;
     }
   }

package/lib/table/table.js

@@ -125,13 +125,13 @@ var Table = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   if (typeof getRowProps === 'function') {
     pipeline.appendRowPropsGetter(getRowProps);
   } else {
-    (0, _devwarning.default)(true, 'table', "parameter 'getRowProps' should be a function but here it is ".concat(getRowProps));
+    (0, _devwarning.default)(getRowProps !== undefined, 'table', "parameter 'getRowProps' should be a function but here it is ".concat(getRowProps));
   }
   if (typeof getTableProps === 'function') {
     var tableProps = getTableProps();
     pipeline.addTableProps(tableProps);
   } else {
-    (0, _devwarning.default)(true, 'table', "parameter 'getTableProps' should be a function but here it is ".concat(getTableProps));
+    (0, _devwarning.default)(getTableProps !== undefined, 'table', "parameter 'getTableProps' should be a function but here it is ".concat(getTableProps));
   }
   return /*#__PURE__*/_react.default.createElement(_table.Table, (0, _extends2.default)({}, pipeline.getProps(), {
     className: tableCls,

package/lib/tree/tree.d.ts

@@ -43,6 +43,7 @@ export interface TreeProps {
     showIcon?: boolean;
     style?: React.CSSProperties;
     className?: string;
+    expandOnFilterNode?: boolean;
 }
 export declare type TreeNodeData = {
     checkable?: boolean;

package/lib/tree/tree.js

@@ -94,7 +94,8 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     loadData = TreeProps.loadData,
     notFoundContent = TreeProps.notFoundContent,
     showLine = TreeProps.showLine,
-    others = __rest(TreeProps, ["prefixCls", "treeData", "virtual", "showIcon", "switcherIcon", "icon", "checkable", "checkStrictly", "disabled", "draggable", "scrollToKey", "expandedKeys", "checkedKeys", "defaultExpandRoot", "defaultExpandAll", "defaultExpandParent", "defaultExpandedKeys", "defaultCheckedKeys", "defaultSelectedKeys", "height", "onCheck", "onExpand", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect", "selectedKeys", "setTreeNodeStyle", "setTreeNodeClassName", "estimatedItemSize", "style", "className", "filterTreeNode", "filterValue", "expandOnClickNode", "onlyExpandOnClickIcon", "loadData", "notFoundContent", "showLine"]);
+    expandOnFilterNode = TreeProps.expandOnFilterNode,
+    others = __rest(TreeProps, ["prefixCls", "treeData", "virtual", "showIcon", "switcherIcon", "icon", "checkable", "checkStrictly", "disabled", "draggable", "scrollToKey", "expandedKeys", "checkedKeys", "defaultExpandRoot", "defaultExpandAll", "defaultExpandParent", "defaultExpandedKeys", "defaultCheckedKeys", "defaultSelectedKeys", "height", "onCheck", "onExpand", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect", "selectedKeys", "setTreeNodeStyle", "setTreeNodeClassName", "estimatedItemSize", "style", "className", "filterTreeNode", "filterValue", "expandOnClickNode", "onlyExpandOnClickIcon", "loadData", "notFoundContent", "showLine", "expandOnFilterNode"]);
   var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls); // 树样式前缀
   var treeNodeClassName = (0, _classnames.default)(className, (_classNames = {}, (0, _defineProperty2.default)(_classNames, "".concat(treePrefixCls), true), (0, _defineProperty2.default)(_classNames, "".concat(treePrefixCls, "-show-line"), showLine), _classNames));
   var treeRootClassName = "".concat(treePrefixCls, "-root");
@@ -154,7 +155,7 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       setSearchStatus('NONE');
     }
   }, [filterValue]);
-  var _useExpand = (0, _treeHooks.useExpand)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue),
+  var _useExpand = (0, _treeHooks.useExpand)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue, expandOnFilterNode),
     _useExpand2 = (0, _slicedToArray2.default)(_useExpand, 2),
     expandedKeys = _useExpand2[0],
     setExpandedKeys = _useExpand2[1];
@@ -170,8 +171,8 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     setCheckedKeys = _useChecked2[2],
     setHalfCheckedKeys = _useChecked2[3];
   var filterData = _react.default.useMemo(function () {
-    return (0, _treeUtils.getFilterData)(spreadAttrData, filterTreeNode, isSearching, posData, keysData);
-  }, [spreadAttrData, isSearching, posData, keysData, filterValue]);
+    return (0, _treeUtils.getFilterData)(spreadAttrData, filterTreeNode, isSearching, posData, keysData, expandOnFilterNode);
+  }, [spreadAttrData, isSearching, posData, keysData, filterValue, expandOnFilterNode]);
   (0, _react.useEffect)(function () {
     var _a, _b;
     if (typeof scrollKey === 'undefined') {

package/lib/tree/treeHooks.d.ts

@@ -4,6 +4,6 @@ export declare const useViewportHeight: (height: number, listRef: React.RefObjec
 export declare const useVisibleDataMemo: (virtual: boolean, filterData: TreeNodeData[], viewportHeight: number, estimatedItemSize: number, start: number) => TreeNodeData[][];
 export declare const usePlantomHeightEffect: (plantomRef: React.RefObject<HTMLElement>, filterData: TreeNodeData[], estimatedItemSize: number) => void;
 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[]>>];
-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, searchStatus: SearchStatus, filterValue: string) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
+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, searchStatus: SearchStatus, filterValue: string, expandOnFilterNode: boolean) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];
 export declare const useScrollToKey: (scrollKey: string, index: number, estimatedItemSize: number, scrollRef: any, viewportHeight: number, treeNodePrefixCls: string) => void;
 export declare const useSelect: (selectedKeysProps: string[], defaultSelectedKeys: string[]) => readonly [string[], React.Dispatch<React.SetStateAction<string[]>>];

package/lib/tree/treeHooks.js

@@ -75,15 +75,15 @@ var useChecked = function useChecked(checkStrictly, checkedKeysProps, defaultChe
   return [checkedKeys, halfCheckedKeys, setCheckedKeys, setHalfCheckedKeys];
 };
 exports.useChecked = useChecked;
-var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue) {
+var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue, expandOnFilterNode) {
   var expandScrollkeys = [];
   if (scrollKey) {
     var pos = (0, _treeUtils.getPos)(flattenAllData, scrollKey);
     expandScrollkeys = (0, _treeUtils.getAllParentKeys)(flattenAllData, pos);
   }
   var initialExpandedKeys = _react.default.useMemo(function () {
-    return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, isInit, searchStatus);
-  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, isInit, searchStatus, filterValue]);
+    return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, isInit, searchStatus, expandOnFilterNode);
+  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, isInit, searchStatus, filterValue, expandOnFilterNode]);
   var _React$useState7 = _react.default.useState(initialExpandedKeys),
     _React$useState8 = (0, _slicedToArray2.default)(_React$useState7, 2),
     expandedKeys = _React$useState8[0],

package/lib/tree/utils/treeUtils.d.ts

@@ -17,8 +17,8 @@ export declare const getChecked: (checkedKeys: string[], key: string) => boolean
 export declare const getSelected: (selectedKeys: string[], key: string) => boolean;
 export declare const getHalfChecked: (halfCheckedKeys: string[], key: string) => boolean;
 export declare function findfilterChildrenKeys(node: any, allFilterKeys: Set<any>): Set<string>;
-export declare const getAllFilterKeys: (data: any[], filterTreeNode: FunctionConstructor, keysData: KeysDataType) => any;
-export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, isSearching: boolean, posData?: {}, keysData?: {}) => any[];
+export declare const getAllFilterKeys: (data: any[], filterTreeNode: FunctionConstructor, keysData: KeysDataType, expandOnFilterNode: boolean) => any;
+export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, isSearching: boolean, posData: {} | undefined, keysData: {} | undefined, expandOnFilterNode: boolean) => any[];
 export declare const getMaxLevel: (data: any[]) => number;
 /**
  *计算node的属性后返回新的 treedata
@@ -60,6 +60,6 @@ export declare const getDataCheckededStateStrictly: (checkedKeys: string[]) => {
 };
 export declare const delKey: (prevKeys: string[], delKeys: string[]) => never[] & string[];
 export declare const getAllNodeKeys: (data: any[]) => string[];
-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, isInit: boolean, searchStatus: SearchStatus) => string[];
+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, isInit: boolean, searchStatus: SearchStatus, expandOnFilterNode: boolean) => string[];
 export declare const getExpandedKeys: (expandedKeys: string[], expandScrollkeys?: string[]) => string[];
 export declare const calcDropPosition: (event: React.MouseEvent, dropNode: HTMLElement) => 0 | 1 | -1;

package/lib/tree/utils/treeUtils.js

@@ -136,7 +136,7 @@ function findfilterChildrenKeys(node, allFilterKeys) {
   }
   return nodes;
 }
-var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData) {
+var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData, expandOnFilterNode) {
   var allFilterKeys = new _set.default();
   var filterExpandKeys = new _set.default();
   var filterKeys = (0, _filter.default)(data).call(data, function (item) {
@@ -146,10 +146,15 @@ var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData)
     findfilterChildrenKeys(item, allFilterKeys);
   });
   filterKeys.forEach(function (item) {
+    var firstIteration = true;
     var node = (0, _extends2.default)({}, item);
     while (node) {
       allFilterKeys.add(node.key);
-      filterExpandKeys.add(node.key);
+      // expandOnFilterNode为true时，不将filterKeys中的节点添加到filterExpandKeys中
+      if (!expandOnFilterNode || !firstIteration) {
+        filterExpandKeys.add(node.key);
+      }
+      firstIteration = false;
       node = (keysData === null || keysData === void 0 ? void 0 : keysData[node === null || node === void 0 ? void 0 : node.parentKey]) || null;
     }
   });
@@ -162,10 +167,11 @@ exports.getAllFilterKeys = getAllFilterKeys;
 var getFilterData = function getFilterData(data, filterTreeNode, isSearching) {
   var posData = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   var keysData = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  var expandOnFilterNode = arguments.length > 5 ? arguments[5] : undefined;
   var filterData = data;
   var allFilterKeys = null;
   if (isSearching) {
-    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode, keysData).allFilterKeys;
+    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode, keysData, expandOnFilterNode).allFilterKeys;
     filterData = (0, _filter.default)(filterData).call(filterData, function (item) {
       return (0, _includes.default)(allFilterKeys).call(allFilterKeys, item.key);
     });
@@ -494,6 +500,7 @@ function getAllCheckedKeys(key, checked, checkedKeys, keysNodeProps, halfChecked
     halfCheckedKeysSet.delete(key);
     childKeys.forEach(function (v) {
       allKeys.add(v);
+      halfCheckedKeysSet.delete(v);
     });
   } else {
     halfCheckedKeysSet.delete(key);
@@ -619,6 +626,7 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   var keysData = arguments.length > 9 ? arguments[9] : undefined;
   var isInit = arguments.length > 10 ? arguments[10] : undefined;
   var searchStatus = arguments.length > 11 ? arguments[11] : undefined;
+  var expandOnFilterNode = arguments.length > 12 ? arguments[12] : undefined;
   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)) || [];
   if (isInit) {
     if (defaultExpandAll) {
@@ -640,7 +648,7 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
     }
   }
   if (isSearching && searchStatus === 'SEARCH_START') {
-    keys = (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys);
+    keys = (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData, expandOnFilterNode).filterExpandKeys);
   }
   return keys;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.44",
+  "version": "1.7.46",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -78,7 +78,7 @@
     "@babel/runtime-corejs3": "^7.11.2",
     "@babel/standalone": "^7.14.3",
     "@kdcloudjs/kdesign-icons": "^1.0.0",
-    "@kdcloudjs/table": "1.2.0-canary.10",
+    "@kdcloudjs/table": "1.2.0-canary.12",
     "@popperjs/core": "^2.5.4",
     "@types/js-cookie": "^3.0.3",
     "async-validator": "^3.5.1",