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 | 134 +++++++++++++++++++++++++++++---------------
1 files changed, 89 insertions(+), 45 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs
index ba030fd..08dba85 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.cs
@@ -1,27 +1,34 @@
-锘縩amespace HStation.WinFrmUI.Basic
+锘縰sing DevExpress.Utils.DragDrop;
+using DevExpress.XtraLayout.Customization.Behaviours;
+
+namespace HStation.WinFrmUI.Basic
{
public partial class SysCatalogManageMainPanel : DocumentPage
{
public SysCatalogManageMainPanel()
{
InitializeComponent();
+ this.PageTitle.Caption = "鍒嗙被绠＄悊";
+ this.treeList1.InitialMultiColSettings();
+ this.PageTitle.HeaderSvgImage = this.svgImage32[0];
+ this.PageTitle.SvgImageSize = new Size(24, 24);
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()
{
this.typeTreeListCtrl2.SetBindingData();
+ _bll = new Yw.BLL.SysCatalog();
}
//鑱氱劍鍒囨崲
private async void TypeTreeListCtrl2_FocusedChangedEvent(long typeID)
{
_allBindingList = new List<SysCatalogViewModel>();
- _bll = new Yw.BLL.SysCatalog();
var alllist = await _bll.GetByTypeID(typeID);
_allBindingList.Clear();
foreach (var item in alllist)
@@ -29,8 +36,9 @@
_allBindingList.Add(new SysCatalogViewModel(item));
}
_allBindingList = _allBindingList.OrderBy(x => x.SortCode).ToList();
- this.catlogViewModelBindingSource.DataSource = _allBindingList;
- this.catlogViewModelBindingSource.ResetBindings(false);
+ this.catalogViewModelBindingSource.DataSource = _allBindingList;
+ this.catalogViewModelBindingSource.ResetBindings(false);
+ this.treeList1.ExpandAll();
}
//娣诲姞
@@ -38,6 +46,8 @@
{
var dlg = new AddSysCatalogDlg();
var typeID = this.typeTreeListCtrl2.GetCurrentID();
+ if (typeID == 0)
+ return;
dlg.SetBindingData(typeID);
dlg.ReloadDataEvent += async (rhs) =>
{
@@ -46,7 +56,7 @@
{
var model = await _bll.GetByID(id);
_allBindingList.Add(new SysCatalogViewModel(model));
- this.catlogViewModelBindingSource.ResetBindings(false);
+ this.catalogViewModelBindingSource.ResetBindings(false);
return true;
}
return false;
@@ -54,37 +64,10 @@
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.catlogViewModelBindingSource.ResetBindings(false);
- return true;
- }
- return false;
- };
- dlg.ShowDialog();
- }
-
//缂栬緫
private void barBtnEditPumpCurve_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
- var dlg = new EditSysCatlaogDlg();
+ var dlg = new EditSysCatalogDlg();
var vm = this.treeList1.GetCurrentViewModel(_allBindingList);
if (vm == null)
{
@@ -97,7 +80,7 @@
if (await _bll.Update(rhs))
{
vm.Reset(rhs);
- this.catlogViewModelBindingSource.ResetBindings(false);
+ this.catalogViewModelBindingSource.ResetBindings(false);
return true;
}
return false;
@@ -116,17 +99,24 @@
}
if (MessageBoxHelper.IsClickOk($"纭鍒犻櫎鏁版嵁琛�?", "鎻愮ず"))
return;
- var result = await _bll.DeleteByID(currentVm.ID);
- if (result)
+ try
{
- _allBindingList.Remove(currentVm);
- this.catlogViewModelBindingSource.ResetBindings(false);
- MessageBoxHelper.ShowSuccess($"鍒犻櫎鎴愬姛!");
+ var result = await _bll.DeleteByID(currentVm.ID);
+ if (result)
+ {
+ _allBindingList.Remove(currentVm);
+ this.catalogViewModelBindingSource.ResetBindings(false);
+ MessageBoxHelper.ShowSuccess($"鍒犻櫎鎴愬姛!");
+ }
+ else
+ {
+ MessageBoxHelper.ShowError($"鍒犻櫎澶辫触!");
+ return;
+ }
}
- else
+ catch (Yw.Dto.InternalException ex)
{
- MessageBoxHelper.ShowError($"鍒犻櫎澶辫触!");
- return;
+ MessageBoxHelper.ShowError(ex.ErrorMsg);
}
}
@@ -136,7 +126,7 @@
var currentVm = this.treeList1.GetCurrentViewModel(_allBindingList);
if (currentVm != null)
{
- var dlg = new SysPropEditDlg();
+ var dlg = new SetSysPropForCatalogDlg();
dlg.SetBindingData(currentVm.ID);
dlg.ShowDialog();
}
@@ -146,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