Skip to content

Commit b18d558

Browse files
committed
Revert "Add draggable TreeView demo with drop restrictions"
This reverts commit 906f2aa. # Conflicts: # src/BootstrapBlazor.Server/Components/Samples/TreeViews.razor # src/BootstrapBlazor.Server/Components/Samples/TreeViews.razor.cs
1 parent 9ccd137 commit b18d558

File tree

4 files changed

+3
-58
lines changed

4 files changed

+3
-58
lines changed

src/BootstrapBlazor.Server/Components/Samples/TreeViews.razor

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
Introduction="@Localizer["TreeViewNormalIntro"]"
2828
Name="Normal">
2929
<section ignore>@((MarkupString)Localizer["TreeViewNormalDescription"].Value)</section>
30-
<TreeView Items="@NormalItems" OnTreeItemClick="@OnTreeItemClick" ShowToolbar="true"></TreeView>
30+
<TreeView Items="@NormalItems" ItemDraggable="true" OnTreeItemClick="@OnTreeItemClick" ShowToolbar="true"
31+
OnDrop="OnDrop"></TreeView>
3132
<ConsoleLogger @ref="Logger1" />
3233
</DemoBlock>
3334

@@ -52,15 +53,6 @@
5253
<ConsoleLogger @ref="Logger2"></ConsoleLogger>
5354
</DemoBlock>
5455

55-
<DemoBlock Title="@Localizer["TreeViewDraggableTitle"]"
56-
Introduction="@Localizer["TreeViewDraggableIntro"]"
57-
Name="TreeDraggable">
58-
<section ignore>@((MarkupString)Localizer["TreeViewDraggableDescription"].Value)</section>
59-
<TreeView Items="@DraggableItems" ItemDraggable="true" OnTreeItemClick="@OnTreeItemClick" ShowToolbar="true"
60-
OnDrop="OnDrop">
61-
</TreeView>
62-
</DemoBlock>
63-
6456
<DemoBlock Title="@Localizer["TreeViewTreeDisableTitle"]"
6557
Introduction="@Localizer["TreeViewTreeDisableIntro"]"
6658
Name="TreeDisable">

src/BootstrapBlazor.Server/Components/Samples/TreeViews.razor.cs

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ public sealed partial class TreeViews
3333

3434
private bool AutoCheckParent { get; set; }
3535

36-
private List<TreeViewItem<TreeFoo>> DraggableItems { get; } = GetDraggableItems();
37-
3836
private List<TreeViewItem<TreeFoo>> DisabledItems { get; } = GetDisabledItems();
3937

4038
private List<TreeViewItem<TreeFoo>>? AccordionItems { get; } = TreeFoo.GetAccordionItems();
@@ -87,21 +85,7 @@ private Task OnTreeItemClick(TreeViewItem<TreeFoo> item)
8785

8886
private static Task<bool> OnDrop(TreeDropEventArgs<TreeFoo> arg)
8987
{
90-
// 如果拖拽到 Id=2 的节点下则不允许
91-
if (arg.Target.Value.Id == "2" && arg.DropType is TreeDropType.AsFirstChild or TreeDropType.AsLastChild)
92-
{
93-
return Task.FromResult(false);
94-
}
95-
// 如果拖拽到 Id=2 的节点下的兄弟节点则不允许
96-
if (arg.DropType is TreeDropType.AsSiblingBelow && arg.Target.Parent?.Value.Id == "2")
97-
{
98-
return Task.FromResult(false);
99-
}
100-
// 如果 Id=6 的节点则不允许拖出
101-
if (arg.Source?.Value.Id == "6")
102-
{
103-
return Task.FromResult(false);
104-
}
88+
Logger1.Log("Move node from " + arg.Source?.Text + " to " + arg.Target.Text + " " + arg.DropType);
10589
return Task.FromResult(true);
10690
}
10791

@@ -144,31 +128,6 @@ private Task OnTreeItemChecked(List<TreeViewItem<TreeFoo>> items)
144128
return Task.CompletedTask;
145129
}
146130

