From 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期五, 18 十月 2024 11:18:33 +0800 Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0 --- WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs | 91 ++++++++++++++++++++++++++++++--------------- 1 files changed, 61 insertions(+), 30 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs index 33c0607..08dba85 100644 --- a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs +++ b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs @@ -1,4 +1,7 @@ -锘縩amespace HStation.WinFrmUI.Basic +锘縰sing DevExpress.Utils.DragDrop; +using DevExpress.XtraLayout.Customization.Behaviours; + +namespace HStation.WinFrmUI.Basic { public partial class SysCatalogManageMainPanel : DocumentPage { @@ -12,9 +15,9 @@ this.typeTreeListCtrl2.FocusedChangedEvent += TypeTreeListCtrl2_FocusedChangedEvent; } - private List<SysCatalogViewModel> _allBindingList = null; + private List<SysCatalogViewModel> _allBindingList; - private Yw.BLL.SysCatalog _bll = null; + private Yw.BLL.SysCatalog _bll; public override void InitialDataSource() { @@ -35,6 +38,7 @@ _allBindingList = _allBindingList.OrderBy(x => x.SortCode).ToList(); this.catalogViewModelBindingSource.DataSource = _allBindingList; this.catalogViewModelBindingSource.ResetBindings(false); + this.treeList1.ExpandAll(); } //娣诲姞 @@ -57,33 +61,6 @@ } return false; }; - dlg.ShowDialog(); - } - - //娣诲姞瀛愰」 - private void BtnAddChild_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) - { - var dlg = new AddSysCatalogDlg(); - var vm = this.treeList1.GetCurrentViewModel(_allBindingList); - if (vm == null) - { - MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛岋紒"); - return; - } - var typeID = this.typeTreeListCtrl2.GetCurrentID(); - dlg.SetBindingData(typeID, vm.ID); - dlg.ReloadDataEvent += async (rhs) => - { - var id = await _bll.Insert(rhs); - if (id > 0) - { - var model = await _bll.GetByID(id); - _allBindingList.Add(new SysCatalogViewModel(model)); - this.catalogViewModelBindingSource.ResetBindings(false); - return true; - } - return false; - }; dlg.ShowDialog(); } @@ -159,5 +136,59 @@ return; } } + + /// <summary> + ///璁剧疆鐖剁骇 + /// </summary> + private void barBtnUpdateParent_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e) + { + var currentVm = this.treeList1.GetCurrentViewModel(_allBindingList); + if (currentVm == null) + { + MessageBoxHelper.ShowWarning("璇烽�夋嫨鏁版嵁琛岋紒"); + return; + } + var dlg = new UpdateCatalogParentDlg(); + dlg.SetBindingData(currentVm.TypeID, currentVm.ID); + dlg.ReloadEvent += async (parentId) => + { + var bol = await _bll.UpdateTreeSortCode(currentVm.ID, parentId, 1); + if (bol) + { + this.InitialDataSource(); + return true; + } + return false; + }; + dlg.ShowDialog(); + } + + private void barCheckSorter_CheckedChanged(object sender, DevExpress.XtraBars.ItemClickEventArgs e) + { + if (barCheckSorter.Checked) + { + behaviorManager1.Attach<DragDropBehavior>(treeList1, behavior => + { + behavior.BeginDragDrop += Behavior_BeginDragDrop; + behavior.EndDragDrop += Behavior_EndDragDrop; + }); + } + else + { + behaviorManager1.Detach<DragDropBehavior>(treeList1); + } + } + + private void Behavior_BeginDragDrop(object sender, BeginDragDropEventArgs e) + { + } + + private async void Behavior_EndDragDrop(object sender, EndDragDropEventArgs e) + { + foreach (var item in _allBindingList) + { + } + // await _bll.update() + } } } \ No newline at end of file -- Gitblit v1.9.3