From a95dc42495472cf931db97f8ccbe9d075708aa0b Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 22 十月 2024 16:33:40 +0800
Subject: [PATCH] 修改泵信息界面
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.Designer.cs | 24
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.cs | 13
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.resx | 73 +---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs | 24 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.Designer.cs | 116 ++++----
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.Designer.cs | 37 +-
/dev/null | 193 -------------
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.designer.cs | 121 +++-----
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.resx | 19 +
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs | 106 +++---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.cs | 30 +-
WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs | 14
16 files changed, 295 insertions(+), 495 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.Designer.cs
index f66fa46..5eca022 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.Designer.cs
@@ -39,7 +39,7 @@
simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
imageComboBoxEditPropGroup = new DevExpress.XtraEditors.ImageComboBoxEdit();
textEditName = new DevExpress.XtraEditors.TextEdit();
- textEdit2 = new DevExpress.XtraEditors.TextEdit();
+ TextEditValue = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -67,7 +67,7 @@
((System.ComponentModel.ISupportInitialize)TextEditFormat.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEditPropGroup.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)textEditName.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)textEdit2.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditValue.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
@@ -99,7 +99,7 @@
layoutControl1.Controls.Add(simpleButton1);
layoutControl1.Controls.Add(imageComboBoxEditPropGroup);
layoutControl1.Controls.Add(textEditName);
- layoutControl1.Controls.Add(textEdit2);
+ layoutControl1.Controls.Add(TextEditValue);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -193,13 +193,13 @@
textEditName.StyleController = layoutControl1;
textEditName.TabIndex = 2;
//
- // textEdit2
+ // TextEditValue
//
- textEdit2.Location = new Point(76, 156);
- textEdit2.Name = "textEdit2";
- textEdit2.Size = new Size(470, 20);
- textEdit2.StyleController = layoutControl1;
- textEdit2.TabIndex = 3;
+ TextEditValue.Location = new Point(76, 156);
+ TextEditValue.Name = "TextEditValue";
+ TextEditValue.Size = new Size(470, 20);
+ TextEditValue.StyleController = layoutControl1;
+ TextEditValue.TabIndex = 3;
//
// Root
//
@@ -301,7 +301,7 @@
//
// layoutControlItem5
//
- layoutControlItem5.Control = textEdit2;
+ layoutControlItem5.Control = TextEditValue;
layoutControlItem5.Location = new Point(0, 144);
layoutControlItem5.Name = "layoutControlItem5";
layoutControlItem5.Size = new Size(538, 24);
@@ -370,7 +370,7 @@
((System.ComponentModel.ISupportInitialize)TextEditFormat.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEditPropGroup.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)textEditName.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)textEdit2.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditValue.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
@@ -405,7 +405,7 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraEditors.TextEdit textEdit2;
+ private DevExpress.XtraEditors.TextEdit TextEditValue;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
private DevExpress.XtraEditors.CheckEdit CheckEditIsNull;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.cs
index d765a78..03fbaad 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/AddPumpPropDlg.cs
@@ -15,12 +15,16 @@
public event Func<Yw.Vmo.SysPropVmo, string, string, Task<bool>> ReloadDataEvent; //灞炴�х被, 缁勫悕,灞炴�у��
private Yw.Vmo.SysPropVmo _AddPropDto { get; set; }
+ private Yw.BLL.SysPropMapping _bll = null;
+
+ private long _catalogId;
/// <summary>
/// 鍒濆鍖栨暟鎹�
/// </summary>
public async void SetBindingData(long CatalogID)
{
+ _catalogId = CatalogID;
var catalogVmo = await new Yw.BLL.SysCatalog().GetByID(CatalogID);
if (catalogVmo == null)
return;
@@ -41,12 +45,12 @@
this.dxErrorProvider1.ClearErrors();
if (imageComboBoxEditPropGroup.EditValue == null)
{
- this.dxErrorProvider1.SetError(imageComboBoxEditPropGroup, "涓嶈兘涓虹┖!");
+ this.dxErrorProvider1.SetError(imageComboBoxEditPropGroup, "蹇呭～椤�!");
isContinue = false;
}
- if (textEditName.Text == null)
+ if (textEditName.EditValue == null)
{
- this.dxErrorProvider1.SetError(textEditName, "涓嶈兘涓虹┖!");
+ this.dxErrorProvider1.SetError(textEditName, "蹇呭～椤�!");
isContinue = false;
}
return isContinue;
@@ -90,7 +94,8 @@
{
_AddPropDto.Format = (Yw.Basic.ePropFormat)ePropFormat.Boolen;
}
- if (await this.ReloadDataEvent.Invoke(_AddPropDto, this.imageComboBoxEditPropGroup.SelectedText, ""))
+ var selected = (ImageComboBoxItem)this.imageComboBoxEditPropGroup.SelectedItem;
+ if (await this.ReloadDataEvent.Invoke(_AddPropDto, selected.Description, TextEditValue.Text))
{
MessageBoxHelper.ShowSuccess("娣诲姞鎴愬姛!");
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.Designer.cs
index f20e44a..9f6cb0f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.Designer.cs
@@ -29,6 +29,7 @@
private void InitializeComponent()
{
components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditPumpPartPropDlg));
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
pumpProductListBox1 = new Assets.PumpProductListBox();
BtnAddPumpPart = new DevExpress.XtraEditors.SimpleButton();
@@ -162,10 +163,10 @@
// gridControl1
//
gridControl1.DataSource = propGroupChoiceViewModelBindingSource;
- gridControl1.Location = new Point(184, 131);
+ gridControl1.Location = new Point(184, 137);
gridControl1.MainView = gridView1;
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(800, 362);
+ gridControl1.Size = new Size(800, 356);
gridControl1.TabIndex = 7;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
@@ -217,25 +218,25 @@
//
// TextEditProductName
//
- TextEditProductName.Location = new Point(248, 41);
+ TextEditProductName.Location = new Point(269, 41);
TextEditProductName.Name = "TextEditProductName";
- TextEditProductName.Size = new Size(736, 20);
+ TextEditProductName.Size = new Size(715, 20);
TextEditProductName.StyleController = layoutControl1;
TextEditProductName.TabIndex = 3;
//
// TextEditProductCode
//
- TextEditProductCode.Location = new Point(248, 65);
+ TextEditProductCode.Location = new Point(269, 65);
TextEditProductCode.Name = "TextEditProductCode";
- TextEditProductCode.Size = new Size(736, 20);
+ TextEditProductCode.Size = new Size(715, 20);
TextEditProductCode.StyleController = layoutControl1;
TextEditProductCode.TabIndex = 4;
//
// TextEditNo
//
- TextEditNo.Location = new Point(248, 89);
+ TextEditNo.Location = new Point(269, 89);
TextEditNo.Name = "TextEditNo";
- TextEditNo.Size = new Size(736, 20);
+ TextEditNo.Size = new Size(715, 20);
TextEditNo.StyleController = layoutControl1;
TextEditNo.TabIndex = 5;
//
@@ -326,7 +327,7 @@
layoutControlItem5.Name = "layoutControlItem5";
layoutControlItem5.Size = new Size(804, 24);
layoutControlItem5.Text = "浜у搧鍚嶇О:";
- layoutControlItem5.TextSize = new Size(52, 14);
+ layoutControlItem5.TextSize = new Size(73, 14);
//
// layoutControlItem6
//
@@ -335,7 +336,7 @@
layoutControlItem6.Name = "layoutControlItem6";
layoutControlItem6.Size = new Size(804, 24);
layoutControlItem6.Text = "浜у搧鍥惧彿:";
- layoutControlItem6.TextSize = new Size(52, 14);
+ layoutControlItem6.TextSize = new Size(73, 14);
//
// layoutControlItem7
//
@@ -344,33 +345,35 @@
layoutControlItem7.Name = "layoutControlItem7";
layoutControlItem7.Size = new Size(804, 24);
layoutControlItem7.Text = "浜у搧缂栧彿:";
- layoutControlItem7.TextSize = new Size(52, 14);
+ layoutControlItem7.TextSize = new Size(73, 14);
//
// layoutControlItem1
//
layoutControlItem1.Control = gridControl1;
- layoutControlItem1.Location = new Point(0, 90);
+ layoutControlItem1.Location = new Point(0, 96);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(804, 366);
+ layoutControlItem1.Size = new Size(804, 360);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
// simpleLabelItemAddProp
//
simpleLabelItemAddProp.AllowHotTrack = false;
+ simpleLabelItemAddProp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("simpleLabelItemAddProp.ImageOptions.SvgImage");
+ simpleLabelItemAddProp.ImageOptions.SvgImageSize = new Size(20, 20);
simpleLabelItemAddProp.Location = new Point(0, 72);
simpleLabelItemAddProp.Name = "simpleLabelItemAddProp";
- simpleLabelItemAddProp.Size = new Size(56, 18);
+ simpleLabelItemAddProp.Size = new Size(77, 24);
simpleLabelItemAddProp.Text = "澧炲姞灞炴��";
- simpleLabelItemAddProp.TextSize = new Size(52, 14);
+ simpleLabelItemAddProp.TextSize = new Size(73, 20);
simpleLabelItemAddProp.Click += simpleLabelItemAddProp_Click;
//
// emptySpaceItem1
//
emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(56, 72);
+ emptySpaceItem1.Location = new Point(77, 72);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(748, 18);
+ emptySpaceItem1.Size = new Size(727, 24);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlGroup2
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
index f596f2f..efce89a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
@@ -29,6 +29,8 @@
private List<Vmo.AssetsPumpPropContentVmo> _allPropList = null;
+ private Yw.BLL.SysPropMapping _sysPropMapping;
+
//鍥炶皟浜嬩欢
public event Func<Vmo.AssetsPumpPartMainVmo, List<Vmo.AssetsPumpPropContentVmo>, Vmo.AssetsPumpMainAndPartMapVmo, Task<bool>> ReloadEvent;
@@ -283,6 +285,28 @@
var id = await bll.Insert(rhs);
if (id > 0)
{
+ _sysPropMapping = new Yw.BLL.SysPropMapping();
+ var allList = await _sysPropMapping.GetHaveListByCatalogID(_series.CatalogID);
+ var list = new List<Yw.Vmo.SysPropMappingSetterVmo>();
+ foreach (var item in allList)
+ {
+ foreach (var prop in item.PropList)
+ {
+ if (prop.Have)
+ {
+ list.Add(new Yw.Vmo.SysPropMappingSetterVmo
+ {
+ PropID = prop.ID,
+ UnitName = prop.UnitName,
+ IsNull = prop.IsNull,
+ DefaultValue = prop.DefaultValue,
+ ChoiceIds = prop.ChoiceList.Select(x => x.ID).ToList(),
+ });
+ }
+ }
+ }
+ list.Add(new Yw.Vmo.SysPropMappingSetterVmo { PropID = id, UnitName = rhs.UnitName, IsNull = rhs.IsNull });
+ await _sysPropMapping.SetByCatalogID(_series.CatalogID, list);
var model = await bll.GetByID(id);
var partMain = new PropGroupChoiceViewModel() { PropGroupName = groupName, PropName = model.Name, ID = model.ID, Value = propValue };
_propList.Add(partMain);
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.resx
index ba25433..07cf239 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.resx
@@ -120,6 +120,25 @@
<metadata name="propGroupChoiceViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <data name="simpleLabelItemAddProp.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+ ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+ OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+ dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZENpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0xNiw0
+ QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0
+ LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N
+ Cjwvc3ZnPgs=
+</value>
+ </data>
<metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>509, 17</value>
</metadata>
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.Designer.cs
index 4de4834..69e66d0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/PumpProductListBox.Designer.cs
@@ -80,7 +80,7 @@
//
// BtnAddProductProp
//
- BtnAddProductProp.Caption = "娣诲姞灞炴��";
+ BtnAddProductProp.Caption = "娣诲姞浜у搧";
BtnAddProductProp.Id = 0;
BtnAddProductProp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAddProductProp.ImageOptions.SvgImage");
BtnAddProductProp.ImageOptions.SvgImageSize = new Size(20, 20);
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.Designer.cs
index 6fe1f83..2081fe8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.Designer.cs
@@ -43,7 +43,6 @@
TextEditRatedFlow = new DevExpress.XtraEditors.TextEdit();
TextEditRatedSpeed = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -51,13 +50,14 @@
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
@@ -80,7 +80,6 @@
((System.ComponentModel.ISupportInitialize)TextEditRatedFlow.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditRatedSpeed.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
@@ -88,13 +87,14 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
@@ -133,9 +133,9 @@
//
BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
BtnOk.Appearance.Options.UseBackColor = true;
- BtnOk.Location = new Point(224, 398);
+ BtnOk.Location = new Point(523, 398);
BtnOk.Name = "BtnOk";
- BtnOk.Size = new Size(212, 22);
+ BtnOk.Size = new Size(66, 22);
BtnOk.StyleController = layoutControl1;
BtnOk.TabIndex = 12;
BtnOk.Text = "瀹屾垚";
@@ -146,9 +146,9 @@
simpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
simpleButton1.Appearance.Options.UseBackColor = true;
simpleButton1.DialogResult = DialogResult.Cancel;
- simpleButton1.Location = new Point(440, 398);
+ simpleButton1.Location = new Point(593, 398);
simpleButton1.Name = "simpleButton1";
- simpleButton1.Size = new Size(213, 22);
+ simpleButton1.Size = new Size(60, 22);
simpleButton1.StyleController = layoutControl1;
simpleButton1.TabIndex = 13;
simpleButton1.Text = "鍙栨秷";
@@ -245,22 +245,12 @@
Root.Size = new Size(661, 428);
Root.TextVisible = false;
//
- // layoutControlItem2
- //
- layoutControlItem2.AllowHtmlStringInCaption = true;
- layoutControlItem2.Control = TextEditRatedSpeed;
- layoutControlItem2.Location = new Point(0, 24);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(324, 24);
- layoutControlItem2.Text = "<color=red>*</color>棰濆畾杞��(r/min):";
- layoutControlItem2.TextSize = new Size(97, 14);
- //
// layoutControlItem4
//
layoutControlItem4.Control = BtnOk;
- layoutControlItem4.Location = new Point(216, 390);
+ layoutControlItem4.Location = new Point(515, 390);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(216, 26);
+ layoutControlItem4.Size = new Size(70, 26);
layoutControlItem4.TextSize = new Size(0, 0);
layoutControlItem4.TextVisible = false;
//
@@ -269,15 +259,15 @@
emptySpaceItem1.AllowHotTrack = false;
emptySpaceItem1.Location = new Point(0, 390);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(216, 26);
+ emptySpaceItem1.Size = new Size(515, 26);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem8
//
layoutControlItem8.Control = simpleButton1;
- layoutControlItem8.Location = new Point(432, 390);
+ layoutControlItem8.Location = new Point(585, 390);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(217, 26);
+ layoutControlItem8.Size = new Size(64, 26);
layoutControlItem8.TextSize = new Size(0, 0);
layoutControlItem8.TextVisible = false;
//
@@ -320,15 +310,24 @@
layoutControlItem1.Text = "<color=red>*</color>鍚嶇О:";
layoutControlItem1.TextSize = new Size(97, 14);
//
- // layoutControlItem3
+ // layoutControlItem9
//
- layoutControlItem3.AllowHtmlStringInCaption = true;
- layoutControlItem3.Control = TextEditRatedFlow;
- layoutControlItem3.Location = new Point(0, 48);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(324, 24);
- layoutControlItem3.Text = "<color=red>*</color>棰濆畾娴侀噺(m鲁/h):";
- layoutControlItem3.TextSize = new Size(97, 14);
+ layoutControlItem9.AllowHtmlStringInCaption = true;
+ layoutControlItem9.Control = TextEditRatedeffciency;
+ layoutControlItem9.Location = new Point(324, 0);
+ layoutControlItem9.Name = "layoutControlItem9";
+ layoutControlItem9.Size = new Size(325, 24);
+ layoutControlItem9.Text = "<color=red>*</color>棰濆畾鏁堢巼(%):";
+ layoutControlItem9.TextSize = new Size(97, 14);
+ //
+ // layoutControlItem6
+ //
+ layoutControlItem6.Control = TextEditTagName;
+ layoutControlItem6.Location = new Point(0, 96);
+ layoutControlItem6.Name = "layoutControlItem6";
+ layoutControlItem6.Size = new Size(649, 24);
+ layoutControlItem6.Text = "鏍囩鍚嶇О:";
+ layoutControlItem6.TextSize = new Size(97, 14);
//
// layoutControlItem7
//
@@ -350,6 +349,26 @@
layoutControlItem10.Text = "<color=red>*</color>棰濆畾鍔熺巼(KW):";
layoutControlItem10.TextSize = new Size(97, 14);
//
+ // layoutControlItem3
+ //
+ layoutControlItem3.AllowHtmlStringInCaption = true;
+ layoutControlItem3.Control = TextEditRatedFlow;
+ layoutControlItem3.Location = new Point(0, 48);
+ layoutControlItem3.Name = "layoutControlItem3";
+ layoutControlItem3.Size = new Size(324, 24);
+ layoutControlItem3.Text = "<color=red>*</color>棰濆畾娴侀噺(m鲁/h):";
+ layoutControlItem3.TextSize = new Size(97, 14);
+ //
+ // layoutControlItem2
+ //
+ layoutControlItem2.AllowHtmlStringInCaption = true;
+ layoutControlItem2.Control = TextEditRatedSpeed;
+ layoutControlItem2.Location = new Point(0, 24);
+ layoutControlItem2.Name = "layoutControlItem2";
+ layoutControlItem2.Size = new Size(324, 24);
+ layoutControlItem2.Text = "<color=red>*</color>棰濆畾杞��(r/min):";
+ layoutControlItem2.TextSize = new Size(97, 14);
+ //
// layoutControlItem12
//
layoutControlItem12.Control = TextEditD2;
@@ -359,16 +378,6 @@
layoutControlItem12.Text = "鍙惰疆澶栧緞(mm):";
layoutControlItem12.TextSize = new Size(97, 14);
//
- // layoutControlItem9
- //
- layoutControlItem9.AllowHtmlStringInCaption = true;
- layoutControlItem9.Control = TextEditRatedeffciency;
- layoutControlItem9.Location = new Point(324, 0);
- layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(325, 24);
- layoutControlItem9.Text = "<color=red>*</color>棰濆畾鏁堢巼(%):";
- layoutControlItem9.TextSize = new Size(97, 14);
- //
// layoutControlItem11
//
layoutControlItem11.Control = TextEditErosion;
@@ -377,15 +386,6 @@
layoutControlItem11.Size = new Size(325, 24);
layoutControlItem11.Text = "姘旇殌(m):";
layoutControlItem11.TextSize = new Size(97, 14);
- //
- // layoutControlItem6
- //
- layoutControlItem6.Control = TextEditTagName;
- layoutControlItem6.Location = new Point(0, 96);
- layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(649, 24);
- layoutControlItem6.Text = "鏍囩鍚嶇О:";
- layoutControlItem6.TextSize = new Size(97, 14);
//
// dxErrorProvider1
//
@@ -479,7 +479,6 @@
((System.ComponentModel.ISupportInitialize)TextEditRatedFlow.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditRatedSpeed.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
@@ -487,13 +486,14 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs
index 544cc88..e424d0f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SetSysPropForCatalogDlg.Designer.cs
@@ -95,6 +95,7 @@
treeList1.Margin = new Padding(3, 2, 3, 2);
treeList1.Name = "treeList1";
treeList1.OptionsBehavior.AllowRecursiveNodeChecking = true;
+ treeList1.OptionsBehavior.PopulateServiceColumns = true;
treeList1.OptionsScrollAnnotations.ShowSelectedRows = DevExpress.Utils.DefaultBoolean.True;
treeList1.OptionsSelection.MultiSelect = true;
treeList1.OptionsView.CheckBoxStyle = DevExpress.XtraTreeList.DefaultNodeCheckBoxStyle.Check;
@@ -115,6 +116,7 @@
colName.OptionsColumn.AllowSort = true;
colName.Visible = true;
colName.VisibleIndex = 0;
+ colName.Width = 169;
//
// colUnitName
//
@@ -124,6 +126,7 @@
colUnitName.OptionsColumn.AllowSort = true;
colUnitName.Visible = true;
colUnitName.VisibleIndex = 1;
+ colUnitName.Width = 169;
//
// colIsNull
//
@@ -133,6 +136,7 @@
colIsNull.OptionsColumn.AllowSort = true;
colIsNull.Visible = true;
colIsNull.VisibleIndex = 3;
+ colIsNull.Width = 59;
//
// colDefaultValue
//
@@ -142,6 +146,7 @@
colDefaultValue.OptionsColumn.AllowSort = true;
colDefaultValue.Visible = true;
colDefaultValue.VisibleIndex = 2;
+ colDefaultValue.Width = 143;
//
// colPropChoice
//
@@ -152,6 +157,7 @@
colPropChoice.OptionsColumn.AllowSort = true;
colPropChoice.Visible = true;
colPropChoice.VisibleIndex = 4;
+ colPropChoice.Width = 305;
//
// repositoryItemCheckedComboBoxEdit1
//
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/AddPumpPropDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/AddPumpPropDlg.Designer.cs
deleted file mode 100644
index 2cd9e23..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/AddPumpPropDlg.Designer.cs
+++ /dev/null
@@ -1,318 +0,0 @@
-锘縩amespace HStation.WinFrmUI
-{
- partial class AddPumpPropDlg
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- PageTitle pageTitle1 = new PageTitle();
- ComponentResourceManager resources = new ComponentResourceManager(typeof(AddPumpPropDlg));
- PageTitle pageTitle2 = new PageTitle();
- layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- btnComplete = new SimpleButton();
- btnPrev = new SimpleButton();
- btnNext = new SimpleButton();
- btnCancel = new SimpleButton();
- navigationFrame1 = new DevExpress.XtraBars.Navigation.NavigationFrame();
- navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage();
- sysPropManageMainPanel1 = new Basic.SysPropManageMainPanel();
- navigationPage2 = new DevExpress.XtraBars.Navigation.NavigationPage();
- sysCatalogManageMainPanel1 = new Basic.SysCatalogManageMainPanel();
- Root = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
- layoutControlCancel = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlNext = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlBack = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlOk = new DevExpress.XtraLayout.LayoutControlItem();
- ((ISupportInitialize)layoutControl1).BeginInit();
- layoutControl1.SuspendLayout();
- ((ISupportInitialize)navigationFrame1).BeginInit();
- navigationFrame1.SuspendLayout();
- navigationPage1.SuspendLayout();
- navigationPage2.SuspendLayout();
- ((ISupportInitialize)Root).BeginInit();
- ((ISupportInitialize)layoutControlItem1).BeginInit();
- ((ISupportInitialize)emptySpaceItem1).BeginInit();
- ((ISupportInitialize)layoutControlCancel).BeginInit();
- ((ISupportInitialize)layoutControlNext).BeginInit();
- ((ISupportInitialize)layoutControlBack).BeginInit();
- ((ISupportInitialize)layoutControlOk).BeginInit();
- SuspendLayout();
- //
- // layoutControl1
- //
- layoutControl1.Controls.Add(btnComplete);
- layoutControl1.Controls.Add(btnPrev);
- layoutControl1.Controls.Add(btnNext);
- layoutControl1.Controls.Add(btnCancel);
- layoutControl1.Controls.Add(navigationFrame1);
- layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(0, 0);
- layoutControl1.Name = "layoutControl1";
- layoutControl1.Root = Root;
- layoutControl1.Size = new Size(1087, 536);
- layoutControl1.TabIndex = 0;
- layoutControl1.Text = "layoutControl1";
- //
- // btnComplete
- //
- btnComplete.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
- btnComplete.Appearance.Options.UseBackColor = true;
- btnComplete.Location = new Point(919, 512);
- btnComplete.MaximumSize = new Size(81, 22);
- btnComplete.MinimumSize = new Size(81, 22);
- btnComplete.Name = "btnComplete";
- btnComplete.Size = new Size(81, 22);
- btnComplete.StyleController = layoutControl1;
- btnComplete.TabIndex = 7;
- btnComplete.Text = "瀹屾垚";
- btnComplete.Click += simpleBtnOK_Click;
- //
- // btnPrev
- //
- btnPrev.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
- btnPrev.Appearance.Options.UseBackColor = true;
- btnPrev.Location = new Point(749, 512);
- btnPrev.MaximumSize = new Size(81, 22);
- btnPrev.MinimumSize = new Size(81, 22);
- btnPrev.Name = "btnPrev";
- btnPrev.Size = new Size(81, 22);
- btnPrev.StyleController = layoutControl1;
- btnPrev.TabIndex = 2;
- btnPrev.Text = "<涓婁竴姝�";
- btnPrev.Click += simpleBtnBack_Click;
- //
- // btnNext
- //
- btnNext.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
- btnNext.Appearance.Options.UseBackColor = true;
- btnNext.Location = new Point(834, 512);
- btnNext.MaximumSize = new Size(81, 22);
- btnNext.MinimumSize = new Size(81, 22);
- btnNext.Name = "btnNext";
- btnNext.Size = new Size(81, 22);
- btnNext.StyleController = layoutControl1;
- btnNext.TabIndex = 3;
- btnNext.Text = "涓嬩竴姝�>";
- btnNext.Click += simpleBtnNext_Click;
- //
- // btnCancel
- //
- btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
- btnCancel.Appearance.Options.UseBackColor = true;
- btnCancel.DialogResult = DialogResult.Cancel;
- btnCancel.Location = new Point(1004, 512);
- btnCancel.MaximumSize = new Size(81, 22);
- btnCancel.MinimumSize = new Size(81, 22);
- btnCancel.Name = "btnCancel";
- btnCancel.Size = new Size(81, 22);
- btnCancel.StyleController = layoutControl1;
- btnCancel.TabIndex = 4;
- btnCancel.Text = "鍙栨秷";
- //
- // navigationFrame1
- //
- navigationFrame1.Controls.Add(navigationPage1);
- navigationFrame1.Controls.Add(navigationPage2);
- navigationFrame1.Location = new Point(2, 2);
- navigationFrame1.Name = "navigationFrame1";
- navigationFrame1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navigationPage1, navigationPage2 });
- navigationFrame1.SelectedPage = navigationPage1;
- navigationFrame1.Size = new Size(1083, 506);
- navigationFrame1.TabIndex = 0;
- navigationFrame1.Text = "navigationFrame1";
- //
- // navigationPage1
- //
- navigationPage1.Caption = "navigationPage1";
- navigationPage1.Controls.Add(sysPropManageMainPanel1);
- navigationPage1.Name = "navigationPage1";
- navigationPage1.Size = new Size(1083, 506);
- //
- // sysPropManageMainPanel1
- //
- sysPropManageMainPanel1.Appearance.BackColor = SystemColors.Control;
- sysPropManageMainPanel1.Appearance.Options.UseBackColor = true;
- sysPropManageMainPanel1.Dock = DockStyle.Fill;
- sysPropManageMainPanel1.Location = new Point(0, 0);
- sysPropManageMainPanel1.Name = "sysPropManageMainPanel1";
- sysPropManageMainPanel1.PageGuid = null;
- pageTitle1.AllowClose = true;
- pageTitle1.Caption = "灞炴�х鐞�";
- pageTitle1.HeaderImage = null;
- pageTitle1.HeaderSvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageTitle1.HeaderSvgImage");
- pageTitle1.SvgImageSize = new Size(24, 24);
- sysPropManageMainPanel1.PageTitle = pageTitle1;
- sysPropManageMainPanel1.Size = new Size(1083, 506);
- sysPropManageMainPanel1.TabIndex = 0;
- //
- // navigationPage2
- //
- navigationPage2.Caption = "navigationPage2";
- navigationPage2.Controls.Add(sysCatalogManageMainPanel1);
- navigationPage2.Name = "navigationPage2";
- navigationPage2.Size = new Size(1083, 506);
- //
- // sysCatalogManageMainPanel1
- //
- sysCatalogManageMainPanel1.Appearance.BackColor = SystemColors.Control;
- sysCatalogManageMainPanel1.Appearance.Options.UseBackColor = true;
- sysCatalogManageMainPanel1.Dock = DockStyle.Fill;
- sysCatalogManageMainPanel1.Location = new Point(0, 0);
- sysCatalogManageMainPanel1.Name = "sysCatalogManageMainPanel1";
- sysCatalogManageMainPanel1.PageGuid = null;
- pageTitle2.AllowClose = true;
- pageTitle2.Caption = "鍒嗙被绠＄悊";
- pageTitle2.HeaderImage = null;
- pageTitle2.HeaderSvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageTitle2.HeaderSvgImage");
- pageTitle2.SvgImageSize = new Size(24, 24);
- sysCatalogManageMainPanel1.PageTitle = pageTitle2;
- sysCatalogManageMainPanel1.Size = new Size(1083, 506);
- sysCatalogManageMainPanel1.TabIndex = 0;
- //
- // Root
- //
- Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, emptySpaceItem1, layoutControlCancel, layoutControlNext, layoutControlBack, layoutControlOk });
- Root.Name = "Root";
- Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(1087, 536);
- Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- layoutControlItem1.Control = navigationFrame1;
- layoutControlItem1.Location = new Point(0, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(1087, 510);
- layoutControlItem1.TextSize = new Size(0, 0);
- layoutControlItem1.TextVisible = false;
- //
- // emptySpaceItem1
- //
- emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(0, 510);
- emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(747, 26);
- emptySpaceItem1.TextSize = new Size(0, 0);
- //
- // layoutControlCancel
- //
- layoutControlCancel.Control = btnCancel;
- layoutControlCancel.Location = new Point(1002, 510);
- layoutControlCancel.MaxSize = new Size(85, 26);
- layoutControlCancel.MinSize = new Size(85, 26);
- layoutControlCancel.Name = "layoutControlCancel";
- layoutControlCancel.Size = new Size(85, 26);
- layoutControlCancel.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlCancel.TextSize = new Size(0, 0);
- layoutControlCancel.TextVisible = false;
- //
- // layoutControlNext
- //
- layoutControlNext.Control = btnNext;
- layoutControlNext.Location = new Point(832, 510);
- layoutControlNext.MaxSize = new Size(85, 26);
- layoutControlNext.MinSize = new Size(85, 26);
- layoutControlNext.Name = "layoutControlNext";
- layoutControlNext.Size = new Size(85, 26);
- layoutControlNext.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlNext.TextSize = new Size(0, 0);
- layoutControlNext.TextVisible = false;
- //
- // layoutControlBack
- //
- layoutControlBack.Control = btnPrev;
- layoutControlBack.Location = new Point(747, 510);
- layoutControlBack.MaxSize = new Size(85, 26);
- layoutControlBack.MinSize = new Size(85, 26);
- layoutControlBack.Name = "layoutControlBack";
- layoutControlBack.Size = new Size(85, 26);
- layoutControlBack.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlBack.TextSize = new Size(0, 0);
- layoutControlBack.TextVisible = false;
- //
- // layoutControlOk
- //
- layoutControlOk.Control = btnComplete;
- layoutControlOk.Location = new Point(917, 510);
- layoutControlOk.MaxSize = new Size(85, 26);
- layoutControlOk.MinSize = new Size(85, 26);
- layoutControlOk.Name = "layoutControlOk";
- layoutControlOk.Size = new Size(85, 26);
- layoutControlOk.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- layoutControlOk.TextSize = new Size(0, 0);
- layoutControlOk.TextVisible = false;
- //
- // AddPumpPropDlg
- //
- AutoScaleDimensions = new SizeF(7F, 14F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1087, 536);
- Controls.Add(layoutControl1);
- Name = "AddPumpPropDlg";
- StartPosition = FormStartPosition.CenterScreen;
- Text = "澧炲姞灞炴��";
- WindowState = FormWindowState.Maximized;
- ((ISupportInitialize)layoutControl1).EndInit();
- layoutControl1.ResumeLayout(false);
- ((ISupportInitialize)navigationFrame1).EndInit();
- navigationFrame1.ResumeLayout(false);
- navigationPage1.ResumeLayout(false);
- navigationPage2.ResumeLayout(false);
- ((ISupportInitialize)Root).EndInit();
- ((ISupportInitialize)layoutControlItem1).EndInit();
- ((ISupportInitialize)emptySpaceItem1).EndInit();
- ((ISupportInitialize)layoutControlCancel).EndInit();
- ((ISupportInitialize)layoutControlNext).EndInit();
- ((ISupportInitialize)layoutControlBack).EndInit();
- ((ISupportInitialize)layoutControlOk).EndInit();
- ResumeLayout(false);
- }
-
- #endregion
-
- private DevExpress.XtraLayout.LayoutControl layoutControl1;
- private DevExpress.XtraBars.Navigation.NavigationFrame navigationFrame1;
- private DevExpress.XtraBars.Navigation.NavigationPage navigationPage1;
- private DevExpress.XtraBars.Navigation.NavigationPage navigationPage2;
- private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
- private Basic.SysPropManageMainPanel sysPropManageMainPanel1;
- private Basic.SysCatalogManageMainPanel sysCatalogManageMainPanel1;
- private SimpleButton btnPrev;
- private SimpleButton btnNext;
- private SimpleButton btnCancel;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlCancel;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlNext;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlBack;
- private SimpleButton btnComplete;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlOk;
- }
-}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/AddPumpPropDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/AddPumpPropDlg.cs
deleted file mode 100644
index 5da45fd..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/AddPumpPropDlg.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-锘縰sing HStation.WinFrmUI.Basic;
-
-namespace HStation.WinFrmUI
-{
- public partial class AddPumpPropDlg : DevExpress.XtraEditors.XtraForm
- {
- public AddPumpPropDlg()
- {
- InitializeComponent();
- this.Load += AddPumpPropDlg_Load;
- }
-
- public static event Action ReloadRefreshData;
-
- private void AddPumpPropDlg_Load(object sender, EventArgs e)
- {
- sysPropManageMainPanel1.InitialDataSource();
- var pumpTypeId = PumpPropViewCtrl.GetPumpTypeId();
- // sysPropManageMainPanel1.propGroupTreeListCtrl1.typeTreeListLookUpEdit1.SetBindingData(pumpTypeId);
- sysCatalogManageMainPanel1.InitialDataSource();
- layoutControlOk.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- layoutControlBack.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- }
-
- //涓嬩竴姝�
- private void simpleBtnNext_Click(object sender, EventArgs e)
- {
- if (this.navigationFrame1.SelectedPage == navigationPage1)
- {
- this.navigationFrame1.SelectedPage = navigationPage2;
- layoutControlNext.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- layoutControlBack.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
- layoutControlOk.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
- }
- }
-
- //涓婁竴姝�
- private void simpleBtnBack_Click(object sender, EventArgs e)
- {
- if (this.navigationFrame1.SelectedPage == navigationPage2)
- {
- this.navigationFrame1.SelectedPage = navigationPage1;
- layoutControlBack.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- layoutControlNext.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
- layoutControlOk.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
- }
- }
-
- //瀹屾垚
- private void simpleBtnOK_Click(object sender, EventArgs e)
- {
- ReloadRefreshData.Invoke();
- this.Close();
- }
- }
-}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/AddPumpPropDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/AddPumpPropDlg.resx
deleted file mode 100644
index 1b8dfb2..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/AddPumpPropDlg.resx
+++ /dev/null
@@ -1,174 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
- <data name="pageTitle1.HeaderSvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOYDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iRG9jdW1lbnRfUHJvcGVydGllcyIgc3R5bGU9ImVuYWJsZS1iYWNrZ3Jv
- dW5kOm5ldyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6
- IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMzAsMjV2
- LTJsLTIuMi0wLjRjLTAuMi0wLjYtMC40LTEuMy0wLjctMS44bDEuMy0xLjhsLTEuNC0xLjRsLTEuOCwx
- LjNjLTAuNS0wLjMtMS4yLTAuNi0xLjgtMC43TDIzLDE2aC0yICBsLTAuNCwyLjJjLTAuNiwwLjItMS4z
- LDAuNC0xLjgsMC43bC0xLjgtMS4zbC0xLjQsMS40bDEuMywxLjhjLTAuMywwLjUtMC42LDEuMi0wLjcs
- MS44TDE0LDIzdjJsMi4yLDAuNGMwLjIsMC42LDAuNCwxLjMsMC43LDEuOCAgbC0xLjMsMS44bDEuNCwx
- LjRsMS44LTEuM2MwLjUsMC4zLDEuMiwwLjYsMS44LDAuN0wyMSwzMmgybDAuNC0yLjJjMC42LTAuMiwx
- LjMtMC40LDEuOC0wLjdsMS44LDEuM2wxLjQtMS40bC0xLjMtMS44ICBjMC4zLTAuNSwwLjYtMS4yLDAu
- Ny0xLjhMMzAsMjV6IE0yMiwyNmMtMS4xLDAtMi0wLjktMi0yczAuOS0yLDItMnMyLDAuOSwyLDJTMjMu
- MSwyNiwyMiwyNnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8cGF0aCBkPSJNMTQuMywyNkg2VjRoNmg2djVj
- MCwwLjYsMC40LDEsMSwxaDV2NS45bDAsMC40YzAuNywwLjIsMS40LDAuNSwyLDAuOFY5bC03LTdINUM0
- LjQsMiw0LDIuNCw0LDN2MjQgIGMwLDAuNiwwLjQsMSwxLDFoMTAuMUMxNC43LDI3LjQsMTQuNCwyNi43
- LDE0LjMsMjZ6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
-</value>
- </data>
- <data name="pageTitle2.HeaderSvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAoFAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
- aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
- c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
- O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
- ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
- c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJDYXRlZ29yeSI+DQog
- ICAgPHBhdGggZD0iTTE5LDEyaC04Yy0wLjYsMC0xLTAuNC0xLTFWNWMwLTAuNiwwLjQtMSwxLTFoOGMw
- LjUsMCwxLDAuNCwxLDF2NkMyMCwxMS42LDE5LjUsMTIsMTksMTJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg
- ICA8cGF0aCBkPSJNMTEsMjZIM2MtMC41LDAtMS0wLjUtMS0xdi02YzAtMC41LDAuNS0xLDEtMWg4YzAu
- NiwwLDEsMC41LDEsMXY2QzEyLDI1LjUsMTEuNiwyNiwxMSwyNnoiIGNsYXNzPSJCbHVlIiAvPg0KICAg
- IDxwYXRoIGQ9Ik0yNywyNmgtOGMtMC41LDAtMS0wLjUtMS0xdi02YzAtMC41LDAuNS0xLDEtMWg4YzAu
- NSwwLDEsMC41LDEsMXY2QzI4LDI1LjUsMjcuNSwyNiwyNywyNnoiIGNsYXNzPSJCbHVlIiAvPg0KICAg
- IDxnIGNsYXNzPSJzdDEiPg0KICAgICAgPHBhdGggZD0iTTE2LDE0di0yaC0ydjJIN2MtMC42LDAtMSww
- LjQtMSwxdjNoMnYtMmgxNHYyaDJ2LTNjMC0wLjYtMC40LTEtMS0xSDE2eiIgY2xhc3M9IkJsYWNrIiAv
- Pg0KICAgIDwvZz4NCiAgPC9nPg0KPC9zdmc+Cw==
-</value>
- </data>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpBarItem.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpBarItem.Designer.cs
deleted file mode 100644
index 2305315..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpBarItem.Designer.cs
+++ /dev/null
@@ -1,155 +0,0 @@
-锘縩amespace HStation.WinFrmUI
-{
- partial class PumpBarItem
- {
- /// <summary>
- /// Required designer variable.
- /// </summary>
- private System.ComponentModel.IContainer components = null;
-
- /// <summary>
- /// Clean up any resources being used.
- /// </summary>
- /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Component Designer generated code
-
- /// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- components = new Container();
- ComponentResourceManager resources = new ComponentResourceManager(typeof(PumpBarItem));
- barManager1 = new DevExpress.XtraBars.BarManager(components);
- bar2 = new DevExpress.XtraBars.Bar();
- barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
- barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
- barDockControlTop = new DevExpress.XtraBars.BarDockControl();
- barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
- barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
- barDockControlRight = new DevExpress.XtraBars.BarDockControl();
- barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
- ((ISupportInitialize)barManager1).BeginInit();
- SuspendLayout();
- //
- // barManager1
- //
- barManager1.Bars.AddRange(new DevExpress.XtraBars.Bar[] { bar2 });
- barManager1.DockControls.Add(barDockControlTop);
- barManager1.DockControls.Add(barDockControlBottom);
- barManager1.DockControls.Add(barDockControlLeft);
- barManager1.DockControls.Add(barDockControlRight);
- barManager1.Form = this;
- barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { barBtnAdd, barBtnEdit, barBtnRefresh });
- barManager1.MainMenu = bar2;
- barManager1.MaxItemId = 3;
- //
- // bar2
- //
- bar2.BarName = "Main menu";
- bar2.CanDockStyle = DevExpress.XtraBars.BarCanDockStyle.Top;
- bar2.DockCol = 0;
- bar2.DockRow = 0;
- bar2.DockStyle = DevExpress.XtraBars.BarDockStyle.Top;
- bar2.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(barBtnAdd), new DevExpress.XtraBars.LinkPersistInfo(barBtnEdit), new DevExpress.XtraBars.LinkPersistInfo(barBtnRefresh) });
- bar2.OptionsBar.AllowQuickCustomization = false;
- bar2.OptionsBar.DrawBorder = false;
- bar2.OptionsBar.DrawDragBorder = false;
- bar2.OptionsBar.MultiLine = true;
- bar2.OptionsBar.UseWholeRow = true;
- bar2.Text = "Main menu";
- //
- // barBtnAdd
- //
- barBtnAdd.Caption = "娣诲姞";
- barBtnAdd.Id = 0;
- barBtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage");
- barBtnAdd.Name = "barBtnAdd";
- barBtnAdd.ItemClick += barBtnAdd_ItemClick;
- //
- // barBtnEdit
- //
- barBtnEdit.Caption = "缂栬緫";
- barBtnEdit.Id = 1;
- barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage");
- barBtnEdit.Name = "barBtnEdit";
- barBtnEdit.ItemClick += barBtnEdit_ItemClick;
- //
- // barDockControlTop
- //
- barDockControlTop.CausesValidation = false;
- barDockControlTop.Dock = DockStyle.Top;
- barDockControlTop.Location = new Point(0, 0);
- barDockControlTop.Manager = barManager1;
- barDockControlTop.Size = new Size(467, 24);
- //
- // barDockControlBottom
- //
- barDockControlBottom.CausesValidation = false;
- barDockControlBottom.Dock = DockStyle.Bottom;
- barDockControlBottom.Location = new Point(0, 171);
- barDockControlBottom.Manager = barManager1;
- barDockControlBottom.Size = new Size(467, 0);
- //
- // barDockControlLeft
- //
- barDockControlLeft.CausesValidation = false;
- barDockControlLeft.Dock = DockStyle.Left;
- barDockControlLeft.Location = new Point(0, 24);
- barDockControlLeft.Manager = barManager1;
- barDockControlLeft.Size = new Size(0, 147);
- //
- // barDockControlRight
- //
- barDockControlRight.CausesValidation = false;
- barDockControlRight.Dock = DockStyle.Right;
- barDockControlRight.Location = new Point(467, 24);
- barDockControlRight.Manager = barManager1;
- barDockControlRight.Size = new Size(0, 147);
- //
- // barBtnRefresh
- //
- barBtnRefresh.Caption = "barButtonItem1";
- barBtnRefresh.Id = 2;
- barBtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefresh.ImageOptions.SvgImage");
- barBtnRefresh.Name = "barBtnRefresh";
- barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
- //
- // PumpBarItem
- //
- AutoScaleDimensions = new SizeF(7F, 14F);
- AutoScaleMode = AutoScaleMode.Font;
- Controls.Add(barDockControlLeft);
- Controls.Add(barDockControlRight);
- Controls.Add(barDockControlBottom);
- Controls.Add(barDockControlTop);
- Name = "PumpBarItem";
- Size = new Size(467, 171);
- ((ISupportInitialize)barManager1).EndInit();
- ResumeLayout(false);
- PerformLayout();
- }
-
- #endregion
-
- private DevExpress.XtraBars.BarManager barManager1;
- private DevExpress.XtraBars.Bar bar2;
- private DevExpress.XtraBars.BarDockControl barDockControlTop;
- private DevExpress.XtraBars.BarDockControl barDockControlBottom;
- private DevExpress.XtraBars.BarDockControl barDockControlLeft;
- private DevExpress.XtraBars.BarDockControl barDockControlRight;
- private DevExpress.XtraBars.BarButtonItem barBtnAdd;
- private DevExpress.XtraBars.BarButtonItem barBtnEdit;
- private DevExpress.XtraBars.BarButtonItem barBtnRefresh;
- }
-}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpBarItem.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpBarItem.cs
deleted file mode 100644
index 4f270af..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpBarItem.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-锘縩amespace HStation.WinFrmUI
-{
- public partial class PumpBarItem : DevExpress.XtraEditors.XtraUserControl
- {
- public PumpBarItem()
- {
- InitializeComponent();
- }
-
- public static event Action ReloadRefreshData;
-
- private void barBtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- var dlg = new AddPumpPropDlg();
- dlg.ShowDialog();
- }
-
- //缂栬緫
- private void barBtnEdit_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- var dlg = new EditPumpPartPropDlg();
- dlg.SetBindingData(PumpPropViewCtrl.GetPumpMainVmo());
- dlg.ShowDialog();
- ReloadRefreshData.Invoke();
- }
-
- //鍒锋柊
- private void barBtnRefresh_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
- {
- ReloadRefreshData.Invoke();
- }
- }
-}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpBarItem.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpBarItem.resx
deleted file mode 100644
index bc01871..0000000
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpBarItem.resx
+++ /dev/null
@@ -1,193 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>17, 17</value>
- </metadata>
- <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
- <data name="barBtnAdd.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKcCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZCI+DQogICAgPHBhdGggZD0iTTI3LDE0aC05VjVj
- MC0wLjUtMC41LTEtMS0xaC0yYy0wLjUsMC0xLDAuNS0xLDF2OUg1Yy0wLjUsMC0xLDAuNS0xLDF2MmMw
- LDAuNSwwLjUsMSwxLDFoOXY5ICAgYzAsMC41LDAuNSwxLDEsMWgyYzAuNSwwLDEtMC41LDEtMXYtOWg5
- YzAuNSwwLDEtMC41LDEtMXYtMkMyOCwxNC41LDI3LjUsMTQsMjcsMTR6IiBjbGFzcz0iR3JlZW4iIC8+
- DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
- </data>
- <data name="barBtnEdit.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABwFAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
- RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
- Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
- aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iUmVuYW1lXzFfIj4NCiAgICA8
- cGF0aCBkPSJNMi4xLDE2aDIuMmwwLjYtMi4zaDMuMkw4LjgsMTZIMTFMNy44LDZINS40TDIuMSwxNnog
- TTYuNCw4LjdjMC4xLTAuMywwLjEtMC42LDAuMS0wLjloMC4xICAgYzAsMC4zLDAuMSwwLjYsMC4xLDAu
- OWwxLDMuM0g1LjRMNi40LDguN3ogTTE3LjUsMTAuNmMwLjYtMC4yLDEuMS0wLjUsMS41LTAuOWMwLjQt
- MC40LDAuNi0wLjksMC42LTEuNGMwLTAuNy0wLjMtMS4zLTAuOS0xLjcgICBDMTguMSw2LjIsMTcuMSw2
- LDE1LjksNkgxMnY5LjlWMTZoNGMxLjIsMCwyLjItMC4yLDIuOS0wLjhDMTkuNywxNC42LDIwLDE0LDIw
- LDEzYzAtMC42LTAuMi0xLjItMC43LTEuNiAgIEMxOC45LDExLDE4LjMsMTAuNywxNy41LDEwLjZ6IE0x
- NC40LDcuN2gwLjljMS4xLDAsMS43LDAuNCwxLjcsMS4xYzAsMC40LTAuMSwwLjctMC40LDAuOUMxNi40
- LDkuOSwxNiwxMCwxNS41LDEwaC0xLjFWNy43eiAgICBNMTcsMTMuOGMtMC4zLDAuMi0wLjgsMC40LTEu
- MywwLjRoLTEuM3YtMi42aDEuM2MwLjUsMCwwLjksMC4xLDEuMywwLjNjMC4zLDAuMiwwLjUsMC42LDAu
- NSwwLjlDMTcuNSwxMy4zLDE3LjQsMTMuNiwxNywxMy44eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxw
- YXRoIGQ9Ik0yNywxOWwtOCw4bC00LTRsOC04TDI3LDE5eiBNMjgsMThsMS43LTEuN2MwLjQtMC40LDAu
- NC0xLDAtMS4zTDI3LDEyLjNjLTAuNC0wLjQtMS0wLjQtMS4zLDBMMjQsMTRMMjgsMTh6ICAgIE0xNCwy
- NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-</value>
- </data>
- <data name="barBtnRefresh.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
- ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
- OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
- dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJlZnJlc2hfMV8iPg0KICAgIDxwYXRoIGQ9Ik0yNC41
- LDcuNUMyMi4zLDUuMywxOS4zLDQsMTYsNEMxMC4xLDQsNS4xLDguMyw0LjIsMTRoNC4xYzAuOS0zLjQs
- NC02LDcuNy02YzIuMiwwLDQuMiwwLjksNS42LDIuNEwxOCwxNCAgIGg1LjdoNC4xSDI4VjRMMjQuNSw3
- LjV6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTE2LjIsMjRjLTIuMiwwLTQuMi0wLjkt
- NS42LTIuNGwzLjYtMy42SDguNEg0LjRINC4ydjEwbDMuNS0zLjVjMi4yLDIuMiw1LjIsMy41LDguNSwz
- LjUgICBDMjIuMSwyOCwyNywyMy43LDI4LDE4aC00LjFDMjMsMjEuNCwxOS45LDI0LDE2LjIsMjR6IiBj
- bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
- </data>
-</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs
index 688c14e..fbe51c8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs
@@ -9,15 +9,13 @@
InitializeComponent();
this.gridView1.SetNormalView();
this.gridView1.RegistCustomDrawRowIndicator();
- AddPumpPropDlg.ReloadRefreshData += RefreshData;
- PumpBarItem.ReloadRefreshData += RefreshData;
}
private List<PropGroupChoiceViewModel> _allBindingList;
public static long _typeId;
- public long _pumpId;
+ public static long _pumpId;
public static Vmo.AssetsPumpMainVmo _assetsPumpMainVmo;
@@ -78,7 +76,7 @@
this.propGroupChoiceViewModelBindingSource.ResetBindings(false);
}
- private void RefreshData()
+ public void RefreshData()
{
SetBindingData(_pumpId.ToString());
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
index 527f0c9..407b6e4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.cs
@@ -30,6 +30,12 @@
}
}
+ //鍒锋柊灞炴�у��
+ public void RefreshPropData()
+ {
+ this.pumpPropViewCtrl1.RefreshData();
+ }
+
private Yw.Geometry.CubicSpline2d _qh, _qe, _qp;
private Yw.Geometry.Point2d _work_pt;
private double _rated_speed;
@@ -532,14 +538,6 @@
}
#endregion 鏋勯�犲嚱鏁板拰鍔犺浇鍑芥暟
-
- private void tabPage榛樿瀹夎鍥�2d_VisibleChanged(object sender, EventArgs e)
- {
- }
-
- private void tabPage绯荤粺瀹夎鍥�2d_VisibleChanged(object sender, EventArgs e)
- {
- }
/// <summary>
///
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.designer.cs
index 5490a51..f50f3fe 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoCtrl.designer.cs
@@ -56,18 +56,16 @@
navBarControlPara = new DevExpress.XtraNavBar.NavBarControl();
pumpPerformCompareInfoCtrl1 = new Yw.WinFrmUI.Phart.PumpPerformCompareInfoCtrl();
tabPage浜у搧灞炴��2 = new DevExpress.XtraTab.XtraTabPage();
+ layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ pumpPropViewCtrl1 = new PumpPropViewCtrl();
+ Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
_tabPage浜у搧鏉愭枡 = new DevExpress.XtraTab.XtraTabPage();
splitContainerControlMaterial = new SplitContainerControl();
_tabPage澶氶�熷害鏇茬嚎鍙傛暟 = new DevExpress.XtraTab.XtraTabPage();
pumpVariableSpeedInfoCtrl1 = new Yw.WinFrmUI.Phart.PumpVariableSpeedInfoCtrl();
navBarGroupControlContainer6 = new DevExpress.XtraNavBar.NavBarGroupControlContainer();
navBarGroupJieZhi = new DevExpress.XtraNavBar.NavBarGroup();
- layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- Root = new DevExpress.XtraLayout.LayoutControlGroup();
- pumpBarItem1 = new PumpBarItem();
- layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- pumpPropViewCtrl1 = new PumpPropViewCtrl();
- layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)xtraTabCtrlMain).BeginInit();
xtraTabCtrlMain.SuspendLayout();
((ISupportInitialize)imageCollection1).BeginInit();
@@ -86,17 +84,16 @@
((ISupportInitialize)navBarControlPara).BeginInit();
navBarControlPara.SuspendLayout();
tabPage浜у搧灞炴��2.SuspendLayout();
+ ((ISupportInitialize)layoutControl1).BeginInit();
+ layoutControl1.SuspendLayout();
+ ((ISupportInitialize)Root).BeginInit();
+ ((ISupportInitialize)layoutControlItem2).BeginInit();
_tabPage浜у搧鏉愭枡.SuspendLayout();
((ISupportInitialize)splitContainerControlMaterial).BeginInit();
((ISupportInitialize)splitContainerControlMaterial.Panel1).BeginInit();
((ISupportInitialize)splitContainerControlMaterial.Panel2).BeginInit();
splitContainerControlMaterial.SuspendLayout();
_tabPage澶氶�熷害鏇茬嚎鍙傛暟.SuspendLayout();
- ((ISupportInitialize)layoutControl1).BeginInit();
- layoutControl1.SuspendLayout();
- ((ISupportInitialize)Root).BeginInit();
- ((ISupportInitialize)layoutControlItem1).BeginInit();
- ((ISupportInitialize)layoutControlItem2).BeginInit();
SuspendLayout();
//
// xtraTabCtrlMain
@@ -371,6 +368,43 @@
tabPage浜у搧灞炴��2.Size = new Size(389, 693);
tabPage浜у搧灞炴��2.Text = "浜у搧灞炴��";
//
+ // layoutControl1
+ //
+ layoutControl1.Controls.Add(pumpPropViewCtrl1);
+ layoutControl1.Dock = DockStyle.Fill;
+ layoutControl1.Location = new Point(0, 0);
+ layoutControl1.Name = "layoutControl1";
+ layoutControl1.Root = Root;
+ layoutControl1.Size = new Size(389, 693);
+ layoutControl1.TabIndex = 1;
+ layoutControl1.Text = "layoutControl1";
+ //
+ // pumpPropViewCtrl1
+ //
+ pumpPropViewCtrl1.Location = new Point(12, 12);
+ pumpPropViewCtrl1.Margin = new Padding(4, 5, 4, 5);
+ pumpPropViewCtrl1.Name = "pumpPropViewCtrl1";
+ pumpPropViewCtrl1.Size = new Size(365, 669);
+ pumpPropViewCtrl1.TabIndex = 5;
+ //
+ // Root
+ //
+ Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ Root.GroupBordersVisible = false;
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2 });
+ Root.Name = "Root";
+ Root.Size = new Size(389, 693);
+ Root.TextVisible = false;
+ //
+ // layoutControlItem2
+ //
+ layoutControlItem2.Control = pumpPropViewCtrl1;
+ layoutControlItem2.Location = new Point(0, 0);
+ layoutControlItem2.Name = "layoutControlItem2";
+ layoutControlItem2.Size = new Size(369, 673);
+ layoutControlItem2.TextSize = new Size(0, 0);
+ layoutControlItem2.TextVisible = false;
+ //
// _tabPage浜у搧鏉愭枡
//
_tabPage浜у搧鏉愭枡.Controls.Add(splitContainerControlMaterial);
@@ -438,60 +472,6 @@
navBarGroupJieZhi.ImageOptions.LargeImage = (Image)resources.GetObject("navBarGroupJieZhi.ImageOptions.LargeImage");
navBarGroupJieZhi.Name = "navBarGroupJieZhi";
//
- // layoutControl1
- //
- layoutControl1.Controls.Add(pumpPropViewCtrl1);
- layoutControl1.Controls.Add(pumpBarItem1);
- layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(0, 0);
- layoutControl1.Name = "layoutControl1";
- layoutControl1.Root = Root;
- layoutControl1.Size = new Size(389, 693);
- layoutControl1.TabIndex = 1;
- layoutControl1.Text = "layoutControl1";
- //
- // Root
- //
- Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2 });
- Root.Name = "Root";
- Root.Size = new Size(389, 693);
- Root.TextVisible = false;
- //
- // pumpBarItem1
- //
- pumpBarItem1.Location = new Point(12, 12);
- pumpBarItem1.Name = "pumpBarItem1";
- pumpBarItem1.Size = new Size(365, 23);
- pumpBarItem1.TabIndex = 4;
- //
- // layoutControlItem1
- //
- layoutControlItem1.Control = pumpBarItem1;
- layoutControlItem1.Location = new Point(0, 0);
- layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(369, 27);
- layoutControlItem1.TextSize = new Size(0, 0);
- layoutControlItem1.TextVisible = false;
- //
- // pumpPropViewCtrl1
- //
- pumpPropViewCtrl1.Location = new Point(12, 39);
- pumpPropViewCtrl1.Margin = new Padding(4, 5, 4, 5);
- pumpPropViewCtrl1.Name = "pumpPropViewCtrl1";
- pumpPropViewCtrl1.Size = new Size(365, 642);
- pumpPropViewCtrl1.TabIndex = 5;
- //
- // layoutControlItem2
- //
- layoutControlItem2.Control = pumpPropViewCtrl1;
- layoutControlItem2.Location = new Point(0, 27);
- layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(369, 646);
- layoutControlItem2.TextSize = new Size(0, 0);
- layoutControlItem2.TextVisible = false;
- //
// PumpFullInfoCtrl
//
Appearance.BackColor = SystemColors.Control;
@@ -519,17 +499,16 @@
((ISupportInitialize)navBarControlPara).EndInit();
navBarControlPara.ResumeLayout(false);
tabPage浜у搧灞炴��2.ResumeLayout(false);
+ ((ISupportInitialize)layoutControl1).EndInit();
+ layoutControl1.ResumeLayout(false);
+ ((ISupportInitialize)Root).EndInit();
+ ((ISupportInitialize)layoutControlItem2).EndInit();
_tabPage浜у搧鏉愭枡.ResumeLayout(false);
((ISupportInitialize)splitContainerControlMaterial.Panel1).EndInit();
((ISupportInitialize)splitContainerControlMaterial.Panel2).EndInit();
((ISupportInitialize)splitContainerControlMaterial).EndInit();
splitContainerControlMaterial.ResumeLayout(false);
_tabPage澶氶�熷害鏇茬嚎鍙傛暟.ResumeLayout(false);
- ((ISupportInitialize)layoutControl1).EndInit();
- layoutControl1.ResumeLayout(false);
- ((ISupportInitialize)Root).EndInit();
- ((ISupportInitialize)layoutControlItem1).EndInit();
- ((ISupportInitialize)layoutControlItem2).EndInit();
ResumeLayout(false);
}
@@ -573,9 +552,7 @@
private Yw.WinFrmUI.Phart.PumpPerformCompareInfoCtrl pumpPerformCompareInfoCtrl1;
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private PumpPropViewCtrl pumpPropViewCtrl1;
- private PumpBarItem pumpBarItem1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
}
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs
index 4e77163..1102a7c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.Designer.cs
@@ -32,20 +32,19 @@
{
components = new Container();
ComponentResourceManager resources = new ComponentResourceManager(typeof(PumpFullInfoViewDlg));
- DevExpress.Utils.SuperToolTip superToolTip6 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem6 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip7 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem7 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip8 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem8 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip9 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem9 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip10 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem10 = new DevExpress.Utils.ToolTipItem();
- PageTitle pageTitle2 = new PageTitle();
+ DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip3 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem3 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip4 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem4 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip5 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem5 = new DevExpress.Utils.ToolTipItem();
+ PageTitle pageTitle1 = new PageTitle();
tileNavPaneTop = new DevExpress.XtraBars.Navigation.TileNavPane();
navBtnTitle = new DevExpress.XtraBars.Navigation.NavButton();
- navBtnRefreshMatching = new DevExpress.XtraBars.Navigation.NavButton();
navBtnEdit = new DevExpress.XtraBars.Navigation.NavButton();
navBtn鎵嬫満椤甸潰 = new DevExpress.XtraBars.Navigation.NavButton();
navBtn瀵垮懡鎴愭湰璁＄畻 = new DevExpress.XtraBars.Navigation.NavButton();
@@ -69,9 +68,10 @@
barButtonItem2 = new BarButtonItem();
barButtonItem3 = new BarButtonItem();
barBtnEditProp = new BarButtonItem();
- barButtonItem5 = new BarButtonItem();
+ barBtnRefreshMatching = new BarButtonItem();
repositoryItemBreadCrumbEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemBreadCrumbEdit();
repositoryItemPageNumberEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemPageNumberEdit();
+ repositoryItemTextEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemTextEdit();
tileNavPane1 = new DevExpress.XtraBars.Navigation.TileNavPane();
navButton1 = new DevExpress.XtraBars.Navigation.NavButton();
navButton2 = new DevExpress.XtraBars.Navigation.NavButton();
@@ -103,6 +103,7 @@
((ISupportInitialize)imageCollection1).BeginInit();
((ISupportInitialize)repositoryItemBreadCrumbEdit1).BeginInit();
((ISupportInitialize)repositoryItemPageNumberEdit1).BeginInit();
+ ((ISupportInitialize)repositoryItemTextEdit1).BeginInit();
((ISupportInitialize)tileNavPane1).BeginInit();
panelMain.SuspendLayout();
((ISupportInitialize)tileNavPane3).BeginInit();
@@ -116,7 +117,6 @@
tileNavPaneTop.AllowGlyphSkinning = true;
tileNavPaneTop.ButtonPadding = new Padding(6);
tileNavPaneTop.Buttons.Add(navBtnTitle);
- tileNavPaneTop.Buttons.Add(navBtnRefreshMatching);
tileNavPaneTop.Buttons.Add(navBtnEdit);
tileNavPaneTop.Buttons.Add(navBtn鎵嬫満椤甸潰);
tileNavPaneTop.Buttons.Add(navBtn瀵垮懡鎴愭湰璁＄畻);
@@ -161,13 +161,6 @@
navBtnTitle.Name = "navBtnTitle";
navBtnTitle.ElementClick += navBtnTitle_ElementClick;
//
- // navBtnRefreshMatching
- //
- navBtnRefreshMatching.Caption = "閲嶆柊鍖归厤";
- navBtnRefreshMatching.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnRefreshMatching.ImageOptions.SvgImage");
- navBtnRefreshMatching.Name = "navBtnRefreshMatching";
- navBtnRefreshMatching.ElementClick += navBtnRefreshMatching_ElementClick;
- //
// navBtnEdit
//
navBtnEdit.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
@@ -207,9 +200,9 @@
navBtnDock.Caption = "鍋滈潬";
navBtnDock.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnDock.ImageOptions.SvgImage");
navBtnDock.Name = "navBtnDock";
- toolTipItem6.Text = "鍋滈潬";
- superToolTip6.Items.Add(toolTipItem6);
- navBtnDock.SuperTip = superToolTip6;
+ toolTipItem1.Text = "鍋滈潬";
+ superToolTip1.Items.Add(toolTipItem1);
+ navBtnDock.SuperTip = superToolTip1;
navBtnDock.ElementClick += navBtnDock_ElementClick;
//
// navButton8
@@ -218,9 +211,9 @@
navButton8.Caption = null;
navButton8.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navButton8.ImageOptions.SvgImage");
navButton8.Name = "navButton8";
- toolTipItem7.Text = "鏈�灏忓寲";
- superToolTip7.Items.Add(toolTipItem7);
- navButton8.SuperTip = superToolTip7;
+ toolTipItem2.Text = "鏈�灏忓寲";
+ superToolTip2.Items.Add(toolTipItem2);
+ navButton8.SuperTip = superToolTip2;
navButton8.ElementClick += navBtnMin_ElementClick;
//
// navBtnbutton9
@@ -228,9 +221,9 @@
navBtnbutton9.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
navBtnbutton9.Caption = null;
navBtnbutton9.Name = "navBtnbutton9";
- toolTipItem8.Text = "鍚戜笅杩樺師";
- superToolTip8.Items.Add(toolTipItem8);
- navBtnbutton9.SuperTip = superToolTip8;
+ toolTipItem3.Text = "鍚戜笅杩樺師";
+ superToolTip3.Items.Add(toolTipItem3);
+ navBtnbutton9.SuperTip = superToolTip3;
navBtnbutton9.ElementClick += navBtnSize_ElementClick;
//
// navBtnbutton10
@@ -239,9 +232,9 @@
navBtnbutton10.Caption = null;
navBtnbutton10.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navBtnbutton10.ImageOptions.SvgImage");
navBtnbutton10.Name = "navBtnbutton10";
- toolTipItem9.Text = "鍏抽棴";
- superToolTip9.Items.Add(toolTipItem9);
- navBtnbutton10.SuperTip = superToolTip9;
+ toolTipItem4.Text = "鍏抽棴";
+ superToolTip4.Items.Add(toolTipItem4);
+ navBtnbutton10.SuperTip = superToolTip4;
navBtnbutton10.ElementClick += navBtnClose_ElementClick;
//
// popupMenu1
@@ -286,9 +279,9 @@
barManager1.DockControls.Add(barDockControlRight);
barManager1.Form = this;
barManager1.Images = imageCollection1;
- barManager1.Items.AddRange(new BarItem[] { bbi瀵煎嚭瀹夎鍥�, bbi瀵煎嚭灞炴�ц〃, bbi瀵煎嚭鎬ц兘鏇茬嚎, bbi涓嬭浇BIM鏂囦欢, barButtonItem1, barButtonItem2, barButtonItem3, barBtnEditProp, barButtonItem5 });
- barManager1.MaxItemId = 20;
- barManager1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemBreadCrumbEdit1, repositoryItemPageNumberEdit1 });
+ barManager1.Items.AddRange(new BarItem[] { bbi瀵煎嚭瀹夎鍥�, bbi瀵煎嚭灞炴�ц〃, bbi瀵煎嚭鎬ц兘鏇茬嚎, bbi涓嬭浇BIM鏂囦欢, barButtonItem1, barButtonItem2, barButtonItem3, barBtnEditProp, barBtnRefreshMatching });
+ barManager1.MaxItemId = 23;
+ barManager1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemBreadCrumbEdit1, repositoryItemPageNumberEdit1, repositoryItemTextEdit1 });
//
// barDockControlTop
//
@@ -358,11 +351,12 @@
barBtnEditProp.Name = "barBtnEditProp";
barBtnEditProp.ItemClick += BarBtnEditProp_ItemClick;
//
- // barButtonItem5
+ // barBtnRefreshMatching
//
- barButtonItem5.Caption = "barButtonItem5";
- barButtonItem5.Id = 16;
- barButtonItem5.Name = "barButtonItem5";
+ barBtnRefreshMatching.Caption = "娉靛瀷鍙峰尮閰�";
+ barBtnRefreshMatching.Id = 22;
+ barBtnRefreshMatching.Name = "barBtnRefreshMatching";
+ barBtnRefreshMatching.ItemClick += BarBtnRefreshMatching_ItemClick;
//
// repositoryItemBreadCrumbEdit1
//
@@ -375,6 +369,11 @@
repositoryItemPageNumberEdit1.AutoHeight = false;
repositoryItemPageNumberEdit1.Mask.EditMask = "########;";
repositoryItemPageNumberEdit1.Name = "repositoryItemPageNumberEdit1";
+ //
+ // repositoryItemTextEdit1
+ //
+ repositoryItemTextEdit1.AutoHeight = false;
+ repositoryItemTextEdit1.Name = "repositoryItemTextEdit1";
//
// tileNavPane1
//
@@ -450,9 +449,9 @@
navButton6.AppearanceSelected.Options.UseForeColor = true;
navButton6.Caption = null;
navButton6.Name = "navButton6";
- toolTipItem10.Text = "鏈�灏忓寲";
- superToolTip10.Items.Add(toolTipItem10);
- navButton6.SuperTip = superToolTip10;
+ toolTipItem5.Text = "鏈�灏忓寲";
+ superToolTip5.Items.Add(toolTipItem5);
+ navButton6.SuperTip = superToolTip5;
//
// panelMain
//
@@ -469,12 +468,12 @@
pumpFullInfoCtrl1.Location = new Point(0, 0);
pumpFullInfoCtrl1.Name = "pumpFullInfoCtrl1";
pumpFullInfoCtrl1.PageGuid = null;
- pageTitle2.AllowClose = true;
- pageTitle2.Caption = "姘存车淇℃伅";
- pageTitle2.HeaderImage = null;
- pageTitle2.HeaderSvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageTitle2.HeaderSvgImage");
- pageTitle2.SvgImageSize = new Size(0, 0);
- pumpFullInfoCtrl1.PageTitle = pageTitle2;
+ pageTitle1.AllowClose = true;
+ pageTitle1.Caption = "姘存车淇℃伅";
+ pageTitle1.HeaderImage = null;
+ pageTitle1.HeaderSvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("pageTitle1.HeaderSvgImage");
+ pageTitle1.SvgImageSize = new Size(0, 0);
+ pumpFullInfoCtrl1.PageTitle = pageTitle1;
pumpFullInfoCtrl1.Size = new Size(1274, 659);
pumpFullInfoCtrl1.TabIndex = 0;
//
@@ -662,7 +661,7 @@
//
// popupMenuEdit
//
- popupMenuEdit.LinksPersistInfo.AddRange(new LinkPersistInfo[] { new LinkPersistInfo(barButtonItem1, true), new LinkPersistInfo(barButtonItem2), new LinkPersistInfo(barButtonItem3), new LinkPersistInfo(barBtnEditProp, true) });
+ popupMenuEdit.LinksPersistInfo.AddRange(new LinkPersistInfo[] { new LinkPersistInfo(barButtonItem1, true), new LinkPersistInfo(barButtonItem2), new LinkPersistInfo(barButtonItem3), new LinkPersistInfo(barBtnEditProp, true), new LinkPersistInfo(barBtnRefreshMatching) });
popupMenuEdit.Manager = barManager1;
popupMenuEdit.Name = "popupMenuEdit";
//
@@ -695,6 +694,7 @@
((ISupportInitialize)imageCollection1).EndInit();
((ISupportInitialize)repositoryItemBreadCrumbEdit1).EndInit();
((ISupportInitialize)repositoryItemPageNumberEdit1).EndInit();
+ ((ISupportInitialize)repositoryItemTextEdit1).EndInit();
((ISupportInitialize)tileNavPane1).EndInit();
panelMain.ResumeLayout(false);
((ISupportInitialize)tileNavPane3).EndInit();
@@ -704,8 +704,6 @@
ResumeLayout(false);
PerformLayout();
}
-
-
@@ -756,15 +754,15 @@
private DevExpress.XtraBars.Navigation.NavButton navButton8;
private PumpFullInfoCtrl pumpFullInfoCtrl1;
private DevExpress.XtraBars.Navigation.NavButton navBtnDock;
- private DevExpress.XtraBars.Navigation.NavButton navBtnRefreshMatching;
private DevExpress.XtraBars.Navigation.NavButton navBtnEdit;
private DevExpress.XtraBars.BarButtonItem barButtonItem1;
private DevExpress.XtraBars.PopupMenu popupMenuEdit;
private DevExpress.XtraBars.BarButtonItem barButtonItem2;
private DevExpress.XtraBars.BarButtonItem barButtonItem3;
private BarButtonItem barBtnEditProp;
- private BarButtonItem barButtonItem5;
private DevExpress.XtraEditors.Repository.RepositoryItemBreadCrumbEdit repositoryItemBreadCrumbEdit1;
private DevExpress.XtraEditors.Repository.RepositoryItemPageNumberEdit repositoryItemPageNumberEdit1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemTextEdit repositoryItemTextEdit1;
+ private BarButtonItem barBtnRefreshMatching;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.cs
index 6b1b47f..549507a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.cs
@@ -350,20 +350,6 @@
JumpPumpFullInfoCtrl.Invoke(this.pumpFullInfoCtrl1);
}
- //閲嶆柊鍖归厤
- private void navBtnRefreshMatching_ElementClick(object sender, DevExpress.XtraBars.Navigation.NavElementEventArgs e)
- {
- var dlg = new PumpSingleMatchingDlg();
- dlg.SetBindingData(_pumpMatchingView);
- dlg.ReloadDataEvent += (matching) =>
- {
- _pumpMatchingView = matching;
- ReloadDataEvent.Invoke(_pumpMatchingView);
- this.SetBindindData(_pumpMatchingView);
- };
- dlg.ShowDialog();
- }
-
private void navBtnEdit_ElementClick(object sender, DevExpress.XtraBars.Navigation.NavElementEventArgs e)
{
this.popupMenuEdit.ShowPopup(MousePosition);
@@ -447,7 +433,21 @@
var dlg = new EditPumpPartPropDlg();
dlg.SetBindingData(PumpPropViewCtrl.GetPumpMainVmo());
dlg.ShowDialog();
- // ReloadRefreshData.Invoke();
+ this.pumpFullInfoCtrl1.RefreshPropData();
+ }
+
+ //娉靛瀷鍙烽噸鏂板尮閰�
+ private void BarBtnRefreshMatching_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ var dlg = new PumpSingleMatchingDlg();
+ dlg.SetBindingData(_pumpMatchingView);
+ dlg.ReloadDataEvent += (matching) =>
+ {
+ _pumpMatchingView = matching;
+ ReloadDataEvent.Invoke(_pumpMatchingView);
+ this.SetBindindData(_pumpMatchingView);
+ };
+ dlg.ShowDialog();
}
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.resx
index d7bd27a..12de776 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/PumpFullInfoViewDlg.resx
@@ -138,35 +138,6 @@
</value>
</data>
<assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
- <data name="navBtnRefreshMatching.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsFAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
- RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
- Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
- aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iQXV0b21hdGljVXBkYXRlcyI+
- DQogICAgPHBhdGggZD0iTTE1LjYsMjUuMUwxNC42LDI1Yy0xLTAuMi0xLjYtMS0xLjYtMnYtMS4xYy0w
- LjMsMC0wLjcsMC4xLTEsMC4xYy00LjQsMC04LTMuNi04LThjMC00LjQsMy42LTgsOC04ICAgYzIuMiww
- LDQuMiwwLjksNS42LDIuNEwxNCwxMmg1LjdIMjJoMS44SDI0VjJsLTMuNSwzLjVDMTguMywzLjMsMTUu
- MywyLDEyLDJDNS40LDIsMCw3LjQsMCwxNGMwLDYuNiw1LjQsMTIsMTIsMTIgICBjMS4xLDAsMi4yLTAu
- MiwzLjMtMC41TDE1LjYsMjUuMXoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgICA8cGF0aCBkPSJNMzEsMjN2
- LTJsLTIuMi0wLjRjLTAuMi0wLjYtMC40LTEuMy0wLjgtMS44bDEuMy0xLjhsLTEuNC0xLjRsLTEuOCwx
- LjNjLTAuNS0wLjMtMS4yLTAuNi0xLjgtMC43TDI0LDE0aC0yICAgbC0wLjQsMi4yYy0wLjYsMC4yLTEu
- MywwLjQtMS44LDAuN0wxOCwxNS42TDE2LjYsMTdsMS4zLDEuOGMtMC4zLDAuNS0wLjYsMS4yLTAuOCwx
- LjhMMTUsMjF2MmwyLjIsMC40YzAuMiwwLjYsMC40LDEuMywwLjgsMS44ICAgTDE2LjcsMjdsMS40LDEu
- NGwxLjgtMS4zYzAuNSwwLjMsMS4yLDAuNiwxLjgsMC43TDIyLDMwaDJsMC40LTIuMmMwLjYtMC4yLDEu
- My0wLjQsMS44LTAuN2wxLjgsMS4zbDEuNC0xLjRsLTEuMy0xLjggICBjMC4zLTAuNSwwLjYtMS4yLDAu
- OC0xLjhMMzEsMjN6IE0yMywyNGMtMS4xLDAtMi0wLjktMi0yczAuOS0yLDItMnMyLDAuOSwyLDJTMjQu
- MSwyNCwyMywyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-</value>
- </data>
<data name="navBtnEdit.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
@@ -315,6 +286,28 @@
<metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <data name="pageTitle1.HeaderSvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALkCAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iQ3JlYXRlX0xpbmVfQ2hhcnRfTm9fTWFya2VycyIgc3R5bGU9ImVuYWJs
+ ZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJs
+ dWV7ZmlsbDojMTE3N0Q3O30KCS5ZZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFD
+ O30KPC9zdHlsZT4NCiAgPHBvbHlnb24gcG9pbnRzPSIyLjgsNS44IDIuOCw1LjggMy43LDQgMTUuMyw5
+ LjcgMjguOCwyIDI5LjgsMy43IDE1LjMsMTIgMi44LDUuOCAiIGNsYXNzPSJSZWQiIC8+DQogIDxwb2x5
+ Z29uIHBvaW50cz0iMi43LDE3LjYgMi43LDE3LjYgMy45LDE2LjEgMTUuMiwyNS41IDI4LjYsMTIuMiAz
+ MCwxMy42IDE1LjQsMjguMiAyLjcsMTcuNiAiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDxwb2x5Z29uIHBv
+ aW50cz0iMi43LDI4LjEgMTUuMSwxNy44IDI5LjYsMjEuOSAyOSwyMy44IDE1LjUsMjAgMy45LDI5LjYg
+ Mi43LDI4LjEgIiBjbGFzcz0iQmx1ZSIgLz4NCjwvc3ZnPgs=
+</value>
+ </data>
+ <metadata name="barManager2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>435, 17</value>
+ </metadata>
<metadata name="imageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>280, 17</value>
</metadata>
@@ -360,28 +353,6 @@
3kwUwQAAAABJRU5ErkJgggs=
</value>
</data>
- <data name="pageTitle2.HeaderSvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALkCAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iQ3JlYXRlX0xpbmVfQ2hhcnRfTm9fTWFya2VycyIgc3R5bGU9ImVuYWJs
- ZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJs
- dWV7ZmlsbDojMTE3N0Q3O30KCS5ZZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFD
- O30KPC9zdHlsZT4NCiAgPHBvbHlnb24gcG9pbnRzPSIyLjgsNS44IDIuOCw1LjggMy43LDQgMTUuMyw5
- LjcgMjguOCwyIDI5LjgsMy43IDE1LjMsMTIgMi44LDUuOCAiIGNsYXNzPSJSZWQiIC8+DQogIDxwb2x5
- Z29uIHBvaW50cz0iMi43LDE3LjYgMi43LDE3LjYgMy45LDE2LjEgMTUuMiwyNS41IDI4LjYsMTIuMiAz
- MCwxMy42IDE1LjQsMjguMiAyLjcsMTcuNiAiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDxwb2x5Z29uIHBv
- aW50cz0iMi43LDI4LjEgMTUuMSwxNy44IDI5LjYsMjEuOSAyOSwyMy44IDE1LjUsMjAgMy45LDI5LjYg
- Mi43LDI4LjEgIiBjbGFzcz0iQmx1ZSIgLz4NCjwvc3ZnPgs=
-</value>
- </data>
- <metadata name="barManager2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>435, 17</value>
- </metadata>
<data name="bbi澶嶅埗娉靛瀷鍙锋枃瀛�.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACV0RVh0VGl0
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
index 45b42b6..af1901c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user
@@ -217,12 +217,6 @@
<Compile Update="03-simulation\XhsProjectSimulationMgrPage.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="04-pump\01-Prop\AddPumpPropDlg.cs">
- <SubType>Form</SubType>
- </Compile>
- <Compile Update="04-pump\01-Prop\PumpBarItem.cs">
- <SubType>UserControl</SubType>
- </Compile>
<Compile Update="04-pump\01-Prop\PumpPropViewCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
--
Gitblit v1.9.3