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
13 changes: 4 additions & 9 deletions packages/components/tree/TreeItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -272,14 +272,14 @@ const TreeItem = forwardRef(
stopLabelTrigger={expandOnClickNode && !!node.children}
{...checkboxProps}
>
<span date-target="label">{labelText}</span>
<span data-target="label">{labelText}</span>
</Checkbox>
);
}
return (
<span
ref={setRefCurrent}
date-target="label"
data-target="label"
className={labelClasses}
// label 可以传入 ReactNode, 如果直接取里面的 children 值,当多层级的时候会有问题
// 所以这里判断如果 label是 ReactNode, 并且 text没有值 就不展示 title
Expand Down Expand Up @@ -308,7 +308,7 @@ const TreeItem = forwardRef(

if (operationsView) {
return (
<span className={treeClassNames.treeOperations} date-target="operations">
<span className={treeClassNames.treeOperations} data-target="operations">
{operationsView}
</span>
);
Expand Down Expand Up @@ -362,19 +362,14 @@ const TreeItem = forwardRef(
evt.preventDefault();
setDragStatus('drop', evt);
};
const childrenKey = props.keys?.children || 'children';

return (
<div
ref={composeRefs(ref, nodeRef)}
data-value={node.value}
data-level={level}
className={classNames(treeClassNames.treeNode, {
[treeClassNames.treeNodeOpen]:
node.expanded &&
(typeof node.data[childrenKey] === 'boolean'
? node.data[childrenKey]
: node.data[childrenKey] !== undefined),
[treeClassNames.treeNodeOpen]: node.expanded,
[treeClassNames.actived]: node.isActivable() ? node.actived : false,
[treeClassNames.disabled]: node.isDisabled(),
[treeClassNames.treeNodeDraggable]: !node.isDisabled() && node.isDraggable(),
Expand Down
8 changes: 4 additions & 4 deletions packages/components/tree/__tests__/mount.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@ import { render } from '@test/utils';

const items = [
{
label: '第1一段',
label: '第 1 段',
value: 1,
children: [
{
label: '第二段',
label: '第 1-1 段',
value: '1-1',
},
{
label: '第二段',
label: '第 1-2 段',
value: '1-2',
},
],
},
{
label: '第1二段',
label: '第 2 段',
value: 2,
},
];
Expand Down
36 changes: 18 additions & 18 deletions packages/components/tree/__tests__/tree.test.tsx
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
import React from 'react';
import { render, fireEvent, vi, mockTimeout, mockDelay } from '@test/utils';
import Tree from '../Tree';
import { fireEvent, mockDelay, mockTimeout, render, vi } from '@test/utils';
import Button from '../../button';
import Tree from '../Tree';
import { TdTreeProps } from '../type';

// TODO
describe('Tree test', () => {
// label 类型定义有问题
const items = [
{
label: '第1一段',
label: '第 1 段',
value: 1,
children: [
{
label: '第二段',
label: '第 1-1 段',
value: '1-1',
},
{
label: '第二段',
label: '第 1-2 段',
value: '1-2',
},
],
},
{
label: '第二段',
label: '第 2 段',
value: 2,
},
];
Expand Down Expand Up @@ -214,31 +214,31 @@ describe('Tree test', () => {
describe('Test props.line', async () => {
const data = [
{
label: '第1一段',
label: '第 1 段',
value: 1,
children: [
{
label: '第二段',
label: '第 1-1 段',
value: '1-1',
children: [
{
label: '第三段',
label: '第 1-1-1 段',
value: '1-1-1',
},
],
},
],
},
{
label: '第二段',
label: '第 2 段',
value: 2,
children: [
{
label: '2.1',
label: '第 2-1 段',
value: '2-1',
children: [
{
label: '2.1.1',
label: '第 2-1-1 段',
value: '2-1-1',
},
],
Expand Down Expand Up @@ -300,19 +300,19 @@ describe('Tree test', () => {
test('TreeNodeState.loading works fine', async () => {
const data = [
{
label: '第1一段',
label: '第 1 段',
value: 1,
loading: true,
expanded: true,
children: [
{
label: '第二段',
label: '第 1-1 段',
value: '1-1',
},
],
},
{
label: '第二段',
label: '第 2 段',
value: 2,
},
];
Expand All @@ -324,17 +324,17 @@ describe('Tree test', () => {
test('custom label', async () => {
const data = [
{
label: '第1一段',
label: '第 1 段',
value: 1,
children: [
{
label: '第二段',
label: '第 1-1 段',
value: '1-1',
},
],
},
{
label: '第二段',
label: '第 2 段',
value: 2,
},
];
Expand Down
Loading