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/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs | 65 ++++++++++++++++++++------------
1 files changed, 41 insertions(+), 24 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs
index 10b8388..529ca1f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs
@@ -1,5 +1,4 @@
-锘�
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
{
public partial class InputXhsProjectInfoWizardPage : DevExpress.XtraEditors.XtraUserControl, Yw.WinFrmUI.IWizardPage<ImportXhsProjectViewModel>
{
@@ -8,50 +7,55 @@
InitializeComponent();
}
- private ImportXhsProjectViewModel _vm = null;
+ /// <summary>
+ /// 椤甸潰鐘舵�佹敼鍙樹簨浠�
+ /// </summary>
+ public event Action PageStateChangedEvent;
+
+ private ImportXhsProjectViewModel _vm = null;//鎿嶄綔瀵硅薄
+ private bool _isInitialize = false;//鏄惁鍒濆鍖�
+ private Lazy<HStation.BLL.XhsProject> _bllProject = new(() => new HStation.BLL.XhsProject());//椤圭洰bll
+ private Lazy<Yw.BLL.SysFlagStd> _bllFlag = new(() => new Yw.BLL.SysFlagStd());//鏍囩bll
/// <summary>
/// 鍒濆鍖�
/// </summary>
- public void InitialPage(ImportXhsProjectViewModel t)
+ public async void InitialPage(ImportXhsProjectViewModel t)
{
if (_isInitialize)
{
return;
}
_vm = t;
+ var allFlagList = await _bllFlag.Value.GetFlagListBySysType(HStation.Xhs.DataType.XhsProject);
+ this.setFlagsEditCtrl1.SetBindingData(allFlagList, null);
_isInitialize = true;
}
/// <summary>
- /// 鏄惁鍒濆鍖�
- /// </summary>
- public bool IsInitialize
- {
- get { return _isInitialize; }
- }
- private bool _isInitialize = false;
-
- public event Action PageStateChangedEvent;
-
- /// <summary>
- /// 鏄惁鍏佽涓婁竴姝�
+ /// 鍏佽涓婁竴姝�
/// </summary>
public bool AllowPrev
{
- get { return true; }
+ get
+ {
+ return true;
+ }
}
/// <summary>
- /// 鏄惁鍏佽涓嬩竴姝�
+ /// 鍏佽涓嬩竴姝�
/// </summary>
public bool AllowNext
{
- get { return true; }
+ get
+ {
+ return _isInitialize;
+ }
}
/// <summary>
- /// 鏄惁鍏佽鍙栨秷
+ /// 鍏佽鍙栨秷
/// </summary>
public bool AllowCancel
{
@@ -59,7 +63,7 @@
}
/// <summary>
- /// 鏄惁鍏佽瀹屾垚
+ /// 鍏佽瀹屾垚
/// </summary>
public bool AllowComplete
{
@@ -67,7 +71,7 @@
}
/// <summary>
- /// 鑳藉惁杩斿洖涓婁竴姝�
+ /// 鑳藉惁涓婁竴姝�
/// </summary>
public bool CanPrev()
{
@@ -75,22 +79,35 @@
}
/// <summary>
- /// 鑳藉惁杩涘叆涓嬩竴姝�
+ /// 鑳藉惁涓嬩竴姝�
/// </summary>
public bool CanNext()
{
+ if (!_isInitialize)
+ {
+ return false;
+ }
this.dxErrorProvider1.ClearErrors();
if (string.IsNullOrEmpty(this.txtName.Text.Trim()))
{
this.dxErrorProvider1.SetError(this.txtName, "蹇呭～椤�");
return false;
}
+ var tagName = this.txtTagNme.Text.Trim();
+ if (!string.IsNullOrEmpty(tagName))
+ {
+ if (_bllProject.Value.IsExistTagName(tagName).Result)
+ {
+ this.dxErrorProvider1.SetError(this.txtTagNme, "鏍囪宸插瓨鍦�");
+ return false;
+ }
+ }
_vm.NO = this.txtNO.Text.Trim();
_vm.Name = this.txtName.Text.Trim();
_vm.Customer = this.txtCustomer.Text.Trim();
_vm.Address = this.txtAddress.Text.Trim();
_vm.Flags = null;
- _vm.TagName = this.txtTagNme.Text.Trim();
+ _vm.TagName = tagName;
_vm.Description = this.txtDescription.Text.Trim();
return true;
}
--
Gitblit v1.9.3