From 0663632b0a4aa990a68fca7ea564c93d963c3eaf Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 26 八月 2024 15:01:51 +0800
Subject: [PATCH] 优化界面
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs | 39 ++++++++++-----------------------------
1 files changed, 10 insertions(+), 29 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs
index c573304..27991b2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs
@@ -1,4 +1,6 @@
-锘縩amespace HStation.WinFrmUI
+锘縰sing NPOI.HSSF.Record;
+
+namespace HStation.WinFrmUI
{
public partial class SetXhsProjectMapLocationWizardPage : DevExpress.XtraEditors.XtraUserControl, Yw.WinFrmUI.IWizardPage<ImportXhsProjectViewModel>
{
@@ -112,11 +114,12 @@
/// </summary>
public bool CanComplete()
{
- Task.Run(() => InsertProject());
+ Task<bool> task = Task.Run(async () => await InsertProject());
+ var bol = task.GetAwaiter();
return true;
}
- private async void InsertProject()
+ private async Task<bool> InsertProject()
{
var bllXhsProjectExtensions = new BLL.XhsProjectExtensions();
var project = new Vmo.Xhs.XhsProjectExtensions();
@@ -136,6 +139,7 @@
var projectId = await bllXhsProjectExtensions.Insert(project);
if (projectId > 1)
{
+ _vm.ProjectID = projectId;
if (_vm.Location != null)
{
var mapInfo = new Yw.Vmo.Map.MapInfo();
@@ -149,38 +153,15 @@
var mapInfoId = await new Yw.BLL.MapInfo().Insert(mapInfo);
if (mapInfoId < 1)
{
- if (this.InvokeRequired)
- {
- this.Invoke(new Action(() =>
- {
- // 鏇存柊UI鎺т欢
- MessageBoxHelper.ShowError("瀵煎叆閿欒!");
- }));
- }
- else
- {
- // 鐩存帴鏇存柊UI鎺т欢
- MessageBoxHelper.ShowError("瀵煎叆閿欒!");
- }
+ return false;
}
else
{
- if (this.InvokeRequired)
- {
- this.Invoke(new Action(() =>
- {
- // 鏇存柊UI鎺т欢
- MessageBoxHelper.ShowError("瀵煎叆閿欒!");
- }));
- }
- else
- {
- // 鐩存帴鏇存柊UI鎺т欢
- MessageBoxHelper.ShowError("瀵煎叆閿欒!");
- }
+ return true;
}
}
}
+ return true;
}
//鍦板浘鍔犺浇瀹屾垚
--
Gitblit v1.9.3