From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.cs | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.cs
index 6080744..e5dbd5f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/15-Translation/AssetsTranslationSingleMatchingCtrl.cs
@@ -9,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;
}
@@ -24,14 +24,17 @@
public async void SetBindingData(string dbId)
{
var allList = await BLLFactory<HStation.BLL.AssetsTranslationMain>.Instance.GetAll();
- _allList = new List<AssetsTranslationSingleMatchingViewModel>();
- allList.ForEach(x => _allList.Add(new AssetsTranslationSingleMatchingViewModel(x)));
- if (long.TryParse(dbId, out long id))
+ if (allList != null)
{
- var item = allList?.Find(x => x.ID == id);
- _selected = item;
+ _allList = new List<AssetsTranslationSingleMatchingViewModel>();
+ allList.ForEach(x => _allList.Add(new AssetsTranslationSingleMatchingViewModel(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)
{
--
Gitblit v1.9.3