From b94da76188b834922d2f13365b22208a4bc4049a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 12 十月 2024 11:33:40 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/PipeLineTreeListCtrl.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipeline/01-series/PipeLineTreeListCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/PipeLineTreeListCtrl.cs
similarity index 88%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipeline/01-series/PipeLineTreeListCtrl.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/PipeLineTreeListCtrl.cs
index 6399766..17d370e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipeline/01-series/PipeLineTreeListCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/01-series/PipeLineTreeListCtrl.cs
@@ -18,17 +18,20 @@
//鑱氱劍鏀瑰彉浜嬩欢
public event Action<long> ReloadEvent = null;
- private BLL.PipeLineSeries _bll = null;
+ private BLL.PipeSeries _bll = null;
private List<PipeLineSeriesViewModel> _allBindingList = new List<PipeLineSeriesViewModel>();
public async void SetBindingData()
{
- _bll = new BLL.PipeLineSeries();
+ _bll = new BLL.PipeSeries();
var alllist = await _bll.GetAll();
- foreach (var item in alllist)
+ if (alllist != null)
{
- _allBindingList.Add(new PipeLineSeriesViewModel(item));
+ foreach (var item in alllist)
+ {
+ _allBindingList.Add(new PipeLineSeriesViewModel(item));
+ }
}
this.treeList1.DataSource = _allBindingList;
this.treeList1.RefreshDataSource();
@@ -49,7 +52,7 @@
var dlg = new AddPipeLineSeriesDlg();
dlg.ReloadDataEvent += async (rhs) =>
{
- var bll = new BLL.PipeLineSeries();
+ var bll = new BLL.PipeSeries();
var id = await bll.Insert(rhs);
if (id > 0)
{
@@ -85,13 +88,13 @@
return;
}
var dlg = new EditPipeLineSeriesDlg();
- var PipeLineSeries = await BLLFactory<BLL.PipeLineSeries>.Instance.GetByID(vm.ID);
+ var PipeLineSeries = await BLLFactory<BLL.PipeSeries>.Instance.GetByID(vm.ID);
if (PipeLineSeries == null)
return;
dlg.SetBindingData(PipeLineSeries);
dlg.ReloadDataEvent += async (rhs) =>
{
- if (await BLLFactory<BLL.PipeLineSeries>.Instance.Update(rhs))
+ if (await BLLFactory<BLL.PipeSeries>.Instance.Update(rhs))
{
vm.Reset(rhs);
this.treeList1.RefreshDataSource();
--
Gitblit v1.9.3