@kdcloudjs/kdesign 1.5.4 → 1.5.7

package/lib/timeline/style/token.less

@@ -1,12 +1,10 @@
 @import '../../style/themes/token.less';
 
 @timeline-prefix: '--@{kd-prefix}-c-timeline';
-@timeline-gap:  8px;
-
-// @timeline-dot-size: var(~'@{timeline-prefix}-dot-sizing',9px);
-@timeline-dot-size: 9px;
-
+@timeline-gap: 8px;
 
+@timeline-dot-size: var(~'@{timeline-prefix}-dot-sizing',9px);
+// @timeline-dot-size: 9px;
 
 // color
 @timeline-finished-color:  var(~'@{timeline-prefix}-finished-color',@color-theme);
@@ -17,7 +15,6 @@
 @timeline-label-color-text: var(~'@{timeline-prefix}-label-color-text',#666666);
 @timeline-content-color-text: var(~'@{timeline-prefix}-content-color-text',@color-text-primary);
 
-
 // font
 @timeline-content-font-size-small: var(~'@{timeline-prefix}-content-font-size',@font-size-small);
 
@@ -26,7 +23,7 @@
 @timeline-width: var(~'@{timeline-prefix}-sizing-width',1px);
 
 // spacing
-@timeline-item-padding-bottom: var(~'@{timeline-prefix}-spacing-padding-bottom',26px);
+@timeline-item-padding-bottom: var(~'@{timeline-prefix}-spacing-padding-bottom',24px);
 
 
 

package/lib/tree/style/index.css

@@ -101,6 +101,24 @@
     普通组件内部自身层级应设置在0-100间
 */
 /* -----------  zIndex  ——————---- end */
+.node-hover-hover {
+  -webkit-transition: background-color var(--kd-c-tree-motion-duration, var(--kd-g-duration, 0.3s)), color var(--kd-c-tree-motion-duration, var(--kd-g-duration, 0.3s));
+  transition: background-color var(--kd-c-tree-motion-duration, var(--kd-g-duration, 0.3s)), color var(--kd-c-tree-motion-duration, var(--kd-g-duration, 0.3s));
+}
+.node-hover-hover:hover {
+  background-color: var(--kd-c-tree-node-color-backgroung-hover, var(--kd-g-color-hover, #f5f5f5));
+  cursor: pointer;
+}
+.node-selected {
+  background-color: var(--kd-c-tree-node-color-backgroung-checked, var(--kd-g-color-theme-3, #e3eeff)) !important;
+  color: var(--kd-c-tree-node-color-text-checked, var(--kd-g-color-theme, #5582f3));
+}
+.node-selected .kd-tree-node-title {
+  color: var(--kd-c-tree-node-color-text-checked, var(--kd-g-color-theme, #5582f3));
+}
+.node-selected .kd-tree-node-icon {
+  color: var(--kd-c-tree-node-color-text-checked, var(--kd-g-color-theme, #5582f3));
+}
 .kd-tree {
   position: relative;
   overflow: auto;
@@ -136,6 +154,15 @@
       -ms-flex-align: center;
           align-items: center;
 }
+.kd-tree-node-root .kd-spin-dot-spin {
+  border: none;
+  width: var(--kd-c-tree-expand-icon-loading-sizing-width, 16px);
+  height: var(--kd-c-tree-expand-icon-loading-sizing-height, 16px);
+}
+.kd-tree-node-root .kd-spin-dot-spin .kd-spin-dot-item {
+  width: var(--kd-c-tree-expand-icon-loading-sizing-width, 16px);
+  height: var(--kd-c-tree-expand-icon-loading-sizing-height, 16px);
+}
 .kd-tree-node-fb-children-pointerEvents * {
   pointer-events: none;
 }
@@ -176,8 +203,8 @@
 }
 .kd-tree-node-icon {
   cursor: pointer;
-  height: var(--kd-c-tree-expand-icon-sizing-height, 22px);
-  width: var(--kd-c-tree-expand-icon-sizing-width, 22px);
+  height: var(--kd-c-tree-expand-icon-sizing-height, 16px);
+  width: var(--kd-c-tree-expand-icon-sizing-width, 16px);
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;
@@ -190,9 +217,13 @@
   font-size: var(--kd-c-tree-node-icon-font-size, 16px);
   color: var(--kd-c-tree-node-icon-color-text, #666666);
 }
+.kd-tree-node-icon-hover:hover {
+  background-color: var(--kd-c-tree-node-color-backgroung-hover, var(--kd-g-color-hover, #f5f5f5));
+  cursor: pointer;
+}
 .kd-tree-node-icon-hidden {
-  height: var(--kd-c-tree-node-icon-sizing-height, 20px);
-  width: var(--kd-c-tree-node-icon-sizing-width, 20px);
+  height: var(--kd-c-tree-node-icon-sizing-height, 16px);
+  width: var(--kd-c-tree-node-icon-sizing-width, 16px);
   -ms-flex-negative: 0;
       flex-shrink: 0;
   opacity: 0;
@@ -233,10 +264,28 @@
       -ms-flex-align: center;
           align-items: center;
   height: 100%;
+  padding-left: 4px;
+}
+.kd-tree-node-title-wrap-hover {
+  -webkit-transition: background-color var(--kd-c-tree-motion-duration, var(--kd-g-duration, 0.3s)), color var(--kd-c-tree-motion-duration, var(--kd-g-duration, 0.3s));
+  transition: background-color var(--kd-c-tree-motion-duration, var(--kd-g-duration, 0.3s)), color var(--kd-c-tree-motion-duration, var(--kd-g-duration, 0.3s));
+}
+.kd-tree-node-title-wrap-hover:hover {
+  background-color: var(--kd-c-tree-node-color-backgroung-hover, var(--kd-g-color-hover, #f5f5f5));
+  cursor: pointer;
+}
+.kd-tree-node-title-wrap-selected {
+  background-color: var(--kd-c-tree-node-color-backgroung-checked, var(--kd-g-color-theme-3, #e3eeff)) !important;
+  color: var(--kd-c-tree-node-color-text-checked, var(--kd-g-color-theme, #5582f3));
+}
+.kd-tree-node-title-wrap-selected .kd-tree-node-title {
+  color: var(--kd-c-tree-node-color-text-checked, var(--kd-g-color-theme, #5582f3));
+}
+.kd-tree-node-title-wrap-selected .kd-tree-node-icon {
+  color: var(--kd-c-tree-node-color-text-checked, var(--kd-g-color-theme, #5582f3));
 }
 .kd-tree-node-title {
   white-space: nowrap;
-  margin-left: 6px;
 }
 .kd-tree-node-selected {
   background-color: var(--kd-c-tree-node-color-backgroung-checked, var(--kd-g-color-theme-3, #e3eeff)) !important;
@@ -285,8 +334,8 @@
           transform: translateY(-50%);
 }
 .kd-tree-node-leaf-icon {
-  height: var(--kd-c-tree-node-icon-sizing-height, 20px);
-  width: var(--kd-c-tree-node-icon-sizing-width, 20px);
+  height: var(--kd-c-tree-node-icon-sizing-height, 16px);
+  width: var(--kd-c-tree-node-icon-sizing-width, 16px);
   display: -webkit-box;
   display: -ms-flexbox;
   display: flex;

package/lib/tree/style/index.less

@@ -28,6 +28,17 @@
     display: flex;
     justify-content: flex-start;
     align-items: center;
+
+    .@{kd-prefix}-spin-dot-spin {
+      border: none;
+      width: @tree-expand-icon-loading-width;
+      height: @tree-expand-icon-loading-height;
+
+      .@{kd-prefix}-spin-dot-item {
+        width: @tree-expand-icon-loading-width;
+        height: @tree-expand-icon-loading-height;
+      }
+    }
   }
   &-fb-children-pointerEvents * {
     pointer-events: none;
@@ -35,13 +46,8 @@
   &-item {
     display: flex;
     align-items: center;
-  }
-  &-item-hover {
-    transition: background-color @tree-transition-duration, color @tree-transition-duration;
-  }
-  &-item-hover:hover {
-    background-color: @tree-node-hover-bg-color;
-    cursor: pointer;
+
+    .node-hover()
   }
 
   &-indent {
@@ -70,6 +76,11 @@
     align-items: center;
     font-size: @tree-node-icon-size;
     color: @tree-node-icon-color-text;
+
+    &-hover:hover {
+      background-color: @tree-node-hover-bg-color;
+      cursor: pointer;
+    }
   }
   &-icon-hidden {
     height: @tree-node-icon-height;
@@ -99,22 +110,19 @@
     display: flex;
     align-items: center;
     height: 100%;
+    padding-left: 4px;
+
+    .node-hover();
+
+    &-selected {
+      .node-selected()
+    }
   }
   &-title {
     white-space: nowrap;
-    margin-left: 6px;
   }
   &-selected {
-    background-color: @tree-node-checked-bg-color !important;
-    color: @tree-node-checked-text-color;
-
-    .@{tree-node-prefix-cls}-title {
-      color: @tree-node-checked-text-color;
-    }
-
-    .@{tree-node-prefix-cls}-icon {
-      color: @tree-node-checked-text-color;
-    }
+    .node-selected()
   }
 
   &-draggabled {

package/lib/tree/style/mixin.less

@@ -1 +1,25 @@
-@import './token.less';
+@import './token.less';
+
+.node-hover {
+  &-hover {
+    transition: background-color @tree-transition-duration, color @tree-transition-duration;
+
+    &:hover {
+      background-color: @tree-node-hover-bg-color;
+      cursor: pointer;
+    }
+  }
+}
+
+.node-selected {
+  background-color: @tree-node-checked-bg-color !important;
+  color: @tree-node-checked-text-color;
+
+  .@{tree-node-prefix-cls}-title {
+    color: @tree-node-checked-text-color;
+  }
+
+  .@{tree-node-prefix-cls}-icon {
+    color: @tree-node-checked-text-color;
+  }
+}

package/lib/tree/style/token.less

@@ -16,10 +16,12 @@
 @tree-node-drag-line-border-color: var(~'@{tree-prefix}-node-drag-line-color-background', #276FF5);
 
 // sizing
-@tree-expand-icon-height: var(~'@{tree-prefix}-expand-icon-sizing-height', 22px);
-@tree-expand-icon-width: var(~'@{tree-prefix}-expand-icon-sizing-width', 22px);
-@tree-node-icon-height: var(~'@{tree-prefix}-node-icon-sizing-height', 20px);
-@tree-node-icon-width: var(~'@{tree-prefix}-node-icon-sizing-width', 20px);
+@tree-expand-icon-height: var(~'@{tree-prefix}-expand-icon-sizing-height', 16px);
+@tree-expand-icon-width: var(~'@{tree-prefix}-expand-icon-sizing-width', 16px);
+@tree-expand-icon-loading-height: var(~'@{tree-prefix}-expand-icon-loading-sizing-height', 16px);
+@tree-expand-icon-loading-width: var(~'@{tree-prefix}-expand-icon-loading-sizing-width', 16px);
+@tree-node-icon-height: var(~'@{tree-prefix}-node-icon-sizing-height', 16px);
+@tree-node-icon-width: var(~'@{tree-prefix}-node-icon-sizing-width', 16px);
 
 // font
 @tree-font-size: var(~'@{tree-prefix}-font-size', @font-size-small);

package/lib/tree/tree.d.ts

@@ -24,6 +24,7 @@ export interface TreeProps {
     virtual?: boolean;
     scrollToKey?: string;
     selectedKeys?: string[];
+    loadData?: () => void;
     onCheck?: (checkedKeys: string[], { checked, node, event, halfCheckedKeys }: any) => void;
     onExpand?: (expandedKeys: string[], { expanded, node }: any) => void;
     onSelect?: ({ checked, node, event }: any) => void;
@@ -36,6 +37,7 @@ export interface TreeProps {
     setTreeNodeClassName?: (node: any) => string;
     setTreeNodeStyle?: (node: any) => Map<string, string>;
     estimatedItemSize?: number;
+    expandOnClickNode?: boolean;
 }
 export declare type TreeNodeData = {
     checkable?: boolean;

package/lib/tree/tree.js

@@ -13,10 +13,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
+var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
+
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
@@ -31,6 +33,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+
 var _ConfigContext = _interopRequireDefault(require("../config-provider/ConfigContext"));
 
 var _utils = require("../_utils");
@@ -96,7 +100,9 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       innerEstimatedItemSize = TreeProps.estimatedItemSize,
       style = TreeProps.style,
       filterTreeNode = TreeProps.filterTreeNode,
-      filterValue = TreeProps.filterValue;
+      filterValue = TreeProps.filterValue,
+      expandOnClickNode = TreeProps.expandOnClickNode,
+      loadData = TreeProps.loadData;
   var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls); // 树样式前缀
 
   var treeNodePrefixCls = getPrefixCls(prefixCls, 'tree-node', customPrefixcls); // 树节点样式前缀
@@ -162,6 +168,16 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       dragOverNodeKey = _React$useState10[0],
       setDragOverNodeKey = _React$useState10[1];
 
+  var _React$useState11 = _react.default.useState(new _set.default()),
+      _React$useState12 = (0, _slicedToArray2.default)(_React$useState11, 2),
+      loadedKeys = _React$useState12[0],
+      setLoadedKeys = _React$useState12[1];
+
+  var _React$useState13 = _react.default.useState(new _set.default()),
+      _React$useState14 = (0, _slicedToArray2.default)(_React$useState13, 2),
+      loadingKeys = _React$useState14[0],
+      setLoadingKeys = _React$useState14[1];
+
   var isSearching = _react.default.useMemo(function () {
     return typeof filterTreeNode === 'function' && filterValue;
   }, [filterValue]);
@@ -212,16 +228,55 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       listRef.current.style.transform = "translate3d(0,".concat(tempStartOffset, "px,0)");
     }
   }, [listRef, scrollRef, virtual, estimatedItemSize]);
+  var handleNodeLoad = (0, _react.useCallback)(function (loadedKeys, loadingKeys, data) {
+    var key = data.key;
+
+    if (!loadData || loadedKeys.has(key) || loadingKeys.has(key)) {
+      return;
+    }
+
+    setLoadingKeys(function (prevLoadingKeys) {
+      var _context;
+
+      return new _set.default((0, _concat.default)(_context = []).call(_context, (0, _toConsumableArray2.default)(prevLoadingKeys), [key]));
+    });
+    loadData(data).then(function () {
+      setLoadedKeys(function (prevState) {
+        var _context2;
+
+        return new _set.default((0, _concat.default)(_context2 = []).call(_context2, (0, _toConsumableArray2.default)(prevState), [key]));
+      });
+      setLoadingKeys(function (prevState) {
+        var prevLoadingKeys = (0, _cloneDeep.default)(prevState);
+        prevLoadingKeys.delete(key);
+        return prevLoadingKeys;
+      });
+    }).catch(function (e) {
+      setLoadingKeys(function (prevState) {
+        var prevLoadingKeys = (0, _cloneDeep.default)(prevState);
+        prevLoadingKeys.delete(key);
+        return prevLoadingKeys;
+      });
+      setExpandedKeys(function (preExpandedKeys) {
+        return (0, _treeUtils.delKey)((0, _toConsumableArray2.default)(preExpandedKeys), [key]);
+      });
+      throw e;
+    });
+  }, [loadData, setExpandedKeys]);
 
-  var handleExpand = _react.default.useCallback(function (key, value, node) {
-    var newExpandedKeys = value ? (0, _treeUtils.addKeys)(expandedKeys, [key]) : (0, _treeUtils.delKey)(expandedKeys, [key]);
+  var handleExpand = _react.default.useCallback(function (key, expanded, node) {
+    var newExpandedKeys = expanded ? (0, _treeUtils.addKeys)(expandedKeys, [key]) : (0, _treeUtils.delKey)(expandedKeys, [key]);
     onExpand && onExpand(newExpandedKeys, {
       node: node,
-      expanded: value
+      expanded: expanded
     });
     setScrollKey('');
     setIsInit(false);
-  }, [expandedKeys, onExpand]);
+
+    if (expanded && loadData) {
+      handleNodeLoad(loadedKeys, loadingKeys, node);
+    }
+  }, [expandedKeys, onExpand, loadData, handleNodeLoad, loadedKeys, loadingKeys]);
 
   var handleCheck = _react.default.useCallback(function (key, value, node, event, pos) {
     var newCheckedKeys = value ? (0, _treeUtils.addKeys)(checkedKeys, [key]) : (0, _treeUtils.delKey)(checkedKeys, [key]);
@@ -317,10 +372,10 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   }, [onDragEnd]);
 
   var handleDrop = _react.default.useCallback(function (event, node, dragNode, dragNodesKeys) {
-    var _context;
+    var _context3;
 
     var pos = (0, _treeUtils.getPos)(flattenAllData, dragNodesKeys);
-    var keys = (0, _concat.default)(_context = (0, _treeUtils.getAllChildKeys)(flattenAllData, pos)).call(_context, dragNodesKeys);
+    var keys = (0, _concat.default)(_context3 = (0, _treeUtils.getAllChildKeys)(flattenAllData, pos)).call(_context3, dragNodesKeys);
     onDrop && onDrop({
       event: event,
       node: node,
@@ -386,7 +441,6 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     className: treeRootClassName,
     ref: listRef
   }, visibleData && (0, _map.default)(visibleData).call(visibleData, function (item) {
-    // const props: any = {}
     var checked = (0, _treeUtils.getChecked)(checkedKeys, item.key);
     var indeterminate = (0, _treeUtils.getHalfChecked)(halfCheckedKeys, item.key);
     item.nodeKey = item.key;
@@ -401,8 +455,7 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     item.onSelect = handleSelect;
     item.checked = checked;
     item.selected = (0, _treeUtils.getSelected)(selectedKeys, item.key);
-    item.indeterminate = indeterminate; // item.showLine = showLine
-
+    item.indeterminate = indeterminate;
     item.disabled = getDisabled(disabled, item.disabled);
     item.showIcon = showIcon || false;
     item.checkable = getCheckable(checkable, item.checkable); // 哪个优先
@@ -417,6 +470,9 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     item.getDragNode = getDragNode;
     item.setDragNode = setDragNode;
     item.dragOver = dragOverNodeKey === item.key && dropPosition === 0;
+    item.expandOnClickNode = expandOnClickNode;
+    item.loading = loadingKeys.has(item.key) && !loadedKeys.has(item.key);
+    item.loadData = loadData;
     return /*#__PURE__*/_react.default.createElement(_treeNode.default, (0, _extends2.default)({}, item, {
       key: item.key,
       ref: treeNodeRef

package/lib/tree/treeHooks.js

@@ -157,7 +157,6 @@ var useScrollToKey = function useScrollToKey(scrollKey, index, estimatedItemSize
     }
 
     if (treeRoot && treeNode) {
-      // const treeRootScrollTop = treeRoot.scrollTop
       var treeRootRect = treeRoot.getBoundingClientRect();
       var treeNodeRect = treeNode.getBoundingClientRect();
 

package/lib/tree/treeNode.d.ts

@@ -25,6 +25,7 @@ export interface TreeNodeProps {
     pos?: string;
     estimatedItemSize?: number;
     dragOver?: boolean;
+    isLeaf?: boolean;
     onCheck?: (key: string, value: boolean, node: React.ReactNode, event: React.MouseEvent<MouseEvent>, pos: string) => void;
     onSelect?: (event: React.MouseEvent<MouseEvent>, node: React.ReactNode, key: string) => void;
     onExpand?: (value: boolean, node: React.ReactNode) => void;

package/lib/tree/treeNode.js

@@ -35,6 +35,8 @@ var _checkbox = _interopRequireDefault(require("./../checkbox"));
 
 var _icon = _interopRequireDefault(require("../icon"));
 
+var _spin = _interopRequireDefault(require("../spin"));
+
 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; }
@@ -86,6 +88,8 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       indeterminate = TreeNodeProps.indeterminate,
       estimatedItemSize = TreeNodeProps.estimatedItemSize,
       dragOver = TreeNodeProps.dragOver,
+      expandOnClickNode = TreeNodeProps.expandOnClickNode,
+      loading = TreeNodeProps.loading,
       onExpand = TreeNodeProps.onExpand,
       onCheck = TreeNodeProps.onCheck,
       onDragStart = TreeNodeProps.onDragStart,
@@ -95,7 +99,7 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       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", "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", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "expandOnClickNode", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"]);
 
   var nodeData = _react.default.useMemo(function () {
     return (0, _extends2.default)({
@@ -113,7 +117,6 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       indeterminate: indeterminate,
       icon: icon,
       switcherIcon: switcherIcon,
-      // showLine,
       showIcon: showIcon,
       selected: selected
     }, others);
@@ -195,57 +198,46 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }
 
     return indentArr;
-  }; // line的两种模式， 图标被替换和图标不被替换
+  };
+
+  var isLeaf = (0, _react.useCallback)(function () {
+    var isLeaf = TreeNodeProps.isLeaf,
+        loadData = TreeNodeProps.loadData,
+        hasChildNode = TreeNodeProps.hasChildNode;
+
+    if (isLeaf === false) {
+      return false;
+    }
 
+    return isLeaf || !loadData && !hasChildNode;
+  }, [TreeNodeProps]); // line的两种模式， 图标被替换和图标不被替换
 
   var renderExpandIcon = function renderExpandIcon() {
-    // todo 图标被替换则 line样式改变
-    // if(switcherIcon){
-    // }
-    if (hasChildNode) {
-      var _classNames2;
-
-      // todo    showLine模式 使用+ -符号图标
-      // if(!!showLine){
-      //   return (
-      //     <span
-      //     onClick={handleClick}
-      //     className={classNames(`${treeNodePrefixCls}-icon`)}
-      //   >
-      //     {expand ? <Icon type='search' /> : <Icon type='add' />}
-      //   </span>
-      //   )
-      // }
+    if (loading) {
+      return /*#__PURE__*/_react.default.createElement(_spin.default, {
+        type: "component"
+      });
+    }
+
+    var showExpandIcon = !isLeaf();
+
+    if (showExpandIcon) {
+      var _classNames3;
+
       if (Array.isArray(switcherIcon) && switcherIcon.length === 2) {
         return /*#__PURE__*/_react.default.createElement("span", {
-          className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-icon"))
+          className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-icon"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-icon-hover"), !expandOnClickNode)),
+          onClick: expandOnClickNode ? undefined : handleExpandIconClick
         }, expandState ? renderIcon(switcherIcon[1]) : renderIcon(switcherIcon[0]));
       }
 
       return /*#__PURE__*/_react.default.createElement("span", {
-        className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-icon"), (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "".concat(treeNodePrefixCls, "-animation-expand"), expandState), (0, _defineProperty2.default)(_classNames2, "".concat(treeNodePrefixCls, "-animation-collapse"), !expandState), _classNames2))
+        className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-icon"), (_classNames3 = {}, (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-animation-expand"), expandState), (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-animation-collapse"), !expandState), (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-icon-hover"), !expandOnClickNode), _classNames3)),
+        onClick: expandOnClickNode ? undefined : handleExpandIconClick
       }, renderIcon(switcherIcon || /*#__PURE__*/_react.default.createElement(_icon.default, {
         type: "arrow-right-solid"
       })));
     } else {
-      // if(typeof showLine === 'object' && !showLine.showLeafIcon){
-      //   return (
-      //     <span
-      //       className={classNames(`${treeNodePrefixCls}-icon-hidden`)}
-      //     >
-      //       {/* todo  renderLeafLine() */}
-      //       {renderIcon(leafIcon)}
-      //     </span>
-      //   )
-      // }else if(typeof showLine === 'object' && showLine.showLeafIcon || showLine === true){
-      //   return (
-      //     <span
-      //       className={classNames(`${treeNodePrefixCls}-leaf-icon`)}
-      //     >
-      //       {renderIcon(leafIcon)}
-      //     </span>
-      //   )
-      // }
       // 叶子结点 隐藏展开按钮
       return /*#__PURE__*/_react.default.createElement("span", {
         className: "".concat(treeNodePrefixCls, "-icon-hidden")
@@ -260,11 +252,11 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   };
 
   var renderNode = function renderNode() {
-    var _classNames3;
+    var _classNames4, _classNames5;
 
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
       draggable: draggable && !disabled,
-      className: (0, _classnames.default)((_classNames3 = {}, (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-draggabled"), true), (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-root"), true), (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-fb-children-pointerEvents"), forbiddenChildrenPointerEvents), (0, _defineProperty2.default)(_classNames3, "".concat(treeNodePrefixCls, "-drag-over"), dragOver), _classNames3)),
+      className: (0, _classnames.default)((_classNames4 = {}, (0, _defineProperty2.default)(_classNames4, "".concat(treeNodePrefixCls, "-draggabled"), true), (0, _defineProperty2.default)(_classNames4, "".concat(treeNodePrefixCls, "-root"), true), (0, _defineProperty2.default)(_classNames4, "".concat(treeNodePrefixCls, "-fb-children-pointerEvents"), forbiddenChildrenPointerEvents), (0, _defineProperty2.default)(_classNames4, "".concat(treeNodePrefixCls, "-drag-over"), dragOver), _classNames4)),
       onDragStart: handleDragStart,
       onDragEnd: handleDragEnd,
       onDragOver: handleDragOver,
@@ -273,7 +265,8 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onDrop: handleDrop,
       ref: dragRef
     }, indent(), renderExpandIcon(), showIcon && renderNodeIcon(), /*#__PURE__*/_react.default.createElement("div", {
-      className: "".concat(treeNodePrefixCls, "-title-wrap")
+      className: (0, _classnames.default)((_classNames5 = {}, (0, _defineProperty2.default)(_classNames5, "".concat(treeNodePrefixCls, "-title-wrap"), true), (0, _defineProperty2.default)(_classNames5, "".concat(treeNodePrefixCls, "-title-wrap-hover"), !expandOnClickNode && !disabled), (0, _defineProperty2.default)(_classNames5, "".concat(treeNodePrefixCls, "-title-wrap-selected"), selected && selectable && !disabled && !expandOnClickNode), _classNames5)),
+      onClick: expandOnClickNode ? undefined : handleClick
     }, checkable ? /*#__PURE__*/_react.default.createElement(_checkbox.default, {
       onChange: handleOnchange,
       checked: checked,
@@ -303,12 +296,17 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     };
   });
 
-  var handleClick = _react.default.useCallback(function (e) {
-    e.stopPropagation();
+  var handleExpandIconClick = (0, _react.useCallback)(function (e) {
+    e === null || e === void 0 ? void 0 : e.stopPropagation();
     setExpandState(!expandState);
     onExpand && onExpand(nodeKey, !expandState, nodeData);
+  }, [expandState, nodeData, nodeKey, onExpand, setExpandState]);
+
+  var handleClick = _react.default.useCallback(function (e) {
+    e.stopPropagation();
+    expandOnClickNode && handleExpandIconClick();
     handleSelect(e);
-  }, [setExpandState, expandState, onExpand, nodeKey, nodeData, handleSelect]);
+  }, [expandOnClickNode, handleExpandIconClick, handleSelect]);
 
   var handleDragStart = _react.default.useCallback(function (e) {
     if (!draggable) return;
@@ -364,11 +362,11 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   }, [onDrop, nodeData, nodeKey]);
 
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-item"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-item-hover"), !disabled && selectable), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-selected"), selected && selectable && !disabled), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-disabled"), disabled), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-opened"), expandState), (0, _concat.default)(_context = "".concat(treeNodePrefixCls, "-item-")).call(_context, nodeKey), className),
+    className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-item"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-item-hover"), !disabled && selectable && expandOnClickNode), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-selected"), selected && selectable && !disabled && expandOnClickNode), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-disabled"), disabled), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-opened"), expandState), (0, _concat.default)(_context = "".concat(treeNodePrefixCls, "-item-")).call(_context, nodeKey), className),
     style: (0, _extends2.default)({
       height: "".concat(estimatedItemSize, "px")
     }, style),
-    onClick: handleClick
+    onClick: expandOnClickNode ? handleClick : undefined
   }, renderNode());
 });
 

package/lib/tree/utils/treeUtils.js

@@ -75,7 +75,7 @@ var flattenAll = function flattenAll(treeData) {
 
       var _pos = pos ? (0, _concat.default)(_context = "".concat(pos, "-")).call(_context, index) : "".concat(index);
 
-      var hasChildNode = children && children instanceof Array && children.length > 0;
+      var hasChildNode = item.isLeaf ? false : children && children instanceof Array && children.length > 0;
       var flattenNode = (0, _extends2.default)({
         title: title,
         key: key,
@@ -92,7 +92,7 @@ var flattenAll = function flattenAll(treeData) {
       }
 
       _level++;
-      fn(children, newTreeData, _level, _pos, flattenNode);
+      hasChildNode && fn(children, newTreeData, _level, _pos, flattenNode);
     });
     return newTreeData;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.5.4",
+  "version": "1.5.7",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [