Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/devui-vue/devui/tree/src/const.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const USE_TREE_TOKEN = 'use-tree-token';
export const NODE_HEIGHT = 40;
export const NODE_HEIGHT = 30;
export const NODE_INDENT = 24;
12 changes: 9 additions & 3 deletions packages/devui-vue/devui/tree/src/new-tree.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineComponent, PropType, provide, toRefs, watch } from 'vue';
import { defineComponent, PropType, provide, renderSlot, toRefs, useSlots, watch } from 'vue';
import type { ITreeNode } from './core/use-tree-types';
import DTreeNode from './components/tree-node';
import useTree from './core/use-tree';
Expand All @@ -15,7 +15,7 @@ export default defineComponent({
default: []
}
},
setup(props) {
setup(props, { slots }) {
const { data } = toRefs(props);

const treeFactory = useTree(
Expand All @@ -37,7 +37,13 @@ export default defineComponent({
return (
<div class="devui-tree">
{
getExpendedTree().value.map(treeNode => <DTreeNode data={treeNode} />)
getExpendedTree().value.map(treeNode => (
slots.default
? renderSlot(useSlots(), 'default', {
treeFactory: treeFactory, nodeData: treeNode
})
: <DTreeNode data={treeNode} />
))
}
</div>
);
Expand Down
1 change: 1 addition & 0 deletions packages/devui-vue/devui/tree/src/tree.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ $keyframe-blue: #5e7ce0;
display: inline-flex;
align-items: center;
width: 100%;
height: 30px;

.devui-tree-node_loading {
margin-left: 50px;
Expand Down