From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.cs | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.cs
index aa3583d..4f05aef 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/01-ModelFile/SelectXhsProjectModelFileWizardPage.cs
@@ -11,7 +11,13 @@
this.layoutControl1.SetupLayoutControl();
}
- private ImportXhsProjectViewModel _vm = null;
+ /// <summary>
+ /// 椤甸潰鐘舵�佹敼鍙樹簨浠�
+ /// </summary>
+ public event Action PageStateChangedEvent;
+
+ private ImportXhsProjectViewModel _vm = null;//鎿嶄綔瀵硅薄
+ private bool _isInitialize = false;//鏄惁鍒濆鍖�
/// <summary>
/// 鍒濆鍖�
@@ -26,17 +32,9 @@
_isInitialize = true;
}
- /// <summary>
- /// 鏄惁鍒濆鍖�
- /// </summary>
- public bool IsInitialize
- {
- get { return _isInitialize; }
- }
- private bool _isInitialize = false;
/// <summary>
- /// 鏄惁鍏佽杩斿洖涓婁竴姝�
+ /// 鍏佽涓婁竴姝�
/// </summary>
public bool AllowPrev
{
@@ -44,15 +42,18 @@
}
/// <summary>
- /// 鏄惁鍏佽杩涘叆涓嬩竴姝�
+ /// 鍏佽涓嬩竴姝�
/// </summary>
public bool AllowNext
{
- get { return true; }
+ get
+ {
+ return _isInitialize;
+ }
}
/// <summary>
- /// 鏄惁鍏佽鍙栨秷
+ /// 鍏佽鍙栨秷
/// </summary>
public bool AllowCancel
{
@@ -60,7 +61,7 @@
}
/// <summary>
- /// 鏄惁鍏佽瀹屾垚
+ /// 鍏佽瀹屾垚
/// </summary>
public bool AllowComplete
{
@@ -68,7 +69,7 @@
}
/// <summary>
- /// 鑳藉惁杩斿洖涓婁竴姝�
+ /// 鑳藉惁涓婁竴姝�
/// </summary>
public bool CanPrev()
{
@@ -76,16 +77,21 @@
}
/// <summary>
- /// 鑳藉惁杩涘叆涓嬩竴姝�
+ /// 鑳藉惁涓嬩竴姝�
/// </summary>
public bool CanNext()
{
+ if (!_isInitialize)
+ {
+ return false;
+ }
this.dxErrorProvider1.ClearErrors();
if (string.IsNullOrEmpty(this.btnEditSelectModelFile.Text.Trim()))
{
this.dxErrorProvider1.SetError(this.btnEditSelectModelFile, "蹇呴�夐」");
return false;
}
+ _vm.ZipFile = this.btnEditSelectModelFile.Text.Trim();
return true;
}
@@ -116,7 +122,6 @@
if (dlg.ShowDialog() == DialogResult.OK)
{
var fileName = dlg.FileName;
- _vm.ZipFile = fileName;
this.btnEditSelectModelFile.EditValue = fileName;
}
}
--
Gitblit v1.9.3