fix: tree custom icon not work

vueComponent · Mar 17, 2020 · 1a61d1f · 1a61d1f
1 parent 43c961c
commit 1a61d1f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/antdv-demo b/antdv-demo
diff --git a/components/tree/Tree.jsx b/components/tree/Tree.jsx
@@ -162,13 +162,9 @@ export default {
         const { on = {}, slots = {}, scopedSlots = {}, class: cls, style, ...restProps } = item;
         const treeNodeProps = {
           ...restProps,
-          icon:
-            ($scopedSlots[scopedSlots.icon] && $scopedSlots[scopedSlots.icon](item)) ||
-            $slots[slots.icon] ||
-            restProps.icon,
+          icon: $scopedSlots[scopedSlots.icon] || $slots[slots.icon] || restProps.icon,
           switcherIcon:
-            ($scopedSlots[scopedSlots.switcherIcon] &&
-              $scopedSlots[scopedSlots.switcherIcon](item)) ||
+            $scopedSlots[scopedSlots.switcherIcon] ||
             $slots[slots.switcherIcon] ||
             restProps.switcherIcon,
           title:

diff --git a/components/vc-tree/src/TreeNode.jsx b/components/vc-tree/src/TreeNode.jsx
@@ -416,7 +416,7 @@ const TreeNode = {
     // Icon + Title
     renderSelector(h) {
       const { selected, loading, dragNodeHighlight } = this;
-      const icon = getComponentFromProp(this, 'icon');
+      const icon = getComponentFromProp(this, 'icon', {}, false);
       const {
         vcTree: { prefixCls, showIcon, icon: treeIcon, draggable, loadData },
       } = this;