Merge pull request #778 from ShuyunFF2E/fix-tree-zzh

Fix tree zzh

Author: liyuan-meng

src/components/tree/index.js

@@ -74,6 +74,7 @@ class Tree extends Component {
     onDragBefore: noop,
     onDragAfter: noop,
     customNodeTpl: noop,
+    renderItem: noop,
     onLoadData: noop,
     showLine: false,
     lineType: 'default',
@@ -114,6 +115,7 @@ class Tree extends Component {
     onDragBefore: PropTypes.func,
     onDragAfter: PropTypes.func,
     customNodeTpl: PropTypes.func,
+    renderItem: PropTypes.func,
     onLoadData: PropTypes.func,
     showLine: PropTypes.bool,
     lineType: PropTypes.oneOf(['default', 'dashed']),
@@ -718,6 +720,7 @@ class Tree extends Component {
       onDragMoving,
       onDragAfter,
       customNodeTpl,
+      renderItem,
       isDynamicLoad,
       showLine,
       lineType,
@@ -772,6 +775,7 @@ class Tree extends Component {
           onDragMoving,
           onDragAfter,
           customNodeTpl,
+          renderItem,
           removeNode,
           addNode,
           isDynamicLoad,

src/components/tree/index.md

@@ -51,7 +51,8 @@ group:
 | onDragMoving             | 拖动过程中调用	    | Function	| -	|
 | onDragAfter              | 拖拽后调用	        | Function	| -	|
 | supportTooltip           | 是否启用tooltip，为true时将根据文本长度自动增加tooltip。如数据超大，建议设置为false以节省性能 | Boolean	| true	|
-| customNodeTpl           | 自定义节点内容 | Function	| -	|
+| customNodeTpl           | 添加自定义节点内容 | Function	| -	|
+| renderItem           | 自定义节点内容 | Function	| -	|
 | onLoadData           | 动态加载数据 | Function	| -	|
 | isDynamicLoad           | 动态加载数据 | bool	| false	|
 | showLine           | 线性样式 | bool	| false	|

src/components/tree/node.js

@@ -172,6 +172,7 @@ class Node extends Component {
       removeNode,
       addNode,
       customNodeTpl,
+      renderItem,
       isDynamicLoad,
       showLine,
       lineType,
@@ -267,6 +268,7 @@ class Node extends Component {
                 supportCheckbox={supportCheckbox}
                 supportTooltip={supportTooltip}
                 onDoubleClick={() => onDoubleClick(data)}
+                renderItem={tmp => renderItem?.(data, tmp)}
               />
               {/* 点击菜单 */}
               {supportMenu && menuType !== RIGHT_MENU && !disabled && (
@@ -407,6 +409,7 @@ function ShowSelection({
   onDoubleClick,
   onHandleSelect,
   supportTooltip,
+  renderItem,
 }) {
   // 显示形式，有弹框菜单的与没有弹框菜单的，是否需要tooltip的，单选与多选的
   let nodeClassName = 'node-name';
@@ -485,6 +488,9 @@ function ShowSelection({
       );
     }
   }
+
+  tmp = renderItem?.(tmp) || tmp;
+
   const labelWidth = {
     width:
       supportMenu && menuType === DIALOG_MENU