fix(tree): fix the logic problem of show attribute of ActionItem unde…

…r BasicTree
vbenjs · Mar 4, 2021 · 80b47c8 · 80b47c8
1 parent 83a3460
commit 80b47c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
@@ -4,6 +4,7 @@
 
 - 修复`Description`已知问题
 - 修复`BasicForm`已知问题
+- 修复`BasicTree`下 ActionItem 的 show 属性逻辑问题
 
 ## 2.0.2 (2021-03-04)
 

diff --git a/src/components/Tree/src/index.vue b/src/components/Tree/src/index.vue
@@ -236,13 +236,14 @@
         const { actionList } = props;
         if (!actionList || actionList.length === 0) return;
         return actionList.map((item, index) => {
+          let nodeShow = true;
           if (isFunction(item.show)) {
-            return item.show?.(node);
+            nodeShow = item.show?.(node);
+          } else if (isBoolean(item.show)) {
+            nodeShow = item.show;
           }
 
-          if (isBoolean(item.show)) {
-            return item.show;
-          }
+          if (!nodeShow) return null;
 
           return (
             <span key={index} class={`${prefixCls}__action`}>
@@ -343,7 +344,6 @@
     }
 
     &__content {
-      // display: inline-block;
       overflow: hidden;
     }