@kdcloudjs/kdesign 1.7.34 → 1.7.37

package/es/select/select.js

@@ -26,8 +26,12 @@ var InternalSelect = function InternalSelect(props, ref) {
   var _useContext = useContext(ConfigContext),
     getPrefixCls = _useContext.getPrefixCls,
     prefixCls = _useContext.prefixCls,
-    userDefaultProps = _useContext.compDefaultProps;
+    userDefaultProps = _useContext.compDefaultProps,
+    locale = _useContext.locale;
   var selectProps = getCompProps('Select', userDefaultProps, props);
+  var selectLangMsg = locale.getCompLangMsg({
+    componentName: 'Select'
+  });
   var size = selectProps.size,
     value = selectProps.value,
     autoFocus = selectProps.autoFocus,
@@ -63,7 +67,8 @@ var InternalSelect = function InternalSelect(props, ref) {
     _selectProps$popperSt = selectProps.popperStyle,
     popperStyle = _selectProps$popperSt === void 0 ? {} : _selectProps$popperSt,
     tagRender = selectProps.tagRender,
-    virtualListProps = selectProps.virtualListProps;
+    virtualListProps = selectProps.virtualListProps,
+    status = selectProps.status;
   var isMultiple = mode === 'multiple'; // 是否多选
   var _useMergedState = useMergedState(undefined, {
       value: value,
@@ -123,7 +128,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   // 多选底部样式
   var multipleFooterCls = classNames(_defineProperty({}, "".concat(selectPrefixCls, "-multiple-footer"), true));
   // 多选，单选公共样式
-  var commCls = classNames((_classNames6 = {}, _defineProperty(_classNames6, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), _defineProperty(_classNames6, _concatInstanceProperty(_context = "".concat(selectPrefixCls, "-size-")).call(_context, size), size), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-wrapper"), true), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-show-search"), isShowSearch && focusd), _classNames6));
+  var commCls = classNames((_classNames6 = {}, _defineProperty(_classNames6, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), _defineProperty(_classNames6, _concatInstanceProperty(_context = "".concat(selectPrefixCls, "-size-")).call(_context, size), size), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-wrapper"), true), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-show-search"), isShowSearch && focusd), _defineProperty(_classNames6, "".concat(selectPrefixCls, "-error"), status === 'error'), _classNames6));
   useEffect(function () {
     if (typeof props.visible !== 'undefined') {
       setOptionShow(props.visible);
@@ -568,16 +573,20 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: dropDownCls,
       style: dropdownStyle,
       ref: dropDownRef
-    }, !dropdownRender && childrenToRender.length > 0 ? dropRender(eleOptionList, heightStyle) : null, renderNotContent(), /*#__PURE__*/React.createElement("div", null, dropdownRender ? dropdownRender(dropRender(childrenToRender, heightStyle)) : null), isMultiple && realChildren.length > 0 ? /*#__PURE__*/React.createElement("div", {
+    }, !dropdownRender && childrenToRender.length > 0 ? dropRender(eleOptionList, heightStyle) : null, renderNotContent(), /*#__PURE__*/React.createElement("div", null, dropdownRender ? dropdownRender(dropRender(eleOptionList, heightStyle)) : null), isMultiple && realChildren.length > 0 ? /*#__PURE__*/React.createElement("div", {
       className: multipleFooterCls
     }, /*#__PURE__*/React.createElement(Checkbox, {
       style: checkboxStyle,
       checked: checked,
       indeterminate: indeterminate,
       onChange: handleSelectAll
-    }, "\u5168\u9009"), /*#__PURE__*/React.createElement("span", {
+    }, selectLangMsg === null || selectLangMsg === void 0 ? void 0 : selectLangMsg.selectAll), /*#__PURE__*/React.createElement("span", {
       className: "".concat(selectPrefixCls, "-multiple-footer-hadSelected")
-    }, "\u5DF2\u9009", /*#__PURE__*/React.createElement("span", null, selectedVal.length), "\u9879")) : null));
+    }, locale.getLangMsg('Select', 'seleted', {
+      size: /*#__PURE__*/React.createElement("span", {
+        className: "".concat(selectPrefixCls, "-multiple-footer-hadSelected-number")
+      }, selectedVal.length)
+    }))) : null));
   };
   // 处理多选tag
   var handleMaxTagHolder = useCallback(function () {
@@ -778,12 +787,6 @@ var InternalSelect = function InternalSelect(props, ref) {
       _spliceInstanceProperty(selectMulOpts).call(selectMulOpts, -1, 1);
       setMulOptions(_toConsumableArray(selectMulOpts));
       onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
-      // !isMultiple
-    } else if (which === KeyCode.BACKSPACE && allowClear && !isMultiple) {
-      setInitValue('');
-      onClear && onClear('');
-      setSearchValue('');
-      onChange && onChange(undefined);
     }
     // optionsList: up、down、enter
     if (optionShow) {

package/es/select/style/index.css

@@ -296,7 +296,7 @@
 .kd-select-icon-clear:hover {
   color: var(--kd-c-select-color-border-hover, var(--kd-g-color-theme, #5582f3));
 }
-.kd-select-focused {
+.kd-select-focused:not(.kd-select-error) {
   border-color: var(--kd-c-select-color-border-foucs, var(--kd-g-color-theme, #5582f3)) !important;
 }
 .kd-select-placeholder {
@@ -323,7 +323,7 @@
 .kd-select-underline {
   border-bottom: 1px solid var(--kd-c-select-color-border, var(--kd-g-color-input, #999));
 }
-.kd-select-underline:hover:not(.kd-select-multiple-disabled):not(.kd-select-single-disabled) {
+.kd-select-underline:hover:not(.kd-select-multiple-disabled):not(.kd-select-single-disabled):not( .kd-select-error) {
   border-bottom: 1px solid var(--kd-c-select-color-border-hover, var(--kd-g-color-theme, #5582f3));
 }
 .kd-select-bordered {
@@ -331,7 +331,7 @@
   padding-left: var(--kd-c-select-bordered-spacing-padding-left, 8px) !important;
   border-radius: var(--kd-c-select-bordered-radius-border, 2px);
 }
-.kd-select-bordered:hover:not(.kd-select-multiple-disabled):not(.kd-select-single-disabled) {
+.kd-select-bordered:hover:not(.kd-select-multiple-disabled):not(.kd-select-single-disabled):not( .kd-select-error) {
   border: 1px solid var(--kd-c-select-color-border-hover, var(--kd-g-color-theme, #5582f3));
 }
 .kd-select-bordered .kd-select-suffix {
@@ -522,7 +522,7 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
-.kd-select .kd-select-single-focused {
+.kd-select .kd-select-single-focused:not(.kd-select-error) {
   border-color: var(--kd-c-select-color-border-foucs, var(--kd-g-color-theme, #5582f3)) !important;
 }
 .kd-select .kd-select-single-disabled {
@@ -698,14 +698,17 @@
   color: #999999;
   padding-left: 12px;
 }
-.kd-select-multiple-footer-hadSelected > span {
+.kd-select-multiple-footer-hadSelected-number {
   color: var(--kd-c-select-footer-color-text-selected, #0e5fd8);
   padding: 0 2px;
 }
-.kd-select.topLeft.hidden,
-.kd-select.bottomLeft.hidden,
-.kd-select.topRight.hidden,
-.kd-select.bottomRight.hidden {
+.kd-select-error:not(.kd-select-single-disabled):not(.kd-select-multiple-disabled) {
+  border-color: var(--kd-c-select-color-error, var(--kd-g-color-error, #fb2323));
+}
+.kd-select-dropdown-panel.topLeft.hidden,
+.kd-select-dropdown-panel.bottomLeft.hidden,
+.kd-select-dropdown-panel.topRight.hidden,
+.kd-select-dropdown-panel.bottomRight.hidden {
   opacity: 0;
   visibility: hidden;
   -webkit-transition: all calc(0.3s - 0.1s) cubic-bezier(0.4, 0, 0.6, 1);

package/es/select/style/index.less

@@ -59,7 +59,7 @@
     }
   }
 
-  &-focused {
+  &-focused:not(.@{select-prefix-cls}-error) {
     .focusColor();
   }
   &-placeholder {
@@ -83,7 +83,9 @@
 
   &-underline {
     border-bottom: 1px solid @select-g-color-border;
-    &:hover:not(.@{select-prefix-cls}-multiple-disabled):not(.@{select-prefix-cls}-single-disabled) {
+    &:hover:not(.@{select-prefix-cls}-multiple-disabled):not(.@{select-prefix-cls}-single-disabled):not(
+        .@{select-prefix-cls}-error
+      ) {
       border-bottom: 1px solid @select-g-color-border-hover;
     }
   }
@@ -92,7 +94,9 @@
     border: 1px solid @select-border-g-color-border;
     padding-left: @select-bordered !important;
     border-radius: @select-border-radius-border;
-    &:hover:not(.@{select-prefix-cls}-multiple-disabled):not(.@{select-prefix-cls}-single-disabled) {
+    &:hover:not(.@{select-prefix-cls}-multiple-disabled):not(.@{select-prefix-cls}-single-disabled):not(
+        .@{select-prefix-cls}-error
+      ) {
       border: 1px solid @select-g-color-border-hover;
     }
 
@@ -265,7 +269,7 @@
         .over();
       }
     }
-    &-focused {
+    &-focused:not(.@{select-prefix-cls}-error) {
       .focusColor();
     }
     &-disabled {
@@ -431,7 +435,7 @@
       &-hadSelected {
         color: #999999;
         padding-left: 12px;
-        > span {
+        &-number {
           color: @select-footer-g-text-color-selected;
           padding: 0 2px;
         }
@@ -439,12 +443,18 @@
     }
   }
 
-  &.topLeft.hidden,
-  &.bottomLeft.hidden,
-  &.topRight.hidden,
-  &.bottomRight.hidden {
-    opacity: 0;
-    visibility: hidden;
-    transition: all calc(@transition-duration - 0.1s) @ease;
+  &-error:not(.@{select-prefix-cls}-single-disabled):not(.@{select-prefix-cls}-multiple-disabled) {
+    border-color: @select-error-color;
+  }
+
+  &-dropdown-panel {
+    &.topLeft.hidden,
+    &.bottomLeft.hidden,
+    &.topRight.hidden,
+    &.bottomRight.hidden {
+      opacity: 0;
+      visibility: hidden;
+      transition: all calc(@transition-duration - 0.1s) @ease;
+    }
   }
 }

package/es/select/style/token.less

@@ -22,6 +22,7 @@
 @select-single-color-text: var(~'@{select-custom-prefix}-single-color-text', @color-text-primary);
 @select-clear-color: var(~'@{select-custom-prefix}-icon-clear-color-text', #d9d9d9);
 @select-clear-color-hover: var(~'@{select-custom-prefix}-icon-clear-color-text-hover', #999);
+@select-error-color: var(~'@{select-custom-prefix}-color-error', @color-error);
 
 // font
 @select-list-font-size: var(~'@{select-custom-prefix}-dropdown-font-size', 12px); // 下拉列表文字大小

package/es/tree/style/index.css

@@ -143,10 +143,24 @@
   -ms-flex-negative: 0;
       flex-shrink: 0;
 }
-.kd-tree-plantom {
+.kd-tree-show-line .kd-tree-node-indent {
+  position: relative;
+}
+.kd-tree-show-line .kd-tree-node-indent::before {
   position: absolute;
-  min-width: 100%;
-  z-index: -1;
+  left: 50%;
+  -webkit-transform: translateX(-50%);
+          transform: translateX(-50%);
+  width: 1px;
+  border-left: 1px solid #d9d9d9;
+  content: '';
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  top: 0;
+  bottom: 0;
+}
+.kd-tree-show-line .kd-tree-node-indent-active::before {
+  border-color: var(--kd-c-tree-color-theme, var(--kd-g-color-theme, #5582f3));
 }
 .kd-tree-node-root {
   position: relative;
@@ -192,20 +206,10 @@
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
-  width: 1px;
-  border-top: 0;
-  border-left: 11px;
-  border-bottom: 0;
-  border-right: 10px;
-  border-color: white;
-  border-style: solid;
+  width: var(--kd-c-tree-expand-icon-sizing-width, 16px);
+  margin-right: 6px;
   height: 100%;
   cursor: default;
-  opacity: 0;
-}
-.kd-tree-node-indent-line {
-  background-color: black;
-  opacity: 1;
 }
 .kd-tree-node-icon {
   cursor: pointer;
@@ -316,6 +320,9 @@
   width: 100%;
   height: 100%;
 }
+.kd-tree-node-draggabled.kd-tree-node-dragging .kd-tree-node-indent::before {
+  border-color: transparent;
+}
 .kd-tree-node-drag-over {
   background-color: var(--kd-c-tree-node-drag-over-color-background, #E3EBFF);
   -webkit-box-shadow: inset 0 0 0 2px var(--kd-c-tree-node-drag-over-color-border, #5582f3);

package/es/tree/style/index.less

@@ -19,10 +19,26 @@
     min-width: 100%;
     flex-shrink: 0;
   }
-  &-plantom {
-    position: absolute;
-    min-width: 100%;
-    z-index: -1;
+
+  &-show-line {
+    .@{tree-node-prefix-cls}-indent {
+      position: relative;
+      &::before {
+        position: absolute;
+        left: 50%;
+        transform: translateX(-50%);
+        width: 1px;
+        border-left: 1px solid #d9d9d9;
+        content: '';
+        box-sizing: border-box;
+        top: 0;
+        bottom: 0;
+      }
+
+      &-active::before {
+        border-color: @tree-color-theme;
+      }
+    }
   }
 }
 
@@ -56,21 +72,13 @@
 
   &-indent {
     display: flex;
-    width: 1px;
-    border-top: 0;
-    border-left: 11px;
-    border-bottom: 0;
-    border-right: 10px;
-    border-color: white;
-    border-style: solid;
+    width: @tree-expand-icon-width;
+    margin-right: 6px;
+
     height: 100%;
     cursor: default;
-    opacity: 0;
-  }
-  &-indent-line {
-    background-color: black;
-    opacity: 1;
   }
+
   &-icon {
     cursor: pointer;
     height: @tree-expand-icon-height;
@@ -135,6 +143,12 @@
     align-items: center;
     width: 100%;
     height: 100%;
+
+    &.@{tree-node-prefix-cls}-dragging {
+      .@{tree-node-prefix-cls}-indent::before {
+        border-color: transparent;
+      }
+    }
   }
 
   &-drag-over {
@@ -143,13 +157,14 @@
   }
 
   &-drag-line {
-    &-top, &-bottom {
+    &-top,
+    &-bottom {
       position: absolute;
       left: 0;
       top: 0;
       width: 100%;
       border-top: 2px solid @tree-node-drag-line-border-color;
-      
+
       &::before {
         content: '';
         width: 4px;

package/es/tree/tree.d.ts

@@ -70,5 +70,6 @@ export declare type KeysDataType = {
 export declare type PosDataType = {
     [key: string]: TreeNodeData;
 };
+export declare type SearchStatus = 'NONE' | 'SEARCH_START' | 'SEARCH_DONE';
 declare const Tree: React.ForwardRefExoticComponent<TreeProps & React.RefAttributes<unknown>>;
 export default Tree;

package/es/tree/tree.js

@@ -6,6 +6,7 @@ import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable
 import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 var __rest = this && this.__rest || function (s, e) {
   var t = {};
@@ -15,7 +16,7 @@ var __rest = this && this.__rest || function (s, e) {
   }
   return t;
 };
-import React, { useContext, useCallback, useEffect } from 'react';
+import React, { useContext, useCallback, useEffect, useMemo } from 'react';
 import classNames from 'classnames';
 import cloneDeep from 'lodash/cloneDeep';
 import ConfigContext from '../config-provider/ConfigContext';
@@ -26,6 +27,7 @@ import { getChecked, getHalfChecked, addKeys, flattenAll, delKey, getFilterData,
 import { useChecked, useExpand, useSelect } from './treeHooks';
 import isBoolean from 'lodash/isBoolean';
 var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var _classNames;
   var _useContext = useContext(ConfigContext),
     getPrefixCls = _useContext.getPrefixCls,
     prefixCls = _useContext.prefixCls,
@@ -79,9 +81,10 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onlyExpandOnClickIcon = _TreeProps$onlyExpand === void 0 ? false : _TreeProps$onlyExpand,
     loadData = TreeProps.loadData,
     notFoundContent = TreeProps.notFoundContent,
-    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 = 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"]);
   var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls); // 树样式前缀
-  var treeNodeClassName = classNames(className, _defineProperty({}, "".concat(treePrefixCls), true));
+  var treeNodeClassName = classNames(className, (_classNames = {}, _defineProperty(_classNames, "".concat(treePrefixCls), true), _defineProperty(_classNames, "".concat(treePrefixCls, "-show-line"), showLine), _classNames));
   var treeRootClassName = "".concat(treePrefixCls, "-root");
   var estimatedItemSize = innerEstimatedItemSize; // 节点高度
   var _React$useMemo = React.useMemo(function () {
@@ -125,17 +128,21 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _React$useState12 = _slicedToArray(_React$useState11, 2),
     loadingKeys = _React$useState12[0],
     setLoadingKeys = _React$useState12[1];
-  var _React$useState13 = React.useState([]),
+  var _React$useState13 = React.useState('NONE'),
     _React$useState14 = _slicedToArray(_React$useState13, 2),
-    searchExpandedKeys = _React$useState14[0],
-    setSearchExpandedKeys = _React$useState14[1];
+    searchStatus = _React$useState14[0],
+    setSearchStatus = _React$useState14[1];
   var isSearching = React.useMemo(function () {
     return typeof filterTreeNode === 'function' && !!filterValue;
   }, [filterValue]);
   useEffect(function () {
-    setSearchExpandedKeys([]);
+    if (isSearching) {
+      setSearchStatus('SEARCH_START');
+    } else {
+      setSearchStatus('NONE');
+    }
   }, [filterValue]);
-  var _useExpand = useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchExpandedKeys),
+  var _useExpand = useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus),
     _useExpand2 = _slicedToArray(_useExpand, 2),
     expandedKeys = _useExpand2[0],
     setExpandedKeys = _useExpand2[1];
@@ -220,12 +227,9 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
       node: node,
       expanded: expanded
     });
-    if (isSearching) {
-      var newSearchExpandedKeys = expanded ? addKeys(searchExpandedKeys, [key]) : delKey(searchExpandedKeys, [key]);
-      setSearchExpandedKeys(newSearchExpandedKeys);
-    }
     setScrollKey(undefined);
     setIsInit(false);
+    setSearchStatus('SEARCH_DONE');
     if (expanded && loadData) {
       handleNodeLoad(loadedKeys, loadingKeys, node);
     }
@@ -370,6 +374,16 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
   useEffect(function () {
     setCheckedKeys(checkedKeys);
   }, [checkedKeys, setCheckedKeys]);
+  var isSelectedNodeChildrenKey = function isSelectedNodeChildrenKey() {
+    var parentKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var key = Array.isArray(selectedKeys) ? selectedKeys === null || selectedKeys === void 0 ? void 0 : selectedKeys[0] : selectedKeys;
+    return _includesInstanceProperty(parentKeys).call(parentKeys, key);
+  };
+  var seletedKeyLevel = useMemo(function () {
+    var _a;
+    var key = Array.isArray(selectedKeys) ? selectedKeys === null || selectedKeys === void 0 ? void 0 : selectedKeys[0] : selectedKeys;
+    return (_a = keysData === null || keysData === void 0 ? void 0 : keysData[key]) === null || _a === void 0 ? void 0 : _a.level;
+  }, [keysData, selectedKeys]);
   var renderTreeNode = function renderTreeNode(item) {
     var checked = getChecked(checkedKeys, item.key);
     var indeterminate = getHalfChecked(halfCheckedKeys, item.key);
@@ -404,9 +418,11 @@ var InternalTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
     item.onlyExpandOnClickIcon = onlyExpandOnClickIcon;
     item.loading = loadingKeys.has(item.key) && !loadedKeys.has(item.key);
     item.loadData = loadData;
+    item.isActiveLine = showLine && isSelectedNodeChildrenKey(item.pathParentKeys);
     return /*#__PURE__*/React.createElement(TreeNode, _extends({}, item, {
       key: item.key,
-      ref: treeNodeRef
+      ref: treeNodeRef,
+      activeLevel: seletedKeyLevel
     }));
   };
   return /*#__PURE__*/React.createElement("div", _extends({

package/es/tree/treeHooks.d.ts

@@ -1,9 +1,9 @@
-import { TreeNodeData, KeysDataType } from './tree';
+import { TreeNodeData, KeysDataType, SearchStatus } from './tree';
 import React from 'react';
 export declare const useViewportHeight: (height: number, listRef: React.RefObject<HTMLElement>) => number[];
 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, searchExpandedKeys: 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) => 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

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useRef } from 'react';
 import { getInitCheckededKeys, getDataCheckededStateStrictly, getInitExpandedKeys, getPos, getAllParentKeys } from './utils/treeUtils';
 export var useViewportHeight = function useViewportHeight(height, listRef) {
   var _React$useState = React.useState(0),
@@ -59,22 +59,22 @@ 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, searchExpandedKeys) {
+export var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus) {
   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, searchExpandedKeys, isInit);
-  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, searchExpandedKeys, isInit]);
+    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]);
   var _React$useState7 = React.useState(initialExpandedKeys),
     _React$useState8 = _slicedToArray(_React$useState7, 2),
     expandedKeys = _React$useState8[0],
     setExpandedKeys = _React$useState8[1];
   React.useEffect(function () {
     setExpandedKeys(initialExpandedKeys);
-  }, [flattenAllData, expandedKeysProps, searchExpandedKeys, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent, scrollKey]);
+  }, [flattenAllData, expandedKeysProps, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent, scrollKey, searchStatus]);
   return [expandedKeys, setExpandedKeys];
 };
 export var useScrollToKey = function useScrollToKey(scrollKey, index, estimatedItemSize, scrollRef, viewportHeight, treeNodePrefixCls) {
@@ -115,8 +115,13 @@ export var useSelect = function useSelect(selectedKeysProps, defaultSelectedKeys
     _useState2 = _slicedToArray(_useState, 2),
     selectedKeys = _useState2[0],
     setSelectedKeys = _useState2[1];
+  var mounting = useRef(true);
   useEffect(function () {
-    selectedKeysProps && setSelectedKeys(selectedKeysProps);
+    if (mounting.current) {
+      mounting.current = false;
+      return;
+    }
+    setSelectedKeys(selectedKeysProps);
   }, [selectedKeysProps]);
   return [selectedKeys, setSelectedKeys];
 };

package/es/tree/treeNode.d.ts

@@ -10,9 +10,8 @@ export interface TreeNodeProps {
     draggable?: boolean;
     disableCheckbox?: boolean;
     icon?: React.ReactNode | ((props: any) => React.ReactNode);
-    showLine?: boolean | {
-        showLeafIcon: boolean;
-    };
+    isActiveLine?: boolean;
+    activeLevel?: number;
     showIcon?: boolean;
     selected?: boolean;
     style?: Map<string, string>;

package/es/tree/treeNode.js

@@ -41,7 +41,8 @@ var TreeNode = /*#__PURE__*/React.forwardRef(function (props) {
     hasChildNode = TreeNodeProps.hasChildNode,
     expand = TreeNodeProps.expand,
     title = TreeNodeProps.title,
-    showLine = TreeNodeProps.showLine,
+    isActiveLine = TreeNodeProps.isActiveLine,
+    activeLevel = TreeNodeProps.activeLevel,
     showIcon = TreeNodeProps.showIcon,
     selected = TreeNodeProps.selected,
     setDragNode = TreeNodeProps.setDragNode,
@@ -62,7 +63,7 @@ var TreeNode = /*#__PURE__*/React.forwardRef(function (props) {
     onDragEnd = TreeNodeProps.onDragEnd,
     onDrop = TreeNodeProps.onDrop,
     onSelect = TreeNodeProps.onSelect,
-    others = __rest(TreeNodeProps, ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "dropPosition", "expandOnClickNode", "onlyExpandOnClickIcon", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"]);
+    others = __rest(TreeNodeProps, ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "isActiveLine", "activeLevel", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "dropPosition", "expandOnClickNode", "onlyExpandOnClickIcon", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"]);
   var nodeData = React.useMemo(function () {
     return _extends({
       selectable: selectable,
@@ -133,12 +134,11 @@ var TreeNode = /*#__PURE__*/React.forwardRef(function (props) {
     return icon;
   };
   var indent = function indent() {
-    var _classNames;
     var indentArr = [];
-    var className = classNames((_classNames = {}, _defineProperty(_classNames, "".concat(treeNodePrefixCls, "-indent"), true), _defineProperty(_classNames, "".concat(treeNodePrefixCls, "-indent-line"), !!showLine), _classNames));
     for (var i = 0; i < level; i++) {
+      var _classNames;
       indentArr.push( /*#__PURE__*/React.createElement("span", {
-        className: className,
+        className: classNames((_classNames = {}, _defineProperty(_classNames, "".concat(treeNodePrefixCls, "-indent"), true), _defineProperty(_classNames, "".concat(treeNodePrefixCls, "-indent-active"), !!isActiveLine && i === activeLevel), _classNames)),
         key: i,
         style: {
           height: "".concat(estimatedItemSize)
@@ -244,6 +244,7 @@ var TreeNode = /*#__PURE__*/React.forwardRef(function (props) {
   }, [expandOnClickNode, handleExpandIconClick, handleSelect, onlyExpandOnClickIcon]);
   var handleDragStart = React.useCallback(function (e) {
     if (!draggable) return;
+    e.target.classList.add("".concat(treeNodePrefixCls, "-dragging"));
     setDragNode(nodeData);
     onDragStart && onDragStart(e, props);
   }, [draggable, setDragNode, nodeData, onDragStart, props]);

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

@@ -1,4 +1,4 @@
-import { TreeNodeData, KeysDataType } from '../tree';
+import { TreeNodeData, KeysDataType, SearchStatus } from '../tree';
 /**
  * 打平所有数组，并添加pos位置信息，
  * 方便根据expandKeys等计算节点的expand，checkedKeys计算节点checked状态
@@ -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, searchExpandedKeys: string[], isInit: boolean) => 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 getExpandedKeys: (expandedKeys: string[], expandScrollkeys?: string[]) => string[];
 export declare const calcDropPosition: (event: React.MouseEvent, dropNode: HTMLElement) => 0 | 1 | -1;

package/es/tree/utils/treeUtils.js

@@ -583,8 +583,8 @@ export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys
   var filterTreeNode = arguments.length > 7 ? arguments[7] : undefined;
   var isSearching = arguments.length > 8 ? arguments[8] : undefined;
   var keysData = arguments.length > 9 ? arguments[9] : undefined;
-  var searchExpandedKeys = arguments.length > 10 ? arguments[10] : undefined;
-  var isInit = arguments.length > 11 ? arguments[11] : undefined;
+  var isInit = arguments.length > 10 ? arguments[10] : undefined;
+  var searchStatus = arguments.length > 11 ? arguments[11] : 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) {
@@ -605,11 +605,10 @@ export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys
       }
     }
   }
-  if (isSearching) {
-    var _context6;
-    keys = _concatInstanceProperty(_context6 = []).call(_context6, _toConsumableArray(searchExpandedKeys), _toConsumableArray(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys));
+  if (isSearching && searchStatus === 'SEARCH_START') {
+    keys = _toConsumableArray(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys);
   }
-  return _Array$from(new _Set(_toConsumableArray(keys)));
+  return keys;
 };
 export var getExpandedKeys = function getExpandedKeys(expandedKeys) {
   var expandScrollkeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];

package/es/tree-select/interface.d.ts

@@ -56,6 +56,7 @@ export interface ITreeSelectProps<T extends TreeSelectValue> extends AbstractSel
     defaultValue?: T;
     mode?: Mode;
     autoFocus?: boolean;
+    status?: 'error';
     onlyExpandOnClickIcon?: boolean;
     onChange?: (value: T, treeNode: TreeNodeData) => void;
     onSelect?: (value: T extends (infer I)[] ? I : T, { checked, node, event }: any) => void;