147-
private static List<TreeViewItem<TreeFoo>> GetDraggableItems()
148-
{
149-
List<TreeFoo> items =
150-
[
151-
new() { Text = "Item A", Id = "1", Icon = "fa-solid fa-font-awesome" },
152-
new() { Text = "Item D", Id = "4", ParentId = "1", Icon = "fa-solid fa-font-awesome" },
153-
new() { Text = "Item E", Id = "5", ParentId = "1", Icon = "fa-solid fa-font-awesome" },
154-
155-
new() { Text = "Item B (Drop inside blocked)", Id = "2", Icon = "fa-solid fa-font-awesome" },
156-
new() { Text = "Item F", Id = "6", ParentId = "2", Icon = "fa-solid fa-font-awesome" },
157-
158-
new() { Text = "Item C", Id = "3", Icon = "fa-solid fa-font-awesome" },
159-
new() { Text = "Item H", Id = "6", ParentId = "3", Icon = "fa-solid fa-font-awesome" },
160-
new() { Text = "Item I", Id = "6", ParentId = "3", Icon = "fa-solid fa-font-awesome" },
161-
162-
new() { Text = "Item G (Can not move out)", Id = "6", ParentId = "2", Icon = "fa-solid fa-font-awesome" },
163-
164-
];
165-
var ret = TreeFoo.CascadingTree(items);
166-
ret[0].IsExpand = true;
167-
ret[1].IsExpand = true;
168-
ret[2].IsExpand = true;
169-
return ret;
170-
}
171-
172131
private static List<TreeViewItem<TreeFoo>> GetDisabledItems()
173132
{
174133
var ret = TreeFoo.GetTreeItems();

src/BootstrapBlazor.Server/Locales/en-US.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -676,9 +676,6 @@
676676
"TreeViewCheckboxCheckBoxDisplayText2": "Automatically select parent node",
677677
"TreeViewCheckboxButtonText": "Refresh",
678678
"TreeViewCheckboxAddButtonText": "Add",
679-
"TreeViewDraggableTitle": "Draggable nodes",
680-
"TreeViewDraggableIntro": "Allows nodes to be dragged and dropped in the tree control",
681-
"TreeViewDraggableDescription": "By setting the <code>ItemDraggable</code> property, you can drag and drop nodes in the tree control. Use the <code>OnDrop</code> callback delegate to handle the drop event, block the drop event by returning <code>false</code>, or allow the drop event by returning <code>true</code>.",
682679
"TreeViewTreeDisableTitle": "Disabled state",
683680
"TreeViewTreeDisableIntro": "Some nodes of the Tree can be set to disabled state",
684681
"TreeViewTreeDisableDescription": "By setting the <code>Disabled</code> property of the data source <code>TreeViewItem</code> object, you can control whether this node can be checked or not. When set to <code>false</code>, it will not affect the node expansion. /shrink function",

src/BootstrapBlazor.Server/Locales/zh-CN.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -676,9 +676,6 @@
676676
"TreeViewCheckboxCheckBoxDisplayText2": "自动选中父节点",
677677
"TreeViewCheckboxButtonText": "刷新",
678678
"TreeViewCheckboxAddButtonText": "追加节点",
679-
"TreeViewDraggableTitle": "可拖拽节点",
680-
"TreeViewDraggableIntro": "使树中的节点可以进行跨层级拖拽操作",
681-
"TreeViewDraggableDescription": "通过设置 <code>ItemDraggable</code> 属性开启节点拖拽功能,使用 <code>OnDrop</code> 回调委托方法响应拖拽节点放置事件,通过返回 <code>false</code> 阻止拖拽节点放置",
682679
"TreeViewTreeDisableTitle": "禁用状态",
683680
"TreeViewTreeDisableIntro": "可将 Tree 的某些节点设置为禁用状态",
684681
"TreeViewTreeDisableDescription": "通过设置数据源 <code>TreeViewItem</code> 对象的 <code>Disabled</code> 属性,来控制此节点是否可以进行勾选动作,设置为 <code>false</code> 时不影响节点展开/收缩功能",

0 commit comments

Comments
 (0)