From 98e49c0dd42840a094837f7acae532bc237a719a Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期二, 20 八月 2024 15:42:37 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 0182908..5e49dd4 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,4 +1,6 @@
-锘縩amespace HStation.WinFrmUI
+锘縰sing DevExpress.XtraBars.Customization;
+
+namespace HStation.WinFrmUI
{
public partial class InputXhsProjectInfoWizardPage : DevExpress.XtraEditors.XtraUserControl, Yw.WinFrmUI.IWizardPage<ImportXhsProjectViewModel>
{
@@ -16,6 +18,9 @@
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
+ public static Action AutoAddItem;
+ public static Action DeleteItem;
+ public static bool AllowImport = false;
/// <summary>
/// 鍒濆鍖�
@@ -51,6 +56,16 @@
get
{
_vm.ZipFile = this.btnEditSelectModelFile.Text.Trim();
+ if (_vm.ZipFile != string.Empty)
+ {
+ AllowImport = true;
+ AutoAddItem.Invoke();
+ }
+ else
+ {
+ AllowImport = false;
+ DeleteItem.Invoke();
+ }
return _isInitialize;
}
}
@@ -103,10 +118,9 @@
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.Address = this.txtAddress.Text.Trim();
_vm.Flags = null;
_vm.TagName = tagName;
_vm.Description = this.txtDescription.Text.Trim();
--
Gitblit v1.9.3