Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "fix(tree): automatically expand the selected nodes on initial render" #5000

Merged
merged 1 commit into from
Feb 8, 2025
Merged

Revert "fix(tree): automatically expand the selected nodes on initial render" #5000

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 2 additions & 23 deletions packages/components/tree/hooks/useTreeStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,32 +55,11 @@ export default function useTreeStore(state: TypeTreeState) {

const updateExpanded = () => {
const { expandParent } = props;

const expandedValueSet = new Set<TreeNodeValue>();

const getValueParentsToSet = (values: TreeNodeValue[]) => {
values.forEach((val) => {
const parents = store.getParents(val);
parents.forEach((parent) => {
expandedValueSet.add(parent.value);
});
});
};

if (Array.isArray(tValue.value)) {
getValueParentsToSet(tValue.value);
}

if (Array.isArray(tExpanded.value)) {
tExpanded.value.forEach((value) => expandedValueSet.add(value));
}

const expandedValue = Array.from(expandedValueSet);

if (!Array.isArray(tExpanded.value)) return;
// 初始化展开状态
// 校验是否自动展开父节点
const expandedMap = new Map();
expandedValue.forEach((val) => {
tExpanded.value.forEach((val) => {
expandedMap.set(val, true);
if (expandParent) {
const node = store.getNode(val);
Expand Down
86 changes: 1 addition & 85 deletions test/unit/snap/__snapshots__/csr.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182116,7 +182116,7 @@ exports[`csr snapshot test > csr test ./packages/components/tree/_example/contro

</div>
<div
class="t-tree__item t-tree__item--open t-tree__item--visible"
class="t-tree__item t-tree__item--visible"
data-level="1"
data-value="1.2"
draggable="false"
Expand Down Expand Up @@ -182167,90 +182167,6 @@ exports[`csr snapshot test > csr test ./packages/components/tree/_example/contro

</label>

</div>
<div
class="t-tree__item t-tree__item--visible"
data-level="2"
data-value="1.2.1"
draggable="false"
style="--level: 2;"
>

<span
class="t-tree__icon t-folder-icon"
ignore="active"
trigger="expand"
>

</span>
<label
class="t-checkbox t-is-checked t-tree__label"
ignore="expand,active"
props="[object Object]"
tabindex="0"
>

<input
class="t-checkbox__former"
name="1.2.1"
tabindex="-1"
type="checkbox"
/>
<span
class="t-checkbox__input"
/>
<span
class="t-checkbox__label"
>

1.2.1

</span>

</label>

</div>
<div
class="t-tree__item t-tree__item--visible"
data-level="2"
data-value="1.2.2"
draggable="false"
style="--level: 2;"
>

<span
class="t-tree__icon t-folder-icon"
ignore="active"
trigger="expand"
>

</span>
<label
class="t-checkbox t-is-checked t-tree__label"
ignore="expand,active"
props="[object Object]"
tabindex="0"
>

<input
class="t-checkbox__former"
name="1.2.2"
tabindex="-1"
type="checkbox"
/>
<span
class="t-checkbox__input"
/>
<span
class="t-checkbox__label"
>

1.2.2

</span>

</label>

</div>
<div
class="t-tree__item t-tree__item--visible"
Expand Down
Loading