@kdcloudjs/kdesign 1.7.45 → 1.7.46

package/es/_utils/usePopper.js

@@ -80,7 +80,7 @@ var getBorderWidth = function getBorderWidth(el) {
     var _context, _context2;
     var parentBorder = getBorderWidth(el.offsetParent);
     border.top += parentBorder.top + parseInt(_sliceInstanceProperty(_context = getComputedStyle(el.offsetParent, null).borderTopWidth).call(_context, 0, -2));
-    border.left += parentBorder.left + parseInt(_sliceInstanceProperty(_context2 = getComputedStyle(el.offsetParent, null).borderTopWidth).call(_context2, 0, -2));
+    border.left += parentBorder.left + parseInt(_sliceInstanceProperty(_context2 = getComputedStyle(el.offsetParent, null).borderLeftWidth).call(_context2, 0, -2));
   }
   return border;
 };

package/es/city-picker/city-picker.js

@@ -232,7 +232,9 @@ var InternalSelect = function InternalSelect(props, ref) {
   var handleOption = function handleOption(city) {
     var _a;
     handleVisibleChange(false);
-    city.type = tabsValue === 'domestic' ? 'domestic' : 'foreign';
+    if (!city.type) {
+      city.type = tabsValue === 'domestic' ? 'domestic' : 'foreign';
+    }
     (city === null || city === void 0 ? void 0 : city.id) !== initValue && (onChange === null || onChange === void 0 ? void 0 : onChange(city === null || city === void 0 ? void 0 : city.id, city));
     (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     setAfterChangeFocus(true);

package/es/config-provider/compDefaultProps.d.ts

@@ -338,6 +338,7 @@ declare const compDefaultProps: {
         switcherIcon: () => JSX.Element;
         estimatedItemSize: number;
         expandOnClickNode: boolean;
+        expandOnFilterNode: boolean;
     };
     TreeNode: {};
     ToolTip: {

package/es/config-provider/compDefaultProps.js

@@ -351,7 +351,8 @@ var compDefaultProps = {
       });
     },
     estimatedItemSize: 32,
-    expandOnClickNode: true
+    expandOnClickNode: true,
+    expandOnFilterNode: false
   },
   TreeNode: {},
   ToolTip: {

package/es/select/select.js

@@ -1,12 +1,20 @@
+import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
+import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
+import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
+import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
+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; }
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _spliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/splice";
+import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
 import React, { useContext, useRef, useEffect, useState, useCallback, useLayoutEffect, useMemo, useImperativeHandle } from 'react';
 import { useMergedState } from '../_utils/hooks';
@@ -376,14 +384,39 @@ var InternalSelect = function InternalSelect(props, ref) {
     setSearchValue('');
     onSelect && onSelect(key); // 下拉项被选中时调用，参数为选中项value或key
   };
+
+  var removeIntersection = function removeIntersection(selectedItems, filteredItems) {
+    var filteredValues = new _Set(_mapInstanceProperty(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 = _toConsumableArray(selectedVal);
     var newSelectMulOpts = _toConsumableArray(selectMulOpts);
-    if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== newSelectedVal.length) {
+    if (!checked) {
       _mapInstanceProperty(filledOptions).call(filledOptions, function (child) {
         var _ref = child.props || child,
           value = _ref.value;
@@ -402,12 +435,15 @@ var InternalSelect = function InternalSelect(props, ref) {
         setSearchValue('');
       }
     } else {
-      newSelectedVal = [];
-      newSelectMulOpts = [];
+      ;
+      var _removeIntersection = removeIntersection(newSelectMulOpts, filledOptions);
+      var _removeIntersection2 = _slicedToArray(_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(_toConsumableArray(newSelectMulOpts));
       }
     }
     onChange && onChange(labelInValue ? newSelectMulOpts : newSelectedVal, newSelectMulOpts);
@@ -528,6 +564,33 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
   }, [isShowSearch, autoFocus, disabled]);
   var optionsListRef = React.useRef(null);
+  var getCheckedState = function getCheckedState(selectedItems, filteredItems) {
+    var _a;
+    var valuesSet = new _Set(_mapInstanceProperty(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,
@@ -567,8 +630,9 @@ 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.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: dropDownCls,
       style: dropdownStyle,
@@ -579,7 +643,9 @@ var InternalSelect = function InternalSelect(props, ref) {
       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.createElement("span", {
       className: "".concat(selectPrefixCls, "-multiple-footer-hadSelected")
     }, locale.getLangMsg('Select', 'seleted', {

package/es/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/es/tree/tree.js

@@ -82,7 +82,8 @@ var InternalTree = /*#__PURE__*/React.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 = classNames(className, (_classNames = {}, _defineProperty(_classNames, "".concat(treePrefixCls), true), _defineProperty(_classNames, "".concat(treePrefixCls, "-show-line"), showLine), _classNames));
   var treeRootClassName = "".concat(treePrefixCls, "-root");
@@ -142,7 +143,7 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
       setSearchStatus('NONE');
     }
   }, [filterValue]);
-  var _useExpand = useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue),
+  var _useExpand = useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue, expandOnFilterNode),
     _useExpand2 = _slicedToArray(_useExpand, 2),
     expandedKeys = _useExpand2[0],
     setExpandedKeys = _useExpand2[1];
@@ -158,8 +159,8 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setCheckedKeys = _useChecked2[2],
     setHalfCheckedKeys = _useChecked2[3];
   var filterData = React.useMemo(function () {
-    return getFilterData(spreadAttrData, filterTreeNode, isSearching, posData, keysData);
-  }, [spreadAttrData, isSearching, posData, keysData, filterValue]);
+    return getFilterData(spreadAttrData, filterTreeNode, isSearching, posData, keysData, expandOnFilterNode);
+  }, [spreadAttrData, isSearching, posData, keysData, filterValue, expandOnFilterNode]);
   useEffect(function () {
     var _a, _b;
     if (typeof scrollKey === 'undefined') {

package/es/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/es/tree/treeHooks.js

@@ -59,15 +59,15 @@ export var useChecked = function useChecked(checkStrictly, checkedKeysProps, def
   }, [nextHalfCheckedKeys]);
   return [checkedKeys, halfCheckedKeys, setCheckedKeys, setHalfCheckedKeys];
 };
-export var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue) {
+export var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue, expandOnFilterNode) {
   var expandScrollkeys = [];
   if (scrollKey) {
     var pos = getPos(flattenAllData, scrollKey);
     expandScrollkeys = getAllParentKeys(flattenAllData, pos);
   }
   var initialExpandedKeys = React.useMemo(function () {
-    return 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 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.useState(initialExpandedKeys),
     _React$useState8 = _slicedToArray(_React$useState7, 2),
     expandedKeys = _React$useState8[0],

package/es/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/es/tree/utils/treeUtils.js

@@ -118,7 +118,7 @@ export function findfilterChildrenKeys(node, allFilterKeys) {
   }
   return nodes;
 }
-export var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData) {
+export var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, keysData, expandOnFilterNode) {
   var allFilterKeys = new _Set();
   var filterExpandKeys = new _Set();
   var filterKeys = _filterInstanceProperty(data).call(data, function (item) {
@@ -128,10 +128,15 @@ export var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, ke
     findfilterChildrenKeys(item, allFilterKeys);
   });
   filterKeys.forEach(function (item) {
+    var firstIteration = true;
     var node = _extends({}, 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;
     }
   });
@@ -143,10 +148,11 @@ export var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode, ke
 export 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 = _filterInstanceProperty(filterData).call(filterData, function (item) {
       return _includesInstanceProperty(allFilterKeys).call(allFilterKeys, item.key);
     });
@@ -464,6 +470,7 @@ export function getAllCheckedKeys(key, checked, checkedKeys, keysNodeProps, half
     halfCheckedKeysSet.delete(key);
     childKeys.forEach(function (v) {
       allKeys.add(v);
+      halfCheckedKeysSet.delete(v);
     });
   } else {
     halfCheckedKeysSet.delete(key);
@@ -585,6 +592,7 @@ export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys
   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 : _concatInstanceProperty(expandedKeys).call(expandedKeys, expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : _concatInstanceProperty(defaultExpandedKeys).call(defaultExpandedKeys, expandScrollkeys)) || [];
   if (isInit) {
     if (defaultExpandAll) {
@@ -606,7 +614,7 @@ export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys
     }
   }
   if (isSearching && searchStatus === 'SEARCH_START') {
-    keys = _toConsumableArray(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys);
+    keys = _toConsumableArray(getAllFilterKeys(data, filterTreeNode, keysData, expandOnFilterNode).filterExpandKeys);
   }
   return keys;
 };

package/lib/_utils/usePopper.js

@@ -94,7 +94,7 @@ var getBorderWidth = function getBorderWidth(el) {
     var _context, _context2;
     var parentBorder = getBorderWidth(el.offsetParent);
     border.top += parentBorder.top + parseInt((0, _slice.default)(_context = getComputedStyle(el.offsetParent, null).borderTopWidth).call(_context, 0, -2));
-    border.left += parentBorder.left + parseInt((0, _slice.default)(_context2 = getComputedStyle(el.offsetParent, null).borderTopWidth).call(_context2, 0, -2));
+    border.left += parentBorder.left + parseInt((0, _slice.default)(_context2 = getComputedStyle(el.offsetParent, null).borderLeftWidth).call(_context2, 0, -2));
   }
   return border;
 };

package/lib/checkbox/group.js

@@ -32,9 +32,6 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
   }
   return t;
 };
-
-// import { Icon } from '../index'
-
 var CheckboxTypes = (0, _type.tuple)('default', 'square');
 exports.CheckboxTypes = CheckboxTypes;
 var CheckboxSizes = (0, _type.tuple)('large', 'middle', 'small');

package/lib/city-picker/city-picker.js

@@ -244,7 +244,9 @@ var InternalSelect = function InternalSelect(props, ref) {
   var handleOption = function handleOption(city) {
     var _a;
     handleVisibleChange(false);
-    city.type = tabsValue === 'domestic' ? 'domestic' : 'foreign';
+    if (!city.type) {
+      city.type = tabsValue === 'domestic' ? 'domestic' : 'foreign';
+    }
     (city === null || city === void 0 ? void 0 : city.id) !== initValue && (onChange === null || onChange === void 0 ? void 0 : onChange(city === null || city === void 0 ? void 0 : city.id, city));
     (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
     setAfterChangeFocus(true);

package/lib/config-provider/compDefaultProps.d.ts

@@ -338,6 +338,7 @@ declare const compDefaultProps: {
         switcherIcon: () => JSX.Element;
         estimatedItemSize: number;
         expandOnClickNode: boolean;
+        expandOnFilterNode: boolean;
     };
     TreeNode: {};
     ToolTip: {

package/lib/config-provider/compDefaultProps.js

@@ -362,7 +362,8 @@ var compDefaultProps = {
       });
     },
     estimatedItemSize: 32,
-    expandOnClickNode: true
+    expandOnClickNode: true,
+    expandOnFilterNode: false
   },
   TreeNode: {},
   ToolTip: {

package/lib/date-picker/utils/date-fns.js

@@ -348,9 +348,6 @@ function setTime(date, _ref) {
     second = _ref$second === void 0 ? 0 : _ref$second;
   return (0, _setHours.default)((0, _setMinutes.default)((0, _setSeconds.default)(date, second), minute), hour);
 }
-
-// ** Date Getters **
-
 function getWeek(date) {
   return (0, _getWeek.default)(date);
 }
@@ -378,8 +375,7 @@ function getEndOfWeek(date) {
 }
 // ** Date Math **
 // *** Addition ***
-// *** Subtraction ***
-// ** Date Comparison **
+
 function isSameYear(date1, date2) {
   var equal = isNullEqual(date1, date2);
   if (typeof equal === 'boolean') {

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,6 +37,9 @@ 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, _classNames5, _classNames6, _classNames12, _context5;
@@ -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,8 +642,9 @@ 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,
@@ -591,7 +655,9 @@ var InternalSelect = function InternalSelect(props, ref) {
       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', {

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[]>>];