Skip to content

Commit 7b72f64

Browse files
committed
revert: 撤销更改
1 parent 5307bad commit 7b72f64

File tree

3 files changed

+1
-104
lines changed

3 files changed

+1
-104
lines changed

src/BootstrapBlazor/Components/TreeView/TreeView.razor

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,13 @@ else
6868
RenderFragment RenderRow(TreeViewItem<TItem> item) =>
6969
@<TreeViewRow @key="item" IsActive="GetActive(item)" Index="GetIndex(item)" Item="item"
7070
NodeIcon="@NodeIcon" ExpandNodeIcon="@ExpandNodeIcon" LoadingIcon="@LoadingIcon"
71-
MaxSelectedCount="MaxSelectedCount" AllowDrag="AllowDrag" PreviewDrop="_previewDrop"
71+
MaxSelectedCount="MaxSelectedCount" AllowDrag="AllowDrag"
7272
ToolbarEditTitle="@ToolbarEditTitle" ToolbarEditLabelText="@ToolbarEditLabelText"
7373
IsDisabled="IsDisabled" CanExpandWhenDisabled="CanExpandWhenDisabled"
7474
ShowCheckbox="ShowCheckbox" ShowIcon="ShowIcon"
7575
ShowToolbar="ShowToolbar" ShowToolbarCallback="ShowToolbarCallback"
7676
OnToggleNodeAsync="OnToggleNodeAsync" OnClick="OnClick"
7777
OnBeforeStateChangedCallback="OnBeforeStateChangedCallback"
7878
OnCheckStateChanged="OnCheckStateChanged"
79-
OnItemDragStart="OnItemDragStart" OnItemDragEnd="OnItemDragEnd" OnItemDrop="OnItemDrop"
8079
OnUpdateCallbackAsync="OnUpdateCallbackAsync" ToolbarTemplate="ToolbarTemplate"></TreeViewRow>;
8180
}

src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs

Lines changed: 0 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -740,107 +740,6 @@ public void ClearCheckedItems()
740740
StateHasChanged();
741741
}
742742

743-
private bool _previewDrop;
744-
private TreeViewItem<TItem>? _draggingItem;
745-
746-
private void OnItemDragStart(TreeViewItem<TItem> treeViewItem)
747-
{
748-
_previewDrop = true;
749-
_draggingItem = treeViewItem;
750-
StateHasChanged();
751-
}
752-
753-
private void OnItemDragEnd()
754-
{
755-
_previewDrop = false;
756-
_draggingItem = null;
757-
StateHasChanged();
758-
}
759-
760-
private async Task OnItemDrop(TreeDropEventArgs<TItem> e)
761-
{
762-
if (_draggingItem is not null)
763-
{
764-
e.Source = _draggingItem;
765-
var allowChangeSource = await OnDrop.Invoke(e);
766-
if (!allowChangeSource)
767-
{
768-
return;
769-
}
770-
771-
// 如果允许改变源节点则更新拖拽项的父对象以及排序
772-
if (_draggingItem.Parent is not null)
773-
{
774-
_draggingItem.Parent.Items.Remove(_draggingItem);
775-
}
776-
else
777-
{
778-
// 没有父对象,则从顶层节点集合中移除
779-
Items.Remove(_draggingItem);
780-
}
781-
782-
_draggingItem.IsExpand = e.ExpandAfterDrop;
783-
784-
switch (e.DropType)
785-
{
786-
case TreeDropType.AsFirstChild:
787-
// 插入到目标的第一个子节点
788-
e.Target.Items.Insert(0, _draggingItem);
789-
_draggingItem.Parent = e.Target;
790-
break;
791-
case TreeDropType.AsLastChild:
792-
// 插入到目标的最后一个子节点
793-
e.Target.Items.Add(_draggingItem);
794-
_draggingItem.Parent = e.Target;
795-
break;
796-
case TreeDropType.AsSiblingBelow:
797-
// 作为目标的下一个兄弟节点
798-
if (e.Target.Parent is not null)
799-
{
800-
var index = e.Target.Parent.Items.IndexOf(e.Target);
801-
if (index >= 0 && index < e.Target.Parent.Items.Count - 1)
802-
{
803-
e.Target.Parent.Items.Insert(index + 1, _draggingItem);
804-
}
805-
else
806-
{
807-
e.Target.Parent.Items.Add(_draggingItem);
808-
}
809-
810-
_draggingItem.Parent = e.Target.Parent;
811-
}
812-
// 如果目标没有父节点,则作为顶层节点处理
813-
else
814-
{
815-
// 目标节点的Index
816-
var index = Items.IndexOf(e.Target);
817-
if (index >= 0 && index < Items.Count - 1)
818-
{
819-
Items.Insert(index + 1, _draggingItem);
820-
}
821-
else
822-
{
823-
Items.Add(_draggingItem);
824-
}
825-
826-
_draggingItem.Parent = null;
827-
}
828-
829-
break;
830-
}
831-
832-
_draggingItem = null;
833-
_previewDrop = false;
834-
_rows = GetTreeItems().ToFlat();
835-
836-
StateHasChanged();
837-
}
838-
else
839-
{
840-
throw new InvalidOperationException("拖拽的项为空");
841-
}
842-
}
843-
844743
/// <summary>
845744
/// Gets all selected node collections
846745
/// </summary>

src/BootstrapBlazor/Components/TreeView/TreeViewRow.razor.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ public partial class TreeViewRow<TItem>
188188
private bool _isBusy = false;
189189
private bool _showToolbar = false;
190190

191-
192191
/// <summary>
193192
/// <inheritdoc/>
194193
/// </summary>

0 commit comments

Comments
 (0)