From ad91b8ac82a0081e1873a411440fd0de601ce0bc Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Mon, 23 Oct 2023 09:57:35 +0800
Subject: [PATCH] fix: not inherit slot and not show icon slot

---
 src/components/Tree/src/BasicTree.vue | 14 +++++++++++---
 src/components/Tree/src/TreeIcon.ts   |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/Tree/src/BasicTree.vue b/src/components/Tree/src/BasicTree.vue
index 680abc2c..2d23abfe 100644
--- a/src/components/Tree/src/BasicTree.vue
+++ b/src/components/Tree/src/BasicTree.vue
@@ -368,15 +368,21 @@ export default defineComponent({
           : (
               title
             )
+
+        const iconDom = icon ? (<TreeIcon icon={icon} />) : slots.icon ? (<span class="mr-1">{getSlot(slots, 'icon')}</span>) : null
+
         item[titleField] = (
           <span class={`${bem('title')} pl-2`} onClick={handleClickNode.bind(null, item[keyField], item[childrenField])}>
             {slots?.title
               ? (
-                  getSlot(slots, 'title', item)
+                <>
+                  {iconDom}
+                  {getSlot(slots, 'title', item)}
+                </>
                 )
               : (
                 <>
-                  {icon && <TreeIcon icon={icon} />}
+                  {iconDom}
                   {titleDom}
                   <span class={bem('actions')}>{renderAction(item)}</span>
                 </>
@@ -415,7 +421,9 @@ export default defineComponent({
           )}
           <Spin wrapperClassName={unref(props.treeWrapperClassName)} spinning={unref(props.loading)} tip="加载中...">
             <ScrollContainer style={scrollStyle} v-show={!unref(getNotFound)}>
-              <Tree {...unref(getBindValues)} showIcon={false} treeData={treeData.value} />
+              <Tree {...unref(getBindValues)} showIcon={false} treeData={treeData.value}>
+                {extendSlots(slots, ['title'])}
+              </Tree>
             </ScrollContainer>
             <Empty v-show={unref(getNotFound)} image={Empty.PRESENTED_IMAGE_SIMPLE} class="!mt-4" />
           </Spin>
diff --git a/src/components/Tree/src/TreeIcon.ts b/src/components/Tree/src/TreeIcon.ts
index ffc08cc9..bcfc3e04 100644
--- a/src/components/Tree/src/TreeIcon.ts
+++ b/src/components/Tree/src/TreeIcon.ts
@@ -4,7 +4,7 @@ import { h } from 'vue'
 import { isString } from '@/utils/is'
 import { Icon } from '@/components/Icon'
 
-export const TreeIcon: FunctionalComponent = ({ icon }: { icon: VNode | string }) => {
+export const TreeIcon: FunctionalComponent = ({ icon }: { icon: VNode | string | undefined }) => {
   if (!icon)
     return null
   if (isString(icon))