From be3e4f6d2dd0529b87204169bce6df55c37a4199 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 14 一月 2025 17:31:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingCtrl.cs | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingCtrl.cs
index 9af2c03..52675b7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/18-pressmeter/AssetsPressmeterSingleMatchingCtrl.cs
@@ -1,13 +1,4 @@
-锘縰sing DevExpress.XtraEditors;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+锘縰sing System.Data;
namespace HStation.WinFrmUI
{
@@ -18,7 +9,7 @@
InitializeComponent();
this.layoutControl1.SetupLayoutControl();
this.gridView1.SetLimitView();
- this.gridView1.RegistCustomDrawCell(Color.BurlyWood, Color.White);
+ this.gridView1.RegistCustomDrawCell();
this.generalSearchCtrl1.SearchEvent += Search;
this.generalSearchCtrl1.ClearEvent += Clear;
}
@@ -34,13 +25,16 @@
{
var allList = await BLLFactory<HStation.BLL.AssetsPressmeterMain>.Instance.GetAll();
_allList = new List<AssetsPressmeterSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsPressmeterSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ allList.ForEach(x => _allList.Add(new AssetsPressmeterSingleMatchingViewModel(x)));
+ if (long.TryParse(dbId, out long id))
+ {
+ var item = allList?.Find(x => x.ID == id);
+ _selected = item;
+ }
+ Search();
}
- Search();
await Task.Delay(300);
if (_selected != null)
{
@@ -86,6 +80,5 @@
}
return vm.Vmo;
}
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3