From 9afc96a7f7f759ae42fbe598a88a865fe737c6bd Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 10 十二月 2024 10:43:21 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.cs | 64 +++++++++++++------------------
1 files changed, 27 insertions(+), 37 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.cs
index 96e8214..e01951c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/04-scheme/01-info/CreateXhsSchemeInfoPage.cs
@@ -14,35 +14,33 @@
private CreateXhsSchemeViewModel _vm = null;//鎿嶄綔瀵硅薄
private bool _isInitialize = false;//鏄惁鍒濆鍖�
- private Lazy<HStation.BLL.XhsProject> _bllProject = new(() => new HStation.BLL.XhsProject());//椤圭洰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;
-
- public async void InitialPage(ImportXhsProjectViewModel t)
+ /// <summary>
+ /// 鍒濆鍖�
+ /// </summary>
+ public async void InitialPage(CreateXhsSchemeViewModel t)
{
if (_isInitialize)
{
return;
}
- //_vm = t;
- //_isInitialize = true;
- //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>
- /// 鍒濆鍖�
- /// </summary>
- public void InitialPage(CreateXhsSchemeViewModel t)
- {
- throw new NotImplementedException();
+ _vm = t;
+ _isInitialize = true;
+ var allFlagList = await BLLFactory<Yw.BLL.SysFlag>.Instance.GetBySysType(HStation.Xhs.DataType.XhsScheme);
+ if (allFlagList == null)
+ {
+ return;
+ }
+ this.setFlagsEditCtrl1.SetBindingData(allFlagList.Select(x => x.Name).ToList(), null);
+ this.xhsSchemeChangeTypeCheckedListHorizCtrl1.SetBindingData(t.HydroInfo);
+ if (t.Scheme == null)
+ {
+ t.Scheme = new XhsSchemeVmo();
+ if (t.AllSchemeList != null && t.AllSchemeList.Count > 0)
+ {
+ t.Scheme.SortCode = t.AllSchemeList.Max(x => x.SortCode) + 1;
+ }
+ }
}
/// <summary>
@@ -106,20 +104,12 @@
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.Name = this.txtName.Text.Trim();
- //_vm.Customer = this.txtCustomer.Text.Trim();
- //_vm.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
- //_vm.TagName = tagName;
- //_vm.Description = this.txtDescription.Text.Trim();
+ _vm.Scheme.Name = this.txtName.Text.Trim();
+ _vm.Scheme.NO = this.txtNO.Text.Trim();
+ _vm.Scheme.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
+ _vm.Scheme.AllowCustom = this.ckAllowCustom.Checked;
+ _vm.Scheme.ChangeTypes = this.xhsSchemeChangeTypeCheckedListHorizCtrl1.GetCheckedList();
+ _vm.Scheme.Description = this.txtDescription.Text.Trim();
return true;
}
--
Gitblit v1.9.3