fix: not inherit slot and not show icon slot
parent
b2ade25899
commit
ad91b8ac82
|
@ -368,15 +368,21 @@ export default defineComponent({
|
||||||
: (
|
: (
|
||||||
title
|
title
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const iconDom = icon ? (<TreeIcon icon={icon} />) : slots.icon ? (<span class="mr-1">{getSlot(slots, 'icon')}</span>) : null
|
||||||
|
|
||||||
item[titleField] = (
|
item[titleField] = (
|
||||||
<span class={`${bem('title')} pl-2`} onClick={handleClickNode.bind(null, item[keyField], item[childrenField])}>
|
<span class={`${bem('title')} pl-2`} onClick={handleClickNode.bind(null, item[keyField], item[childrenField])}>
|
||||||
{slots?.title
|
{slots?.title
|
||||||
? (
|
? (
|
||||||
getSlot(slots, 'title', item)
|
<>
|
||||||
|
{iconDom}
|
||||||
|
{getSlot(slots, 'title', item)}
|
||||||
|
</>
|
||||||
)
|
)
|
||||||
: (
|
: (
|
||||||
<>
|
<>
|
||||||
{icon && <TreeIcon icon={icon} />}
|
{iconDom}
|
||||||
{titleDom}
|
{titleDom}
|
||||||
<span class={bem('actions')}>{renderAction(item)}</span>
|
<span class={bem('actions')}>{renderAction(item)}</span>
|
||||||
</>
|
</>
|
||||||
|
@ -415,7 +421,9 @@ export default defineComponent({
|
||||||
)}
|
)}
|
||||||
<Spin wrapperClassName={unref(props.treeWrapperClassName)} spinning={unref(props.loading)} tip="加载中...">
|
<Spin wrapperClassName={unref(props.treeWrapperClassName)} spinning={unref(props.loading)} tip="加载中...">
|
||||||
<ScrollContainer style={scrollStyle} v-show={!unref(getNotFound)}>
|
<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>
|
</ScrollContainer>
|
||||||
<Empty v-show={unref(getNotFound)} image={Empty.PRESENTED_IMAGE_SIMPLE} class="!mt-4" />
|
<Empty v-show={unref(getNotFound)} image={Empty.PRESENTED_IMAGE_SIMPLE} class="!mt-4" />
|
||||||
</Spin>
|
</Spin>
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { h } from 'vue'
|
||||||
import { isString } from '@/utils/is'
|
import { isString } from '@/utils/is'
|
||||||
import { Icon } from '@/components/Icon'
|
import { Icon } from '@/components/Icon'
|
||||||
|
|
||||||
export const TreeIcon: FunctionalComponent = ({ icon }: { icon: VNode | string }) => {
|
export const TreeIcon: FunctionalComponent = ({ icon }: { icon: VNode | string | undefined }) => {
|
||||||
if (!icon)
|
if (!icon)
|
||||||
return null
|
return null
|
||||||
if (isString(icon))
|
if (isString(icon))
|
||||||
|
|
Loading…
Reference in New Issue