From 7676398e188b4e6618ec9c7831534db1775c99cc Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 02 十二月 2024 15:23:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/10-nozzle/HydroNozzleListCtrl.cs | 98 +++++++++++++++++++++----------------------------
1 files changed, 42 insertions(+), 56 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/10-nozzle/HydroNozzleListCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/10-nozzle/HydroNozzleListCtrl.cs
index e919e14..6bdaa37 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/10-nozzle/HydroNozzleListCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/10-nozzle/HydroNozzleListCtrl.cs
@@ -30,18 +30,6 @@
public event Action<List<HydroVisualViewModel>> HydroChangedViewEvent;
/// <summary>
- /// 鏄剧ず鏌ヨ闈㈡澘
- /// </summary>
- [Browsable(true)]
- [Description("鏄剧ず鏌ヨ闈㈡澘")]
- [DefaultValue(true)]
- public bool ShowFindPanel
- {
- get { return this.gridView1.OptionsFind.AlwaysVisible; }
- set { this.gridView1.OptionsFind.AlwaysVisible = value; }
- }
-
- /// <summary>
/// 鏄惁鎷ユ湁姘村姏鍒楄〃
/// </summary>
public bool HasHydroList
@@ -59,16 +47,7 @@
/// </summary>
public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo)
{
- _allList = new List<HydroNozzleViewModel>();
- if (hydroInfo != null && hydroInfo.Nozzles != null && hydroInfo.Nozzles.Count > 0)
- {
- foreach (var visual in hydroInfo.Nozzles)
- {
- var vm = new HydroNozzleViewModel(visual, hydroInfo);
- _allList.Add(vm);
- }
- }
- Search();
+ SetBindingData(hydroInfo, allCalcuResultVisualDict: null);
}
/// <summary>
@@ -76,13 +55,22 @@
/// </summary>
public void SetBindingData(Yw.Model.HydroModelInfo hydroInfo, List<HydroCalcuVisualResult> allCalcuResultList)
{
+ var allCalcuResultVisualDict = allCalcuResultList?.ToDictionary(x => x.Code);
+ SetBindingData(hydroInfo, allCalcuResultVisualDict);
+ }
+
+ /// <summary>
+ /// 缁戝畾鏁版嵁
+ /// </summary>
+ public void SetBindingData(HydroModelInfo hydroInfo, Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict)
+ {
_allList = new List<HydroNozzleViewModel>();
if (hydroInfo != null && hydroInfo.Nozzles != null && hydroInfo.Nozzles.Count > 0)
{
foreach (var visual in hydroInfo.Nozzles)
{
var vm = new HydroNozzleViewModel(visual, hydroInfo);
- var calcuResult = allCalcuResultList?.Find(x => x.Code == visual.Code);
+ var calcuResult = allCalcuResultVisualDict?.GetValue(visual.Code);
if (calcuResult != null)
{
vm.UpdateCalcuProperty(calcuResult);
@@ -101,7 +89,7 @@
_allList = new List<HydroNozzleViewModel>();
allVisualViewModelList?.ForEach(x =>
{
- if (x.Catalog == HydroParterCatalogHelper.GetName(Yw.Hydro.ParterCatalog.Nozzle))
+ if (x.Vmo.Catalog == Yw.Hydro.ParterCatalog.Nozzle)
{
_allList.Add(x as HydroNozzleViewModel);
}
@@ -181,13 +169,22 @@
/// </summary>
public void UpdateCalcuProperty(List<HydroCalcuVisualResult> allCalcuResultList)
{
- if (allCalcuResultList != null && allCalcuResultList.Count > 0)
+ var allCalcuResultVisualDict = allCalcuResultList?.ToDictionary(x => x.Code);
+ UpdateCalcuProperty(allCalcuResultVisualDict);
+ }
+
+ /// <summary>
+ /// 鏇存柊璁＄畻灞炴��
+ /// </summary>
+ public void UpdateCalcuProperty(Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict)
+ {
+ if (allCalcuResultVisualDict != null && allCalcuResultVisualDict.Count > 0)
{
if (_allList != null && _allList.Count > 0)
{
foreach (var visual in _allList)
{
- var calcuResult = allCalcuResultList.Find(x => x.Code == visual.Code);
+ var calcuResult = allCalcuResultVisualDict.GetValue(visual.Code);
if (calcuResult != null)
{
visual.UpdateCalcuProperty(calcuResult);
@@ -255,24 +252,6 @@
this.HydroChangedInfoEvent?.Invoke(allVisualInfoList);
};
dlg.ShowDialog();
- }
-
- //鏌ヨ
- private void btnSearch_Click(object sender, EventArgs e)
- {
- Search();
- }
-
- //閲嶇疆
- private void btnReset_Click(object sender, EventArgs e)
- {
- Reset();
- }
-
- //璁剧疆
- private void btnSet_Click(object sender, EventArgs e)
- {
- Set();
}
private void gridView1_RowCellClick(object sender, DevExpress.XtraGrid.Views.Grid.RowCellClickEventArgs e)
@@ -371,7 +350,7 @@
}
/// <summary>
- /// 璁剧疆鎵归噺璁剧疆妯″紡
+ /// 璁剧疆鎵归噺妯″紡
/// </summary>
public void SetBulkView()
{
@@ -392,19 +371,26 @@
this.colSet.Visible = true;
}
- public void SetBindingData(HydroModelInfo hydroInfo, Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict)
- {
-
- }
-
- public void UpdateCalcuProperty(Dictionary<string, HydroCalcuVisualResult> allCalcuResultVisualDict)
- {
-
- }
-
+ /// <summary>
+ /// 璁剧疆缁撴灉妯″紡
+ /// </summary>
public void SetResultView()
{
-
+ this.groupForHead.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ this.colDbLocked.Visible = true;
+ this.colName.Visible = true;
+ this.colCode.Visible = true;
+ this.colModelType.Visible = true;
+ this.colCoefficient.Visible = true;
+ this.colElev.Visible = true;
+ this.colMinorLoss.Visible = true;
+ this.colHasDb.Visible = true;
+ this.colFlags.Visible = true;
+ this.colDescription.Visible = true;
+ this.colCalcuPress.Visible = true;
+ this.colCalcuHead.Visible = true;
+ this.colCalcuDemand.Visible = true;
+ this.colSet.Visible = false;
}
}
}
--
Gitblit v1.9.3