Skip to content

feat(TreeView): update javascript of TreeView #4725

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

Merged
merged 3 commits into from
Nov 23, 2024
Merged

feat(TreeView): update javascript of TreeView #4725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
021713b
refactor: 精简脚本移除不使用事件
ArgoZhang Nov 23, 2024
a508e09
refactor: 修复键盘功能
ArgoZhang Nov 23, 2024
added69
chore: bump version 9.0.1
ArgoZhang Nov 23, 2024
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 src/BootstrapBlazor/BootstrapBlazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.0.1-beta04</Version>
<Version>9.0.1</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
59 changes: 4 additions & 55 deletions src/BootstrapBlazor/Components/TreeView/TreeView.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,6 @@ export function init(id, options) {
const tree = { el, invoke, isVirtualize };
Data.set(id, tree)

EventHandler.on(el, 'mouseenter', '.tree-content', e => {
const ele = e.delegateTarget.parentNode
ele.classList.add('hover')
})

EventHandler.on(el, 'mouseleave', '.tree-content', e => {
const ele = e.delegateTarget.parentNode
ele.classList.remove('hover')
})

EventHandler.on(el, 'click', '.tree-node', e => {
const node = e.delegateTarget
const prev = node.previousElementSibling;
const radio = prev.querySelector('[type="radio"]')
if (radio && radio.getAttribute('disabled') !== 'disabled') {
radio.click();
}
})

EventHandler.on(el, 'keydown', '.tree-root', e => {
if (e.key === 'ArrowDown' || e.key === 'ArrowUp' || e.key === 'ArrowLeft' || e.key === 'ArrowRight') {
const v = el.getAttribute('data-bb-keyboard');
Expand All @@ -41,33 +22,14 @@ export function init(id, options) {
else if (e.keyCode === 32) {
const v = el.getAttribute('data-bb-keyboard');
if (v === "true") {
const checkbox = el.querySelector(".active > .tree-content > .form-check > .form-check-input");
const checkbox = el.querySelector(".active .form-check-input");
if (checkbox) {
e.preventDefault();
checkbox.click();
}
}
}
});

if (isVirtualize) {
EventHandler.on(el, 'click', '.form-check-input', async e => {
const checkbox = e.delegateTarget;
const state = checkbox.getAttribute('data-bb-state');
if (state) {
const row = checkbox.closest('.tree-content');
const index = row.getAttribute('data-bb-tree-view-index');

const v = state === '1' ? 0 : 1;
await setChildrenState(id, parseInt(index), v);
await setParentState(id, parseInt(index), v);
const handler = setTimeout(() => {
checkbox.checked = v === 1;
clearTimeout(handler);
}, 0);
}
});
}
}

export function scroll(id, options) {
Expand Down Expand Up @@ -114,13 +76,7 @@ export function setChildrenState(id, index, state) {
if (checkbox) {
checkbox.indeterminate = false;
checkbox.checked = state === 1;
checkbox.setAttribute('data-bb-state', state);
if (state === 1) {
checkbox.parentElement.classList.add('is-checked');
}
else {
checkbox.parentElement.classList.remove('is-checked');
}
EventHandler.trigger(checkbox, "statechange.bb.checkbox", { state });
}
next = next.nextElementSibling;
}
Expand Down Expand Up @@ -151,7 +107,6 @@ export async function setParentState(id, index, state) {
for (let index = 0; index < parents.length; index++) {
const checkbox = parents[index].querySelector('.form-check-input');
const result = results[index];
checkbox.setAttribute('data-bb-state', result);
checkbox.indeterminate = false;
if (result === 0) {
checkbox.checked = false;
Expand All @@ -162,6 +117,7 @@ export async function setParentState(id, index, state) {
else {
checkbox.indeterminate = true;
}
EventHandler.trigger(checkbox, "statechange.bb.checkbox", { state: result });
}
}
}
Expand All @@ -173,14 +129,7 @@ export function dispose(id) {
Data.remove(id);

if (tree) {
const { el, isVirtualize } = tree;
EventHandler.off(el, 'mouseenter');
EventHandler.off(el, 'mouseleave');
EventHandler.off(el, 'click', '.tree-node');
const { el } = tree;
EventHandler.off(el, 'keyup', '.tree-root');

if (isVirtualize) {
EventHandler.off(el, 'click', '.form-check-input');
};
}
}