From d107fd0519b4b84c31bc55bbd30cc0ba0af7507d Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 07 二月 2025 10:41:13 +0800
Subject: [PATCH] 过渡件匹配Model修改，增加过渡件类型匹配字段
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/15-pipe/HydroPipeListCtrl.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/15-pipe/HydroPipeListCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/15-pipe/HydroPipeListCtrl.cs
index 5db0df6..e2be5a9 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/15-pipe/HydroPipeListCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/15-pipe/HydroPipeListCtrl.cs
@@ -233,22 +233,33 @@
{
return;
}
- var name = this.txtName.Text.Trim();
- var code = this.txtCode.Text.Trim();
- var modelType = this.txtModelType.Text.Trim();
_allBindingList = _allList;
+
+ var name = this.txtName.Text.Trim();
if (!string.IsNullOrEmpty(name))
{
_allBindingList = _allBindingList.Where(x => !string.IsNullOrEmpty(x.Name) && x.Name.Contains(name)).ToList();
}
+ var code = this.txtCode.Text.Trim();
if (!string.IsNullOrEmpty(code))
{
_allBindingList = _allBindingList.Where(x => !string.IsNullOrEmpty(x.Code) && x.Code.Contains(code)).ToList();
}
+ var modelType = this.txtModelType.Text.Trim();
if (!string.IsNullOrEmpty(modelType))
{
_allBindingList = _allBindingList.Where(x => !string.IsNullOrEmpty(x.ModelType) && x.ModelType.Contains(modelType)).ToList();
}
+ double? diameterMin = this.txtDiameterMin.EditValue == null ? null : double.Parse(this.txtDiameterMin.EditValue.ToString());
+ if (diameterMin.HasValue)
+ {
+ _allBindingList = _allBindingList.Where(x => x.Diameter >= diameterMin.Value).ToList();
+ }
+ double? diameterMax = this.txtDiameterMax.EditValue == null ? null : double.Parse(this.txtDiameterMax.EditValue.ToString());
+ if (diameterMax.HasValue)
+ {
+ _allBindingList = _allBindingList.Where(x => x.Diameter <= diameterMax.Value).ToList();
+ }
this.hydroPipeViewModelBindingSource.DataSource = _allBindingList;
this.hydroPipeViewModelBindingSource.ResetBindings(false);
}
--
Gitblit v1.9.3