From 5c4bc78d4b5e50391e25d672654589c381be21e6 Mon Sep 17 00:00:00 2001 From: lixiaojun <1287241240@qq.com> Date: 星期日, 15 九月 2024 11:53:47 +0800 Subject: [PATCH] 水力组件升级 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/02-ProjectInfo/InputXhsProjectInfoWizardPage.cs | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 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 5e49dd4..fb47f8d 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 @@ -17,7 +17,7 @@ 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 + private Lazy<Yw.BLL.SysFlag> _bllFlag = new(() => new Yw.BLL.SysFlag());//鏍囩bll public static Action AutoAddItem; public static Action DeleteItem; public static bool AllowImport = false; @@ -33,8 +33,10 @@ } _vm = t; _isInitialize = true; - var allFlagList = await _bllFlag.Value.GetFlagListBySysType(HStation.Xhs.DataType.XhsProject); - this.setFlagsEditCtrl1.SetBindingData(allFlagList, null); + var allFlagList = await _bllFlag.Value.GetBySysType(HStation.Xhs.DataType.XhsProject); + if (allFlagList == null) + return; + this.setFlagsEditCtrl1.SetBindingData(allFlagList.Select(x => x.Name).ToList(), null); } /// <summary> @@ -56,16 +58,16 @@ get { _vm.ZipFile = this.btnEditSelectModelFile.Text.Trim(); - if (_vm.ZipFile != string.Empty) - { - AllowImport = true; - AutoAddItem.Invoke(); - } - else - { - AllowImport = false; - DeleteItem.Invoke(); - } + /* if (_vm.ZipFile != string.Empty) + { + AllowImport = true; + AutoAddItem.Invoke(); + } + else + { + AllowImport = false; + DeleteItem.Invoke(); + }*/ return _isInitialize; } } -- Gitblit v1.9.3