fix(tree): fix the logic problem of show attribute of ActionItem under BasicTree

Vben
1 parent 83a34603
Showing 2 changed files with 6 additions and 5 deletions
CHANGELOG.zh_CN.md
src/components/Tree/src/index.vue
@@ -4,6 +4,7 @@
  
 - 修复`Description`已知问题
 - 修复`BasicForm`已知问题
+- 修复`BasicTree`下 ActionItem 的 show 属性逻辑问题
  
 ## 2.0.2 (2021-03-04)
  
@@ -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;
     }