From 46f64905a3c309a50c0f245b3350cdeb8dd699c6 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 22 一月 2025 17:29:02 +0800
Subject: [PATCH] 计算优化
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs | 64 ++++++++++++--------------------
1 files changed, 24 insertions(+), 40 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs
index 59e1689..da2f1f2 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/05-property/HydroVisualPropertyCtrl.cs
@@ -226,8 +226,15 @@
{
e.CellText = ((DateTime)e.Properties.Value).ToString("yyyy-MM-dd HH:mm:ss");
}
+ else if (fullTypeName == typeof(string[]).FullName)
+ {
+ var stringValue = (string[])e.Properties.Value;
+ e.CellText = stringValue?.Length.ToString();
+ }
else
{
+
+
var descriptor = this.propertyGridControl1.GetPropertyDescriptor(e.Row);
if (descriptor != null)
{
@@ -471,10 +478,6 @@
if (vm is HydroValveViewModel valve)
{
- if (fieldName == nameof(HydroValveViewModel.ValveSetting))
- {
- e.Row.Visible = false;
- }
switch (valve.Vmo.ValveType)
{
case Yw.Hydro.ValveType.PSV:
@@ -487,11 +490,7 @@
{
e.Row.Visible = false;
}
- if (fieldName == nameof(HydroValveViewModel.ValveOL))
- {
- e.Row.Visible = false;
- }
- if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ if (fieldName == nameof(HydroValveViewModel.ValveLength))
{
e.Row.Visible = false;
}
@@ -507,11 +506,7 @@
{
e.Row.Visible = false;
}
- if (fieldName == nameof(HydroValveViewModel.ValveOL))
- {
- e.Row.Visible = false;
- }
- if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ if (fieldName == nameof(HydroValveViewModel.ValveLength))
{
e.Row.Visible = false;
}
@@ -527,11 +522,7 @@
{
e.Row.Visible = false;
}
- if (fieldName == nameof(HydroValveViewModel.ValveOL))
- {
- e.Row.Visible = false;
- }
- if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ if (fieldName == nameof(HydroValveViewModel.ValveLength))
{
e.Row.Visible = false;
}
@@ -547,11 +538,7 @@
{
e.Row.Visible = true;
}
- if (fieldName == nameof(HydroValveViewModel.ValveOL))
- {
- e.Row.Visible = false;
- }
- if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ if (fieldName == nameof(HydroValveViewModel.ValveLength))
{
e.Row.Visible = false;
}
@@ -567,11 +554,7 @@
{
e.Row.Visible = false;
}
- if (fieldName == nameof(HydroValveViewModel.ValveOL))
- {
- e.Row.Visible = true;
- }
- if (fieldName == nameof(HydroValveViewModel.ValveQL))
+ if (fieldName == nameof(HydroValveViewModel.ValveLength))
{
e.Row.Visible = false;
}
@@ -587,13 +570,9 @@
{
e.Row.Visible = false;
}
- if (fieldName == nameof(HydroValveViewModel.ValveOL))
+ if (fieldName == nameof(HydroValveViewModel.ValveLength))
{
e.Row.Visible = false;
- }
- if (fieldName == nameof(HydroValveViewModel.ValveQL))
- {
- e.Row.Visible = true;
}
}
break;
@@ -607,13 +586,9 @@
{
e.Row.Visible = false;
}
- if (fieldName == nameof(HydroValveViewModel.ValveOL))
+ if (fieldName == nameof(HydroValveViewModel.ValveLength))
{
- e.Row.Visible = false;
- }
- if (fieldName == nameof(HydroValveViewModel.ValveQL))
- {
- e.Row.Visible = false;
+ e.Row.Visible = true;
}
}
break;
@@ -699,6 +674,9 @@
link.EndCode = tempCode;
link.UpdateVmoProperty();
+ _propStatusHelper?.UpdatePropStatus(link.Code, nameof(link.Vmo.StartCode), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}璋冩暣涓婁笅娓�");
+ _propStatusHelper?.UpdatePropStatus(link.Code, nameof(link.Vmo.EndCode), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}璋冩暣涓婁笅娓�");
+
var translation = this.SelectedObject as HydroTranslationViewModel;
if (translation != null)
{
@@ -706,6 +684,8 @@
translation.StartDiameter = translation.EndDiameter;
translation.EndDiameter = tempDiameter;
translation.UpdateVmoProperty();
+ _propStatusHelper?.UpdatePropStatus(translation.Code, nameof(translation.Vmo.StartDiameter), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}璋冩暣涓婁笅娓�");
+ _propStatusHelper?.UpdatePropStatus(translation.Code, nameof(translation.Vmo.EndDiameter), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}璋冩暣涓婁笅娓�");
}
var pump = this.SelectedObject as HydroPumpViewModel;
@@ -715,8 +695,12 @@
pump.InletDiameter = pump.OutletDiameter;
pump.OutletDiameter = tempDiameter;
pump.UpdateVmoProperty();
+ _propStatusHelper?.UpdatePropStatus(pump.Code, nameof(pump.Vmo.InletDiameter), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}璋冩暣涓婁笅娓�");
+ _propStatusHelper?.UpdatePropStatus(pump.Code, nameof(pump.Vmo.OutletDiameter), Yw.Hydro.ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}璋冩暣涓婁笅娓�");
}
+ _changeHelper?.Append(link.Vmo, eChangeType.Update);
+
this.propertyGridControl1.UpdateRows();
}
}
--
Gitblit v1.9.3