From 9b08736cc1346d71a43603b690324cf1d33a16e4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 21 十二月 2024 12:22:27 +0800
Subject: [PATCH] 项目管理整改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-generate/GenerateXhsProjectWizardPage.cs | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-generate/GenerateXhsProjectWizardPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-generate/GenerateXhsProjectWizardPage.cs
index 15133da..4ba42d3 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-generate/GenerateXhsProjectWizardPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-generate/GenerateXhsProjectWizardPage.cs
@@ -14,7 +14,6 @@
public event Action PageStateChangedEvent;
private ImportXhsProjectViewModel _vm = null;//鎿嶄綔瀵硅薄
- private bool _isInitialize = false;//鏄惁鍒濆鍖�
private bool _importResult = false;//瀵煎叆缁撴灉
@@ -42,12 +41,15 @@
}
/// <summary>
- ///
+ /// 鍒濆鍖栭〉闈�
/// </summary>
- public async Task InitialPage(ImportXhsProjectViewModel vm)
+ public async void InitialPage(ImportXhsProjectViewModel vm)
{
+ if (vm == null)
+ {
+ return;
+ }
_vm = vm;
- _isInitialize = false;
_importResult = false;
this.listBoxControl1.Items.Clear();
_importResult = await ImportXhsProjectHelper.Import(vm, (msg, color) =>
@@ -71,7 +73,6 @@
this.progressBarControl1.Position = 0;
this.itemForProgress.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
}
- _isInitialize = true;
this.PageStateChangedEvent?.Invoke();
}
@@ -82,12 +83,9 @@
{
get
{
- if (_isInitialize)
+ if (!_importResult)
{
- if (!_importResult)
- {
- return true;
- }
+ return true;
}
return false;
}
@@ -100,12 +98,9 @@
{
get
{
- if (_isInitialize)
+ if (_importResult)
{
- if (_importResult)
- {
- return true;
- }
+ return true;
}
return false;
}
@@ -118,12 +113,9 @@
{
get
{
- if (_isInitialize)
+ if (!_importResult)
{
- if (!_importResult)
- {
- return true;
- }
+ return true;
}
return false;
}
--
Gitblit v1.9.3